Skip to content

Commit 41874dc

Browse files
authored
Refactor: ApiRespinse 수정 (#130)
## #️⃣연관된 이슈 > #50 ## 📝작업 내용 > ResponseEntity -> ApiRespnse ### 스크린샷 <img width="1150" height="264" alt="image" src="https://github.com/user-attachments/assets/66acddb7-27cf-4a97-942e-ec1717f07296" />
2 parents 4cd6f24 + 8f30d80 commit 41874dc

File tree

3 files changed

+36
-11
lines changed

3 files changed

+36
-11
lines changed

src/main/java/EatPic/spring/domain/user/controller/UserController.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
import EatPic.spring.domain.user.dto.*;
55
import EatPic.spring.domain.user.dto.request.LoginRequestDTO;
66
import EatPic.spring.domain.user.dto.request.SignupRequestDTO;
7-
import EatPic.spring.domain.user.dto.response.CheckEmailResponseDTO;
8-
import EatPic.spring.domain.user.dto.response.CheckNicknameResponseDTO;
9-
import EatPic.spring.domain.user.dto.response.LoginResponseDTO;
10-
import EatPic.spring.domain.user.dto.response.SignupResponseDTO;
7+
import EatPic.spring.domain.user.dto.response.*;
118
import EatPic.spring.domain.user.service.UserService;
129
import EatPic.spring.global.common.ApiResponse;
1310
import EatPic.spring.global.common.code.status.ErrorStatus;
@@ -70,9 +67,17 @@ public ApiResponse<CheckEmailResponseDTO> checkEmail(@RequestParam String email)
7067
// 유저 아이디 중복 검사
7168
@GetMapping("/check-user-id")
7269
@Operation(summary = "유저 아이디 중복 검사")
73-
public ApiResponse<Map<String, Boolean>> checkUserId(@RequestParam String nameId) {
70+
public ApiResponse<CheckNameIdResponseDTO> checkUserId(@RequestParam String nameId) {
7471
boolean isDuplicate = userService.isnameIdDuplicate(nameId);
75-
return ApiResponse.onSuccess(Map.of("isDuplicate", isDuplicate));
72+
73+
if(isDuplicate) {
74+
return ApiResponse.onFailure(
75+
ErrorStatus.DUPLICATE_NAMEID.getCode(),
76+
ErrorStatus.DUPLICATE_NAMEID.getMessage(),
77+
UserConverter.toCheckNameIdResponseDTO(nameId, false)
78+
);
79+
}
80+
return ApiResponse.onSuccess(UserConverter.toCheckNameIdResponseDTO(nameId, true));
7681
}
7782

7883
// 닉네임 중복 검사

src/main/java/EatPic/spring/domain/user/converter/UserConverter.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
import EatPic.spring.domain.reaction.dto.ReactionResponseDTO;
55
import EatPic.spring.domain.reaction.entity.ReactionType;
66
import EatPic.spring.domain.user.dto.UserInfoDTO;
7-
import EatPic.spring.domain.user.dto.response.CheckEmailResponseDTO;
8-
import EatPic.spring.domain.user.dto.response.CheckNicknameResponseDTO;
9-
import EatPic.spring.domain.user.dto.response.LoginResponseDTO;
10-
import EatPic.spring.domain.user.dto.response.UserResponseDTO;
7+
import EatPic.spring.domain.user.dto.response.*;
118
import EatPic.spring.domain.user.entity.User;
129
import EatPic.spring.domain.user.mapping.UserBlock;
1310
import EatPic.spring.domain.user.mapping.UserFollow;
@@ -99,14 +96,22 @@ public static UserResponseDTO.UserActionResponseDto toUserActionResponseDto(User
9996
.build();
10097
}
10198

102-
// 유저 아이디 중복 검사
99+
// 이메일 중복 검사
103100
public static CheckEmailResponseDTO toCheckEmailResponseDTO(String email, boolean isDuplicate){
104101
return CheckEmailResponseDTO.builder()
105102
.email(email)
106103
.isDuplicate(isDuplicate)
107104
.build();
108105
}
109106

107+
// 이메일 중복 검사
108+
public static CheckNameIdResponseDTO toCheckNameIdResponseDTO(String nameId, boolean isDuplicate){
109+
return new CheckNameIdResponseDTO().builder()
110+
.nameId(nameId)
111+
.isDuplicate(isDuplicate)
112+
.build();
113+
}
114+
110115
// 닉네임 중복 검사
111116
public static CheckNicknameResponseDTO toCheckNicknameResponseDto(String nickname, boolean isDuplicate) {
112117
return CheckNicknameResponseDTO.builder()
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package EatPic.spring.domain.user.dto.response;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Builder;
5+
import lombok.Getter;
6+
import lombok.NoArgsConstructor;
7+
8+
@Builder
9+
@Getter
10+
@NoArgsConstructor
11+
@AllArgsConstructor
12+
public class CheckNameIdResponseDTO {
13+
private String nameId;
14+
private boolean isDuplicate;
15+
}

0 commit comments

Comments
 (0)