Merge branch 'develop' into bug-fe-#343

djk01281 · web-flow · commit 51a3b9999878 · 2024-12-01T10:04:11.000+09:00
diff --git a/apps/backend/src/app.module.ts b/apps/backend/src/app.module.ts
@@ -20,9 +20,12 @@ import { AuthModule } from './auth/auth.module';
 import { UserModule } from './user/user.module';
 import { WorkspaceModule } from './workspace/workspace.module';
 import { RoleModule } from './role/role.module';
+import { TasksModule } from './tasks/tasks.module';
+import { ScheduleModule } from '@nestjs/schedule';
 
 @Module({
   imports: [
+    ScheduleModule.forRoot(),
     ServeStaticModule.forRoot({
       rootPath: path.join(__dirname, '..', '..', 'frontend', 'dist'),
     }),
@@ -34,7 +37,14 @@ import { RoleModule } from './role/role.module';
       imports: [ConfigModule],
       inject: [ConfigService],
       useFactory: (configService: ConfigService) => ({
-        type: 'sqlite',
+
+        // type: 'sqlite',
+        // database: 'db.sqlite',
+        type: 'postgres',
+        host: configService.get('DB_HOST'),
+        port: configService.get('DB_PORT'),
+        username: configService.get('DB_USER'),
+        password: configService.get('DB_PASSWORD'),
         database: configService.get('DB_NAME'),
         entities: [Node, Page, Edge, User, Workspace, Role],
         logging: true,
@@ -50,6 +60,7 @@ import { RoleModule } from './role/role.module';
     UserModule,
     WorkspaceModule,
     RoleModule,
+    TasksModule,
   ],
   controllers: [AppController],
   providers: [AppService],
diff --git a/apps/backend/src/auth/auth.module.ts b/apps/backend/src/auth/auth.module.ts
@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { UserRepository } from '../user/user.repository';
-import { UserModule } from 'src/user/user.module';
+import { UserModule } from '../user/user.module';
 import { AuthService } from './auth.service';
 import { AuthController } from './auth.controller';
 import { NaverStrategy } from './strategies/naver.strategy';
diff --git a/apps/backend/src/auth/auth.service.spec.ts b/apps/backend/src/auth/auth.service.spec.ts
@@ -5,6 +5,7 @@ import { SignUpDto } from './dtos/signUp.dto';
 import { User } from '../user/user.entity';
 import { UpdateUserDto } from './dtos/UpdateUser.dto';
 import { UserNotFoundException } from '../exception/user.exception';
+import { Snowflake } from '@theinternetfolks/snowflake';
 
 describe('AuthService', () => {
   let authService: AuthService;
@@ -68,9 +69,8 @@ describe('AuthService', () => {
         provider: 'naver',
         email: 'new@naver.com',
       };
-      const generated
-      
-      flakeId = Snowflake.generate(); // Snowflake.generate()의 mock 값을 준비
+
+      const generatedSnowflakeId = Snowflake.generate(); // Snowflake.generate()의 mock 값을 준비
       const newDate = new Date();
       const createdUser = {
         providerId: dto.providerId,
diff --git a/apps/backend/src/auth/auth.service.ts b/apps/backend/src/auth/auth.service.ts
@@ -6,7 +6,6 @@ import { UpdateUserDto } from './dtos/UpdateUser.dto';
 import { UserNotFoundException } from '../exception/user.exception';
 import { Snowflake } from '@theinternetfolks/snowflake';
 
-
 @Injectable()
 export class AuthService {
   constructor(private readonly userRepository: UserRepository) {}
diff --git a/apps/backend/src/node/node.service.spec.ts b/apps/backend/src/node/node.service.spec.ts
@@ -9,14 +9,14 @@ import { CreateNodeDto } from './dtos/createNode.dto';
 import { UpdateNodeDto } from './dtos/updateNode.dto';
 import { MoveNodeDto } from './dtos/moveNode.dto';
 import { WorkspaceRepository } from '../workspace/workspace.repository';
+import { Workspace } from '../workspace/workspace.entity';
 
 describe('NodeService', () => {
   let service: NodeService;
   let nodeRepository: jest.Mocked<NodeRepository>;
   let pageRepository: jest.Mocked<PageRepository>;
   let workspaceRepository: jest.Mocked<WorkspaceRepository>;
 
-
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [
diff --git a/apps/backend/src/page/dtos/updatePartialPage.dto.ts b/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;
+}
diff --git a/apps/backend/src/page/page.entity.ts b/apps/backend/src/page/page.entity.ts
@@ -8,7 +8,6 @@ import {
   CreateDateColumn,
   UpdateDateColumn,
   VersionColumn,
-  IsNull,
 } from 'typeorm';
 import { Node } from '../node/node.entity';
 import { Workspace } from '../workspace/workspace.entity';
diff --git a/apps/backend/src/page/page.repository.ts b/apps/backend/src/page/page.repository.ts
@@ -1,7 +1,8 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } 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,7 @@ export class PageRepository extends Repository<Page> {
     });
   }
 
-  async bulkUpdate(pages) {
-    await this.createQueryBuilder()
-      .insert()
-      .into(Page)
-      .values(pages)
-      .orUpdate(['title', 'content'], ['id'])
-      .execute();
+  async bulkUpdate(pages: UpdatePartialPageDto[]) {
+    await Promise.all(pages.map((page) => this.update(page.id, page)));
   }
 }
diff --git a/apps/backend/src/page/page.service.spec.ts b/apps/backend/src/page/page.service.spec.ts
@@ -28,6 +28,7 @@ describe('PageService', () => {
             save: jest.fn(),
             delete: jest.fn(),
             findOneBy: jest.fn(),
+            findOne: jest.fn(),
             findPagesByWorkspace: jest.fn(),
           },
         },
@@ -135,6 +136,7 @@ describe('PageService', () => {
         content: {} as JSON,
         emoji: undefined,
         workspace: workspace1,
+        node: newNode,
       });
     });
   });
@@ -235,19 +237,22 @@ describe('PageService', () => {
         emoji: null,
         workspace: null,
       };
-      jest.spyOn(pageRepository, 'findOneBy').mockResolvedValue(expectedPage);
+      jest.spyOn(pageRepository, 'findOne').mockResolvedValue(expectedPage);
 
       await expect(service.findPageById(1)).resolves.toEqual(expectedPage);
     });
 
     it('id에 해당하는 페이지가 없을 경우 PageNotFoundException을 throw한다.', async () => {
-      jest.spyOn(pageRepository, 'findOneBy').mockResolvedValue(undefined);
+      jest.spyOn(pageRepository, 'findOne').mockResolvedValue(undefined);
 
       await expect(service.findPageById(1)).rejects.toThrow(
         PageNotFoundException,
       );
 
-      expect(pageRepository.findOneBy).toHaveBeenCalledWith({ id: 1 });
+      expect(pageRepository.findOne).toHaveBeenCalledWith({
+        where: { id: 1 },
+        relations: ['node'],
+      });
     });
   });
 
diff --git a/apps/backend/src/page/page.service.ts b/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';
 
@@ -37,6 +38,7 @@ export class PageService {
       content,
       emoji,
       workspace,
+      node,
     });
 
     // 페이지와 노드를 서로 연결하여 저장한다.
