refactor: ♻️ 리스트에 자신이 있는 경우 isFollowing을 null로 반환

- #405
42Statistics · Dec 27, 2023 · d7e74f5 · d7e74f5
1 parent 4202205
commit d7e74f5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/app/src/follow/follow.service.ts b/app/src/follow/follow.service.ts
@@ -226,12 +226,18 @@ export class FollowService {
         throw new NotFoundException();
       }
 
-      const isFollowed = await this.followModel.findOne({
-        userId: userId,
-        followId: user.id,
-      });
+      let isFollowing: boolean | undefined = undefined;
+
+      if (userId !== user.id) {
+        const isFollowed = await this.followModel.findOne({
+          userId: userId,
+          followId: user.id,
+        });
+
+        isFollowing = !!isFollowed;
+      }
 
-      return { isFollowing: !!isFollowed, user };
+      return { isFollowing, user };
     });
 
     return Promise.all(followList);

diff --git a/app/src/follow/model/follow.model.ts b/app/src/follow/model/follow.model.ts
@@ -3,8 +3,8 @@ import { UserPreview } from 'src/common/models/common.user.model';
 
 @ObjectType()
 export class FollowList {
-  @Field()
-  isFollowing: boolean;
+  @Field({ nullable: true })
+  isFollowing?: boolean;
 
   @Field()
   user: UserPreview;

diff --git a/app/src/schema.gql b/app/src/schema.gql
@@ -60,7 +60,7 @@ type UserRankingIndexPaginated {
 }
 
 type FollowList {
-  isFollowing: Boolean!
+  isFollowing: Boolean
   user: UserPreview!
 }