Merge branch 'develop' of github.com:Here-You/here-you-backend into d…

…evelop

src/mate/cursor-page/cursor-page-option.dto.ts

@@ -1,4 +1,4 @@
-// cursor-page.options.ts
+// cursor-page.options.dto.ts
 
 import { Type } from "class-transformer";
 import { IsEnum, IsOptional } from "class-validator";

src/response/response-code.enum.ts

@@ -29,6 +29,7 @@ export enum ResponseCode {
   COMMENT_UPDATE_SUCCESS = 'OK',
   COMMENT_DELETE_SUCCESS = 'OK',
   FOLLOW_SUCCESS = 'OK',
+  GET_COMMENT_DETAIL_SUCCESS = 'OK',
 
 
 
@@ -84,6 +85,7 @@ export enum ResponseCode {
   GET_USER_PROFILE_FAIL = 'BAD_REQUEST',
   COMMENT_UPDATE_FAIL = 'BAD_REQUEST',
   COMMENT_DELETE_FAIL = 'BAD_REQUEST',
+  GET_COMMENT_DETAIL_FAIL = 'BAD_REQUEST',
 
 
 

src/rule/dto/cursor-page-options-parameter.interface.ts

@@ -0,0 +1,8 @@
+import { CursorPageOptionsDto } from "./cursor-page.options.dto";
+
+export interface CursorPageMetaDtoParameters {
+    cursorPageOptionsDto: CursorPageOptionsDto;
+    total: number;
+    hasNextData: boolean;
+    cursor: number;
+}

src/rule/dto/cursor-page-order.enum.ts

@@ -0,0 +1,4 @@
+export enum Order {
+    ASC = "asc",
+    DESC = "desc"
+}

src/rule/dto/cursor-page.dto.ts

@@ -0,0 +1,15 @@
+import { IsArray } from "class-validator";
+import { CursorPageMetaDto } from "./cursor-page.meta.dto";
+
+export class CursorPageDto<T> {
+
+    @IsArray()
+    readonly data: T[];
+
+    readonly meta: CursorPageMetaDto;
+
+    constructor(data: T[], meta: CursorPageMetaDto) {
+        this.data = data;
+        this.meta = meta;
+    }
+}

src/rule/dto/cursor-page.meta.dto.ts

@@ -0,0 +1,16 @@
+import { CursorPageMetaDtoParameters } from "./cursor-page-options-parameter.interface";
+
+export class CursorPageMetaDto {
+
+    readonly total: number;
+    readonly take: number;
+    readonly hasNextData: boolean;
+    readonly cursor: number;
+
+    constructor({cursorPageOptionsDto, total, hasNextData, cursor}: CursorPageMetaDtoParameters) {
+        this.take = cursorPageOptionsDto.take;
+        this.total = total;
+        this.hasNextData = hasNextData;
+        this.cursor = cursor;
+    }
+}

src/rule/dto/cursor-page.options.dto.ts

@@ -0,0 +1,19 @@
+import { Type } from "class-transformer";
+import { IsEnum, IsOptional } from "class-validator";
+import { Order } from "./cursor-page-order.enum";
+
+export class CursorPageOptionsDto {
+
+    @Type(() => String)
+    @IsEnum(Order)
+    @IsOptional()
+    readonly sort?: Order = Order.DESC;
+
+    @Type(() => Number)
+    @IsOptional()
+    readonly take?: number = 5;
+
+    @Type(() => String)
+    @IsOptional()
+    readonly cursorId?: number = "" as any;
+}

src/rule/dto/cursot-page-order.enums.ts

@@ -0,0 +1,15 @@
+import { IsArray } from "class-validator";
+import { CursorPageMetaDto } from "./cursor-page.meta.dto";
+
+export class CursorPageDto<T> {
+
+    @IsArray()
+    readonly data: T[];
+
+    readonly meta: CursorPageMetaDto;
+
+    constructor(data: T[], meta: CursorPageMetaDto) {
+        this.data = data;
+        this.meta = meta;
+    }
+}

src/rule/dto/get-comment.dto.ts

@@ -0,0 +1,23 @@
+import {IsDate, IsNotEmpty, IsNumber, IsOptional, IsString} from 'class-validator';
+
+export class GetCommentDto {
+    @IsNotEmpty()
+    @IsNumber()
+    id: number;
+
+    @IsNotEmpty()
+    @IsString()
+    content: string;
+
+    @IsNotEmpty()
+    @IsDate()
+    updated: Date;
+
+    @IsNotEmpty()
+    @IsString()
+    name: string;
+
+    @IsOptional()
+    @IsString()
+    image: string;
+}

src/rule/rule.controller.ts

@@ -5,9 +5,9 @@ import { ResponseCode } from '../response/response-code.enum';
 import { ResponseDto } from '../response/response.dto';
 import { UserGuard } from '../user/user.guard';
 import { Request } from 'express';
-import {FollowSearchDto} from "../follow/dto/follow.search.dto";
-import {GetSearchMemberDto} from "./dto/get.search.member.dto";
+import {GetSearchMemberDto} from "./dto/get-search-member.dto";
 import { UpdateRuleDto } from "./dto/update-rule.dto";
+import {CursorPageOptionsDto} from "./dto/cursor-page.options.dto";
 
 @Controller('mate/rule')
 export class RuleController {
@@ -36,7 +36,33 @@ export class RuleController {
     }
   }
 
-  // [2] 여행 규칙 상세 페이지 조회 (게시글)
+  // [2] 여행 규칙 상세 페이지 조회 (댓글) - 페이지네이션
+  @Get('/detail/:ruleId')
+  @UseGuards(UserGuard)
+  async getComment(@Req() req: Request,
+                   @Param('ruleId') ruleId: number,
+                   @Query() cursorPageOptionsDto: CursorPageOptionsDto
+  ): Promise<ResponseDto<any>> {
+    try {
+      const result = await this.ruleService.getComment(cursorPageOptionsDto, ruleId);
+
+      return new ResponseDto(
+          ResponseCode.GET_COMMENT_DETAIL_SUCCESS,
+          true,
+          "여행 규칙 상세 페이지 (댓글) 조회 성공",
+          result
+      );
+    } catch (e) {
+      return new ResponseDto(
+          ResponseCode.GET_COMMENT_DETAIL_FAIL,
+          false,
+          "여행 규칙 상세 페이지 (댓글) 조회 실패",
+          null
+      );
+    }
+  }
+
+  // [3] 여행 규칙 상세 페이지 조회 (게시글)
   @Get('/detail/:ruleId')
   @UseGuards(UserGuard)
   async getDetail(@Req() req: Request, @Param('ruleId') ruleId: number): Promise<ResponseDto<any>> {
@@ -61,7 +87,7 @@ export class RuleController {
     }
   }
 
-  // [2] 여행 규칙 수정
+  // [4] 여행 규칙 수정
   @Patch('/detail/:ruleId')
   @UseGuards(UserGuard)
   async updateRule(@Body() updateRuleDto: UpdateRuleDto, @Req() req: Request, @Param('ruleId') ruleId: number): Promise<ResponseDto<any>> {
@@ -86,7 +112,7 @@ export class RuleController {
     }
   }
 
-  // [3] 여행 규칙 전체 리스트 조회
+  // [5] 여행 규칙 전체 리스트 조회
   @Get('list')
   @UseGuards(UserGuard)
   async getRuleList(@Req() req: Request): Promise<ResponseDto<any>> {
@@ -109,7 +135,7 @@ export class RuleController {
     }
   }
 
-  // [3] 여행 규칙 생성
+  // [6] 여행 규칙 생성
   @Post('/write')
   @UseGuards(UserGuard)
   async createRule(@Req() req: Request, @Body() createRuleDto: CreateRuleDto): Promise<ResponseDto<any>> {
@@ -132,7 +158,7 @@ export class RuleController {
     }
   }
 
-  // [4] 여행 규칙 참여 멤버로 초대할 메이트 검색 결과
+  // [7] 여행 규칙 참여 멤버로 초대할 메이트 검색 결과
   @Get('/write/search/:ruleId')
   @UseGuards(UserGuard)
   async getSearchMember(

src/rule/rule.service.ts

@@ -1,4 +1,4 @@
-import {Injectable, HttpException, BadRequestException} from '@nestjs/common';
+import {Injectable, HttpException, BadRequestException, HttpStatus} from '@nestjs/common';
 import { CreateRuleDto } from './dto/create-rule.dto';
 import { RuleMainEntity } from './domain/rule.main.entity';
 import { RuleSubEntity } from './domain/rule.sub.entity';
@@ -9,10 +9,14 @@ import { S3UtilService} from "../utils/S3.service";
 import { GetMemberListDto} from "./dto/get-member-list.dto";
 import {UserService} from "../user/user.service";
 import {GetRuleListDto, MemberPairDto} from "./dto/get-rule-list.dto";
-import {Like} from "typeorm";
-import {GetSearchMemberDto} from "./dto/get.search.member.dto";
+import {LessThan, Like} from "typeorm";
+import {GetSearchMemberDto} from "./dto/get-search-member.dto";
 import {UpdateRuleDto} from "./dto/update-rule.dto";
-import {FollowSearchDto} from "../follow/dto/follow.search.dto";
+import {CursorPageOptionsDto} from "../mate/cursor-page/cursor-page-option.dto";
+import {CommentEntity} from "../comment/domain/comment.entity";
+import {GetCommentDto } from "./dto/get-comment.dto";
+import {CursorPageDto} from "./dto/cursor-page.dto";
+import {CursorPageMetaDto} from "./dto/cursor-page.meta.dto";
 
 @Injectable()
 export class RuleService {
@@ -108,6 +112,59 @@ export class RuleService {
     return dto;
   };
 
+  // [3] 여행 규칙 상세 페이지 조회 (댓글) - 페이지네이션
+  async getComment(cursorPageOptionsDto: CursorPageOptionsDto, ruleId: number): Promise<CursorPageDto<GetCommentDto>> {
+    // (1) 데이터 조회
+    const [comments, total] = await CommentEntity.findAndCount({
+      take: cursorPageOptionsDto.take,
+      where: {
+        rule: { id: ruleId },
+        id: cursorPageOptionsDto.cursorId ? LessThan(cursorPageOptionsDto.cursorId) : null,
+      },
+      relations: {user:{profileImage: true}},
+      order: {
+        id: cursorPageOptionsDto.sort.toUpperCase() as any,
+      },
+    });
+
+    const result = await Promise.all(comments.map(async (comment) => {
+      const getCommentDto = new GetCommentDto();
+
+      getCommentDto.id = comment.id;
+      getCommentDto.name = comment.user.name;
+      getCommentDto.content = comment.content;
+      getCommentDto.updated = comment.updated;
+
+      // 사용자 프로필 이미지
+      const image = comment.user.profileImage;
+      if(image == null) getCommentDto.image = null;
+      else {
+        const userImageKey = image.imageKey;
+        getCommentDto.image = await this.s3Service.getImageUrl(userImageKey);
+      }
+
+      return getCommentDto;
+    }));
+
+    // (2) 페이징 및 정렬 기준 설정
+    const takePerPage = cursorPageOptionsDto.take;
+    const isLastPage = total <= takePerPage;
+
+    let hasNextData = true;
+    let cursor: number;
+
+    if (isLastPage || result.length <= 0) {
+      hasNextData = false;
+      cursor = null;
+    } else {
+      cursor = result[result.length - 1].id;
+    }
+
+    const cursorPageMetaDto = new CursorPageMetaDto({ cursorPageOptionsDto, total, hasNextData, cursor });
+
+    return new CursorPageDto(result, cursorPageMetaDto);
+  }
+
   // [3] 여행 규칙 나가기
   // -1) 초대 받은 팀원 -> 초대 삭제
   async deleteInvitation(ruleId: number, userId: number): Promise<RuleInvitationEntity> {