Skip to content

[ALL] 이것저것 #43 #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
engus525 merged 1 commit into from
Feb 19, 2025
Merged

[ALL] 이것저것 #43 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...in/java/young/blaybus/domain/senior/controller/response/DetailMatchingSeniorResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public class DetailMatchingSeniorResponse {

private LocalTime endTime;

@Setter
private Integer fitness;

private String phoneNumber;
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/young/blaybus/domain/senior/service/DetailSeniorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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<DayOfWeek> seniorDayList = detailSeniorRepository.getSeniorDayList(seniorId);
response.setDayList(seniorDayList.stream().map(Enum::name).toList());
Expand Down
Loading