Merge pull request #25 from With-Mate/fix/profile/sh

Fix/profile/sh, Fix/Matching/sh
With-Mate · Feb 18, 2024 · 00c7417 · 00c7417
2 parents 7dd0b6c + 54a9e1f
commit 00c7417
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/withmate/src/main/java/com/gdscewha/withmate/domain/matching/service/MatchingService.java b/withmate/src/main/java/com/gdscewha/withmate/domain/matching/service/MatchingService.java
@@ -145,11 +145,11 @@ public MatchedResultDto getMatchedResult(MatchingInputDto reqDto) {
     public Pair<Matching, Matching> relateMatesByCategory(Category category, MatchingInputDto reqDto) {
         Member me = memberService.getCurrentMember();
         if (me.getIsRelationed()) {
-            log.info("멤버: isRelationed");
+            log.info("멤버: 메이트 관계가 있는 사람이 있음");
             return null;
         }
-        if (me.getMatching().equals(null)){
-            log.info("멤버: matched");
+        if (me.getMatching() != null){
+            log.info("멤버: 매칭 대기 중");
             return null;
         }
         // 같은 카테고리의 Matching 리스트
@@ -182,9 +182,8 @@ public Pair<Matching, Matching> relateMatesByCategory(Category category, Matchin
             // Mate의 매칭 삭제
             matchingRepository.delete(mateMatching);
             return matchingPair;
-        } else {
-            throw new MatchingException(ErrorCode.MATCHING_NOT_FOUND);
         }
+        return null;
     }
 
 }
diff --git a/...java/com/gdscewha/withmate/domain/memberrelation/controller/MemberRelationController.java b/...java/com/gdscewha/withmate/domain/memberrelation/controller/MemberRelationController.java
@@ -3,7 +3,6 @@
 import com.gdscewha.withmate.domain.member.entity.Member;
 import com.gdscewha.withmate.domain.member.service.MemberService;
 import com.gdscewha.withmate.domain.memberrelation.dto.MRUpdateDto;
-import com.gdscewha.withmate.domain.memberrelation.entity.MemberRelation;
 import com.gdscewha.withmate.domain.memberrelation.service.MemberRelationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;