From 4c54a8b51f4d752aaa0836c98d90e4b20c519ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0dil=20Zeynep=20Alemdar?= Date: Sun, 3 Nov 2024 23:58:39 +0300 Subject: [PATCH 1/2] fix: return 404 in case Admin Registration Status is not WAITING --- .../service/impl/AdminRegistrationCompleteServiceImpl.java | 6 +++--- .../AdminRegistrationApplicationControllerTest.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImpl.java b/src/main/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImpl.java index c3180218f..4f47f85ba 100644 --- a/src/main/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImpl.java +++ b/src/main/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImpl.java @@ -1,9 +1,11 @@ package org.ays.auth.service.impl; +import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdAuthException; +import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdException; import org.ays.auth.exception.AysUserAlreadyExistsByEmailAddressException; import org.ays.auth.exception.AysUserAlreadyExistsByPhoneNumberException; import org.ays.auth.model.AdminRegistrationApplication; @@ -26,8 +28,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - /** * Implementation of {@link AdminRegistrationCompleteService} that handles the completion of admin registration applications. * This service manages the creation of new admin users and assigns appropriate roles and permissions. @@ -83,7 +83,7 @@ public void complete(final String id, final AdminRegistrationApplicationComplete final AdminRegistrationApplication application = adminRegistrationApplicationReadPort .findById(id) .filter(AdminRegistrationApplication::isWaiting) - .orElseThrow(() -> new AysAdminRegistrationApplicationNotExistByIdAuthException(id)); + .orElseThrow(() -> new AysAdminRegistrationApplicationNotExistByIdException(id)); user.setInstitution(application.getInstitution()); user.notVerify(); diff --git a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java index 9eeae3458..743a18fe3 100644 --- a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java +++ b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java @@ -2,6 +2,7 @@ import org.ays.AysRestControllerTest; import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdAuthException; +import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdException; import org.ays.auth.model.AdminRegistrationApplication; import org.ays.auth.model.AdminRegistrationApplicationBuilder; import org.ays.auth.model.enums.AdminRegistrationApplicationStatus; @@ -399,7 +400,7 @@ void givenIdAndAdminRegisterRequest_whenAdminApplicationNotFound_thenReturnUnaut .withValidValues().build(); // When - Mockito.doThrow(new AysAdminRegistrationApplicationNotExistByIdAuthException(mockId)) + Mockito.doThrow(new AysAdminRegistrationApplicationNotExistByIdException(mockId)) .when(adminRegistrationCompleteService) .complete(Mockito.anyString(), Mockito.any()); From 381bdfa059d90efaffff4dcc6ba9edd4920eb028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0dil=20Zeynep=20Alemdar?= Date: Sun, 24 Nov 2024 19:55:34 +0300 Subject: [PATCH 2/2] fix failing unit tests --- .../AdminRegistrationApplicationControllerTest.java | 2 +- .../AdminRegistrationCompleteServiceImplTest.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java index 743a18fe3..efbeb4815 100644 --- a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java +++ b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java @@ -400,7 +400,7 @@ void givenIdAndAdminRegisterRequest_whenAdminApplicationNotFound_thenReturnUnaut .withValidValues().build(); // When - Mockito.doThrow(new AysAdminRegistrationApplicationNotExistByIdException(mockId)) + Mockito.doThrow(new AysAdminRegistrationApplicationNotExistByIdAuthException(mockId)) .when(adminRegistrationCompleteService) .complete(Mockito.anyString(), Mockito.any()); diff --git a/src/test/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImplTest.java b/src/test/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImplTest.java index 0f15df206..087fca3a2 100644 --- a/src/test/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImplTest.java +++ b/src/test/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImplTest.java @@ -1,7 +1,9 @@ package org.ays.auth.service.impl; +import java.util.List; +import java.util.Optional; import org.ays.AysUnitTest; -import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdAuthException; +import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdException; import org.ays.auth.exception.AysUserAlreadyExistsByEmailAddressException; import org.ays.auth.exception.AysUserAlreadyExistsByPhoneNumberException; import org.ays.auth.model.AdminRegistrationApplication; @@ -33,9 +35,6 @@ import org.mockito.Mockito; import org.springframework.security.crypto.password.PasswordEncoder; -import java.util.List; -import java.util.Optional; - class AdminRegistrationCompleteServiceImplTest extends AysUnitTest { @InjectMocks @@ -273,7 +272,7 @@ void givenValidApplicationId_whenApplicationNotFound_thenThrowAdminRegistrationA // Then Assertions.assertThrows( - AysAdminRegistrationApplicationNotExistByIdAuthException.class, + AysAdminRegistrationApplicationNotExistByIdException.class, () -> adminUserRegisterService.complete(mockApplicationId, mockCompleteRequest) ); @@ -336,7 +335,7 @@ void givenUsedApplicationId_whenApplicationStatusIsNotWaiting_thenThrowAdminRegi // Then Assertions.assertThrows( - AysAdminRegistrationApplicationNotExistByIdAuthException.class, + AysAdminRegistrationApplicationNotExistByIdException.class, () -> adminUserRegisterService.complete(mockApplicationId, mockCompleteRequest) );