fix: 스케줄러 bulk update 연산 수정

Author: ezcolin2

apps/backend/src/page/dtos/updatePartialPage.dto.ts

@@ -0,0 +1,36 @@
+import { IsString, IsJSON, IsOptional, IsNumber } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UpdatePartialPageDto {
+  @ApiProperty({
+    example: 1,
+    description: 'page PK',
+  })
+  @IsNumber()
+  id: number;
+
+  @ApiProperty({
+    example: '페이지 제목입니다.',
+    description: '페이지 제목.',
+  })
+  @IsString()
+  @IsOptional()
+  title?: string;
+
+  @ApiProperty({
+    example: "{'doc' : 'type'}",
+    description: '페이지 내용 JSON 형태',
+  })
+  @IsJSON()
+  @IsOptional()
+  content?: JSON;
+
+  @ApiProperty({
+    example: '📝',
+    description: '페이지 이모지',
+    required: false,
+  })
+  @IsString()
+  @IsOptional()
+  emoji?: string;
+}

apps/backend/src/page/page.repository.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { DataSource, Repository } from 'typeorm';
 import { Page } from './page.entity';
 import { InjectDataSource } from '@nestjs/typeorm';
+import { UpdatePartialPageDto } from './dtos/updatePartialPage.dto';
 
 @Injectable()
 export class PageRepository extends Repository<Page> {
@@ -20,12 +21,9 @@ export class PageRepository extends Repository<Page> {
     });
   }
 
-  async bulkUpdate(pages) {
-    await this.createQueryBuilder()
-      .insert()
-      .into(Page, ['id', 'title', 'content', 'version'])
-      .values(pages)
-      .orUpdate(['title', 'content', 'version'], ['id'])
-      .execute();
+  async bulkUpdate(pages: UpdatePartialPageDto[]) {
+    for await (const page of pages) {
+      await this.update(page.id, page);
+    }
   }
 }

apps/backend/src/page/page.service.ts

@@ -5,6 +5,7 @@ import { PageRepository } from './page.repository';
 import { Page } from './page.entity';
 import { CreatePageDto } from './dtos/createPage.dto';
 import { UpdatePageDto } from './dtos/updatePage.dto';
+import { UpdatePartialPageDto } from './dtos/updatePartialPage.dto';
 import { PageNotFoundException } from '../exception/page.exception';
 import { WorkspaceNotFoundException } from '../exception/workspace.exception';
 
@@ -67,7 +68,6 @@ export class PageService {
   }
 
   async updatePage(id: number, dto: UpdatePageDto): Promise<Page> {
-    console.log(id, dto, 'asdfasdasd');
     // 갱신할 페이지를 조회한다.
     // 페이지를 조회한다.
     const page = await this.pageRepository.findOneBy({ id });
@@ -83,7 +83,7 @@ export class PageService {
     return await this.pageRepository.save(newPage);
   }
 
-  async updateBulkPage(pages: UpdatePageDto[]) {
+  async updateBulkPage(pages: UpdatePartialPageDto[]) {
     await this.pageRepository.bulkUpdate(pages);
   }
 

apps/backend/src/redis/redis.service.ts

@@ -24,14 +24,12 @@ export class RedisService {
 
   async get(key: string) {
     const data = await this.redisClient.hgetall(key);
-    console.log(data);
     return Object.fromEntries(
       Object.entries(data).map(([field, value]) => [field, value]),
     ) as RedisPage;
   }
 
   async set(key: string, value: object) {
-    console.log('set', Object.entries(value));
     return await this.redisClient.hset(key, Object.entries(value));
   }
 

apps/backend/src/tasks/tasks.service.ts

@@ -14,13 +14,19 @@ export class TasksService {
 
   @Cron(CronExpression.EVERY_30_SECONDS)
   async handleCron() {
-    console.log(await this.redisService.getAllKeys());
+    this.logger.log('스케줄러 시작');
+    // 시작 시간
+    const startTime = performance.now();
+
+    // redis의 모든 값을 가져와서 database에 저장
     const keys = await this.redisService.getAllKeys();
     const pages = [];
-    this.logger.log('스케줄러 시작');
     for await (const key of keys) {
       const { title, content } = await this.redisService.get(key);
       const jsonContent = JSON.parse(content);
+      Object.assign({
+        id: parseInt(key),
+      });
       pages.push({
         id: parseInt(key),
         title,
@@ -33,7 +39,11 @@ export class TasksService {
       // });
       // this.logger.log('데이터베이스 갱신');
     }
-    console.log(pages);
-    this.pageService.updateBulkPage(pages);
+    await this.pageService.updateBulkPage(pages);
+
+    // 끝 시간
+    const endTime = performance.now();
+    this.logger.log(`갱신 개수 : ${pages.length}개`);
+    this.logger.log(`실행 시간 : ${(endTime - startTime) / 1000}초`);
   }
 }

apps/backend/src/yjs/yjs.service.ts

@@ -100,7 +100,6 @@ export class YjsService
 
         if (Object.keys(pageContent).length > 0) {
           this.transformText(pageContent);
-          this.logger.error(pageContent);
           // this.logger.error(this.transformText(pageContent));
           this.initializePageContent(pageContent, editorDoc);
         }