From d8d2eb2448345ad7075cf4b8bad4d8b19bc106d4 Mon Sep 17 00:00:00 2001 From: Kim Doo Hyeon Date: Thu, 20 Feb 2025 01:51:05 +0900 Subject: [PATCH] =?UTF-8?q?[ALL]=20=EC=9D=B4=EA=B2=83=EC=A0=80=EA=B2=83=20?= =?UTF-8?q?#43?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 어르신 상세 fitness 추가 --- .../controller/response/DetailMatchingSeniorResponse.java | 1 + .../blaybus/domain/senior/service/DetailSeniorService.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/young/blaybus/domain/senior/controller/response/DetailMatchingSeniorResponse.java b/src/main/java/young/blaybus/domain/senior/controller/response/DetailMatchingSeniorResponse.java index 26c1dc0..f302939 100644 --- a/src/main/java/young/blaybus/domain/senior/controller/response/DetailMatchingSeniorResponse.java +++ b/src/main/java/young/blaybus/domain/senior/controller/response/DetailMatchingSeniorResponse.java @@ -53,6 +53,7 @@ public class DetailMatchingSeniorResponse { private LocalTime endTime; + @Setter private Integer fitness; private String phoneNumber; diff --git a/src/main/java/young/blaybus/domain/senior/service/DetailSeniorService.java b/src/main/java/young/blaybus/domain/senior/service/DetailSeniorService.java index 4b3d160..72d40fc 100644 --- a/src/main/java/young/blaybus/domain/senior/service/DetailSeniorService.java +++ b/src/main/java/young/blaybus/domain/senior/service/DetailSeniorService.java @@ -13,6 +13,7 @@ import young.blaybus.domain.senior.controller.response.DetailMatchingSeniorResponse; import young.blaybus.domain.senior.controller.response.DetailSeniorResponse; import young.blaybus.domain.senior.repository.DetailSeniorRepository; +import young.blaybus.domain.senior.repository.SeniorRepository; import young.blaybus.util.enums.DayOfWeek; import young.blaybus.util.enums.assist.FoodAssist; import young.blaybus.util.enums.assist.LifeAssist; @@ -26,6 +27,8 @@ public class DetailSeniorService { private final DetailSeniorRepository detailSeniorRepository; private final MemberRepository memberRepository; + private final RecommendService recommendService; + private final SeniorRepository seniorRepository; public DetailSeniorResponse getSenior(Long seniorId) { @@ -56,6 +59,8 @@ public DetailMatchingSeniorResponse getMatchingSenior(Long seniorId) { .orElseThrow(() -> new GeneralException(ErrorStatus.UNAUTHORIZED)); DetailMatchingSeniorResponse response = detailSeniorRepository.getMatchingSenior(seniorId, worker); + response.setFitness(recommendService.calculateFitness(worker, + seniorRepository.findById(seniorId).orElseThrow(() -> new GeneralException(ErrorStatus.KEY_NOT_EXIST)))); List seniorDayList = detailSeniorRepository.getSeniorDayList(seniorId); response.setDayList(seniorDayList.stream().map(Enum::name).toList());