Refactor : 응답 DTO 개선

src/main/java/com/example/cp_main_be/domain/admin/dto/AdminResponseDTO.java

@@ -2,6 +2,10 @@
 
 import com.example.cp_main_be.domain.mission.daily_mission_master.MissionType;
 import java.time.LocalDateTime;
+import java.util.UUID;
+
+import com.example.cp_main_be.domain.reports.domain.ReportReason;
+import com.example.cp_main_be.domain.reports.enums.ReportStatus;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -30,4 +34,23 @@ public static class PlantMasterResDTO {
     private int unlockLevel;
     private LocalDateTime createdAt;
   }
+
+  @Getter
+  @Builder
+  public static class UserResDTO {
+    private Long id;
+    private UUID uuid;
+    private String username;
+  }
+
+  @Getter
+  @Builder
+  public static class ReportResDTO {
+    private Long reportId;
+    private ReportStatus status;
+    private ReportReason reportReason;
+    private LocalDateTime reportDate;
+    private Long reviewerId;
+    private LocalDateTime reviewDate;
+  }
 }

src/main/java/com/example/cp_main_be/domain/admin/presentation/AdminController.java

@@ -48,7 +48,7 @@ public ResponseEntity<ApiResponse<AdminResponseDTO.DailyMissionMastersResDTO>> c
     return ResponseEntity.ok(ApiResponse.success(result));
   }
 
-  @PutMapping("/missions/daily/{id}")
+  @PutMapping("/missions/daily/{dailyMissionMasterId}")
   @Operation(summary = "일일 미션(미션마스터) 수정 API")
   public ResponseEntity<ApiResponse<AdminResponseDTO.DailyMissionMastersResDTO>> updateDailyMission(
       @RequestBody AdminRequestDTO.UpdateMissionRequestDTO requestDTO, @PathVariable Long id) {
@@ -68,9 +68,14 @@ public ResponseEntity<ApiResponse<DailyKeywords>> createKeyword(
 
   @GetMapping("/users")
   @Operation(summary = "사용자 목록 조회 API")
-  public ResponseEntity<ApiResponse<ListResponse<User>>> getUsers() {
+  public ResponseEntity<ApiResponse<ListResponse<AdminResponseDTO.UserResDTO>>> getUsers() {
     List<User> users = adminService.getUsers();
-    ListResponse<User> listResponse = new ListResponse<>(users);
+    ListResponse<AdminResponseDTO.UserResDTO> listResponse = new ListResponse<>( users.stream()
+            .map(user -> AdminResponseDTO.UserResDTO.builder()
+                    .username(user.getUsername())
+                    .uuid(user.getUuid())
+                    .id(user.getId())
+                    .build()).toList());
     return ResponseEntity.ok(ApiResponse.success(listResponse));
   }
 
@@ -100,10 +105,10 @@ public ResponseEntity<ApiResponse<AdminResponseDTO.PlantMasterResDTO>> createNew
     return ResponseEntity.ok(ApiResponse.success(result));
   }
 
-  @PutMapping("/plants/{id}")
+  @PutMapping("/plants/{plantId}")
   @Operation(summary = "식물 정보 수정 API")
   public ResponseEntity<ApiResponse<AdminResponseDTO.PlantMasterResDTO>> updatePlantMasters(
-      @PathVariable(name = "id") Long plantId,
+      @PathVariable(name = "plantId") Long plantId,
       AdminRequestDTO.UpdatePlantMasterRequestDTO requestDTO) {
     PlantMasters plantMaster = adminService.updatePlantMasters(plantId, requestDTO);
     AdminResponseDTO.PlantMasterResDTO result = PlantMasters.toPlantMasterResDTO(plantMaster);
@@ -112,18 +117,36 @@ public ResponseEntity<ApiResponse<AdminResponseDTO.PlantMasterResDTO>> updatePla
 
   @GetMapping("/reports")
   @Operation(summary = "신고 목록 조회 API")
-  public ResponseEntity<ApiResponse<ListResponse<Reports>>> getAllReports() {
+  public ResponseEntity<ApiResponse<ListResponse<AdminResponseDTO.ReportResDTO>>> getAllReports() {
     List<Reports> reports = adminService.getAllReports();
-    ListResponse<Reports> listResponse = new ListResponse<>(reports);
+    ListResponse<AdminResponseDTO.ReportResDTO> listResponse = new ListResponse<>(reports.stream()
+            .map(request -> AdminResponseDTO.ReportResDTO.builder()
+                    .reportReason(request.getReason())
+                    .reportDate(request.getCreatedAt())
+                    .reportId(request.getId())
+                    .status(request.getStatus())
+                    .reviewDate(request.getReviewedAt())
+                    .reviewerId(request.getReviewerId())
+                    .build()
+            ).toList());
     return ResponseEntity.ok(ApiResponse.success(listResponse));
   }
 
   @PutMapping("/reports/{reportId}")
   @Operation(summary = "신고 상태 변경 API")
-  public ResponseEntity<ApiResponse<Reports>> updateReportStatus(
+  public ResponseEntity<ApiResponse<AdminResponseDTO.ReportResDTO>> updateReportStatus(
       @PathVariable(name = "reportId") Long reportId,
       @RequestParam(name = "status") ReportStatus reportStatus) {
     Reports result = adminService.updateReportStatus(reportId, reportStatus);
-    return ResponseEntity.ok(ApiResponse.success(result));
+    AdminResponseDTO.ReportResDTO reportResDTO = AdminResponseDTO.ReportResDTO.builder()
+            .reportReason(result.getReason())
+            .status(result.getStatus())
+            .reportDate(result.getCreatedAt())
+            .reportId(result.getId())
+            .reviewDate(result.getReviewedAt())
+            .reviewerId(result.getReviewerId())
+            .build();
+
+    return ResponseEntity.ok(ApiResponse.success(reportResDTO));
   }
 }

src/main/java/com/example/cp_main_be/domain/mission/quiz/dto/QuizRequestDTO.java

@@ -1,11 +1,13 @@
 package com.example.cp_main_be.domain.mission.quiz.dto;
 
+import com.example.cp_main_be.domain.mission.quiz.enums.QuizType;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
 public class QuizRequestDTO {
 
-  private Integer answerNumber;
+  private QuizType quizType;
+  private Long selectedOptionId;
 }

src/main/java/com/example/cp_main_be/domain/mission/user_daily_mission/presentation/UserDailyMissionController.java

@@ -10,6 +10,7 @@
 import com.example.cp_main_be.global.util.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -59,7 +60,8 @@ public ResponseEntity<ApiResponse<CompletedQuizResponseDTO>> getQuizResult(
     return ResponseEntity.ok(ApiResponse.success(result));
   }
 
-  @PostMapping("/photo/{userDailyMissionId}/upload")
+  @PostMapping(value = "/photo/{userDailyMissionId}/upload"
+          ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE )
   @Operation(summary = "미션 사진 업로드 API")
   public ResponseEntity<ApiResponse<String>> uploadPictureForMission(
       @RequestParam MultipartFile file,

src/main/java/com/example/cp_main_be/domain/mission/user_daily_mission/service/UserDailyMissionService.java

@@ -74,7 +74,7 @@ public Boolean summitAnswer(QuizRequestDTO request, Long userDailyMissionId) {
     boolean isCorrect = false;
 
     for (QuizOptions quizOptions : quizOptionsList) {
-      if (quizOptions.getOptionOrder() == request.getAnswerNumber()) {
+      if (quizOptions.getOptionOrder() == request.getSelectedOptionId()) {
         selectedOption = quizOptions;
         isCorrect = quizOptions.isCorrect();
         break;