Merge pull request #53 from Devroup/feature/weeklyContent-parameter-modify

feat: getWeeklyContent parameter를 babyId에서 babyGroupId로 수정

Author: dh1180

src/main/java/Devroup/hidaddy/controller/WeeklyContent.java

@@ -22,10 +22,10 @@ public class WeeklyContent {
     @Operation(summary = "현재 주차의 정보 조회", description = "아이의 출산 예정일로 현재 주차를 계산하고 정보를 조회합니다.")
     @GetMapping("/current")
     public ResponseEntity<WeeklyContentResponse> getCurrentWeeklyContent(
-            @RequestParam Long babyId,
+            @RequestParam Long groupId,
             @AuthenticationPrincipal User user
     ) {
-        return ResponseEntity.ok(weeklyContentService.getWeeklyContent(babyId));
+        return ResponseEntity.ok(weeklyContentService.getWeeklyContent(groupId));
     }
 
     @Operation(summary = "특정 주차의 정보 조회", description = "원하는 특정 주차의 정보를 조회합니다.")

src/main/java/Devroup/hidaddy/service/WeeklyContentService.java

@@ -3,7 +3,9 @@
 import Devroup.hidaddy.dto.weeklycontent.WeeklyContentResponse;
 import Devroup.hidaddy.dto.weeklycontent.WeeklyContentSimpleResponse;
 import Devroup.hidaddy.entity.Baby;
+import Devroup.hidaddy.entity.BabyGroup;
 import Devroup.hidaddy.entity.WeeklyContent;
+import Devroup.hidaddy.repository.user.BabyGroupRepository;
 import Devroup.hidaddy.repository.user.BabyRepository;
 import Devroup.hidaddy.repository.weeklycontent.WeeklyContentRepository;
 import lombok.RequiredArgsConstructor;
@@ -12,20 +14,23 @@
 
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
+import java.util.List;
 
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class WeeklyContentService {
-    private final BabyRepository babyRepository;
+    private final BabyGroupRepository babyGroupRepository;
     private final WeeklyContentRepository weeklyContentRepository;
 
     // 출산 예정일로부터 현재 날짜 계산하여 해당 주차 컨텐츠 출력
-    public WeeklyContentResponse getWeeklyContent(Long babyId) {
-        Baby baby = babyRepository.findById(babyId)
-                .orElseThrow(() -> new IllegalArgumentException("아이를 찾을 수 없습니다."));
+    public WeeklyContentResponse getWeeklyContent(Long groupId) {
+        BabyGroup group = babyGroupRepository.findWithBabiesById(groupId)
+                .orElseThrow(() -> new IllegalArgumentException("선택된 아기 그룹을 찾을 수 없습니다."));
 
-        int currentweek = caculateCurrentWeek(baby.getDueDate().toLocalDate());
+        List<Baby> babies = group.getBabies();
+
+        int currentweek = caculateCurrentWeek(babies.get(0).getDueDate().toLocalDate());
 
         WeeklyContent weeklyContent = weeklyContentRepository.findByWeek(currentweek)
                 .orElseThrow(() -> new IllegalArgumentException(currentweek + "주차 데이터가 없습니다."));