Skip to content

AYS-537 | fix: return 404 in case Admin Registration Status is not WAITING #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

AYS-537 | fix: return 404 in case Admin Registration Status is not WAITING #405

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c54a8b
fix: return 404 in case Admin Registration Status is not WAITING
Nov 3, 2024
381bdfa
fix failing unit tests
Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.
Expand Down Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());

Expand Down
Loading