Merge pull request #247 from boostcampwm2023/BE-RegistrationToken-#239

[BE/#239] registration token 등록 API 구현
boostcampwm2023 · Nov 30, 2023 · 1b38d0b · 1b38d0b
2 parents 4412478 + 9989422
commit 1b38d0b
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 8 deletions.
diff --git a/BE/src/chat/chat.service.ts b/BE/src/chat/chat.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { PostEntity } from '../entities/post.entity';
-import { In, Repository } from 'typeorm';
+import { Repository } from 'typeorm';
 import { ChatRoomEntity } from '../entities/chatRoom.entity';
 import { ChatEntity } from 'src/entities/chat.entity';
 import { ChatDto } from './dto/chat.dto';

diff --git a/BE/src/entities/chat.entity.ts b/BE/src/entities/chat.entity.ts
@@ -1,4 +1,3 @@
-import { CreateBucketCommand } from '@aws-sdk/client-s3';
 import {
   Column,
   CreateDateColumn,

diff --git a/BE/src/entities/chatRoom.entity.ts b/BE/src/entities/chatRoom.entity.ts
@@ -5,11 +5,7 @@ import {
   Entity,
   OneToMany,
   PrimaryGeneratedColumn,
-  UpdateDateColumn,
 } from 'typeorm';
-import { PostEntity } from './post.entity';
-import { BlockUserEntity } from './blockUser.entity';
-import { BlockPostEntity } from './blockPost.entity';
 import { ChatEntity } from './chat.entity';
 
 @Entity('chat_room')

diff --git a/BE/src/main.ts b/BE/src/main.ts
@@ -6,7 +6,6 @@ import { dailyOption, winstonOptions } from './config/winston.config';
 import * as winstonDaily from 'winston-daily-rotate-file';
 import { ValidationPipe } from '@nestjs/common';
 import { HttpLoggerInterceptor } from './utils/httpLogger.interceptor';
-import { AuthGuard } from './utils/auth.guard';
 import { WsAdapter } from '@nestjs/platform-ws';
 
 async function bootstrap() {

diff --git a/BE/src/users/users.controller.ts b/BE/src/users/users.controller.ts
@@ -10,13 +10,15 @@ import {
   UploadedFile,
   HttpException,
   UseGuards,
+  Body,
 } from '@nestjs/common';
 import { UsersService } from './users.service';
 import { CreateUserDto } from './createUser.dto';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { MultiPartBody } from 'src/utils/multiPartBody.decorator';
 import { UpdateUsersDto } from './usersUpdate.dto';
 import { AuthGuard } from 'src/utils/auth.guard';
+import { UserHash } from '../utils/auth.decorator';
 
 @Controller('users')
 @UseGuards(AuthGuard)
@@ -65,4 +67,12 @@ export class UsersController {
   ) {
     await this.usersService.updateUserById(userId, body, file);
   }
+
+  @Post('registration-token')
+  async registrationTokenSave(
+    @Body('registration_token') registrationToken: string,
+    @UserHash() userId: string,
+  ) {
+    await this.usersService.registerToken(userId, registrationToken);
+  }
 }
diff --git a/BE/src/users/users.module.ts b/BE/src/users/users.module.ts
@@ -9,6 +9,7 @@ import { PostImageEntity } from '../entities/postImage.entity';
 import { BlockUserEntity } from '../entities/blockUser.entity';
 import { BlockPostEntity } from '../entities/blockPost.entity';
 import { AuthGuard } from 'src/utils/auth.guard';
+import { RegistrationTokenEntity } from '../entities/registrationToken.entity';
 
 @Module({
   imports: [
@@ -18,6 +19,7 @@ import { AuthGuard } from 'src/utils/auth.guard';
       PostImageEntity,
       BlockUserEntity,
       BlockPostEntity,
+      RegistrationTokenEntity,
     ]),
   ],
   controllers: [UsersController],

diff --git a/BE/src/users/users.service.ts b/BE/src/users/users.service.ts
@@ -10,6 +10,7 @@ import { PostEntity } from '../entities/post.entity';
 import { PostImageEntity } from '../entities/postImage.entity';
 import { BlockUserEntity } from '../entities/blockUser.entity';
 import { BlockPostEntity } from '../entities/blockPost.entity';
+import { RegistrationTokenEntity } from '../entities/registrationToken.entity';
 
 @Injectable()
 export class UsersService {
@@ -24,6 +25,8 @@ export class UsersService {
     private blockUserRepository: Repository<BlockUserEntity>,
     @InjectRepository(BlockPostEntity)
     private blockPostRepository: Repository<BlockPostEntity>,
+    @InjectRepository(RegistrationTokenEntity)
+    private registrationTokenRepository: Repository<RegistrationTokenEntity>,
     private s3Handler: S3Handler,
   ) {}
 
@@ -138,4 +141,30 @@ export class UsersService {
     const fileLocation = await this.s3Handler.uploadFile(file);
     return fileLocation;
   }
+
+  async registerToken(userId, registrationToken) {
+    const registrationTokenEntity =
+      await this.registrationTokenRepository.findOne({
+        where: { user_hash: userId },
+      });
+    if (registrationTokenEntity === null) {
+      await this.registrationTokenRepository.save({
+        user_hash: userId,
+        registration_token: registrationToken,
+      });
+    } else {
+      await this.updateRegistrationToken(userId, registrationToken);
+    }
+  }
+
+  async updateRegistrationToken(userId, registrationToken) {
+    const registrationTokenEntity = new RegistrationTokenEntity();
+    registrationTokenEntity.registration_token = registrationToken;
+    await this.registrationTokenRepository.update(
+      {
+        user_hash: userId,
+      },
+      registrationTokenEntity,
+    );
+  }
 }
diff --git a/BE/src/utils/auth.decorator.ts b/BE/src/utils/auth.decorator.ts
@@ -10,6 +10,6 @@ export const UserHash = createParamDecorator(
       Buffer.from(jwtPayload, 'base64').toString(),
     );
 
-    return jwtPayloadJson.user_hash;
+    return jwtPayloadJson.userId;
   },
 );