Merge branch 'feat/delete-post-read' into development

Author: winverse

apps/cron/Dockerfile

@@ -27,7 +27,7 @@ ARG TURBO_TOKEN
 ENV TURBO_TOKEN=${TURBO_TOKEN}
 
 ARG TURBO_REMOTE_CACHE_SIGNATURE_KEY
-ENV TURBO_REMOTE_CACHE_SIGNATURE_KEY=${TURBO_REMOTE_CACHE_SIGNATURE_KEY}
+ENV TURBO_REMOTE_CACHE_SIGNATURE_KEY=$TURBO_REMOTE_CACHE_SIGNATURE_KEY
 
 ENV APP_NAME="cron"
 ENV APP_DIR="apps/${APP_NAME}"

apps/cron/src/app.mts

@@ -1,20 +1,24 @@
 import Fastify from 'fastify'
 import fastifyCron from 'fastify-cron'
-import routes from '@routes/index.js'
-import closePlugin from '@plugins/encapsulated/closePlugin.js'
+import routes from '@routes/index.mjs'
+import closePlugin from '@plugins/encapsulated/closePlugin.mjs'
 import checkApiKeyPlugin from '@plugins/global/checkApiKeyPlugin.mjs'
 import corsPlugin from '@plugins/global/corsPlugin.mjs'
 import errorHandlerPlugin from '@plugins/global/errorHandlerPlugin.mjs'
+import cronPlugin from '@plugins/global/cronPlugin.mjs'
 
 const app = Fastify({
   logger: true,
+  pluginTimeout: 60000,
 })
 
 app.register(checkApiKeyPlugin)
 app.register(corsPlugin)
 app.register(errorHandlerPlugin)
 app.register(closePlugin)
-app.register(fastifyCron.default)
+await app.register(fastifyCron.default)
+
+await app.register(cronPlugin)
 
 app.register(routes)
 

apps/cron/src/common/constants/HttpStatusConstants.ts renamed to apps/cron/src/common/constants/HttpStatusConstants.mts

