Merge pull request #181 from 00sOrg/Fix/155

🔨 [Fix] Fix help request to users near favorite
00sOrg · Oct 3, 2024 · d6ee2a3 · d6ee2a3
2 parents 333a90a + fb3a58c
commit d6ee2a3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/modules/alarm/notification.controller.ts b/src/modules/alarm/notification.controller.ts
@@ -72,12 +72,17 @@ export class NotificationController {
   )
   async sendHelpRequestToNearFavorite(@Req() req, @Param('id') id: string) {
     const sender = req.user;
-    await this.favoriteService.checkFavorite(sender.id, Number(id));
-    const favoriteMember = await this.memberService.findMemberById(Number(id));
+    const favoriteMember = await this.favoriteService.checkFavorite(
+      sender.id,
+      Number(id),
+    );
     const receivers = await this.memberService.findNearbyAndFavoritingMembers(
       favoriteMember.latitude,
       favoriteMember.longitude,
     );
-    await this.notificationService.requestHelpToNearby(receivers, sender);
+    await this.notificationService.requestHelpToNearby(
+      receivers,
+      favoriteMember,
+    );
   }
 }
diff --git a/src/modules/members/services/favorites.service.ts b/src/modules/members/services/favorites.service.ts
@@ -135,13 +135,14 @@ export class FavoritesService {
   async checkFavorite(
     memberId: number,
     favoritedMemberId: number,
-  ): Promise<void> {
+  ): Promise<Member> {
     const favorite = await this.favoritesRepository.findFavorite(
       memberId,
       favoritedMemberId,
     );
     if (!favorite) {
       throw new ExceptionHandler(ErrorStatus.FAVORITE_NOT_FOUND);
     }
+    return favorite.favoritedMember;
   }
 }