Skip to content
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

AYS-555 | Refactored "ALREADY EXIST" errors to standardize as "CONFLICT ERROR" #417

Merged
merged 1 commit into from
Dec 21, 2024
Merged

AYS-555 | Refactored "ALREADY EXIST" errors to standardize as "CONFLICT ERROR" #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/java/org/ays/common/exception/handler/GlobalExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ AysErrorResponse handleNotExistError(final AysNotExistException exception) {

@ExceptionHandler(AysConflictException.class)
@ResponseStatus(HttpStatus.CONFLICT)
AysErrorResponse handleAlreadyExistError(final AysConflictException exception) {
AysErrorResponse handleConflictError(final AysConflictException exception) {
log.error(exception.getMessage(), exception);

return AysErrorResponse.builder()
.header(AysErrorResponse.Header.ALREADY_EXIST.getName())
.header(AysErrorResponse.Header.CONFLICT_ERROR.getName())
.message(exception.getMessage())
.build();
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/ays/common/model/response/AysErrorResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ public enum Header {
*/
API_ERROR("API ERROR"),
/**
* ALREADY_EXIST header.
* CONFLICT_ERROR header.
*/
ALREADY_EXIST("ALREADY EXIST"),
CONFLICT_ERROR("CONFLICT ERROR"),
/**
* NOT_FOUND header.
*/
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/org/ays/auth/controller/AdminRegistrationApplicationEndToEndTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ void givenValidAdminRegistrationApplicationId_whenApproveAdminRegistrationApplic
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
.post(endpoint, superAdminToken.getAccessToken());

AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.ALREADY_EXIST;
AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.CONFLICT_ERROR;

aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
.andExpect(AysMockResultMatchersBuilders.status()
Expand Down Expand Up @@ -555,7 +555,7 @@ void givenValidAdminRegistrationApplicationId_whenApproveAdminRegistrationApplic
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
.post(endpoint, superAdminToken.getAccessToken());

AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.ALREADY_EXIST;
AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.CONFLICT_ERROR;

aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
.andExpect(AysMockResultMatchersBuilders.status()
Expand Down Expand Up @@ -739,7 +739,7 @@ void givenValidAdminRegistrationApplicationRejectRequest_whenRejectAdminRegistra
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
.post(endpoint, superAdminToken.getAccessToken(), rejectRequest);

AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.ALREADY_EXIST;
AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.CONFLICT_ERROR;

aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
.andExpect(AysMockResultMatchersBuilders.status()
Expand Down Expand Up @@ -779,7 +779,7 @@ void givenValidAdminRegistrationApplicationRejectRequest_whenRejectAdminRegistra
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
.post(endpoint, superAdminToken.getAccessToken(), rejectRequest);

AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.ALREADY_EXIST;
AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.CONFLICT_ERROR;

aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
.andExpect(AysMockResultMatchersBuilders.status()
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/ays/auth/controller/AysRoleControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ void givenValidIdForPassivation_whenRoleUsing_thenReturnConflict() throws Except
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
.patch(endpoint, mockSuperAdminToken.getAccessToken());

AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.ALREADY_EXIST;
AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.CONFLICT_ERROR;

aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
.andExpect(AysMockResultMatchersBuilders.status()
Expand Down Expand Up @@ -986,7 +986,7 @@ void givenValidId_whenRoleAlreadyDeleted_thenReturnConflict() throws Exception {
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
.delete(endpoint, mockAdminToken.getAccessToken());

AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.ALREADY_EXIST;
AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.CONFLICT_ERROR;

aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
.andExpect(AysMockResultMatchersBuilders.status()
Expand Down Expand Up @@ -1014,7 +1014,7 @@ void givenValidId_whenRoleUsing_thenReturnConflict() throws Exception {
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
.delete(endpoint, mockAdminToken.getAccessToken());

AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.ALREADY_EXIST;
AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.CONFLICT_ERROR;

aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
.andExpect(AysMockResultMatchersBuilders.status()
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/ays/common/model/response/AysErrorResponseBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public class AysErrorResponseBuilder {
.header(AysErrorResponse.Header.AUTH_ERROR.getName())
.isSuccess(false).build();

public static final AysErrorResponse ALREADY_EXIST = AysErrorResponse.builder()
.header(AysErrorResponse.Header.ALREADY_EXIST.getName())
public static final AysErrorResponse CONFLICT_ERROR = AysErrorResponse.builder()
.header(AysErrorResponse.Header.CONFLICT_ERROR.getName())
.isSuccess(false).build();

public static final AysErrorResponse NOT_FOUND = AysErrorResponse.builder()
Expand Down
Loading