From 30313538a3527b8d11d5762f6c3a46d38c369fdb Mon Sep 17 00:00:00 2001
From: bewe <93899302+bernarduswillson@users.noreply.github.com>
Date: Fri, 17 Nov 2023 03:56:02 +0700
Subject: [PATCH] fix: docker and format
---
docker-compose.yml | 16 ++++++-------
dockerfile | 24 +++++++++----------
.../org/toco/service/toco_service_impl.java | 2 +-
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 8d11b58..f32b585 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,12 +11,12 @@ services:
MYSQL_USER: toco
MYSQL_PASSWORD: toco
-# toco-soap:
-# build:
-# dockerfile: Dockerfile
-# context: .
-# ports:
-# - "8080:8080"
-# depends_on:
-# - toco-soap-db
+ toco-soap:
+ build:
+ dockerfile: Dockerfile
+ context: .
+ ports:
+ - "8080:8080"
+ depends_on:
+ - toco-soap-db
diff --git a/dockerfile b/dockerfile
index 1e8e49a..e67df1e 100644
--- a/dockerfile
+++ b/dockerfile
@@ -1,15 +1,15 @@
FROM mysql/mysql-server:8.0.23
COPY db/tocosoap.sql /docker-entrypoint-initdb.d/
-#FROM maven:3.8-openjdk-11-slim
-#
-#WORKDIR /app
-#
-#COPY src ./src
-#COPY pom.xml .
-#COPY .env .
-#COPY target ./target
-#
-#RUN mvn clean package
-#
-#CMD ["mvn", "exec:java"]
\ No newline at end of file
+FROM maven:3.8-openjdk-11-slim
+
+WORKDIR /app
+
+COPY src ./src
+COPY pom.xml .
+COPY .env .
+COPY target ./target
+
+RUN mvn clean package
+
+CMD ["mvn", "exec:java"]
\ No newline at end of file
diff --git a/src/main/java/org/toco/service/toco_service_impl.java b/src/main/java/org/toco/service/toco_service_impl.java
index 665696c..98c87d4 100644
--- a/src/main/java/org/toco/service/toco_service_impl.java
+++ b/src/main/java/org/toco/service/toco_service_impl.java
@@ -113,7 +113,7 @@ public class toco_service_impl implements toco_service {
transaction_model transactionModel = new transaction_model();
voucher_entity voucherEntity = new voucher_entity(voucher,user_id,amount,"0");
voucherModel.insert(voucherEntity);
- transactionModel.insert(new transaction_entity(user_id, amount, "voucher", "accepted", "0"));
+ transactionModel.insert(new transaction_entity(user_id, amount, "Voucher Redeemed", "accepted", "0"));
if (userGemsModel.checkUser(user_id)) {
Integer currentGems = userGemsModel.getUserGems(user_id);
userGemsModel.update(new userGems_Entity(user_id, currentGems + amount));
--
GitLab