diff --git a/docker-compose.yml b/docker-compose.yml index 8d11b58ff5d05c3a848716449f31c7566020ea98..f32b58505ef6bfd324733518079cdaca86a72644 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 1e8e49a088f825130874f72c7ae2146f352e2b5d..e67df1e50f4981e95ec147e6c0dc9ff0b312fa60 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 665696c57c14b42106448644ce21b0aca3d272c3..98c87d4fedc8ba12c9c82fda6da1b0ac019aa0be 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));