[#142] dto 형식 통일

src/main/java/zoo/insightnote/domain/comment/controller/CommentController.java

@@ -9,10 +9,10 @@
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
-import zoo.insightnote.domain.comment.dto.response.CommentCreateRequest;
-import zoo.insightnote.domain.comment.dto.response.CommentUpdateRequest;
-import zoo.insightnote.domain.comment.dto.request.CommentIdResponse;
-import zoo.insightnote.domain.comment.dto.request.CommentListResponse;
+import zoo.insightnote.domain.comment.dto.request.CommentCreateRequest;
+import zoo.insightnote.domain.comment.dto.request.CommentUpdateRequest;
+import zoo.insightnote.domain.comment.dto.response.CommentIdResponse;
+import zoo.insightnote.domain.comment.dto.response.CommentListResponse;
 
 
 @Tag(name = "Comment API", description = "댓글 관련 API")

src/main/java/zoo/insightnote/domain/comment/controller/CommentControllerImpl.java

@@ -13,11 +13,11 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import zoo.insightnote.domain.comment.dto.request.CommentListResponse;
+import zoo.insightnote.domain.comment.dto.response.CommentListResponse;
 
-import zoo.insightnote.domain.comment.dto.response.CommentCreateRequest;
-import zoo.insightnote.domain.comment.dto.response.CommentUpdateRequest;
-import zoo.insightnote.domain.comment.dto.request.CommentIdResponse;
+import zoo.insightnote.domain.comment.dto.request.CommentCreateRequest;
+import zoo.insightnote.domain.comment.dto.request.CommentUpdateRequest;
+import zoo.insightnote.domain.comment.dto.response.CommentIdResponse;
 
 import zoo.insightnote.domain.comment.service.CommentService;
 

src/main/java/zoo/insightnote/domain/comment/dto/response/CommentCreateRequest.java → src/main/java/zoo/insightnote/domain/comment/dto/request/CommentCreateRequest.java

@@ -1,4 +1,4 @@
-package zoo.insightnote.domain.comment.dto.response;
+package zoo.insightnote.domain.comment.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

src/main/java/zoo/insightnote/domain/comment/dto/response/CommentUpdateRequest.java → src/main/java/zoo/insightnote/domain/comment/dto/request/CommentUpdateRequest.java

@@ -1,4 +1,4 @@
-package zoo.insightnote.domain.comment.dto.response;
+package zoo.insightnote.domain.comment.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

src/main/java/zoo/insightnote/domain/comment/dto/response/CommentDefaultResponse.java

@@ -0,0 +1,10 @@
+package zoo.insightnote.domain.comment.dto.response;
+import java.time.LocalDateTime;
+
+public record CommentDefaultResponse (
+     Long commentId,
+     String content,
+     LocalDateTime createAt,
+     String author
+){
+}

src/main/java/zoo/insightnote/domain/comment/dto/response/CommentIdResponse.java

@@ -0,0 +1,5 @@
+package zoo.insightnote.domain.comment.dto.response;
+
+
+public record CommentIdResponse(Long id) {
+}

src/main/java/zoo/insightnote/domain/comment/dto/request/CommentListResponse.java → src/main/java/zoo/insightnote/domain/comment/dto/response/CommentListResponse.java

@@ -1,4 +1,4 @@
-package zoo.insightnote.domain.comment.dto.request;
+package zoo.insightnote.domain.comment.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/zoo/insightnote/domain/comment/mapper/CommentMapper.java

@@ -1,7 +1,7 @@
 package zoo.insightnote.domain.comment.mapper;
 
-import zoo.insightnote.domain.comment.dto.response.CommentCreateRequest;
-import zoo.insightnote.domain.comment.dto.request.CommentDefaultResponse;
+import zoo.insightnote.domain.comment.dto.request.CommentCreateRequest;
+import zoo.insightnote.domain.comment.dto.response.CommentDefaultResponse;
 
 import zoo.insightnote.domain.comment.entity.Comment;
 import zoo.insightnote.domain.insight.entity.Insight;

src/main/java/zoo/insightnote/domain/comment/service/CommentService.java

@@ -6,11 +6,11 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import zoo.insightnote.domain.comment.dto.request.CommentIdResponse;
-import zoo.insightnote.domain.comment.dto.request.CommentListResponse;
+import zoo.insightnote.domain.comment.dto.response.CommentIdResponse;
+import zoo.insightnote.domain.comment.dto.response.CommentListResponse;
 
-import zoo.insightnote.domain.comment.dto.response.CommentCreateRequest;
-import zoo.insightnote.domain.comment.dto.response.CommentUpdateRequest;
+import zoo.insightnote.domain.comment.dto.request.CommentCreateRequest;
+import zoo.insightnote.domain.comment.dto.request.CommentUpdateRequest;
 
 import zoo.insightnote.domain.comment.entity.Comment;
 import zoo.insightnote.domain.comment.mapper.CommentMapper;

src/main/java/zoo/insightnote/domain/user/controller/UserController.java

@@ -10,14 +10,11 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import zoo.insightnote.domain.email.dto.request.EmailAuthRequest;
-import zoo.insightnote.domain.user.dto.request.JoinRequest;
+import zoo.insightnote.domain.user.dto.request.UserJoinRequest;
 import zoo.insightnote.domain.user.dto.request.UserInfoRequest;
-import zoo.insightnote.domain.user.dto.response.PaymentUserInfoResponseDto;
-import zoo.insightnote.domain.user.dto.response.UserInfoResponse;
+import zoo.insightnote.domain.user.dto.response.PaymentUserInfoResponse;
 
 @Tag(name = "USER", description = "유저 관련 API")
 public interface UserController {
@@ -26,7 +23,7 @@ public interface UserController {
 //    ResponseEntity<?> joinProcess(@Parameter(description = "이름, 이메일 기입")@RequestBody JoinRequest joinRequest);
 
     @Operation(summary = "비회원 로그인", description = "이메일 인증 후 비회원 로그인을 진행합니다.")
-    ResponseEntity<?> login(@Parameter(description = "이메일, 이메일 기입") @RequestBody JoinRequest joinRequest);
+    ResponseEntity<?> login(@Parameter(description = "이메일, 이메일 기입") @RequestBody UserJoinRequest userJoinRequest);
 
     @Operation(summary = "비회원 이메일 인증", description = "비회원 회원가입과 로그인을 위한 로그인 인증입니다. 전송 시 5분간 유효합니다. (코드 전송은 약 4초 정도 소요되니 잠시만 기다려주세요.)")
     ResponseEntity<?> sendEmailAuthCode(@Parameter(description = "인증할 이메일 기입") @RequestBody EmailAuthRequest emailAuthRequest) throws MessagingException;
@@ -47,5 +44,5 @@ public interface UserController {
     ResponseEntity<Map<String, String>> getToken(HttpServletRequest request);
 
     @Operation(summary = "결제 시 유저 정보 반환", description = "결제 시 참가자 신청 정보에 보여지는 유저 정보를 반환합니다.")
-    ResponseEntity<PaymentUserInfoResponseDto> getPaymentUserInfo(@AuthenticationPrincipal UserDetails userDetails);
+    ResponseEntity<PaymentUserInfoResponse> getPaymentUserInfo(@AuthenticationPrincipal UserDetails userDetails);
 }

src/main/java/zoo/insightnote/domain/user/controller/UserControllerImpl.java

@@ -21,9 +21,9 @@
 import org.springframework.web.bind.annotation.RestController;
 import zoo.insightnote.domain.email.dto.request.EmailAuthRequest;
 import zoo.insightnote.domain.email.service.EmailVerificationService;
-import zoo.insightnote.domain.user.dto.request.JoinRequest;
+import zoo.insightnote.domain.user.dto.request.UserJoinRequest;
 import zoo.insightnote.domain.user.dto.request.UserInfoRequest;
-import zoo.insightnote.domain.user.dto.response.PaymentUserInfoResponseDto;
+import zoo.insightnote.domain.user.dto.response.PaymentUserInfoResponse;
 import zoo.insightnote.domain.user.dto.response.UserInfoResponse;
 import zoo.insightnote.domain.user.service.UserService;
 import zoo.insightnote.global.jwt.JWTUtil;
@@ -44,7 +44,7 @@ public class UserControllerImpl implements UserController {
 //    }
 
     @PostMapping("/login")
-    public ResponseEntity<?> login(@Valid @RequestBody JoinRequest joinRequest) {
+    public ResponseEntity<?> login(@Valid @RequestBody UserJoinRequest userJoinRequest) {
         return ResponseEntity.ok().build();
     }
 
@@ -112,8 +112,8 @@ public ResponseEntity<Map<String, String>> getToken(HttpServletRequest request)
     }
 
     @GetMapping("/userInfo")
-    public ResponseEntity<PaymentUserInfoResponseDto> getPaymentUserInfo(@AuthenticationPrincipal UserDetails userDetails) {
-        PaymentUserInfoResponseDto response = userService.getPaymentUserInfo(userDetails.getUsername());
+    public ResponseEntity<PaymentUserInfoResponse> getPaymentUserInfo(@AuthenticationPrincipal UserDetails userDetails) {
+        PaymentUserInfoResponse response = userService.getPaymentUserInfo(userDetails.getUsername());
         return ResponseEntity.ok(response);
     }
 }

src/main/java/zoo/insightnote/domain/user/dto/request/UserInfoRequest.java

@@ -1,16 +1,11 @@
 package zoo.insightnote.domain.user.dto.request;
 
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class UserInfoRequest {
-    private String name;
-    private String nickname;
-    private String phoneNumber;
-    private String occupation;
-    private String job;
-    private String interestCategory;
-    private String snsUrl;
-}
+public record UserInfoRequest(
+        String name,
+        String nickname,
+        String phoneNumber,
+        String occupation,
+        String job,
+        String interestCategory,
+        String snsUrl
+) { }

src/main/java/zoo/insightnote/domain/user/dto/request/UserJoinRequest.java

@@ -0,0 +1,20 @@
+package zoo.insightnote.domain.user.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+
+public record UserJoinRequest(
+        @NotBlank(message = "이름을 입력해주세요.")
+        @Schema(description = "이름", example = "홍길동")
+        String name,
+
+        @NotBlank(message = "이메일을 입력해주세요.")
+        @Pattern(regexp = "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,6}$", message = "이메일 형식에 맞지 않습니다.")
+        @Schema(description = "이메일", example = "abc@example.com")
+        String email,
+
+        @NotBlank(message = "인증코드는 필수입니다.")
+        @Schema(description = "인증코드", example = "123456")
+        String code
+) { }

src/main/java/zoo/insightnote/domain/user/dto/response/PaymentUserInfoResponse.java

@@ -0,0 +1,10 @@
+package zoo.insightnote.domain.user.dto.response;
+
+import lombok.Builder;
+
+@Builder
+public record PaymentUserInfoResponse(
+        Long userId,
+        String name,
+        String email
+) { }

src/main/java/zoo/insightnote/domain/user/dto/response/UserInfoResponse.java

@@ -1,18 +1,31 @@
 package zoo.insightnote.domain.user.dto.response;
 
 import lombok.Builder;
-import lombok.Getter;
+import zoo.insightnote.domain.user.entity.User;
 
-@Getter
 @Builder
-public class UserInfoResponse {
-    private String name;
-    private String nickname;
-    private String email;
-    private String phoneNumber;
-    private String occupation;
-    private String job;
-    private String interestCategory;
-    private String snsUrl;
-    private String username;
-}
+public record UserInfoResponse(
+        String name,
+        String nickname,
+        String email,
+        String phoneNumber,
+        String occupation,
+        String job,
+        String interestCategory,
+        String snsUrl,
+        String username
+) {
+    public static UserInfoResponse from(User user) {
+        return UserInfoResponse.builder()
+                .name(user.getName())
+                .nickname(user.getNickname())
+                .email(user.getEmail())
+                .phoneNumber(user.getPhoneNumber())
+                .occupation(user.getOccupation())
+                .job(user.getJob())
+                .interestCategory(user.getInterestCategory())
+                .username(user.getUsername())
+                .snsUrl(user.getSnsUrl())
+                .build();
+    }
+}