From a32d5a499f96f2769876e0b820683acf01c895e8 Mon Sep 17 00:00:00 2001
From: dirgantarasiahaan <siahaandirgantara@gmail.com>
Date: Sun, 28 May 2023 17:48:37 +0700
Subject: [PATCH] change password

---
 .../controller/AuthenticationController.java     | 16 ++++++++--------
 ...rdRequest.java => ChangePasswordRequest.java} |  2 +-
 ...rdService.java => ChangePasswordService.java} | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename src/main/java/com/iconplus/smartproc/model/request/{ForgotPasswordRequest.java => ChangePasswordRequest.java} (86%)
 rename src/main/java/com/iconplus/smartproc/service/authentication/{ForgotPasswordService.java => ChangePasswordService.java} (89%)

diff --git a/src/main/java/com/iconplus/smartproc/controller/AuthenticationController.java b/src/main/java/com/iconplus/smartproc/controller/AuthenticationController.java
index b642974..d7a4920 100644
--- a/src/main/java/com/iconplus/smartproc/controller/AuthenticationController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/AuthenticationController.java
@@ -2,12 +2,12 @@ package com.iconplus.smartproc.controller;
 
 import com.iconplus.smartproc.helper.model.EmptyRequest;
 import com.iconplus.smartproc.helper.model.EmptyResponse;
-import com.iconplus.smartproc.model.request.ForgotPasswordRequest;
+import com.iconplus.smartproc.model.request.ChangePasswordRequest;
 import com.iconplus.smartproc.model.request.LoginRequest;
 import com.iconplus.smartproc.model.request.RefreshTokenRequest;
 import com.iconplus.smartproc.model.response.LoginResponse;
 import com.iconplus.smartproc.model.response.RefreshTokenResponse;
-import com.iconplus.smartproc.service.authentication.ForgotPasswordService;
+import com.iconplus.smartproc.service.authentication.ChangePasswordService;
 import com.iconplus.smartproc.service.authentication.LoginService;
 import com.iconplus.smartproc.service.authentication.LogoutService;
 import com.iconplus.smartproc.service.authentication.TokenManagementService;
@@ -21,16 +21,16 @@ public class AuthenticationController {
     private LoginService loginService;
     private TokenManagementService tokenManagementService;
     private LogoutService logoutService;
-    private ForgotPasswordService forgotPasswordService;
+    private ChangePasswordService changePasswordService;
 
     public AuthenticationController(LoginService loginService,
                                     TokenManagementService tokenManagementService,
                                     LogoutService logoutService,
-                                    ForgotPasswordService forgotPasswordService) {
+                                    ChangePasswordService changePasswordService) {
         this.loginService = loginService;
         this.tokenManagementService = tokenManagementService;
         this.logoutService = logoutService;
-        this.forgotPasswordService = forgotPasswordService;
+        this.changePasswordService = changePasswordService;
     }
 
     @PostMapping("/login")
@@ -49,9 +49,9 @@ public class AuthenticationController {
 
     }
 
-    @PostMapping("/forgot-password")
-    public EmptyResponse forgotPassword(@RequestBody ForgotPasswordRequest forgotPasswordRequest) {
-        return forgotPasswordService.execute(forgotPasswordRequest);
+    @PostMapping("/change-password")
+    public EmptyResponse changePassword(@RequestBody ChangePasswordRequest changePasswordRequest) {
+        return changePasswordService.execute(changePasswordRequest);
     }
 
 }
diff --git a/src/main/java/com/iconplus/smartproc/model/request/ForgotPasswordRequest.java b/src/main/java/com/iconplus/smartproc/model/request/ChangePasswordRequest.java
similarity index 86%
rename from src/main/java/com/iconplus/smartproc/model/request/ForgotPasswordRequest.java
rename to src/main/java/com/iconplus/smartproc/model/request/ChangePasswordRequest.java
index 7c29ff4..041ffb5 100644
--- a/src/main/java/com/iconplus/smartproc/model/request/ForgotPasswordRequest.java
+++ b/src/main/java/com/iconplus/smartproc/model/request/ChangePasswordRequest.java
@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class ForgotPasswordRequest extends BaseRequest {
+public class ChangePasswordRequest extends BaseRequest {
     private String currentPassword;
     private String newPassword;
     private String confirmationPassword;
diff --git a/src/main/java/com/iconplus/smartproc/service/authentication/ForgotPasswordService.java b/src/main/java/com/iconplus/smartproc/service/authentication/ChangePasswordService.java
similarity index 89%
rename from src/main/java/com/iconplus/smartproc/service/authentication/ForgotPasswordService.java
rename to src/main/java/com/iconplus/smartproc/service/authentication/ChangePasswordService.java
index a4b6d8a..baf76a7 100644
--- a/src/main/java/com/iconplus/smartproc/service/authentication/ForgotPasswordService.java
+++ b/src/main/java/com/iconplus/smartproc/service/authentication/ChangePasswordService.java
@@ -4,7 +4,7 @@ import com.iconplus.smartproc.exception.BusinessException;
 import com.iconplus.smartproc.helper.context.ApiContext;
 import com.iconplus.smartproc.helper.model.EmptyResponse;
 import com.iconplus.smartproc.helper.service.BaseService;
-import com.iconplus.smartproc.model.request.ForgotPasswordRequest;
+import com.iconplus.smartproc.model.request.ChangePasswordRequest;
 import com.iconplus.smartproc.repository.UsersRepository;
 import com.iconplus.smartproc.service.CommonService;
 import com.iconplus.smartproc.util.Constants;
@@ -14,12 +14,12 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 @Service
-public class ForgotPasswordService implements BaseService<ForgotPasswordRequest, EmptyResponse> {
+public class ChangePasswordService implements BaseService<ChangePasswordRequest, EmptyResponse> {
 
     private ApiContext apiContext;
     private UsersRepository usersRepository;
     private CommonService commonService;
-    public ForgotPasswordService(UsersRepository usersRepository,
+    public ChangePasswordService(UsersRepository usersRepository,
                                  ApiContext apiContext,
                                  CommonService commonService) {
         this.usersRepository = usersRepository;
@@ -28,7 +28,7 @@ public class ForgotPasswordService implements BaseService<ForgotPasswordRequest,
     }
 
     @Override
-    public EmptyResponse execute(ForgotPasswordRequest input) {
+    public EmptyResponse execute(ChangePasswordRequest input) {
 
         Long id = Long.valueOf(apiContext.getUserId());
         var users = usersRepository.findByIdAndIsDeleteFalse(id)
@@ -48,7 +48,7 @@ public class ForgotPasswordService implements BaseService<ForgotPasswordRequest,
         }
 
         String newPassword = commonService.getPassword(input.getNewPassword());
-        String confirmationPassword = commonService.getPassword(input.getNewPassword());
+        String confirmationPassword = commonService.getPassword(input.getConfirmationPassword());
 
 
         if (!StringUtils.equalsIgnoreCase(newPassword, confirmationPassword)) {