diff --git a/src/main/java/com/tarento/retail/controller/UserController.java b/src/main/java/com/tarento/retail/controller/UserController.java index a13298bdd9059e551f86e90746896495f031e3d6..051720918c95e3f3cdfd58acd3f38445c7cb6277 100644 --- a/src/main/java/com/tarento/retail/controller/UserController.java +++ b/src/main/java/com/tarento/retail/controller/UserController.java @@ -502,13 +502,9 @@ 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/util/Sql.java b/src/main/java/com/tarento/retail/util/Sql.java index 75edd8e2d285af1b3470a0befa2881f5139f0144..f18c7f51031c773568234a7dd001efa1d129d462 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=?";