Merge pull request #29 from velog-io/development

알림기능 버그 수정 및 로직 변경

Author: winverse

.github/workflows/velog-cron-build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.16]
+        node-version: [18.18.2]
     defaults:
       run:
         working-directory: './packages/velog-cron'

.github/workflows/velog-server-build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.16]
+        node-version: [18.18.2]
     defaults:
       run:
         working-directory: './packages/velog-server'

.github/workflows/velog-web-build.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.16]
+        node-version: [18.18.2]
     defaults:
       run:
         working-directory: './packages/velog-web'

.gitignore

@@ -6,3 +6,5 @@
 .env
 .env.*
 !**/**/.env.example
+
+.vscode

.vscode/c_cpp_properties.json

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "notifications" ADD COLUMN     "is_noticed" BOOLEAN NOT NULL DEFAULT false;

.vscode/launch.json

@@ -628,8 +628,9 @@ model Notification {
   action     Json      @default("{}")
   action_id  String?   @db.Uuid
   is_read    Boolean   @default(false)
-  is_deleted Boolean   @default(false)
   read_at    DateTime?
+  is_deleted Boolean   @default(false)
+  is_noticed Boolean   @default(false)
   created_at DateTime  @default(now()) @db.Timestamptz(6)
   user       User      @relation(fields: [fk_user_id], references: [id], onDelete: Cascade, onUpdate: Restrict)
 

.vscode/settings.json

@@ -26,6 +26,9 @@ class Runner implements IRunner {
         const user = await this.findUsersByUsername(username)
         const posts = await this.findWritenPostsByUserId(user.id)
 
+        // add block list
+        await this.redis.addBlockList(username)
+
         if (posts.length === 0) {
           console.log(`${user.username} 유저의 비공개 처리 할 게시글이 없습니다.`)
           continue
@@ -44,9 +47,6 @@ class Runner implements IRunner {
         // set private = true
         await this.setIsPrivatePost(postIds)
 
-        // add block list
-        await this.redis.addBlockList(username)
-
         const blockUesrInfo: BlockUserInfo = {
           id: user.id,
           username: user.username,
@@ -62,7 +62,7 @@ class Runner implements IRunner {
     }
 
     if (handledUser.length === 0) {
-      console.log('게시글 비공개 처리된 유저가 존재하지 않습니다.')
+      console.log('비공개 게시글 처리된 유저가 존재하지 않습니다.')
       process.exit(0)
     }
 

packages/velog-prisma/prisma/migrations/20240207042213_add_is_noticed_column/migration.sql

@@ -18,7 +18,8 @@ const errorHandlerPlugin: FastifyPluginCallback = (fastify, _, done) => {
       'error',
       JSON.stringify({
         type: 'fastify OnError',
-        requestbody: request?.body,
+        requestbody: request?.body || 'none',
+        query: request?.query || 'none',
         error,
         user: request?.user,
       }),

packages/velog-prisma/prisma/schema.prisma

@@ -19,11 +19,12 @@ enum NotificationType {
 
 type Query {
   notifications(input: NotificationsInput!): [Notification!]!
-  notificationCount: Int!
+  notNoticeNotificationCount: Int!
 }
 
 type Mutation {
   createNotification(input: CreateNotificationInput!): Notification!
+  updateNotNoticeNotification: Void
   readNotification(input: ReadNotificationInput!): Void
   readAllNotifications: Void
   removeAllNotifications: Void

packages/velog-scripts/scripts/privatePostsOfSpamAccount.mts

@@ -205,6 +205,7 @@ export type Mutation = {
   unregister?: Maybe<Scalars['Void']['output']>
   updateAbout?: Maybe<UserProfile>
   updateEmailRules?: Maybe<UserMeta>
+  updateNotNoticeNotification?: Maybe<Scalars['Void']['output']>
   updateProfile?: Maybe<UserProfile>
   updateSocialInfo?: Maybe<UserProfile>
   updateThumbnail?: Maybe<UserProfile>
@@ -359,7 +360,7 @@ export type Query = {
   followers: Array<FollowResult>
   followings: Array<FollowResult>
   isLogged?: Maybe<Scalars['Boolean']['output']>
-  notificationCount: Scalars['Int']['output']
+  notNoticeNotificationCount: Scalars['Int']['output']
   notifications: Array<Notification>
   post?: Maybe<Post>
   posts: Array<Post>
@@ -1055,6 +1056,7 @@ export type MutationResolvers<
     ContextType,
     RequireFields<MutationUpdateEmailRulesArgs, 'input'>
   >
+  updateNotNoticeNotification?: Resolver<Maybe<ResolversTypes['Void']>, ParentType, ContextType>
   updateProfile?: Resolver<
     Maybe<ResolversTypes['UserProfile']>,
     ParentType,
@@ -1190,7 +1192,7 @@ export type QueryResolvers<
     RequireFields<QueryFollowingsArgs, 'input'>
   >
   isLogged?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>
-  notificationCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>
+  notNoticeNotificationCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>
   notifications?: Resolver<
     Array<ResolversTypes['Notification']>,
     ParentType,

packages/velog-server/src/common/plugins/global/errorHandlerPlugin.ts

@@ -9,9 +9,9 @@ const notificationResolvers: Resolvers = {
       const notificationService = container.resolve(NotificationService)
       return await notificationService.list(input, ctx.user?.id)
     },
-    notificationCount: async (_, __, ctx) => {
+    notNoticeNotificationCount: async (_, __, ctx) => {
       const notificationService = container.resolve(NotificationService)
-      return await notificationService.getCount(ctx.user?.id)
+      return await notificationService.getNotNoticeCount(ctx.user?.id)
     },
   },
   Mutation: {
@@ -28,6 +28,10 @@ const notificationResolvers: Resolvers = {
         signedUserId: ctx.user?.id,
       })
     },
+    updateNotNoticeNotification: async (_, __, ctx) => {
+      const notificationService = container.resolve(NotificationService)
+      return await notificationService.updateNotNotice(ctx.user?.id)
+    },
     readNotification: async (_, { input }, ctx) => {
       const notificationService = container.resolve(NotificationService)
       return await notificationService.read(input.notification_ids, ctx.user?.id)

packages/velog-server/src/graphql/Notification.gql

@@ -1,4 +1,5 @@
 import { BadRequestError } from '@errors/BadRequestErrors.js'
+import { ConfilctError } from '@errors/ConfilctError.js'
 import { ForbiddenError } from '@errors/ForbiddenError.js'
 import { NotFoundError } from '@errors/NotfoundError.js'
 import { UnauthorizedError } from '@errors/UnauthorizedError.js'
@@ -17,7 +18,8 @@ import { z } from 'zod'
 
 interface Service {
   list(query?: NotificationsInput, signedUserId?: string): Promise<Notification[]>
-  getCount(signedUserId?: string): Promise<number>
+  getNotNoticeCount(signedUserId?: string): Promise<number>
+  updateNotNotice(signedUserId?: string): Promise<void>
   create(args: CreateArgs): Promise<Notification>
   read(notificationIds: string[], signedUserId?: string): Promise<void>
   readAll(signedUserId?: string): Promise<void>
@@ -65,7 +67,7 @@ export class NotificationService implements Service {
     })
     return notifications as unknown as Notification[]
   }
-  public async getCount(signedUserId?: string): Promise<number> {
+  public async getNotNoticeCount(signedUserId?: string): Promise<number> {
     if (!signedUserId) {
       throw new UnauthorizedError('Not logged in')
     }
@@ -80,7 +82,28 @@ export class NotificationService implements Service {
       where: {
         fk_user_id: signedUserId,
         is_deleted: false,
-        is_read: false,
+        is_noticed: false,
+      },
+    })
+  }
+  public async updateNotNotice(signedUserId?: string): Promise<void> {
+    if (!signedUserId) {
+      throw new UnauthorizedError('Not logged in')
+    }
+
+    const user = await this.userService.findById(signedUserId)
+
+    if (!user) {
+      throw new NotFoundError('Not found user')
+    }
+
+    await this.db.notification.updateMany({
+      where: {
+        fk_user_id: signedUserId,
+        is_noticed: false,
+      },
+      data: {
+        is_noticed: true,
       },
     })
   }
@@ -106,6 +129,10 @@ export class NotificationService implements Service {
       throw new BadRequestError('Not found action')
     }
 
+    if (fkUserId === actor.id) {
+      throw new ConfilctError('Cannot target the same user as actor')
+    }
+
     const action = (actionInfo as any)[type]
 
     const validate = this.notificationActionValidate(type, action)

packages/velog-server/src/graphql/helpers/generated.ts

@@ -92,26 +92,28 @@ export class PostLikeService implements Service {
       },
     })
 
-    // create notification
-    await this.notificationService.createOrUpdate({
-      fkUserId: post.fk_user_id,
-      actorId: signedUserId,
-      actionId: post.id,
-      type: 'postLike',
-      action: {
-        postLike: {
-          post_like_id: postLike.id,
-          actor_display_name: signedUser.profile?.display_name || '',
-          actor_thumbnail: signedUser.profile?.thumbnail || '',
-          actor_username: signedUser.username,
-          post_id: likesPost.id,
-          post_title: likesPost.title || '',
-          post_url_slug: likesPost.url_slug || '',
-          post_writer_username: likesPost.user.username,
-          type: 'postLike',
+    if (post.fk_user_id !== signedUserId) {
+      // create notification
+      await this.notificationService.createOrUpdate({
+        fkUserId: post.fk_user_id,
+        actorId: signedUserId,
+        actionId: post.id,
+        type: 'postLike',
+        action: {
+          postLike: {
+            post_like_id: postLike.id,
+            actor_display_name: signedUser.profile?.display_name || '',
+            actor_thumbnail: signedUser.profile?.thumbnail || '',
+            actor_username: signedUser.username,
+            post_id: likesPost.id,
+            post_title: likesPost.title || '',
+            post_url_slug: likesPost.url_slug || '',
+            post_writer_username: likesPost.user.username,
+            type: 'postLike',
+          },
         },
-      },
-    })
+      })
+    }
 
     const unscored = this.utils.checkUnscore(post.body!.concat(post.title || ''))
     if (!unscored) {

packages/velog-server/src/graphql/resolvers/notificationResolvers.ts

@@ -6,7 +6,6 @@ const nextConfig = {
   reactStrictMode: true,
   swcMinify: true,
   images: {
-    formats: ['image/avif', 'image/webp'],
     domains: ['velog.velcdn.com', 'images.velog.io', 'media.vlpt.us'],
     unoptimized: true,
   },

packages/velog-server/src/services/NotificationService/index.ts

@@ -43,7 +43,7 @@
     "html-react-parser": "^5.0.6",
     "inquirer": "^9.2.7",
     "nanoid": "^4.0.2",
-    "next": "^14.0.3",
+    "next": "^14.1.0",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-preset-env": "^8.5.0",
     "prismjs": "^1.29.0",

packages/velog-server/src/services/PostLikeService/index.ts

@@ -4,6 +4,6 @@ type Props = {
   children: React.ReactNode
 }
 
-export default async function HomeListLayout({ children }: Props) {
+export default function HomeListLayout({ children }: Props) {
   return <HomeLayout>{children}</HomeLayout>
 }

packages/velog-web/next.config.mjs

@@ -9,6 +9,6 @@ export const metadata: Metadata = {
   alternates: { canonical: 'https://velog.io/' },
 }
 
-export default async function Trending({ params }: Props) {
+export default function Trending({ params }: Props) {
   return <TrendingHome params={params} />
 }