Merge pull request velopert#154 from velopert/feature/follow

Feature/follow

Author: velopert

src/cache.ts

@@ -1,15 +1,5 @@
 import Redis from 'ioredis';
 
-type GenerateCacheKey = {
-  recommendedPostKey: (postId: string) => string;
-  postCacheKey: (username: string, postUrlSlug: string) => string;
-  userCacheKey: (username: string) => string;
-  postSeriesKey: (username: string, seriesUrlSlug: string) => string;
-  changeEmailKey: (code: string) => string;
-};
-
-type QueueName = 'feed';
-
 class Cache {
   client: Redis.Redis | null = null;
 
@@ -46,15 +36,25 @@ class Cache {
       changeEmailKey: (code: string) => `changeEmailCode:${code}`,
     };
   }
-  getQueueName(name: QueueName): string {
-    const mapper = {
-      feed: 'feedQueue',
+
+  get queueName() {
+    return {
+      feed: 'queue:feed',
     };
-    return mapper[name];
   }
 }
 
 const cache = new Cache();
 cache.connect();
 
 export default cache;
+
+type GenerateCacheKey = {
+  recommendedPostKey: (postId: string) => string;
+  postCacheKey: (username: string, postUrlSlug: string) => string;
+  userCacheKey: (username: string) => string;
+  postSeriesKey: (username: string, seriesUrlSlug: string) => string;
+  changeEmailKey: (code: string) => string;
+};
+
+type QueueName = 'feed';

src/graphql/post.ts

@@ -1,15 +1,7 @@
 import { ApolloContext } from './../app';
 import { gql, IResolvers, ApolloError, AuthenticationError } from 'apollo-server-koa';
 import Post from '../entity/Post';
-import {
-  getRepository,
-  getManager,
-  LessThan,
-  Not,
-  MoreThan,
-  UsingJoinColumnIsNotAllowedError,
-} from 'typeorm';
-import PostScore from '../entity/PostScore';
+import { getRepository, getManager, LessThan, Not, MoreThan } from 'typeorm';
 import { normalize, escapeForUrl, checkEmpty } from '../lib/utils';
 import removeMd from 'remove-markdown';
 import PostsTags from '../entity/PostsTags';
@@ -35,15 +27,11 @@ import { createLikeLog, createReadLog } from '../lib/bigQuery';
 import esClient from '../search/esClient';
 import { buildFallbackRecommendedPosts, buildRecommendedPostsQuery } from '../search/buildQuery';
 import { pickRandomItems } from '../etc/pickRandomItems';
-import { shuffleArray } from '../etc/shuffleArray';
-import checkUnscore from '../etc/checkUnscore';
 import geoipCountry from 'geoip-country';
 import { purgeRecentPosts, purgeUser, purgePost } from '../lib/graphcdn';
 import imageService from '../services/imageService';
-import { sendSlackMessage } from '../lib/sendSlackMessage';
 import externalInterationService from '../services/externalIntegrationService';
 import postService from '../services/postService';
-import userFollowService from '../services/userFollowService';
 import { checkBlockList } from '../lib/checkBlockList';
 
 const lruCache = new LRU<string, string[]>({
@@ -100,7 +88,6 @@ export const typeDef = gql`
     linked_posts: LinkedPosts
     last_read_at: Date
     recommended_posts: [Post]
-    followed: Boolean
   }
   type SearchResult {
     count: Int
@@ -392,10 +379,6 @@ export const resolvers: IResolvers<any, ApolloContext> = {
         next,
       };
     },
-    followed: async (parent: Post, _, ctx) => {
-      if (!ctx.user_id) return false;
-      return await userFollowService.isFollowed(ctx.user_id, parent.fk_user_id);
-    },
   },
   Query: {
     post: async (parent: any, { id, username, url_slug }: any, ctx: any) => {
@@ -903,12 +886,12 @@ export const resolvers: IResolvers<any, ApolloContext> = {
           });
         });
 
-        const queueName = cache.getQueueName('feed');
-        const queueInfo = {
-          fk_follower_id: ctx.user_id,
+        const queueName = cache.queueName.feed;
+        const queueData = {
+          fk_following_id: ctx.user_id,
           fk_post_id: post.id,
         };
-        cache.client!.lpush(queueName, JSON.stringify(queueInfo));
+        cache.client!.lpush(queueName, JSON.stringify(queueData));
       }
 
       purgeRecentPosts();

src/graphql/user.ts

@@ -23,6 +23,7 @@ export const typeDef = gql`
     velog_config: VelogConfig
     series_list: [Series]
     user_meta: UserMeta
+    is_followed: Boolean
   }
   type UserProfile {
     id: ID!
@@ -63,8 +64,8 @@ export const typeDef = gql`
     acceptIntegration: String!
     initiateChangeEmail(email: String!): Boolean
     confirmChangeEmail(code: String!): Boolean
-    follow(follow_user_id: ID!): Boolean
-    unfollow(follow_user_id: ID!): Boolean
+    follow(following_user_id: ID!): Boolean
+    unfollow(following_user_id: ID!): Boolean
   }
 `;
 
@@ -117,6 +118,10 @@ export const resolvers: IResolvers<any, ApolloContext> = {
       const userMetaRepo = getRepository(UserMeta);
       return userMetaRepo.findOne({ fk_user_id: user_id });
     },
+    is_followed: async (parent: User, _, ctx) => {
+      if (!ctx.user_id) return false;
+      return await userService.isFollowed(parent.id, ctx.user_id);
+    },
   },
   Query: {
     user: async (parent: any, { id, username }: any) => {
@@ -295,13 +300,13 @@ export const resolvers: IResolvers<any, ApolloContext> = {
       if (!ctx.user_id) throw new AuthenticationError('Not Logged In');
       return await userService.confirmChangeEmail(ctx.user_id, args.code);
     },
-    follow: async (_, args: { follow_user_id: string }, ctx) => {
+    follow: async (_, args: { following_user_id: string }, ctx) => {
       if (!ctx.user_id) throw new AuthenticationError('Not Logged In');
-      return await userService.followUser(args.follow_user_id, ctx.cookies);
+      return await userService.follow(args.following_user_id, ctx.cookies);
     },
-    unfollow: async (_, args: { follow_user_id: string }, ctx) => {
+    unfollow: async (_, args: { following_user_id: string }, ctx) => {
       if (!ctx.user_id) throw new AuthenticationError('Not Logged In');
-      return await userService.unfollowUser(args.follow_user_id, ctx.cookies);
+      return await userService.unfollow(args.following_user_id, ctx.cookies);
     },
   },
 };

src/services/postService.ts

@@ -193,7 +193,7 @@ const postService = {
         mutation LikePost {
           likePost(input: { postId: "${postId}"}) {
             id
-            liked
+            is_liked
             likes
           }
         }
@@ -227,7 +227,7 @@ const postService = {
         mutation UnLikePost {
           unlikePost(input: { postId: "${postId}"}) {
             id
-            liked
+            is_liked
             likes
           }
         }

src/services/userFollowService.ts

@@ -1,5 +1,5 @@
 import Joi from 'joi';
-import type { User, Prisma } from '@prisma/client';
+import type { User, Prisma, FollowUser } from '@prisma/client';
 import db from '../lib/db';
 import { validateArgs } from '../lib/utils';
 import { ApolloError, AuthenticationError } from 'apollo-server-koa';
@@ -140,7 +140,7 @@ const userService = {
     cache.client?.del(key);
     return true;
   },
-  async followUser(followUserId: string, cookies: Cookies) {
+  async follow(followingUserId: string, cookies: Cookies) {
     try {
       const query = 'mutation Follow ($input: FollowInput!) {\n\tfollow(input: $input) \n}';
 
@@ -156,7 +156,7 @@ const userService = {
         {
           operationName: 'Follow',
           query: query,
-          variables: { input: { followUserId: followUserId } },
+          variables: { input: { followingUserId: followingUserId } },
         },
         {
           headers: {
@@ -172,7 +172,7 @@ const userService = {
       return false;
     }
   },
-  async unfollowUser(followUserId: string, cookies: Cookies) {
+  async unfollow(followingUserId: string, cookies: Cookies) {
     try {
       const query = 'mutation Unfollow ($input: UnfollowInput!) {\n\tunfollow(input: $input) \n}';
 
@@ -188,7 +188,7 @@ const userService = {
         {
           operationName: 'Unfollow',
           query: query,
-          variables: { input: { followUserId: followUserId } },
+          variables: { input: { followingUserId: followingUserId } },
         },
         {
           headers: {
@@ -204,6 +204,20 @@ const userService = {
       return false;
     }
   },
+  async findFollowRelationship(
+    followingUserId: string,
+    signedUserId: string
+  ): Promise<FollowUser | null> {
+    return await db.followUser.findFirst({
+      where: {
+        fk_following_user_id: followingUserId,
+        fk_follower_user_id: signedUserId,
+      },
+    });
+  },
+  async isFollowed(followingUserId: string, signedUserId: string): Promise<boolean> {
+    return !!(await this.findFollowRelationship(followingUserId, signedUserId));
+  },
 };
 
 export default userService;