Merge branch 'development'

Author: winverse

infrastructure/Pulumi.production.yaml

@@ -1,4 +1,4 @@
 config:
   aws:region: ap-northeast-2
   velog:DOCKER_ENV: production
-  velog:target: server,web
+  velog:target: cron

infrastructure/Pulumi.stage.yaml

@@ -1,4 +1,4 @@
 config:
   aws:region: ap-northeast-2
   velog:DOCKER_ENV: stage
-  velog:target: web
+  velog:target: server

infrastructure/src/lib/ecsOptions.ts

@@ -29,7 +29,7 @@ const serverProdEcsOption: EcsBaseOption = {
   cpu: 1, // unit 1024
   memory: 2, // unit 1024
   maxCapacity: 12,
-  minCapacity: 1,
+  minCapacity: 2,
 }
 
 const serverStageEcsOption: EcsBaseOption = {

packages/velog-cron/src/services/StatsService/index.ts

@@ -36,10 +36,10 @@ export class StatsService implements Service {
 
     await this.discord.sendMessage(
       'stats',
-      `[Daily]\n기간: ${format(
+      `[Daily]\n${format(
         start,
         'yyyy-MM-dd',
-      )}\n${usersCount}명의 사용자가 가입했습니다.\n${postCount}개의 공개 포스트가 작성되었습니다.`,
+      )} 동안\n${usersCount}명의 사용자가 가입했습니다.\n${postCount}개의 공개 포스트가 작성되었습니다.`,
     )
   }
   public async weekly() {
@@ -53,10 +53,10 @@ export class StatsService implements Service {
     const timeFormat = 'yyyy-MM-dd HH:mm:ss'
     await this.discord.sendMessage(
       'stats',
-      `[Daily]\n기간: ${format(start, timeFormat)}-${format(
+      `[Weekly]\n${format(start, timeFormat)}-${format(
         end,
-        'HH:mm:ss',
-      )}\n${usersCount}명의 사용자가 가입했습니다.\n${postCount}개의 공개 포스트가 작성되었습니다.`,
+        timeFormat,
+      )} 동안\n${usersCount}명의 사용자가 가입했습니다.\n${postCount}개의 공개 포스트가 작성되었습니다.`,
     )
   }
   public async monthly() {

packages/velog-scripts/package.json

@@ -7,7 +7,7 @@
   },
   "type": "module",
   "scripts": {
-    "private:posts": "pnpm env:copy -e development && ts-node ./scripts/privatePostsOfSpamAccount.mts",
+    "private:posts": "pnpm env:copy -e development && node --loader ts-node/esm ./scripts/privatePostsOfSpamAccount.mts",
     "check:gql": "pnpm prisma:copy && pnpm env:copy -e development && ts-node ./scripts/checkGql.mts",
     "restore:posts": "pnpm env:copy -e development && pnpm prisma:copy && ts-node ./scripts/restorePosts.mts",
     "add:bannedKeyword": "pnpm env:copy -e development && pnpm prisma:copy && ts-node ./scripts/addBannedKeywords.mts",

packages/velog-scripts/scripts/privatePostsOfSpamAccount.mts

@@ -6,7 +6,7 @@ import inquirer from 'inquirer'
 import { ENV } from '../env/env.mjs'
 import { DiscordService } from '../lib/discord/DiscordService.mjs'
 import { BlockListService } from '../lib/blockList/BlockListService.mjs'
-
+import { format } from 'date-fns'
 interface IRunner {}
 
 @injectable()
@@ -42,6 +42,7 @@ class Runner implements IRunner {
           user.id,
           username,
           user.profile?.display_name || null,
+          user.created_at,
         )
 
         if (!askResult.is_set_private) continue
@@ -136,6 +137,7 @@ class Runner implements IRunner {
     userId: string,
     username: string,
     displayName: string | null,
+    createdAt: Date,
   ): Promise<AskDeletePostsResult> {
     const blockedList = await this.blockList.readBlockList()
     if (blockedList.includes(username)) {
@@ -149,6 +151,7 @@ class Runner implements IRunner {
       id: userId,
       username: username,
       displayName: displayName ?? '',
+      '가입 날짜': format(createdAt, 'yyyy-MM-dd'),
       '업데이트 될 글 개수': posts.length,
       '최근 작성된 글': posts.slice(0, 5).map((post) => ({
         title: post.title,

packages/velog-scripts/tsconfig.json

@@ -17,7 +17,6 @@
   "include": ["./scripts", ".eslintrc.cjs", "./lib", "./env", "./data"],
   "exclude": [],
   "ts-node": {
-    "transpileOnly": true,
-    "esm": true
+    "transpileOnly": true
   }
 }

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

@@ -13,6 +13,7 @@ const authPlugin: FastifyPluginAsync = async (fastify) => {
 
     const userService = container.resolve(UserService)
     const jwt = container.resolve(JwtService)
+    const cookie = container.resolve(CookieService)
 
     let accessToken: string | undefined = request.cookies['access_token']
     const refreshToken: string | undefined = request.cookies['refresh_token']
@@ -34,6 +35,14 @@ const authPlugin: FastifyPluginAsync = async (fastify) => {
           await userService.restoreToken({ request, reply })
         }
 
+        // const user = await userService.findById(accessTokenData.user_id)
+
+        // if (!user) {
+        //   cookie.clearCookie(reply, 'access_token')
+        //   cookie.clearCookie(reply, 'refresh_token')
+        //   throw new Error('User not found')
+        // }
+
         request.user = { id: accessTokenData.user_id }
         return
       }
@@ -62,7 +71,6 @@ const authPlugin: FastifyPluginAsync = async (fastify) => {
         }
       } catch (error) {
         console.log('refresh token error', error)
-        const cookie = container.resolve(CookieService)
         cookie.clearCookie(reply, 'access_token')
         cookie.clearCookie(reply, 'refresh_token')
       }

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

@@ -23,6 +23,7 @@ const errorHandlerPlugin: FastifyPluginCallback = (fastify, _, done) => {
           query: request?.query || 'none',
           error,
           user: request?.user,
+          ip: request?.ip,
         }),
       )
       .catch(console.error)
@@ -56,6 +57,7 @@ const errorHandlerPlugin: FastifyPluginCallback = (fastify, _, done) => {
             requestbody: request?.body,
             error,
             user: request?.user,
+            ip: request?.ip,
           }),
         )
         .catch(console.error)

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

@@ -45,6 +45,7 @@ const mercuriusPlugin: FastifyPluginAsync = async (fastify) => {
               requestbody: request?.body,
               result,
               user: request?.user,
+              ip: request?.ip,
             }),
           )
           .catch(console.error)
@@ -65,6 +66,7 @@ const mercuriusPlugin: FastifyPluginAsync = async (fastify) => {
               requestbody: (ctx as any).request?.body,
               execution,
               user: (ctx as any).request?.user,
+              ip: (ctx as any).request?.ip,
             }),
           )
           .catch(console.error)