@@ -81,13 +83,16 @@ export class PageService {
     return await this.pageRepository.save(newPage);
   }
 
-  async updateBulkPage(pages: UpdatePageDto[]) {
+  async updateBulkPage(pages: UpdatePartialPageDto[]) {
     await this.pageRepository.bulkUpdate(pages);
   }
 
   async findPageById(id: number): Promise<Page> {
     // 페이지를 조회한다.
-    const page = await this.pageRepository.findOneBy({ id });
+    const page = await this.pageRepository.findOne({
+      where: { id },
+      relations: ['node'],
+    });
 
     // 페이지가 없으면 NotFound 에러
     if (!page) {
diff --git a/apps/backend/src/redis/redis.service.ts b/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));
   }
 
diff --git a/apps/backend/src/tasks/tasks.module.ts b/apps/backend/src/tasks/tasks.module.ts
@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { TasksService } from './tasks.service';
+import { RedisModule } from '../redis/redis.module';
+import { PageModule } from '../page/page.module';
+
+@Module({
+  imports: [RedisModule, PageModule],
+  providers: [TasksService],
+})
+export class TasksModule {}
diff --git a/apps/backend/src/tasks/tasks.service.ts b/apps/backend/src/tasks/tasks.service.ts
@@ -11,27 +11,38 @@ export class TasksService {
     private readonly pageService: PageService,
   ) {}
 
-  @Cron(CronExpression.EVERY_MINUTE)
+  @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: key,
+        id: parseInt(key),
         title,
         content: jsonContent,
         version: 1,
       });
-      this.pageService.updatePage(parseInt(key), {
-        title,
-        content: jsonContent,
-      });
-      this.logger.log('데이터베이스 갱신');
+      // this.pageService.updatePage(parseInt(key), {
+      //   title,
+      //   content: jsonContent,
+      // });
+      // this.logger.log('데이터베이스 갱신');
     }
-    this.pageService.updateBulkPage(pages);
+    await this.pageService.updateBulkPage(pages);
+
+    // 끝 시간
+    const endTime = performance.now();
+    this.logger.log(`갱신 개수 : ${pages.length}개`);
+    this.logger.log(`실행 시간 : ${(endTime - startTime) / 1000}초`);
   }
 }
diff --git a/apps/backend/src/yjs/yjs.module.ts b/apps/backend/src/yjs/yjs.module.ts
@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { YjsService } from './yjs.service';
-import { NodeModule } from 'src/node/node.module';
+import { NodeModule } from '../node/node.module';
 import { PageModule } from '../page/page.module';
 import { EdgeModule } from '../edge/edge.module';
 import { RedisModule } from '../redis/redis.module';
diff --git a/apps/backend/src/yjs/yjs.service.ts b/apps/backend/src/yjs/yjs.service.ts
diff --git a/services/nginx/conf.d/prod_nginx.conf b/services/nginx/conf.d/prod_nginx.conf
diff --git a/services/nginx/conf.d/prod_nginx_init.conf b/services/nginx/conf.d/prod_nginx_init.conf
