Main

.github/workflows/docker-build.yml

@@ -75,6 +75,7 @@ jobs:
           echo "REDIS_HOST=${{ secrets.REDIS_HOST }}" >> .env.test
           echo "REDIS_PORT=${{ secrets.REDIS_PORT }}" >> .env.test
           echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}" >> .env.test
+          echo "DISCORD_WEBHOOK_URL=${{ secrets.DISCORD_WEBHOOK_URL }}" >> .env.test
 
           cat .env.test
 
@@ -112,6 +113,7 @@ jobs:
           echo "REDIS_HOST=${{ secrets.REDIS_HOST }}" >> .env.prod
           echo "REDIS_PORT=${{ secrets.REDIS_PORT }}" >> .env.prod
           echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}" >> .env.prod
+          echo "DISCORD_WEBHOOK_URL=${{ secrets.DISCORD_WEBHOOK_URL }}" >> .env.prod
 
           cat .env.prod
 

package.json

@@ -42,6 +42,7 @@
     "class-validator": "^0.14.1",
     "cross-env": "^7.0.3",
     "deepl-node": "^1.13.0",
+    "discord-webhook-node": "^1.1.8",
     "express-basic-auth": "^1.2.1",
     "multer": "^1.4.5-lts.1",
     "multer-s3": "^3.0.1",

src/app.module.ts

@@ -25,6 +25,7 @@ import { AttendanceCheckModule } from './attendance-check/attendance-check.modul
 import { APP_FILTER } from '@nestjs/core';
 import { UnhandledExceptionFilter } from './common/filter/unhandled-exception.filter';
 import { KukeyExceptionFilter } from './common/filter/kukey-exception.filter';
+import { BannerModule } from './home/banner/banner.module';
 
 console.log(`.env.${process.env.NODE_ENV}`);
 
@@ -75,6 +76,7 @@ console.log(`.env.${process.env.NODE_ENV}`);
     CalendarModule,
     ReportModule,
     AttendanceCheckModule,
