Skip to content

Commit 4c54a8b

Browse files
author
İdil Zeynep Alemdar
committed
fix: return 404 in case Admin Registration Status is not WAITING
1 parent 594c938 commit 4c54a8b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package org.ays.auth.service.impl;
22

3+
import java.util.List;
34
import lombok.RequiredArgsConstructor;
45
import lombok.extern.slf4j.Slf4j;
56
import org.apache.commons.collections4.CollectionUtils;
67
import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdAuthException;
8+
import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdException;
79
import org.ays.auth.exception.AysUserAlreadyExistsByEmailAddressException;
810
import org.ays.auth.exception.AysUserAlreadyExistsByPhoneNumberException;
911
import org.ays.auth.model.AdminRegistrationApplication;
@@ -26,8 +28,6 @@
2628
import org.springframework.stereotype.Service;
2729
import org.springframework.transaction.annotation.Transactional;
2830

29-
import java.util.List;
30-
3131
/**
3232
* Implementation of {@link AdminRegistrationCompleteService} that handles the completion of admin registration applications.
3333
* 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
8383
final AdminRegistrationApplication application = adminRegistrationApplicationReadPort
8484
.findById(id)
8585
.filter(AdminRegistrationApplication::isWaiting)
86-
.orElseThrow(() -> new AysAdminRegistrationApplicationNotExistByIdAuthException(id));
86+
.orElseThrow(() -> new AysAdminRegistrationApplicationNotExistByIdException(id));
8787

8888
user.setInstitution(application.getInstitution());
8989
user.notVerify();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.ays.AysRestControllerTest;
44
import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdAuthException;
5+
import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdException;
56
import org.ays.auth.model.AdminRegistrationApplication;
67
import org.ays.auth.model.AdminRegistrationApplicationBuilder;
78
import org.ays.auth.model.enums.AdminRegistrationApplicationStatus;
@@ -399,7 +400,7 @@ void givenIdAndAdminRegisterRequest_whenAdminApplicationNotFound_thenReturnUnaut
399400
.withValidValues().build();
400401

401402
// When
402-
Mockito.doThrow(new AysAdminRegistrationApplicationNotExistByIdAuthException(mockId))
403+
Mockito.doThrow(new AysAdminRegistrationApplicationNotExistByIdException(mockId))
403404
.when(adminRegistrationCompleteService)
404405
.complete(Mockito.anyString(), Mockito.any());
405406

0 commit comments

Comments
 (0)