Merge remote-tracking branch 'origin/main' into feat/rss-remove-delete

Author: Jo-Minseok

server/src/rss/api-docs/requestDeleteRss.api-docs.ts

@@ -1,5 +1,6 @@
 import { applyDecorators } from '@nestjs/common';
 import {
+  ApiBadRequestResponse,
   ApiNotFoundResponse,
   ApiOkResponse,
   ApiOperation,
@@ -27,5 +28,11 @@ export function ApiRequestDeleteRss() {
         message: 'RSS 데이터를 찾을 수 없습니다.',
       },
     }),
+    ApiBadRequestResponse({
+      description: 'Bad Request',
+      example: {
+        message: '오류 메세지',
+      },
+    }),
   );
 }

server/src/rss/dto/request/rss-request-delete.dto.ts

@@ -9,14 +9,6 @@ export class RequestDeleteRssDto {
   @IsUrl({}, { message: '유효한 URL을 입력해주세요.' })
   blogUrl: string;
 
-  @ApiProperty({
-    example: 'example user name',
-    description: '사용자 이름을 입력해주세요.',
-  })
-  @IsNotEmpty({ message: '유저 이름은 반드시 입력해야 합니다.' })
-  @IsString({ message: '문자열로 입력해주세요.' })
-  userName: string;
-
   @ApiProperty({
     example: 'example@example.com',
     description: '이메일 주소를 입력해주세요.',

server/src/rss/service/rss.service.ts

@@ -186,14 +186,12 @@ export class RssService {
         where: {
           rssUrl: requestDeleteRssDto.blogUrl,
           email: requestDeleteRssDto.email,
-          userName: requestDeleteRssDto.userName,
         },
       }),
       this.rssRepository.findOne({
         where: {
           rssUrl: requestDeleteRssDto.blogUrl,
           email: requestDeleteRssDto.email,
-          userName: requestDeleteRssDto.userName,
         },
       }),
     ]);
@@ -212,7 +210,7 @@ export class RssService {
     );
 
     this.emailService.sendRssRemoveCertificationMail(
-      requestDeleteRssDto.userName,
+      rssAccept?.userName ?? rssWait.userName,
       requestDeleteRssDto.email,
       requestDeleteRssDto.blogUrl,
       certificateCode,

server/test/rss/dto/rss-remove.dto.spec.ts

@@ -7,7 +7,6 @@ describe('RequestDeleteRssDto Test', () => {
   beforeEach(() => {
     dto = new RequestDeleteRssDto({
       blogUrl: 'https://test.com/rss',
-      userName: 'test',
       email: 'test@test.com',
     });
   });
@@ -40,32 +39,6 @@ describe('RequestDeleteRssDto Test', () => {
     );
   });
 
-  it('사용자 이름이 없다.', async () => {
-    // given
-    delete dto.userName;
-
-    // when
-    const errors = await validate(dto);
-
-    // then
-    expect(errors[0].constraints).toHaveProperty(
-      'isNotEmpty',
-      '유저 이름은 반드시 입력해야 합니다.',
-    );
-  });
-  it('사용자 이름이 문자열이 아니다.', async () => {
-    // given
-    dto.userName = 100 as any;
-
-    // when
-    const errors = await validate(dto);
-
-    // then
-    expect(errors[0].constraints).toHaveProperty(
-      'isString',
-      '문자열로 입력해주세요.',
-    );
-  });
   it('이메일 주소가 없다.', async () => {
     // given
     delete dto.email;