Merge pull request #64 from Boost-Coder/feature/RegistTotal-#60

[#60] 종합 점수 등록 및 업데이트

src/app.module.ts

@@ -4,14 +4,9 @@ import { AppService } from './app.service';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { TypeOrmConfigService } from './Config/typeorm.config';
 import { ConfigModule } from '@nestjs/config';
-import { AlgorithmModule } from './algorithm/algorithm.module';
 import { AuthModule } from './auth/auth.module';
 import { UserModule } from './user/user.module';
-import { GithubModule } from './github/github.module';
-import { GradeController } from './grade/grade.controller';
-import { GradeService } from './grade/grade.service';
-import { GradeModule } from './grade/grade.module';
-import { RankModule } from './rank/rank.module';
+import { StatModule } from './stat/stat.module';
 import * as process from 'process';
 
 @Module({
@@ -23,12 +18,9 @@ import * as process from 'process';
             isGlobal: true,
             envFilePath: `${process.cwd()}/envs/${process.env.NODE_ENV}.env`,
         }),
-        AlgorithmModule,
         AuthModule,
         UserModule,
-        GithubModule,
-        GradeModule,
-        RankModule,
+        StatModule,
     ],
     controllers: [AppController],
     providers: [AppService],

src/auth/auth.module.ts

@@ -5,9 +5,14 @@ import { JwtConfig } from '../Config/jwt.config';
 import { JwtModule } from '@nestjs/jwt';
 import { UserModule } from '../user/user.module';
 import { JwtStrategy } from './strategy/jwt.strategy';
+import { StatModule } from '../stat/stat.module';
 
 @Module({
-    imports: [JwtModule.registerAsync({ useClass: JwtConfig }), UserModule],
+    imports: [
+        JwtModule.registerAsync({ useClass: JwtConfig }),
+        UserModule,
+        StatModule,
+    ],
     controllers: [AuthController],
     providers: [AuthService, JwtStrategy],
 })

src/auth/auth.service.spec.ts

@@ -4,6 +4,7 @@ import { UserService } from '../user/user.service';
 import { JwtService } from '@nestjs/jwt';
 import { ConfigService } from '@nestjs/config';
 import { User } from '../Entity/user';
+import { TotalService } from '../stat/service/total.service';
 
 const mockUserService = {
     findUserByProviderId: jest.fn(),
@@ -18,6 +19,10 @@ const mockConfigService = {
     get: jest.fn(),
 };
 
+const mockTotalService = {
+    createTotalPoint: jest.fn(),
+};
+
 describe('AuthService', () => {
     let service: AuthService;
 
@@ -37,6 +42,10 @@ describe('AuthService', () => {
                     provide: ConfigService,
                     useValue: mockConfigService,
                 },
+                {
+                    provide: TotalService,
+                    useValue: mockTotalService,
+                },
             ],
         }).compile();
 
@@ -76,6 +85,7 @@ describe('AuthService', () => {
             const result = await service.logInOrSignUp(providerId);
 
             expect(mockUserService.createUser).not.toHaveBeenCalled();
+            expect(mockTotalService.createTotalPoint).not.toHaveBeenCalled();
             expect(result.isMember).toEqual(true);
         });
 
@@ -86,6 +96,7 @@ describe('AuthService', () => {
             const result = await service.logInOrSignUp(providerId);
 
             expect(mockUserService.createUser).toHaveBeenCalled();
+            expect(mockTotalService.createTotalPoint).toHaveBeenCalled();
             expect(result.isMember).toEqual(false);
         });
 
@@ -102,8 +113,10 @@ describe('AuthService', () => {
             mockUserService.createUser.mockResolvedValue(user);
 
             const result = await service.logInOrSignUp(providerId);
-
+            mockUserService.createUser.mockClear();
+            mockTotalService.createTotalPoint.mockClear();
             expect(mockUserService.createUser).not.toHaveBeenCalled();
+            expect(mockTotalService.createTotalPoint).not.toHaveBeenCalled();
             expect(result.isMember).toEqual(false);
         });
     });

src/auth/auth.service.ts

@@ -9,20 +9,23 @@ import { ConfigService } from '@nestjs/config';
 import { SejongAuthDto } from './sejongAuth.dto';
 import { UpdateUserInfoDto } from '../user/dto/update-user-info.dto';
 import { TokenExpiredError } from 'jsonwebtoken';
+import { TotalService } from '../stat/service/total.service';
 
 @Injectable()
 export class AuthService {
     constructor(
         private userService: UserService,
         private jwtService: JwtService,
         private configService: ConfigService,
+        private totalService: TotalService,
     ) {}
 
     async logInOrSignUp(providerId: string) {
         let user = await this.userService.findUserByProviderId(providerId);
         const isMember = this.isMember(user);
         if (!user) {
             user = await this.userService.createUser(providerId);
+            await this.totalService.createTotalPoint(user.userId);
         }
         const accessToken = this.generateAccessToken(user);
         const refreshToken = this.generateRefreshToken(user);

src/algorithm/algorithm.repository.ts → src/stat/repository/algorithm.repository.ts

@@ -1,8 +1,8 @@
-import { BaseRepository } from '../utils/base.repository';
+import { BaseRepository } from '../../utils/base.repository';
 import { Inject, Injectable, Scope } from '@nestjs/common';
 import { DataSource, Repository } from 'typeorm';
 import { REQUEST } from '@nestjs/core';
-import { Algorithm } from '../Entity/algorithm';
+import { Algorithm } from '../../Entity/algorithm';
 
 @Injectable({ scope: Scope.REQUEST })
 export class AlgorithmRepository extends BaseRepository {

src/github/github.repository.ts → src/stat/repository/github.repository.ts

@@ -1,6 +1,6 @@
-import { BaseRepository } from '../utils/base.repository';
+import { BaseRepository } from '../../utils/base.repository';
 import { Inject, Injectable, Scope } from '@nestjs/common';
-import { Github } from '../Entity/github';
+import { Github } from '../../Entity/github';
 import { DataSource, Repository } from 'typeorm';
 import { REQUEST } from '@nestjs/core';
 

src/grade/grade.repository.ts → src/stat/repository/grade.repository.ts

@@ -1,9 +1,9 @@
-import { BaseRepository } from '../utils/base.repository';
+import { BaseRepository } from '../../utils/base.repository';
 import { Inject, Injectable } from '@nestjs/common';
 import { DataSource, Repository } from 'typeorm';
-import { Github } from '../Entity/github';
+import { Github } from '../../Entity/github';
 import { REQUEST } from '@nestjs/core';
-import { Grade } from '../Entity/grade';
+import { Grade } from '../../Entity/grade';
 
 @Injectable()
 export class GradeRepository extends BaseRepository {