Merge pull request #90 from Boost-Coder/feature/Transaction-#89

[#89] 트랜잭션 적용 및 리펙토링
Boost-Coder · Apr 22, 2024 · 990c45a · 990c45a
2 parents 3a6b0ee + bfbb11b
commit 990c45a
Show file tree

Hide file tree

Showing 20 changed files with 190 additions and 175 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,6 +43,7 @@
     "rxjs": "^7.8.1",
     "typeorm": "^0.3.20",
     "typeorm-naming-strategies": "^4.1.0",
+    "typeorm-transactional": "^0.5.0",
     "uuid": "^9.0.1",
     "winston": "^3.13.0",
     "winston-daily-rotate-file": "^5.0.0"

diff --git a/src/app.module.ts b/src/app.module.ts
@@ -11,11 +11,20 @@ import * as process from 'process';
 import { HttpLoggerInterceptor } from './utils/httpLoggerInterceptor';
 import { APP_FILTER, APP_INTERCEPTOR } from '@nestjs/core';
 import { HttpExceptionFilter } from './utils/httpExceptionFilter';
+import { addTransactionalDataSource } from 'typeorm-transactional';
+import { DataSource } from 'typeorm';
 
 @Module({
     imports: [
         TypeOrmModule.forRootAsync({
             useClass: TypeOrmConfigService,
+            async dataSourceFactory(options) {
+                if (!options) {
+                    throw new Error('Invalid options passed');
+                }
+
+                return addTransactionalDataSource(new DataSource(options));
+            },
         }),
         ConfigModule.forRoot({
             isGlobal: true,

diff --git a/src/main.ts b/src/main.ts
@@ -3,8 +3,10 @@ import { AppModule } from './app.module';
 import { winstonLogger } from './Config/winston.config';
 import { ValidationPipe } from '@nestjs/common';
 import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
+import { initializeTransactionalContext } from 'typeorm-transactional';
 
 async function bootstrap() {
+    initializeTransactionalContext();
     const app = await NestFactory.create(AppModule, {
         logger: winstonLogger,
     });

diff --git a/src/stat/repository/algorithm.repository.ts b/src/stat/repository/algorithm.repository.ts
@@ -1,69 +1,23 @@
-import { Inject, Injectable, Scope } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import { REQUEST } from '@nestjs/core';
 import { Algorithm } from '../../Entity/algorithm';
-import { RankListOptionDto } from '../dto/rank-list-option.dto';
-import { User } from '../../Entity/user';
-import { PointFindDto } from '../dto/rank-find.dto';
 import { StatRepository } from '../../utils/stat.repository';
 
-@Injectable({ scope: Scope.REQUEST })
+@Injectable()
 export class AlgorithmRepository extends StatRepository {
-    constructor(dataSource: DataSource, @Inject(REQUEST) req: Request) {
-        super(dataSource, req, Algorithm);
-    }
-
-    async save(algorithm: Algorithm) {
-        await this.repository.save(algorithm);
+    constructor(dataSource: DataSource) {
+        super(dataSource, Algorithm);
     }
 
     async findOneById(userId: string) {
-        return await this.repository.findOneBy({ userId: userId });
-    }
-    public async findIndividualAlgorithmRank(
-        userId: string,
-        options: PointFindDto,
-    ) {
-        const queryBuilder = this.repository
-            .createQueryBuilder()
-            .select(['b.rank', 'b.user_id', 'b.major'])
-            .distinct(true)
-            .from((sub) => {
-                return sub
-                    .select('RANK() OVER (ORDER BY a.point DESC)', 'rank')
-                    .addSelect('a.user_id', 'user_id')
-                    .addSelect('a.point', 'point')
-                    .from(Algorithm, 'a')
-                    .innerJoin(User, 'u', 'a.user_id = u.user_id')
-                    .addSelect('u.major', 'major')
-                    .where(this.createClassificationOption(options));
-            }, 'b')
-            .where(`b.user_id = '${userId}'`);
-
-        return await queryBuilder.getRawOne();
-    }
-
-    createCursorOption(options: RankListOptionDto) {
-        if (!options.cursorPoint && !options.cursorUserId) {
-            return 'b.point > -1';
-        } else {
-            return `b.point < ${options.cursorPoint} or b.point = ${options.cursorPoint} AND b.user_id > '${options.cursorUserId}'`;
-        }
-    }
-
-    createClassificationOption(options: PointFindDto) {
-        if (options.major != null) {
-            return `u.major like '${options.major}'`;
-        } else {
-            return `u.id > 0`;
-        }
+        return await this.findOneBy({ userId: userId });
     }
 
-    async update(userId: string, algorithm: Algorithm) {
-        await this.repository.update({ userId: userId }, algorithm);
+    async updateAlgorithm(userId: string, algorithm: Algorithm) {
+        await this.update({ userId: userId }, algorithm);
     }
 
-    async delete(userId: string) {
-        await this.repository.delete({ userId: userId });
+    async deleteAlgorithm(userId: string) {
+        await this.delete({ userId: userId });
     }
 }
diff --git a/src/stat/repository/github.repository.ts b/src/stat/repository/github.repository.ts
@@ -1,25 +1,20 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { Github } from '../../Entity/github';
 import { DataSource } from 'typeorm';
-import { REQUEST } from '@nestjs/core';
 import { StatRepository } from '../../utils/stat.repository';
 
 @Injectable()
 export class GithubRepository extends StatRepository {
-    constructor(dataSource: DataSource, @Inject(REQUEST) req: Request) {
-        super(dataSource, req, Github);
+    constructor(dataSource: DataSource) {
+        super(dataSource, Github);
     }
 
-    public async save(github: Github) {
-        await this.repository.save(github);
+    public async findOneById(id: string) {
+        return await this.findOneBy({ userId: id });
     }
 
-    public async findOne(id: string) {
-        return await this.repository.findOneBy({ userId: id });
-    }
-
-    public async update(github: Github) {
-        return await this.repository.update(
+    public async updateGithub(github: Github) {
+        return await this.update(
             { userId: github.userId },
             {
                 githubId: github.githubId,
@@ -29,11 +24,11 @@ export class GithubRepository extends StatRepository {
         );
     }
 
-    public async delete(id: string) {
-        await this.repository.delete({ userId: id });
+    public async deleteGithub(id: string) {
+        await this.delete({ userId: id });
     }
 
     public async findAll() {
-        return await this.repository.find();
+        return await this.find();
     }
 }
diff --git a/src/stat/repository/grade.repository.ts b/src/stat/repository/grade.repository.ts
@@ -1,25 +1,20 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import { REQUEST } from '@nestjs/core';
 import { Grade } from '../../Entity/grade';
 import { StatRepository } from '../../utils/stat.repository';
 
 @Injectable()
 export class GradeRepository extends StatRepository {
-    constructor(dataSource: DataSource, @Inject(REQUEST) req: Request) {
-        super(dataSource, req, Grade);
+    constructor(dataSource: DataSource) {
+        super(dataSource, Grade);
     }
 
-    public async save(grade: Grade) {
-        await this.repository.save(grade);
+    public async findOneById(id: string) {
+        return await this.findOneBy({ userId: id });
     }
 
-    public async findOne(id: string) {
-        return await this.repository.findOneBy({ userId: id });
-    }
-
-    public async update(newGrade: Grade) {
-        return await this.repository.update(
+    public async updateGrade(newGrade: Grade) {
+        return await this.update(
             { userId: newGrade.userId },
             {
                 grade: newGrade.grade,
@@ -28,7 +23,7 @@ export class GradeRepository extends StatRepository {
         );
     }
 
-    public async delete(id: string) {
-        await this.repository.delete({ userId: id });
+    public async deleteGrade(id: string) {
+        await this.delete({ userId: id });
     }
 }
diff --git a/src/stat/repository/total.repository.ts b/src/stat/repository/total.repository.ts
@@ -1,23 +1,19 @@
 import { DataSource } from 'typeorm';
-import { Inject } from '@nestjs/common';
-import { REQUEST } from '@nestjs/core';
 import { TotalPoint } from '../../Entity/totalPoint';
 import { StatRepository } from '../../utils/stat.repository';
+import { Injectable } from '@nestjs/common';
 
+@Injectable()
 export class TotalRepository extends StatRepository {
-    constructor(dataSource: DataSource, @Inject(REQUEST) req: Request) {
-        super(dataSource, req, TotalPoint);
+    constructor(private dataSource: DataSource) {
+        super(dataSource, TotalPoint);
     }
 
     async findOneById(userId: string) {
-        return await this.repository.findOneBy({ userId: userId });
+        return await this.findOneBy({ userId: userId });
     }
 
-    async update(total: TotalPoint, userId: string) {
-        return await this.repository.update({ userId: userId }, total);
-    }
-
-    async save(total: TotalPoint) {
-        return await this.repository.save(total);
+    async updateTotal(total: TotalPoint, userId: string) {
+        return await this.update({ userId: userId }, total);
     }
 }