@@ -1,4 +1,4 @@
-import { HttpError } from './HttpError.js'
+import { HttpError } from './HttpError.mjs'
 
 export class BadRequestError extends HttpError {
   constructor(message = 'BAD_REQUEST') {

apps/cron/src/common/constants/HttpStatusMessageConstants.ts renamed to apps/cron/src/common/constants/HttpStatusMessageConstants.mts

@@ -1,4 +1,4 @@
-import { HttpError } from './HttpError.js'
+import { HttpError } from './HttpError.mjs'
 
 export class ConfilctError extends HttpError {
   constructor(message = 'CONFILCT') {

apps/cron/src/common/errors/BadRequestErrors.ts renamed to apps/cron/src/common/errors/BadRequestErrors.mts

@@ -1,4 +1,4 @@
-import { HttpError } from './HttpError.js'
+import { HttpError } from './HttpError.mjs'
 
 export class ForbiddenError extends HttpError {
   constructor(message = 'FORBIDDEN') {

apps/cron/src/common/errors/ConfilctError.ts renamed to apps/cron/src/common/errors/ConfilctError.mts

@@ -1,4 +1,4 @@
-import { HttpError } from './HttpError.js'
+import { HttpError } from './HttpError.mjs'
 
 export class NotFoundError extends HttpError {
   constructor(message = 'NOT_FOUND') {

apps/cron/src/common/errors/ForbiddenError.ts renamed to apps/cron/src/common/errors/ForbiddenError.mts

@@ -1,4 +1,4 @@
-import { HttpError } from './HttpError.js'
+import { HttpError } from './HttpError.mjs'
 
 export class UnauthorizedError extends HttpError {
   constructor(message = 'Unauthorized') {

apps/cron/src/common/errors/HttpError.ts renamed to apps/cron/src/common/errors/HttpError.mts

@@ -0,0 +1,6 @@
+export { BadRequestError } from './BadRequestErrors.mjs'
+export { ConfilctError } from './ConfilctError.mjs'
+export { ForbiddenError } from './ForbiddenError.mjs'
+export { HttpError, isHttpError } from './HttpError.mjs'
+export { NotFoundError } from './NotfoundError.mjs'
+export { UnauthorizedError } from './UnauthorizedError.mjs'

apps/cron/src/common/errors/NotfoundError.ts renamed to apps/cron/src/common/errors/NotfoundError.mts

@@ -1,5 +1,5 @@
 import { ENV } from '@env'
-import { UnauthorizedError } from '@errors/UnauthorizedError.js'
+import { UnauthorizedError } from '@errors/UnauthorizedError.mjs'
 import { FastifyPluginCallback } from 'fastify'
 import fp from 'fastify-plugin'
 

apps/cron/src/common/errors/UnauthorizedError.ts renamed to apps/cron/src/common/errors/UnauthorizedError.mts

@@ -1,7 +1,7 @@
 import { FastifyPluginCallback } from 'fastify'
 import { ENV } from '@env'
 import cors from '@fastify/cors'
-import { ForbiddenError } from '@errors/ForbiddenError.js'
+import { ForbiddenError } from '@errors/ForbiddenError.mjs'
 import fp from 'fastify-plugin'
 
 const corsPlugin: FastifyPluginCallback = (fastify, opts, done) => {

apps/cron/src/common/errors/index.mts

@@ -1,15 +1,16 @@
+import fp from 'fastify-plugin'
 import { StatsDaily, StatsWeekly, StatsMonthly } from '@jobs/stats/index.js'
-import { GenerateFeedJob } from '@jobs/GenerateFeedJob.js'
-import { CalculatePostScoreJob } from '@jobs/CalculatePostScoreJob.js'
-import { GenerateTrendingWritersJob } from '@jobs/GenerateTrendingWritersJob.js'
-import { DeleteFeedJob } from '@jobs/DeleteFeedJob.js'
-import { FastifyPluginCallback } from 'fastify'
+import { GenerateFeedJob } from '@jobs/GenerateFeedJob.mjs'
+import { CalculatePostScoreJob } from '@jobs/CalculatePostScoreJob.mjs'
+import { GenerateTrendingWritersJob } from '@jobs/GenerateTrendingWritersJob.mjs'
+import { DeleteFeedJob } from '@jobs/DeleteFeedJob.mjs'
+import { FastifyPluginAsync } from 'fastify'
 import { container } from 'tsyringe'
 import { ENV } from '@env'
-import { CheckSpamPostJob } from '@jobs/CheckSpamPostJob.js'
-import fp from 'fastify-plugin'
+import { CheckSpamPostJob } from '@jobs/CheckSpamPostJob.mjs'
+import { DeletePostReadJob } from '@jobs/DeletePostReadJob.mjs'
 
-const cronPlugin: FastifyPluginCallback = async (fastfiy, opts, done) => {
+const cronPlugin: FastifyPluginAsync = async (fastfiy) => {
   const calculatePostScoreJob = container.resolve(CalculatePostScoreJob)
   const generateFeedJob = container.resolve(GenerateFeedJob)
   const generateTrendingWritersJob = container.resolve(GenerateTrendingWritersJob)
@@ -18,6 +19,7 @@ const cronPlugin: FastifyPluginCallback = async (fastfiy, opts, done) => {
   const statsWeeklyJob = container.resolve(StatsWeekly)
   const statsMonthlyJob = container.resolve(StatsMonthly)
   const checkSpamPostJob = container.resolve(CheckSpamPostJob)
+  const deleteReadPostJob = container.resolve(DeletePostReadJob)
 
   // 덜 실행하면서, 실행되는 순서로 정렬
   // crontime은 UTC 기준으로 작성되기 때문에 KST에서 9시간을 빼줘야함
@@ -54,6 +56,11 @@ const cronPlugin: FastifyPluginCallback = async (fastfiy, opts, done) => {
       cronTime: '*/2 * * * *', // every 2 minutes
       jobService: checkSpamPostJob,
     },
+    {
+      name: 'delete post read in every 2 minutes',
+      cronTime: '*/2 * * * *', // every 2 minutes
+      jobService: deleteReadPostJob,
+    },
     // Stats Start
     {
       name: 'providing a count of new users and posts from the past 1 day',
@@ -82,33 +89,30 @@ const cronPlugin: FastifyPluginCallback = async (fastfiy, opts, done) => {
     })
   }
 
-  try {
-    // for Test
+  const initializeJobs = async () => {
+    console.log('Initializing cron jobs...')
     if (ENV.appEnv !== 'production') {
-      const immediateRunJobs = jobDescription.filter((job) => !!job.isImmediateExecute)
-      await Promise.all(immediateRunJobs.map(createTick))
-      const crons = immediateRunJobs.map(createJob)
-      await Promise.all(
-        crons.map((cron) => {
-          console.log(`${cron.name} is registered`)
-          cron.start()
-        }),
-      )
+      const immediateRunJobs = jobDescription.filter((job) => job.isImmediateExecute)
+      const crons = await Promise.all(immediateRunJobs.map(createJob))
+      for (const cron of crons) {
+        cron.start()
+        console.log(`${cron.name} is registered`)
+      }
     }
 
-    if (ENV.dockerEnv === 'production') {
-      const crons = jobDescription.map(createJob)
-      await Promise.all(
-        crons.map((cron) => {
-          console.log(`${cron.name} is registered`)
-          cron.start()
-        }),
-      )
+    if (['production', 'stage'].includes(ENV.dockerEnv)) {
+      const crons = await Promise.all(jobDescription.map(createJob))
+      for (const cron of crons) {
+        cron.start()
+        console.log(`${cron.name} is registered`)
+      }
     }
+  }
+
+  try {
+    await initializeJobs()
   } catch (error) {
     console.error('Error initializing cron jobs:', error)
-  } finally {
-    done()
   }
 }
 
@@ -148,6 +152,7 @@ type JobService =
   | StatsWeekly
   | StatsMonthly
   | CheckSpamPostJob
+  | DeletePostReadJob
 
 type BaseJobService = {
   name: string
@@ -164,4 +169,10 @@ type NotNeedParamJobService = Omit<BaseJobService, 'param'> & {
   jobService: Exclude<JobService, CalculatePostScoreJob>
 }
 
-export default fp(cronPlugin)
+export default fp(cronPlugin, {
+  name: 'cronPlugin',
+  fastify: '4.x',
+  decorators: {
+    fastify: ['cron'],
+  },
+})

apps/cron/src/common/errors/index.ts

@@ -1,5 +1,5 @@
 import { ENV } from '@env'
-import { isHttpError } from '@errors/HttpError.js'
+import { isHttpError } from '@errors/HttpError.mjs'
 import { FastifyPluginCallback } from 'fastify'
 import fp from 'fastify-plugin'
 

apps/cron/src/common/plugins/encapsulated/closePlugin.ts renamed to apps/cron/src/common/plugins/encapsulated/closePlugin.mts

@@ -1,6 +1,6 @@
 import dotenv from 'dotenv'
 import { container } from 'tsyringe'
-import { UtilsService } from '@lib/utils/UtilsService.js'
+import { UtilsService } from '@lib/utils/UtilsService.mjs'
 import { existsSync } from 'fs'
 import { z } from 'zod'
 

apps/cron/src/common/plugins/global/checkApiKeyPlugin.mts

@@ -1,15 +1,12 @@
-import { DbService } from '@lib/db/DbService.js'
-import { PostService } from '@services/PostService/index.js'
+import { DbService } from '@lib/db/DbService.mjs'
+import { PostService } from '@services/PostService/index.mjs'
 import { injectable, singleton } from 'tsyringe'
-import { Job, JobProgress } from '@jobs/JobProgress.js'
+import { Job, JobProgress } from '@jobs/JobProgress.mjs'
 
 @singleton()
 @injectable()
 export class CalculatePostScoreJob extends JobProgress implements Job {
-  constructor(
-    private readonly postService: PostService,
-    private readonly db: DbService,
-  ) {
+  constructor(private readonly postService: PostService, private readonly db: DbService) {
     super()
   }
   public async runner(score: number) {

apps/cron/src/common/plugins/global/corsPlugin.mts

@@ -1,8 +1,8 @@
 import { injectable, singleton } from 'tsyringe'
-import { Job, JobProgress } from './JobProgress.js'
-import { PostService } from '@services/PostService/index.js'
-import { CheckPostSpamArgs, RedisService } from '@lib/redis/RedisService.js'
-import { DiscordService } from '@lib/discord/DiscordService.js'
+import { Job, JobProgress } from './JobProgress.mjs'
+import { PostService } from '@services/PostService/index.mjs'
+import { CheckPostSpamArgs, RedisService } from '@lib/redis/RedisService.mjs'
+import { DiscordService } from '@lib/discord/DiscordService.mjs'
 
 @injectable()
 @singleton()

apps/cron/src/common/plugins/global/cronPlugin.mts

@@ -1,6 +1,6 @@
 import { injectable, singleton } from 'tsyringe'
-import { Job, JobProgress } from './JobProgress.js'
-import { FeedService } from '@services/FeedService/index.js'
+import { Job, JobProgress } from './JobProgress.mjs'
+import { FeedService } from '@services/FeedService/index.mjs'
 
 @singleton()
 @injectable()

apps/cron/src/common/plugins/global/errorHandlerPlugin.mts

@@ -0,0 +1,27 @@
+import { injectable, singleton } from 'tsyringe'
+import { Job, JobProgress } from './JobProgress.mjs'
+import { PostReadService } from '@services/PostReadService/index.mjs'
+
+@injectable()
+@singleton()
+export class DeletePostReadJob extends JobProgress implements Job {
+  constructor(private readonly postReadService: PostReadService) {
+    super()
+  }
+  public async runner() {
+    console.log('Delete post read job start...')
+    console.time('delete post read')
+
+    const count = 1000
+    const postReads = await this.postReadService.findMany(count)
+
+    const postReadIds = postReads.map((postRead) => postRead.id)
+
+    for (const postReadId of postReadIds) {
+      await this.postReadService.deleteById(postReadId)
+    }
+
+    console.log(`Deleted PostRead count: ${count}`)
+    console.timeEnd('delete post read')
+  }
+}

apps/cron/src/env.mts

@@ -1,15 +1,12 @@
-import { Job, JobProgress } from '@jobs/JobProgress.js'
-import { RedisService } from '@lib/redis/RedisService.js'
-import { FeedService } from '@services/FeedService/index.js'
+import { Job, JobProgress } from '@jobs/JobProgress.mjs'
+import { RedisService } from '@lib/redis/RedisService.mjs'
+import { FeedService } from '@services/FeedService/index.mjs'
 import { injectable, singleton } from 'tsyringe'
 
 @singleton()
 @injectable()
 export class GenerateFeedJob extends JobProgress implements Job {
-  constructor(
-    private readonly redis: RedisService,
-    private readonly feedService: FeedService,
-  ) {
+  constructor(private readonly redis: RedisService, private readonly feedService: FeedService) {
     super()
   }
   public async runner() {

apps/cron/src/jobs/CalculatePostScoreJob.ts renamed to apps/cron/src/jobs/CalculatePostScoreJob.mts

@@ -1,15 +1,12 @@
 import { injectable, singleton } from 'tsyringe'
-import { Job, JobProgress } from './JobProgress.js'
-import { RedisService } from '@lib/redis/RedisService.js'
-import { WriterService } from '@services/WriterService/index.js'
+import { Job, JobProgress } from './JobProgress.mjs'
+import { RedisService } from '@lib/redis/RedisService.mjs'
+import { WriterService } from '@services/WriterService/index.mjs'
 
 @singleton()
 @injectable()
 export class GenerateTrendingWritersJob extends JobProgress implements Job {
-  constructor(
-    private readonly redis: RedisService,
-    private readonly writerService: WriterService,
-  ) {
+  constructor(private readonly redis: RedisService, private readonly writerService: WriterService) {
     super()
   }
   public async runner(): Promise<void> {

apps/cron/src/jobs/CheckSpamPostJob.ts renamed to apps/cron/src/jobs/CheckSpamPostJob.mts

@@ -1,6 +1,6 @@
 import { injectable, singleton } from 'tsyringe'
-import { Job, JobProgress } from '../JobProgress.js'
-import { StatsService } from '@services/StatsService/index.js'
+import { Job, JobProgress } from '../JobProgress.mjs'
+import { StatsService } from '@services/StatsService/index.mjs'
 
 @singleton()
 @injectable()

apps/cron/src/jobs/DeleteFeedJob.ts renamed to apps/cron/src/jobs/DeleteFeedJob.mts

@@ -1,6 +1,6 @@
 import { injectable, singleton } from 'tsyringe'
-import { Job, JobProgress } from '../JobProgress.js'
-import { StatsService } from '@services/StatsService/index.js'
+import { Job, JobProgress } from '../JobProgress.mjs'
+import { StatsService } from '@services/StatsService/index.mjs'
 
 @singleton()
 @injectable()

apps/cron/src/jobs/DeletePostReadJob.mts

@@ -1,6 +1,6 @@
 import { injectable, singleton } from 'tsyringe'
-import { Job, JobProgress } from '../JobProgress.js'
-import { StatsService } from '@services/StatsService/index.js'
+import { Job, JobProgress } from '../JobProgress.mjs'
+import { StatsService } from '@services/StatsService/index.mjs'
 
 @singleton()
 @injectable()

apps/cron/src/jobs/GenerateFeedJob.ts renamed to apps/cron/src/jobs/GenerateFeedJob.mts

@@ -1,5 +1,5 @@
 import { container } from 'tsyringe'
-import { DiscordService } from './DiscordService.js'
+import { DiscordService } from './DiscordService.mjs'
 
 describe('DiscordService', () => {
   const service = container.resolve(DiscordService)

apps/cron/src/jobs/GenerateTrendingWritersJob.ts renamed to apps/cron/src/jobs/GenerateTrendingWritersJob.mts

@@ -1,5 +1,5 @@
 import { container } from 'tsyringe'
-import { RedisService } from './RedisService.js'
+import { RedisService } from './RedisService.mjs'
 
 describe('RedisService', () => {
   const service = container.resolve(RedisService)

apps/cron/src/jobs/JobProgress.ts renamed to apps/cron/src/jobs/JobProgress.mts

@@ -1,5 +1,5 @@
 import { container } from 'tsyringe'
-import { UtilsService } from './UtilsService.js'
+import { UtilsService } from './UtilsService.mjs'
 
 describe('UtilsService', () => {
   const service = container.resolve(UtilsService)