fix: 뒤늦게 신청한 상대의 친구 선택 상태가 변경되지 않는 버그 수정 (#153)

HandongSF · Mar 17, 2024 · 7c0bcbd · 7c0bcbd
1 parent f551a14
commit 7c0bcbd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/edu/handong/csee/histudy/domain/StudyApplicant.java b/src/main/java/edu/handong/csee/histudy/domain/StudyApplicant.java
@@ -48,7 +48,7 @@ public static StudyApplicant of(
     return applicant;
   }
 
-  public void changeStatusIfPartnerRequested(
+  public void changeStatusIfReceivedBy(
       User user, Function<StudyPartnerRequest, RequestStatus> changeStatus) {
     this.partnerRequests.stream()
         .filter(request -> request.isReceivedBy(user))

diff --git a/src/main/java/edu/handong/csee/histudy/service/UserService.java b/src/main/java/edu/handong/csee/histudy/service/UserService.java
@@ -57,9 +57,12 @@ public ApplyFormDto apply(ApplyForm form, String email) {
             studyApplicantRepository
                 .findByUserAndTerm(partner, currentTerm)
                 .ifPresent(
-                    partnerApplication ->
-                        partnerApplication.changeStatusIfPartnerRequested(
-                            user, StudyPartnerRequest::accept)));
+                    partnerApplication -> {
+                      partnerApplication.changeStatusIfReceivedBy(
+                          user, StudyPartnerRequest::accept);
+
+                      applicant.changeStatusIfReceivedBy(partner, StudyPartnerRequest::accept);
+                    }));
     studyApplicantRepository.save(applicant);
     return new ApplyFormDto(applicant);
   }
@@ -88,9 +91,12 @@ public StudyApplicant apply(List<Long> friendsIds, List<Long> courseIds, String
             studyApplicantRepository
                 .findByUserAndTerm(partner, currentTerm)
                 .ifPresent(
-                    partnerApplication ->
-                        partnerApplication.changeStatusIfPartnerRequested(
-                            user, StudyPartnerRequest::accept)));
+                    partnerApplication -> {
+                      partnerApplication.changeStatusIfReceivedBy(
+                          user, StudyPartnerRequest::accept);
+
+                      applicant.changeStatusIfReceivedBy(partner, StudyPartnerRequest::accept);
+                    }));
     return studyApplicantRepository.save(applicant);
   }
 
@@ -109,7 +115,7 @@ private void removeFormHistoryIfExists(User user, AcademicTerm currentTerm) {
                     .findByUserAndTerm(receiver, currentTerm)
                     .ifPresent(
                         partnerApplication ->
-                            partnerApplication.changeStatusIfPartnerRequested(
+                            partnerApplication.changeStatusIfReceivedBy(
                                 user, StudyPartnerRequest::unfriend));
               }
               studyApplicantRepository.delete(applicant);