화살표 Day 추가

DevKor-github · Jan 27, 2024 · 83fc061 · 83fc061
1 parent 86fbe34
commit 83fc061
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/src/blurting/blurting.controller.ts b/src/blurting/blurting.controller.ts
@@ -180,12 +180,17 @@ export class BlurtingController {
     return await this.blurtingService.likeAnswer(id, answerId);
   }
   @UseGuards(AuthGuard('access'))
-  @Post('/arrow/:toId')
+  @Post('/arrow/:toId/:day')
   @ApiParam({
     description: '화살표 받을 사람 id',
     name: 'toId',
     type: Number,
   })
+  @ApiParam({
+    description: 'day',
+    name: 'day, 1,2,3으로 보내주세요',
+    type: Number,
+  })
   @ApiOperation({
     summary: '화살표 보내기',
     description: '화살표 보내기',
@@ -194,9 +199,13 @@ export class BlurtingController {
   @ApiOkResponse({
     description: '화살표 보내기 성공',
   })
-  async makeArrow(@Req() req: Request, @Param('toId') toId: number) {
+  async makeArrow(
+    @Req() req: Request,
+    @Param('toId') toId: number,
+    @Param('day') day: number,
+  ) {
     const { id } = req.user as JwtPayload;
-    return await this.blurtingService.makeArrow(id, toId);
+    return await this.blurtingService.makeArrow(id, toId, day);
   }
   @UseGuards(AuthGuard('access'))
   @Get('/arrow')

diff --git a/src/blurting/blurting.service.ts b/src/blurting/blurting.service.ts
@@ -480,7 +480,7 @@ export class BlurtingService {
     }
   }
 
-  async makeArrow(userId: number, toId: number) {
+  async makeArrow(userId: number, toId: number, day: number) {
     const user = await this.userService.findUserByVal('id', userId);
 
     const arrow = await this.arrowRepository.findOne({
@@ -490,9 +490,10 @@ export class BlurtingService {
       },
       order: { no: 'DESC' },
     });
-    let no = 1;
-    if (arrow) no = arrow.no + 1;
-
+    const no = day;
+    if (arrow && arrow.no >= day) {
+      throw new BadRequestException('이미 화살표 존재');
+    }
     const newArrow = this.arrowRepository.create({
       from: { id: userId },
       to: toId === -1 ? null : { id: toId },
@@ -504,12 +505,12 @@ export class BlurtingService {
 
     this.fcmService.sendPush(
       toId,
-      `${user.userNickname}님이 당신에게 화살표를 보냈습니다!`,
+      `${user.userNickname}님이 당신에게 화살을 보냈습니다!`,
       'blurting',
     );
     const newEntity = this.notificationRepository.create({
       user: { id: userId },
-      body: `${user.userNickname}님이 당신에게 화살표를 보냈습니다!`,
+      body: `${user.userNickname}님이 당신에게 화살을 보냈습니다!`,
     });
     await this.notificationRepository.insert(newEntity);
   }