diff --git a/src/main/java/umc_haekathon_4/demo/converter/TreasureBoxConverter.java b/src/main/java/umc_haekathon_4/demo/converter/TreasureBoxConverter.java index 6a771d0..84eb0d3 100644 --- a/src/main/java/umc_haekathon_4/demo/converter/TreasureBoxConverter.java +++ b/src/main/java/umc_haekathon_4/demo/converter/TreasureBoxConverter.java @@ -22,6 +22,8 @@ public static TreasureBox toEntity(TreasureBoxRequestDTO.CreateTreasureBoxDTO cr public static TreasureBoxResponseDTO toDTO(TreasureBox treasureBox) { return TreasureBoxResponseDTO.builder() .id(treasureBox.getId()) + .userId(treasureBox.getUser().getId()) + .createdAt(treasureBox.getCreatedAt()) .deadline(treasureBox.getDeadline()) .status(treasureBox.getStatus()) .title(treasureBox.getTitle()) diff --git a/src/main/java/umc_haekathon_4/demo/service/TreasureBoxService.java b/src/main/java/umc_haekathon_4/demo/service/TreasureBoxService.java index bbab10f..6ffdd20 100644 --- a/src/main/java/umc_haekathon_4/demo/service/TreasureBoxService.java +++ b/src/main/java/umc_haekathon_4/demo/service/TreasureBoxService.java @@ -11,8 +11,6 @@ import umc_haekathon_4.demo.web.dto.TreasureBoxRequestDTO; import umc_haekathon_4.demo.web.dto.TreasureBoxResponseDTO; -import java.util.List; - @Service @RequiredArgsConstructor public class TreasureBoxService { @@ -82,7 +80,6 @@ public TreasureBoxResponseDTO delayDeadline(Long id, TreasureBoxRequestDTO.Updat return TreasureBoxConverter.toDTO(treasureBox); } - public List getTreasureBoxes() { return treasureBoxRepository.findAll(); } @@ -121,6 +118,5 @@ private double calculateDistance(double lat1, double lon1, double lat2, double l double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); double distance = R * c * 1000; // convert to meters return distance; - } } diff --git a/src/main/java/umc_haekathon_4/demo/web/controller/TreasureBoxController.java b/src/main/java/umc_haekathon_4/demo/web/controller/TreasureBoxController.java index 75f17ff..fbcfc0c 100644 --- a/src/main/java/umc_haekathon_4/demo/web/controller/TreasureBoxController.java +++ b/src/main/java/umc_haekathon_4/demo/web/controller/TreasureBoxController.java @@ -12,8 +12,6 @@ import umc_haekathon_4.demo.web.dto.TreasureBoxRequestDTO; import umc_haekathon_4.demo.web.dto.TreasureBoxResponseDTO; -import java.util.List; - @RestController @RequestMapping("/") @RequiredArgsConstructor @@ -28,7 +26,6 @@ public ApiResponse create(@RequestBody @Valid TreasureBo return ApiResponse.onSuccess(TreasureBoxConverter.toDTO(treasureBox)); } - //보물상자 리스트 @GetMapping("/treasurebox/list") @Operation(summary = "보물상자 리스트", description = "보물상자의 목록을 조회하는 API") diff --git a/src/main/java/umc_haekathon_4/demo/web/dto/TreasureBoxResponseDTO.java b/src/main/java/umc_haekathon_4/demo/web/dto/TreasureBoxResponseDTO.java index b274b1f..0b43cc4 100644 --- a/src/main/java/umc_haekathon_4/demo/web/dto/TreasureBoxResponseDTO.java +++ b/src/main/java/umc_haekathon_4/demo/web/dto/TreasureBoxResponseDTO.java @@ -14,10 +14,11 @@ @AllArgsConstructor public class TreasureBoxResponseDTO { private Long id; + private Long userId; + private LocalDateTime createdAt; private LocalDate deadline; private String status; private String title; - private String body; private double latitude; private double longitude;