AYS-501 | The error has been fixed.

Author: MenekseYuncu

src/main/java/org/ays/auth/service/impl/AysUserUpdateServiceImpl.java

@@ -66,15 +66,21 @@ public void update(final String id,
                 .lineNumber(updateRequest.getPhoneNumber().getLineNumber())
                 .build();
 
-        this.validatePhoneNumber(user, phoneNumber);
-        this.validateEmailAddress(user, updateRequest.getEmailAddress());
+        if (!user.getPhoneNumber().equals(phoneNumber)) {
+            this.validatePhoneNumber(user, phoneNumber);
+            user.setPhoneNumber(phoneNumber);
+        }
+
+        if (!user.getEmailAddress().equals(updateRequest.getEmailAddress())) {
+            this.validateEmailAddress(user, updateRequest.getEmailAddress());
+            user.setEmailAddress(updateRequest.getEmailAddress());
+        }
+
         this.validateRolesAndSet(user, updateRequest.getRoleIds());
 
         user.setFirstName(updateRequest.getFirstName());
         user.setLastName(updateRequest.getLastName());
-        user.setEmailAddress(updateRequest.getEmailAddress());
         user.setCity(updateRequest.getCity());
-        user.setPhoneNumber(phoneNumber);
         user.setUpdatedUser(identity.getUserId());
 
         userSavePort.save(user);

src/test/java/org/ays/auth/controller/AysUserEndToEndTest.java

@@ -2,7 +2,6 @@
 
 import org.ays.AysEndToEndTest;
 import org.ays.auth.model.AysRole;
-import org.ays.auth.model.AysRoleBuilder;
 import org.ays.auth.model.AysUser;
 import org.ays.auth.model.AysUserBuilder;
 import org.ays.auth.model.enums.AysUserStatus;
@@ -18,6 +17,8 @@
 import org.ays.auth.port.AysRoleReadPort;
 import org.ays.auth.port.AysUserReadPort;
 import org.ays.auth.port.AysUserSavePort;
+import org.ays.common.model.AysPhoneNumberBuilder;
+import org.ays.common.model.request.AysPhoneNumberRequestBuilder;
 import org.ays.common.model.response.AysPageResponse;
 import org.ays.common.model.response.AysResponse;
 import org.ays.common.model.response.AysResponseBuilder;
@@ -387,6 +388,11 @@ void givenValidIdAndUserUpdateRequest_whenRolesUpdatedOnly_thenReturnSuccess() t
         AysUser user = userSavePort.save(
                 new AysUserBuilder()
                         .withValidValues()
+                        .withFirstName("Test")
+                        .withLastName("Dene")
+                        .withEmailAddress("Test.deneme@afetyonetimsistemi.org")
+                        .withCity("İzmir")
+                        .withPhoneNumber(new AysPhoneNumberBuilder().withValidValues().build())
                         .withoutId()
                         .withRoles(roles)
                         .withInstitution(institution)
@@ -395,12 +401,8 @@ void givenValidIdAndUserUpdateRequest_whenRolesUpdatedOnly_thenReturnSuccess() t
 
         // Given
         String id = user.getId();
-        List<AysRole> newRoles = List.of(
-                new AysRoleBuilder()
-                        .withValidValues()
-                        .withId("42fe288d-be87-4169-875e-e721a75cc833")
-                        .build()
-        );
+        AysRole newRole = roles.get(0);
+        List<AysRole> newRoles = List.of(newRole);
 
         Set<String> newRoleIds = newRoles.stream()
                 .map(AysRole::getId)
@@ -409,6 +411,11 @@ void givenValidIdAndUserUpdateRequest_whenRolesUpdatedOnly_thenReturnSuccess() t
 
         AysUserUpdateRequest updateRequest = new AysUserUpdateRequestBuilder()
                 .withValidValues()
+                .withFirstName("Test")
+                .withLastName("Dene")
+                .withEmailAddress("Test.deneme@afetyonetimsistemi.org")
+                .withCity("İzmir")
+                .withPhoneNumber(new AysPhoneNumberRequestBuilder().withValidValues().build())
                 .withRoleIds(newRoleIds)
                 .build();