Merge pull request #64 from oodd-team/OD-162

매칭 신청 수정 OD-162

Author: happbob

src/matching/matching.controller.ts

@@ -78,10 +78,7 @@ export class MatchingController {
     }
 
     if (
-      await this.matchingService.getMatchingByUserId(
-        body.requesterId,
-        body.targetId,
-      )
+      await this.matchingService.existsMatching(body.requesterId, body.targetId)
     )
       throw InvalidInputValueException('이미 매칭 요청을 보냈습니다.');
 

src/matching/matching.service.ts

@@ -23,25 +23,6 @@ export class MatchingService {
     private readonly chatMessageService: ChatMessageService,
     private readonly dataSource: DataSource,
   ) {}
-  async getMatchingByUserId(
-    requesterId: number,
-    targetId: number,
-  ): Promise<Matching> {
-    return await this.matchingRepository.findOne({
-      where: [
-        {
-          requester: { id: requesterId },
-          target: { id: targetId },
-          status: StatusEnum.ACTIVATED,
-        },
-        {
-          requester: { id: targetId },
-          target: { id: requesterId },
-          status: StatusEnum.ACTIVATED,
-        },
-      ],
-    });
-  }
 
   async getMatchingsByCurrentId(currentUserId: number): Promise<Matching[]> {
     return await this.matchingRepository.find({
@@ -61,6 +42,7 @@ export class MatchingService {
       const matching = await queryRunner.manager.save(Matching, {
         requester: { id: body.requesterId },
         target: { id: body.targetId },
+        message: body.message,
       });
 
       const chatRoom = await this.chatRoomService.createChatRoom(
@@ -179,10 +161,7 @@ export class MatchingService {
     });
   }
 
-  async existsMatching(
-    requesterId: number,
-    targetId: number,
-  ): Promise<boolean> {
+  async isMatching(requesterId: number, targetId: number): Promise<boolean> {
     const count = await this.matchingRepository.count({
       where: [
         {
@@ -202,4 +181,33 @@ export class MatchingService {
 
     return count > 0;
   }
+
+  async existsMatching(
+    requesterId: number,
+    targetId: number,
+  ): Promise<boolean> {
+    const matching = await this.matchingRepository.findOne({
+      where: [
+        {
+          requester: { id: requesterId },
+          target: { id: targetId },
+          status: StatusEnum.ACTIVATED,
+        },
+        {
+          requester: { id: targetId },
+          target: { id: requesterId },
+          status: StatusEnum.ACTIVATED,
+        },
+      ],
+    });
+
+    // 매칭이 없거나 REJECTED 상태이면 false
+    if (
+      !matching ||
+      matching.requestStatus === MatchingRequestStatusEnum.REJECTED
+    ) {
+      return false;
+    }
+    return true;
+  }
 }

src/user/user.controller.ts

@@ -52,7 +52,7 @@ export class UserController {
     const currentUserId = req.user.id; // 또는 다른 방법으로 현재 사용자 ID를 가져옴
 
     // MatchingService를 통해 해당 사용자가 친구인지 확인
-    const isFriend = await this.matchingService.existsMatching(
+    const isFriend = await this.matchingService.isMatching(
       currentUserId,
       userId,
     );