diff --git a/src/main/java/young/blaybus/domain/senior/controller/response/DetailSeniorResponse.java b/src/main/java/young/blaybus/domain/senior/controller/response/DetailSeniorResponse.java index 63d7049..6f8ee72 100644 --- a/src/main/java/young/blaybus/domain/senior/controller/response/DetailSeniorResponse.java +++ b/src/main/java/young/blaybus/domain/senior/controller/response/DetailSeniorResponse.java @@ -35,6 +35,23 @@ public class DetailSeniorResponse { private String address; + private Integer salary; + + @Setter + private List dayValueList; + + @Setter + private List foodAssistValueList; + + @Setter + private List moveAssistValueList; + + @Setter + private List lifeAssistValueList; + + @Setter + private List toiletAssistValueList; + @Setter private List dayList; @@ -53,4 +70,5 @@ public class DetailSeniorResponse { private LocalTime startTime; private LocalTime endTime; + } diff --git a/src/main/java/young/blaybus/domain/senior/repository/DetailSeniorRepository.java b/src/main/java/young/blaybus/domain/senior/repository/DetailSeniorRepository.java index f621b28..efc5a93 100644 --- a/src/main/java/young/blaybus/domain/senior/repository/DetailSeniorRepository.java +++ b/src/main/java/young/blaybus/domain/senior/repository/DetailSeniorRepository.java @@ -1,5 +1,6 @@ package young.blaybus.domain.senior.repository; +import static young.blaybus.domain.job_seek.QJobSeek.jobSeek; import static young.blaybus.domain.senior.QSenior.senior; import static young.blaybus.domain.senior.QSeniorDay.seniorDay; import static young.blaybus.domain.senior.QSeniorFoodAssist.seniorFoodAssist; @@ -35,11 +36,13 @@ public DetailSeniorResponse getSenior(Long seniorId) { senior.sex, senior.birthday, senior.address, + jobSeek.salary, senior.startTime, senior.endTime ) ) .from(senior) + .leftJoin(jobSeek).on(senior.eq(jobSeek.senior)) .where(senior.id.eq(seniorId)) .fetchOne(); } 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 b9619d3..505e64d 100644 --- a/src/main/java/young/blaybus/domain/senior/service/DetailSeniorService.java +++ b/src/main/java/young/blaybus/domain/senior/service/DetailSeniorService.java @@ -1,10 +1,16 @@ package young.blaybus.domain.senior.service; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import young.blaybus.domain.senior.controller.response.DetailSeniorResponse; import young.blaybus.domain.senior.repository.DetailSeniorRepository; +import young.blaybus.util.enums.DayOfWeek; +import young.blaybus.util.enums.assist.FoodAssist; +import young.blaybus.util.enums.assist.LifeAssist; +import young.blaybus.util.enums.assist.MoveAssist; +import young.blaybus.util.enums.assist.ToiletAssist; @Service @RequiredArgsConstructor @@ -16,11 +22,22 @@ public class DetailSeniorService { public DetailSeniorResponse getSenior(Long seniorId) { DetailSeniorResponse senior = detailSeniorRepository.getSenior(seniorId); - senior.setDayList(detailSeniorRepository.getSeniorDayList(seniorId)); - senior.setLifeAssistList(detailSeniorRepository.getLifeAssistList(seniorId)); - senior.setFoodAssistList(detailSeniorRepository.getFoodAssistList(seniorId)); - senior.setMoveAssistList(detailSeniorRepository.getMoveAssistList(seniorId)); - senior.setToiletAssistList(detailSeniorRepository.getToiletAssistList(seniorId)); + List seniorDayList = detailSeniorRepository.getSeniorDayList(seniorId); + List lifeAssistList = detailSeniorRepository.getLifeAssistList(seniorId); + List foodAssistList = detailSeniorRepository.getFoodAssistList(seniorId); + List moveAssistList = detailSeniorRepository.getMoveAssistList(seniorId); + List toiletAssistList = detailSeniorRepository.getToiletAssistList(seniorId); + + senior.setDayList(seniorDayList); + senior.setLifeAssistList(lifeAssistList); + senior.setFoodAssistList(foodAssistList); + senior.setMoveAssistList(moveAssistList); + senior.setToiletAssistList(toiletAssistList); + senior.setDayValueList(seniorDayList.stream().map(DayOfWeek::toString).toList()); + senior.setLifeAssistValueList(lifeAssistList.stream().map(LifeAssist::getValue).toList()); + senior.setFoodAssistValueList(foodAssistList.stream().map(FoodAssist::getValue).toList()); + senior.setMoveAssistValueList(moveAssistList.stream().map(MoveAssist::getValue).toList()); + senior.setToiletAssistValueList(toiletAssistList.stream().map(ToiletAssist::getValue).toList()); return senior; }