From c9c9653e665fb1cfddbb18c56544f089e313e03b Mon Sep 17 00:00:00 2001
From: unknown <13521043@std.stei.itb.ac.id>
Date: Thu, 16 Nov 2023 21:14:14 +0700
Subject: [PATCH] add gym_name attribute
---
mysql/gym_tracker.sql | 11 ++++-------
src/main/java/com/gymtracker/model/Application.java | 13 ++++++++++++-
.../com/gymtracker/service/ApplicationService.java | 10 ++++++----
3 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/mysql/gym_tracker.sql b/mysql/gym_tracker.sql
index 25a315a..54a0057 100644
--- a/mysql/gym_tracker.sql
+++ b/mysql/gym_tracker.sql
@@ -3,7 +3,7 @@
-- https://www.phpmyadmin.net/
--
-- Host: db-java:3307
--- Generation Time: Nov 14, 2023 at 08:06 AM
+-- Generation Time: Nov 16, 2023 at 01:49 PM
-- Server version: 8.1.0
-- PHP Version: 8.2.8
@@ -30,12 +30,13 @@ SET time_zone = "+00:00";
CREATE TABLE `application` (
`username` varchar(50) NOT NULL,
`gym_id` int NOT NULL,
+ `gym_name` varchar(50) NOT NULL,
`email` varchar(255) NOT NULL,
`acceptance` tinyint NOT NULL DEFAULT '0',
`trainer_name` varchar(50) NOT NULL,
`trainer_description` varchar(255) DEFAULT NULL,
`application_description` text
-) ;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-- --------------------------------------------------------
@@ -51,10 +52,6 @@ CREATE TABLE `logging` (
`request_description` text NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
---
--- Dumping data for table `logging`
---
-
--
-- Indexes for dumped tables
--
@@ -79,7 +76,7 @@ ALTER TABLE `logging`
-- AUTO_INCREMENT for table `logging`
--
ALTER TABLE `logging`
- MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=15;
+ MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=0;
COMMIT;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
diff --git a/src/main/java/com/gymtracker/model/Application.java b/src/main/java/com/gymtracker/model/Application.java
index a38670a..279e691 100644
--- a/src/main/java/com/gymtracker/model/Application.java
+++ b/src/main/java/com/gymtracker/model/Application.java
@@ -14,6 +14,8 @@ public class Application implements Serializable {
@Column(nullable = false)
private int gym_id;
+ @Column
+ private String gym_name;
@Column(nullable = false)
private String email;
@@ -40,6 +42,10 @@ public class Application implements Serializable {
return gym_id;
}
+ public String getGymName() {
+ return gym_name;
+ }
+
public String getEmail() {
return email;
}
@@ -77,9 +83,10 @@ public class Application implements Serializable {
}
// Constructors
- public Application(String username, int gym_id, String email, int acceptance, String trainer_name) {
+ public Application(String username, int gym_id, String gym_name, String email, int acceptance, String trainer_name) {
this.username = username;
this.gym_id = gym_id;
+ this.gym_name = gym_name;
this.email = email;
this.acceptance = acceptance;
this.trainer_name = trainer_name;
@@ -99,6 +106,10 @@ public class Application implements Serializable {
this.gym_id = gym_id;
}
+ public void setGymName(String gym_name) {
+ this.gym_name = gym_name;
+ }
+
public void setEmail(String email) {
this.email = email;
}
diff --git a/src/main/java/com/gymtracker/service/ApplicationService.java b/src/main/java/com/gymtracker/service/ApplicationService.java
index 81d1201..a225ad1 100644
--- a/src/main/java/com/gymtracker/service/ApplicationService.java
+++ b/src/main/java/com/gymtracker/service/ApplicationService.java
@@ -79,6 +79,7 @@ public class ApplicationService {
public String apply (
@WebParam(name = "username") String username,
@WebParam(name = "gym_id") int gym_id,
+ @WebParam(name = "gym_name") String gym_name,
@WebParam(name = "email") String email,
@WebParam(name = "trainer_name") String trainer_name,
@WebParam(name = "trainer_description") String trainer_description,
@@ -86,7 +87,7 @@ public class ApplicationService {
) throws Exception {
try {
- Application application = new Application(username, gym_id, email, 0, trainer_name);
+ Application application = new Application(username, gym_id, gym_name, email, 0, trainer_name);
if (trainer_description != null){
application.setTrainerDescription(trainer_description);
}
@@ -219,7 +220,7 @@ public class ApplicationService {
ApplicationService.beginTransaction(session);
// Get all the gym_id and acceptance status of the aplication
- String query = "SELECT g.gym_id, g.acceptance FROM Application g WHERE g.username = :username";
+ String query = "SELECT g.gym_id, g.gym_name, g.acceptance FROM Application g WHERE g.username = :username";
List<Object[]> resultList = session.createQuery(query, Object[].class)
.setParameter("username", username)
.getResultList();
@@ -229,8 +230,9 @@ public class ApplicationService {
StringBuilder result = new StringBuilder();
for (Object[] status : resultList) {
int gymId = (int) status[0];
- int acceptance = (int) status[1];
- result.append("(gym_id: ").append(gymId).append(", acceptance: )").append(acceptance).append("\n");
+ String gymName = (String) status[1];
+ int acceptance = (int) status[2];
+ result.append("(gym_id: ").append(gymId).append(", gym_name: ").append(gymName).append(", acceptance: ").append(acceptance).append(")\n");
}
return result.toString();
--
GitLab