diff --git a/src/main/java/org/soapService/Repository/AccountVerificationRequestRepository.java b/src/main/java/org/soapService/Repository/AccountVerificationRequestRepository.java
index fc38b7d3b2887935e51eacdb4f6c7a6604cd2897..e0c1c7bfa8b3b801412a5fe6e3a217cf850d330c 100644
--- a/src/main/java/org/soapService/Repository/AccountVerificationRequestRepository.java
+++ b/src/main/java/org/soapService/Repository/AccountVerificationRequestRepository.java
@@ -98,13 +98,22 @@ public class AccountVerificationRequestRepository implements BaseRepository<Acco
}
public void deleteAll() throws SQLException {
-
+ String query = "DELETE FROM account_verification_requests";
+ PreparedStatement ps = conn.prepareStatement(query);
+ ps.executeUpdate();
}
- public int delete(AccountVerificationRequest data) throws SQLException {
+ public int delete(int id) throws SQLException {
String query = "DELETE FROM account_verification_requests WHERE id = ?";
PreparedStatement ps = conn.prepareStatement(query);
- ps.setInt(1, data.getId());
+ ps.setInt(1, id);
+ return ps.executeUpdate();
+ }
+
+ public int delete(String userId) throws SQLException {
+ String query = "DELETE FROM account_verification_requests WHERE user_id = ? ";
+ PreparedStatement ps = conn.prepareStatement(query);
+ ps.setString(1, userId);
return ps.executeUpdate();
}
}
diff --git a/src/main/java/org/soapService/Repository/BaseRepository.java b/src/main/java/org/soapService/Repository/BaseRepository.java
index 2dceb6aa3a13dcc9d28d9006d12fc3ab0cfc70f0..ee8748c0f57aaffb6ce2f53279810870626e912c 100644
--- a/src/main/java/org/soapService/Repository/BaseRepository.java
+++ b/src/main/java/org/soapService/Repository/BaseRepository.java
@@ -15,6 +15,6 @@ public interface BaseRepository<T> {
public void deleteAll() throws SQLException;
- public int delete(T data) throws SQLException;
+ public int delete(int id) throws SQLException;
}
diff --git a/src/main/java/org/soapService/Repository/CatalogReqeustRepository.java b/src/main/java/org/soapService/Repository/CatalogReqeustRepository.java
index 16bcae8560370e91231decf59941bfab1e386c06..2979c1dcc44c63b036260ebc6e1f8acf4714b60e 100644
--- a/src/main/java/org/soapService/Repository/CatalogReqeustRepository.java
+++ b/src/main/java/org/soapService/Repository/CatalogReqeustRepository.java
@@ -111,10 +111,10 @@ public class CatalogReqeustRepository implements BaseRepository<CatalogRequest>
}
- public int delete(CatalogRequest data) throws SQLException {
+ public int delete(int id) throws SQLException {
String query = "DELETE FROM catalog_requests WHERE id = ?";
PreparedStatement ps = conn.prepareStatement(query);
- ps.setInt(1, data.getId());
+ ps.setInt(1, id);
return ps.executeUpdate();
}
}
diff --git a/src/main/java/org/soapService/Repository/LogRepository.java b/src/main/java/org/soapService/Repository/LogRepository.java
index e783401e0a375fb4fd94cc2e5eb55f62ecfe7728..7c3fb07c09950ae9ae21fa8c8191bf9e476d61a2 100644
--- a/src/main/java/org/soapService/Repository/LogRepository.java
+++ b/src/main/java/org/soapService/Repository/LogRepository.java
@@ -38,7 +38,7 @@ public class LogRepository implements BaseRepository<Log> {
}
- public int delete(Log data) throws SQLException {
+ public int delete(int id) throws SQLException {
return 0;
}
}
diff --git a/src/main/java/org/soapService/Repository/ReportUserRepository.java b/src/main/java/org/soapService/Repository/ReportUserRepository.java
index 865a48185ee11c4438236dc764e47d0a137bdd29..02050001563b57e092ea337de882b3ca3f7a1305 100644
--- a/src/main/java/org/soapService/Repository/ReportUserRepository.java
+++ b/src/main/java/org/soapService/Repository/ReportUserRepository.java
@@ -79,16 +79,24 @@ public class ReportUserRepository implements BaseRepository<ReportUser> {
}
- public int delete(ReportUser data) throws SQLException {
- String query = "DELETE FROM report_users WHERE uuid = ?";
- String identifier = data.getUuid();
- if (data.getReportedId() != null) {
- query = "DELETE FROM report_users WHERE reported_id = ?";
- identifier = data.getReportedId();
- }
+ public int delete(int id) throws SQLException {
+ String query = "DELETE FROM report_users WHERE id = ?";
+ PreparedStatement ps = conn.prepareStatement(query);
+ ps.setInt(1, id);
+ return ps.executeUpdate();
+ }
+ public int deleteByReportedId(String reportedId) throws SQLException {
+ String query = "DELETE FROM report_users WHERE reported_id = ?";
+ PreparedStatement ps = conn.prepareStatement(query);
+ ps.setString(1, reportedId);
+ return ps.executeUpdate();
+ }
+
+ public int deleteByUuid(String uuid) throws SQLException {
+ String query = "DELETE FROM report_users WHERE uuid = ?";
PreparedStatement ps = conn.prepareStatement(query);
- ps.setString(1, identifier);
+ ps.setString(1, uuid);
return ps.executeUpdate();
}
}
diff --git a/src/main/java/org/soapService/Services/AccountVerificationRequestServiceImpl.java b/src/main/java/org/soapService/Services/AccountVerificationRequestServiceImpl.java
index 1132e84211d61eb9d3128e1794d8497105849f25..1982fafea448d419555a8a8b56cbbf5cf8f79588 100644
--- a/src/main/java/org/soapService/Services/AccountVerificationRequestServiceImpl.java
+++ b/src/main/java/org/soapService/Services/AccountVerificationRequestServiceImpl.java
@@ -153,6 +153,13 @@ public class AccountVerificationRequestServiceImpl extends BaseService implement
new RequestException(HTTPStatusCode.BAD_REQUEST.getCodeStr(),
"This user doesn't have a request or already verified");
}
+
+ int deleteRes = accountVerificationRepository.delete(accountVerificationRequest.getUserId());
+ if (deleteRes == 0) {
+ System.out.println("Failed to delete request");
+ } else {
+ System.out.println("Successfully delete request");
+ }
} catch (ValidationException e) {
System.out.println(e.getMessage());
new RequestException(HTTPStatusCode.BAD_REQUEST.getCodeStr(), e.getMessage());
@@ -192,10 +199,7 @@ public class AccountVerificationRequestServiceImpl extends BaseService implement
try {
accountVerificationServiceValidation.validateDeleteVerificationRequest(requestId);
- AccountVerificationRequest accountVerificationRequest = new AccountVerificationRequest();
- accountVerificationRequest.setId(requestId);
-
- int res = accountVerificationRepository.delete(accountVerificationRequest);
+ int res = accountVerificationRepository.delete(requestId);
if (res == 0) {
new RequestException(HTTPStatusCode.BAD_REQUEST.getCodeStr(),
diff --git a/src/main/java/org/soapService/Services/CatalogRequestServiceImpl.java b/src/main/java/org/soapService/Services/CatalogRequestServiceImpl.java
index 425d711c26f694deea075aa90043d4e271391116..a01814eea19614fb98d39f22c0e452c1134e8570 100644
--- a/src/main/java/org/soapService/Services/CatalogRequestServiceImpl.java
+++ b/src/main/java/org/soapService/Services/CatalogRequestServiceImpl.java
@@ -209,10 +209,7 @@ public class CatalogRequestServiceImpl extends BaseService implements CatalogReq
try {
catalogValidation.validateDeleteCatalogRequest(requestId);
- CatalogRequest catalogRequest = new CatalogRequest();
- catalogRequest.setId(requestId);
-
- int res = catalogRepository.delete(catalogRequest);
+ int res = catalogRepository.delete(requestId);
if (res == 0) {
new RequestException(HTTPStatusCode.BAD_REQUEST.getCodeStr(),
diff --git a/src/main/java/org/soapService/Services/ReportUserServiceImpl.java b/src/main/java/org/soapService/Services/ReportUserServiceImpl.java
index ded0449dd43f53300952b67f9451429466242621..1bb3875767b50b2cadc50e221f116a677a3cb5c4 100644
--- a/src/main/java/org/soapService/Services/ReportUserServiceImpl.java
+++ b/src/main/java/org/soapService/Services/ReportUserServiceImpl.java
@@ -75,11 +75,8 @@ public class ReportUserServiceImpl extends BaseService implements ReportUserServ
try {
reportUserServiceValidation.validateBlockUser(reportedId);
- ReportUser reportUser = new ReportUser();
- reportUser.setReportedId(reportedId);
-
// delete all report to the user
- int res = reportUserRepository.delete(reportUser);
+ int res = reportUserRepository.deleteByReportedId(reportedId);
if (res == 0) {
new RequestException(HTTPStatusCode.BAD_REQUEST.getCodeStr(), "The report with following User ID doesn't exist");
@@ -115,10 +112,7 @@ public class ReportUserServiceImpl extends BaseService implements ReportUserServ
try {
reportUserServiceValidation.validateDeleteReportUser(reportId);
- ReportUser reportUser = new ReportUser();
- reportUser.setUuid(reportId);
-
- int res = reportUserRepository.delete(reportUser);
+ int res = reportUserRepository.deleteByUuid(reportId);
if (res == 0) {
new RequestException(HTTPStatusCode.BAD_REQUEST.getCodeStr(), "This report doesn't exist");
}