From 93e033e89ffdffb1cf3ce46e711609cab55b74b9 Mon Sep 17 00:00:00 2001
From: Raditss <raditya.naufal.a@gmail.com>
Date: Wed, 15 Nov 2023 13:28:38 +0700
Subject: [PATCH] add gems included in transaction
---
.gitignore | 5 ++++-
pom.xml | 15 ---------------
.../java/org/toco/model/transaction_model.java | 4 ++--
.../java/org/toco/service/toco_service_impl.java | 4 ++++
4 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5ff6309..1c91c9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,7 @@ build/
.vscode/
### Mac OS ###
-.DS_Store
\ No newline at end of file
+.DS_Store
+
+### ENV ###
+.env
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3817136..eca3f6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,21 +38,6 @@
<artifactId>webservices-api</artifactId>
<version>4.0.2</version>
</dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5-20081211</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet-core</artifactId>
- <version>3.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>6.0.13</version>
- </dependency>
<dependency>
<groupId>io.github.cdimascio</groupId>
<artifactId>java-dotenv</artifactId>
diff --git a/src/main/java/org/toco/model/transaction_model.java b/src/main/java/org/toco/model/transaction_model.java
index 767535d..fe08525 100644
--- a/src/main/java/org/toco/model/transaction_model.java
+++ b/src/main/java/org/toco/model/transaction_model.java
@@ -7,9 +7,9 @@ import org.toco.entity.transaction_entity;
public class transaction_model {
// insert a transaction
public void insert (transaction_entity transaction_entity) {
- String sql = "INSERT INTO transaction (user_id, amount, image, status) VALUES (?, ?, ?, ?)";
+ String sqltrans = "INSERT INTO transaction (user_id, amount, image, status) VALUES (?, ?, ?, ?)";
try (Connection connection = connector.connect() ;
- PreparedStatement command = connection.prepareStatement(sql)) {
+ PreparedStatement command = connection.prepareStatement(sqltrans)) {
command.setInt(1, transaction_entity.getUser_id());
command.setInt(2, transaction_entity.getAmount());
command.setString(3, transaction_entity.getImage());
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 b4dffc4..e3bfb1c 100644
--- a/src/main/java/org/toco/service/toco_service_impl.java
+++ b/src/main/java/org/toco/service/toco_service_impl.java
@@ -25,15 +25,19 @@ public class toco_service_impl implements toco_service {
if (validateApiKey()){
userGems_Entity userGems = new userGems_Entity(user_id, gem);
userGems_model userGemsModel = new userGems_model();
+ transaction_model transactionModel = new transaction_model();
+ transaction_entity tan = new transaction_entity(user_id, gem, "add gems", "ACCEPTED");
if (userGemsModel.checkUser(user_id)) {
Integer currentGems = userGemsModel.getUserGems(user_id);
userGems.setGem(currentGems + gem);
userGemsModel.update(userGems);
addLoggging("User with id " + user_id + " added " + gem + " gems");
+ transactionModel.insert(tan);
return "success";
} else {
userGemsModel.insert(userGems);
addLoggging("User with id " + user_id + " added " + gem + " gems");
+ transactionModel.insert(tan);
return "success";
}
}
--
GitLab