+    BannerModule,
   ],
   controllers: [AppController],
   providers: [

src/auth/auth.service.ts

@@ -25,6 +25,7 @@ import { ChangePasswordResponseDto } from './dto/change-password-response.dto';
 import { SendTempPasswordResponseDto } from './dto/send-temporary-password.dto';
 import { EntityManager } from 'typeorm';
 import { throwKukeyException } from 'src/utils/exception.util';
+import { Webhook } from 'discord-webhook-node';
 
 @Injectable()
 export class AuthService {
@@ -254,6 +255,21 @@ export class AuthService {
       user,
     );
 
+    const discordUrl = await this.configService.get('DISCORD_WEBHOOK_URL');
+    const hook = new Webhook(discordUrl);
+    const totalUsers = await this.userService.getTotalUsersCount();
+
+    await hook
+      .send(
+        'The ' +
+          totalUsers +
+          'th user has signed up for KU-KEY! (' +
+          studentNumber +
+          ')',
+      )
+      .then(() => console.log('Sent new user request to discord'))
+      .catch((err) => console.log(err.message));
+
     return new SignUpResponseDto(true, studentNumber);
   }
 
@@ -343,6 +359,11 @@ export class AuthService {
     email: string,
   ): Promise<SendTempPasswordResponseDto> {
     const user = await this.userService.findUserByEmail(email);
+
+    if (!user) {
+      throwKukeyException('USER_NOT_FOUND');
+    }
+
     const tempPassword = this.generateRandomString(10);
 
     const isUpdated = await this.userService.updatePassword(

src/common/constant/club-count.constant.ts

@@ -0,0 +1 @@
+export const CLUB_COUNT = 5;

src/community/comment/comment.controller.ts

@@ -20,11 +20,6 @@ import { GetCommentResponseDto } from './dto/get-comment.dto';
 import { UpdateCommentRequestDto } from './dto/update-comment.dto';
 import { DeleteCommentResponseDto } from './dto/delete-comment.dto';
 import { LikeCommentResponseDto } from './dto/like-comment.dto';
-import {
-  CreateReportRequestDto,
-  CreateReportResponseDto,
-} from '../report/dto/create-report.dto';
-import { ReportService } from '../report/report.service';
 import { CursorPageOptionsDto } from 'src/common/dto/CursorPageOptions.dto';
 import { GetMyCommentListResponseDto } from './dto/get-myComment-list.dto';
 import { TransactionInterceptor } from 'src/common/interceptors/transaction.interceptor';
@@ -39,10 +34,7 @@ import { CommentDocs } from 'src/decorators/docs/comment.decorator';
 @ApiBearerAuth('accessToken')
 @CommentDocs
 export class CommentController {
-  constructor(
-    private readonly commentService: CommentService,
-    private readonly reportService: ReportService,
-  ) {}
+  constructor(private readonly commentService: CommentService) {}
 
   @Get('/my')
   async getMyCommentList(
@@ -112,22 +104,4 @@ export class CommentController {
       commentId,
     );
   }
-
-  @Post('/:commentId/report')
-  async reportComment(
-    @User() user: AuthorizedUserDto,
-    @Param('commentId') commentId: number,
-    @Body() body: CreateReportRequestDto,
-  ): Promise<CreateReportResponseDto> {
-    const comment = await this.commentService.getComment(commentId);
-    if (!comment) {
-      throwKukeyException('COMMENT_NOT_FOUND');
-    }
-    return await this.reportService.createReport(
-      user.id,
-      body.reason,
-      comment.postId,
-      commentId,
-    );
-  }
 }

src/community/comment/comment.module.ts

@@ -8,7 +8,7 @@ import { PostModule } from '../post/post.module';
 import { CommentLikeEntity } from 'src/entities/comment-like.entity';
 import { CommentAnonymousNumberEntity } from 'src/entities/comment-anonymous-number.entity';
 import { NoticeModule } from 'src/notice/notice.module';
-import { ReportModule } from '../report/report.module';
+import { UserModule } from 'src/user/user.module';
 
 @Module({
   imports: [
@@ -19,9 +19,10 @@ import { ReportModule } from '../report/report.module';
     ]),
     PostModule,
     NoticeModule,
-    ReportModule,
+    UserModule,
   ],
   controllers: [CommentController],
   providers: [CommentService, CommentRepository],
+  exports: [CommentService],
 })
 export class CommentModule {}

src/community/comment/comment.service.ts

@@ -19,6 +19,7 @@ import { CursorPageOptionsDto } from 'src/common/dto/CursorPageOptions.dto';
 import { CursorPageMetaResponseDto } from 'src/common/dto/CursorPageResponse.dto';
 import { GetMyCommentListResponseDto } from './dto/get-myComment-list.dto';
 import { throwKukeyException } from 'src/utils/exception.util';
+import { UserBanService } from 'src/user/user-ban.service';
 
 @Injectable()
 export class CommentService {
@@ -28,6 +29,7 @@ export class CommentService {
     @InjectRepository(CommentAnonymousNumberEntity)
     private readonly commentAnonymousNumberRepository: Repository<CommentAnonymousNumberEntity>,
     private readonly noticeService: NoticeService,
+    private readonly userBanService: UserBanService,
   ) {}
 
   async getMyCommentList(
@@ -62,6 +64,10 @@ export class CommentService {
     requestDto: CreateCommentRequestDto,
     parentCommentId?: number,
   ) {
+    if (await this.userBanService.checkUserBan(user.id)) {
+      throwKukeyException('USER_BANNED');
+    }
+
     const post = await this.postService.isExistingPostId(postId);
     if (!post) {
       throwKukeyException('POST_NOT_FOUND');
@@ -171,6 +177,10 @@ export class CommentService {
     commentId: number,
     requestDto: UpdateCommentRequestDto,
   ): Promise<GetCommentResponseDto> {
+    if (await this.userBanService.checkUserBan(user.id)) {
+      throwKukeyException('USER_BANNED');
+    }
+
     const comment =
       await this.commentRepository.getCommentByCommentId(commentId);
     if (!comment) {
@@ -218,13 +228,20 @@ export class CommentService {
     if (!comment) {
       throwKukeyException('COMMENT_NOT_FOUND');
     }
-    if (comment.userId !== user.id) {
-      throwKukeyException('COMMENT_OWNERSHIP_REQUIRED');
-    }
-
     const post = await this.postService.isExistingPostId(comment.postId);
-    if (Number(post.boardId) === 2) {
-      throwKukeyException('COMMENT_IN_QUESTION_BOARD');
+
+    this.checkDeleteAuthority(comment, post, user);
+
+    if (post) {
+      const updateResult = await transactionManager.decrement(
+        PostEntity,
+        { id: comment.postId },
+        'commentCount',
+        1,
+      );
+      if (!updateResult.affected) {
+        throwKukeyException('POST_UPDATE_FAILED');
+      }
     }
 
     const deleteResult = await transactionManager.softRemove(
@@ -235,19 +252,26 @@ export class CommentService {
       throwKukeyException('COMMENT_DELETE_FAILED');
     }
 
-    const updateResult = await transactionManager.decrement(
-      PostEntity,
-      { id: comment.postId },
-      'commentCount',
-      1,
-    );
-    if (!updateResult.affected) {
-      throwKukeyException('POST_UPDATE_FAILED');
-    }
-
     return new DeleteCommentResponseDto(true);
   }
 
+  private checkDeleteAuthority(
+    comment: CommentEntity,
+    post: PostEntity,
+    user: AuthorizedUserDto,
+  ) {
+    if (user.id !== -1) {
+      if (comment.userId !== user.id) {
+        throwKukeyException('COMMENT_OWNERSHIP_REQUIRED');
+      }
+      if (post) {
+        if (Number(post.boardId) === 2) {
+          throwKukeyException('COMMENT_IN_QUESTION_BOARD');
+        }
+      }
+    }
+  }
+
   async likeComment(
     tranasactionManager: EntityManager,
     user: AuthorizedUserDto,