From 1b1085400e6d699a29ecb40dd9a48b7a757b0422 Mon Sep 17 00:00:00 2001
From: sarojsingh2021 <saroj.kumarsingh@tarento.com>
Date: Wed, 4 Jan 2023 15:27:00 +0530
Subject: [PATCH] fix user-delete
---
.../com/tarento/retail/controller/UserController.java | 11 ++++-------
.../tarento/retail/service/impl/UserServiceImpl.java | 3 ++-
src/main/java/com/tarento/retail/util/Sql.java | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/tarento/retail/controller/UserController.java b/src/main/java/com/tarento/retail/controller/UserController.java
index a13298b..dee2110 100644
--- a/src/main/java/com/tarento/retail/controller/UserController.java
+++ b/src/main/java/com/tarento/retail/controller/UserController.java
@@ -494,7 +494,7 @@ public class UserController {
return ResponseGenerator.failureResponse("Invalid Token");
}
- // DELETE user
+ // SOFT DELETE user
@RequestMapping(value = PathRoutes.UserRoutes.ADMIN_DELETE_USER, method = RequestMethod.POST)
public Object softDeleteUser(@RequestBody UserDto userDto,
@RequestHeader(value = Constants.AUTH_HEADER) String authToken, BindingResult result)
@@ -502,13 +502,10 @@ public class UserController {
if (result.hasErrors()) {
return ResponseGenerator.failureResponse(HttpStatus.UNPROCESSABLE_ENTITY.toString());
}
- Boolean userTokenAvailable = userService.findUserByToken(authToken);
- String username = "";
- if (userTokenAvailable) {
- username = jwtTokenUtil.getUsernameFromToken(authToken);
- User user = userService.findOne(username);
- return ResponseGenerator.successResponse(userService.softDeleteUser(userDto));
+ if (userService.softDeleteUser(userDto)) {
+
+ return ResponseGenerator.successResponse(true);
}
return ResponseGenerator.failureResponse("Invalid Token");
}
diff --git a/src/main/java/com/tarento/retail/service/impl/UserServiceImpl.java b/src/main/java/com/tarento/retail/service/impl/UserServiceImpl.java
index 421382b..486b3e1 100644
--- a/src/main/java/com/tarento/retail/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/tarento/retail/service/impl/UserServiceImpl.java
@@ -568,7 +568,7 @@ public class UserServiceImpl implements UserDetailsService, UserService {
@Override
public Boolean validateUserOTP(String username, String otp) {
-
+
try {
LoginAuthentication loginAuth = Cache.getUserAuthData(username);
if (loginAuth != null && loginAuth.getOtpExpiryDate() > DateUtil.getCurrentTimestamp()
@@ -579,6 +579,7 @@ public class UserServiceImpl implements UserDetailsService, UserService {
LOGGER.error(String.format(Constants.EXCEPTION_METHOD, "validateUserOTP", e.getMessage()));
}
return Boolean.FALSE;
+
}
@Override
diff --git a/src/main/java/com/tarento/retail/util/Sql.java b/src/main/java/com/tarento/retail/util/Sql.java
index 75edd8e..f18c7f5 100644
--- a/src/main/java/com/tarento/retail/util/Sql.java
+++ b/src/main/java/com/tarento/retail/util/Sql.java
@@ -158,7 +158,7 @@ public interface Sql {
final String FETCH_AUTH_TOKEN_REF = "SELECT id FROM user_authentication WHERE auth_token = ? ";
final String REMOVE_USER_DEVICE_TOKEN = "DELETE from user_device WHERE user_auth_id IN (SELECT id FROM user_authentication WHERE auth_token =?) ";
final String DELETE_USER = "DELETE from user WHERE id=?";
- final String SOFT_DELETE_USER = "UPDATE user SET deleted=1 WHERE id= ?";
+ final String SOFT_DELETE_USER = "UPDATE user SET is_deleted=1, is_active = 0 WHERE id= ?";
final String DELETE_USER_ROLE = "DELETE from user_role where user_id=?";
final String DELETE_COUNTRY_USER = "DELETE from country_user where user_id=?";
--
GitLab