move isFollowedByMe from UserStats to User

Author: akirasosa

src/app/core/domains.ts

@@ -12,6 +12,7 @@ export interface User {
   name?:string;
   userStats?:UserStats;
   isMyself?:boolean;
+  isFollowedByMe?:boolean;
   avatarHash?:string;
 }
 
@@ -23,6 +24,5 @@ export interface UserStats {
   micropostCnt:number;
   followingCnt:number;
   followerCnt:number;
-  followedByMe:boolean;
 }
 

src/app/shared/follow-btn/follow-btn.component.spec.ts

@@ -30,9 +30,7 @@ describe('FollowBtnComponent', () => {
       id: 1,
       email: "test@test.com",
       isMyself: null,
-      userStats: {
-        followedByMe: false,
-      }
+      isFollowedByMe: false,
     })
   }));
 
@@ -52,9 +50,7 @@ describe('FollowBtnComponent', () => {
       id: 1,
       email: "test@test.com",
       isMyself: false,
-      userStats: {
-        followedByMe: true,
-      }
+      isFollowedByMe: true,
     })
   }));
 
@@ -63,9 +59,7 @@ describe('FollowBtnComponent', () => {
       id: 1,
       email: "test@test.com",
       isMyself: false,
-      userStats: {
-        followedByMe: false,
-      }
+      isFollowedByMe: false,
     })
   }));
 

src/app/shared/follow-btn/follow-btn.component.ts

@@ -73,14 +73,14 @@ export class FollowBtnComponent implements OnChanges {
   private _canShowFollowBtn(user: User): boolean {
     if (user.isMyself === null) return false; // not signed in
     if (user.isMyself === true) return false; // myself
-    if (user.userStats.followedByMe === true) return false; // already followed
+    if (user.isFollowedByMe === true) return false; // already followed
     return true;
   }
 
   private _canShowUnfollowBtn(user: User): boolean {
     if (user.isMyself === null) return false; // not signed in
     if (user.isMyself === true) return false; // myself
-    if (user.userStats.followedByMe === false) return false; // not followed yet
+    if (user.isFollowedByMe === false) return false; // not followed yet
     return true;
   }
 }