Merge branch 'dev' of https://github.com/oodd-team/oodd-server-nestjs into dev

Author: khmandarrin

src/common/entities/user.entity.ts

@@ -50,6 +50,13 @@ export class User extends BaseEntity {
   @Column('datetime')
   joinedAt!: Date; // joinedAt는 datetime 타입
 
+  @ApiProperty({
+    description: '이용약관 동의 시각',
+    example: '2021-08-01 00:00:00',
+  })
+  @Column('datetime')
+  privacyTermAcceptedAt!: Date;
+
   //one to many 관계 설정
 
   @OneToMany(() => Post, (post) => post.user)

src/post/dtos/total-postsResponse.dto.ts src/post/dtos/all-posts.response.ts

@@ -15,20 +15,32 @@ class PostImageDto {
 }
 
 class UserDto {
+  @ApiProperty({
+    example: '19',
+    description: '작성자의 user ID 입니다.',
+  })
+  userId: number;
+
   @ApiProperty({
     example: 'nickname',
-    description: '사용자의 닉네임입니다.',
+    description: '작성자의 닉네임입니다.',
   })
   nickname: string;
 
   @ApiProperty({
     example: 'http://profilepictureurl.example',
-    description: '사용자의 프로필 사진 URL입니다.',
+    description: '작성자의 프로필 사진 URL입니다.',
   })
   profilePictureUrl: string;
 }
 
-class PostDto {
+export class PostDto {
+  @ApiProperty({
+    example: '3',
+    description: '게시글의 번호입니다.',
+  })
+  postId: number;
+
   @ApiProperty({
     example: '게시글 내용 content',
     description: '게시글의 내용입니다.',
@@ -58,24 +70,12 @@ class PostDto {
     description: '게시글 작성자의 정보입니다.',
   })
   user: UserDto;
-
-  @ApiProperty({
-    example: true,
-    description: '현재 사용자가 해당 게시글의 작성자인지 여부입니다.',
-  })
-  isPostWriter: boolean;
 }
 
-export class GetPostsResponse {
+export class GetAllPostsResponse {
   @ApiProperty({
     type: [PostDto],
     description: '조회된 게시글 목록입니다.',
   })
   post: PostDto[];
-
-  @ApiProperty({
-    example: false,
-    description: '매칭 여부입니다.',
-  })
-  isMatching: boolean = false;
 }

src/post/dtos/page-options.dto.ts

@@ -10,8 +10,8 @@ export class PageOptionsDto {
   @Type(() => Number)
   @IsInt()
   @IsOptional()
-  @Min(1) // 페이지는 1 이상
-  page?: number;
+  @Min(1)
+  page?: number = 1;
 
   @ApiProperty({
     example: '10',
@@ -20,7 +20,7 @@ export class PageOptionsDto {
   @Type(() => Number)
   @IsInt()
   @IsOptional()
-  take?: number;
+  take?: number = 10;
 
   // 기본값 설정
   constructor() {

src/post/dtos/page.dto.ts

@@ -1,16 +1,16 @@
 import { IsArray } from 'class-validator';
 import { PageMetaDto } from './page-meta.dto';
 import { ApiProperty } from '@nestjs/swagger';
-import { GetPostsResponse } from './total-postsResponse.dto';
+import { GetAllPostsResponse } from './all-posts.response';
 import {
   GetMyPostsResponse,
   GetOtherPostsResponse,
-} from './user-postsResponse.dto';
+} from './user-posts.response';
 
 export class PageDto<T> {
   @ApiProperty({
     description: '실제 데이터',
-    type: [GetPostsResponse, GetMyPostsResponse, GetOtherPostsResponse],
+    type: [GetAllPostsResponse, GetMyPostsResponse, GetOtherPostsResponse],
   })
   @IsArray()
   readonly data: T[]; // 실제 데이터

src/post/dtos/user-postsResponse.dto.ts src/post/dtos/user-posts.response.ts

@@ -1,6 +1,18 @@
 import { ApiProperty, OmitType } from '@nestjs/swagger';
 
 class PostDto {
+  @ApiProperty({
+    example: '19',
+    description: '조회한 작성자의 user ID 입니다.',
+  })
+  userId: number;
+
+  @ApiProperty({
+    example: '3',
+    description: '게시글의 번호입니다.',
+  })
+  postId: number;
+
   @ApiProperty({
     example: true,
     description: '대표 게시글 여부를 나타냅니다.',
@@ -48,7 +60,7 @@ export class GetMyPostsResponse {
     type: [PostDto],
     description: '조회된 사용자의 게시글 목록입니다.',
   })
-  posts: PostDto[];
+  post: PostDto[];
 
   @ApiProperty({
     example: 20,
@@ -79,7 +91,7 @@ export class GetOtherPostsResponse {
     type: [OtherUserPostDto],
     description: '다른 사용자의 게시글 목록입니다.',
   })
-  posts: OtherUserPostDto[];
+  post: OtherUserPostDto[];
 
   @ApiProperty({
     example: 30,

src/post/post.controller.ts

@@ -11,11 +11,11 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { PostService } from './post.service';
-import { GetPostsResponse } from './dtos/total-postsResponse.dto';
+import { GetAllPostsResponse } from './dtos/all-posts.response';
 import {
   GetMyPostsResponse,
   GetOtherPostsResponse,
-} from './dtos/user-postsResponse.dto';
+} from './dtos/user-posts.response';
 import {
   CreatePostsSwagger,
   DeletePostSwagger,
@@ -33,6 +33,10 @@ import { GetPostResponse } from './dtos/get-post.dto';
 import { PatchPostDto } from './dtos/patch-Post.dto';
 import { PageOptionsDto } from './dtos/page-options.dto';
 import { PageDto } from './dtos/page.dto';
+import dayjs from 'dayjs';
+import { PageMetaDto } from './dtos/page-meta.dto';
+import { DataNotFoundException } from 'src/common/exception/service.exception';
+import { Post as PostEntity } from 'src/common/entities/post.entity';
 
 @Controller('post')
 @ApiBearerAuth('Authorization')
@@ -41,12 +45,13 @@ import { PageDto } from './dtos/page.dto';
 export class PostController {
   constructor(private readonly postService: PostService) {}
 
-  @Get('/')
+  @Get()
   @GetPostsSwagger('게시글 리스트 조회 API')
   @ApiQuery({
     name: 'userId',
     required: false,
-    description: 'User ID',
+    description:
+      'User ID가 제공되면 사용자 게시글 조회, 제공되지 않으면 전체 게시글이 조회됩니다.',
     type: Number,
   })
   @ApiQuery({
@@ -66,25 +71,104 @@ export class PostController {
     @Query('userId') userId?: number,
   ): Promise<
     BaseResponse<
-      PageDto<GetPostsResponse | GetMyPostsResponse | GetOtherPostsResponse>
+      PageDto<GetAllPostsResponse | GetMyPostsResponse | GetOtherPostsResponse>
     >
   > {
-    const currentUserId = req.user.id;
-
-    const options = pageOptionsDto
+    const pageOptions = pageOptionsDto
       ? {
           ...new PageOptionsDto(),
-          ...pageOptionsDto, // Dto에 전달된 기본값
+          ...pageOptionsDto,
         }
       : new PageOptionsDto();
 
-    const postsResponse = await this.postService.getPosts(
-      options,
-      userId,
-      currentUserId,
+    const { posts, total } = userId
+      ? await this.postService.getUserPosts(pageOptions, userId)
+      : await this.postService.getAllPosts(pageOptions, req.user.id);
+
+    const pageMetaDto = new PageMetaDto({
+      pageOptionsDto: pageOptions,
+      total,
+    });
+
+    if (pageMetaDto.last_page < pageMetaDto.page) {
+      throw DataNotFoundException('해당 페이지는 존재하지 않습니다');
+    }
+    const postsResponse = userId
+      ? this.createUserPostsResponse(posts, req.user.id, userId)
+      : this.createAllPostsResponse(posts, req.user.id);
+
+    return new BaseResponse(
+      true,
+      '게시글 리스트 조회 성공',
+      new PageDto([postsResponse], pageMetaDto),
     );
+  }
 
-    return new BaseResponse(true, '게시글 리스트 조회 성공', postsResponse);
+  private createUserPostsResponse(
+    posts: PostEntity[],
+    currentUserId: number,
+    userId: number,
+  ): GetMyPostsResponse | GetOtherPostsResponse {
+    if (userId == currentUserId) {
+      return {
+        post: posts.map((post) => ({
+          userId: post.user.id,
+          postId: post.id,
+          createdAt: dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ'),
+          imageUrl: post.postImages.find(
+            (image) => image.orderNum == 1 && image.status === 'activated',
+          )?.url,
+          isRepresentative: post.isRepresentative,
+          likeCount: post.postLikes.length,
+          commentCount: post.postComments.length,
+          isPostLike: this.postService.checkIsPostLiked(post, currentUserId),
+          isPostComment: this.postService.checkIsPostCommented(
+            post,
+            currentUserId,
+          ),
+        })),
+        totalComments: this.postService.calculateTotalComments(posts),
+        totalPosts: posts.length,
+        totalLikes: this.postService.calculateTotalLikes(posts),
+      };
+    } else {
+      return {
+        post: posts.map((post) => ({
+          userId: post.user.id,
+          postId: post.id,
+          createdAt: dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ'),
+          imageUrl: post.postImages.find(
+            (image) => image.orderNum == 1 && image.status === 'activated',
+          )?.url,
+          isRepresentative: post.isRepresentative,
+          likeCount: post.postLikes.length,
+          isPostLike: this.postService.checkIsPostLiked(post, currentUserId),
+        })),
+        totalPosts: posts.length,
+        totalLikes: this.postService.calculateTotalLikes(posts),
+      };
+    }
+  }
+  private createAllPostsResponse(posts: PostEntity[], currentUserId: number) {
+    return {
+      post: posts.map((post) => ({
+        postId: post.id,
+        content: post.content,
+        createdAt: dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ'),
+        postImages: post.postImages
+          .filter((image) => image.status === 'activated')
+          .map((image) => ({
+            url: image.url,
+            orderNum: image.orderNum,
+          })),
+        isPostLike: this.postService.checkIsPostLiked(post, currentUserId),
+        user: {
+          userId: post.user.id,
+          nickname: post.user.nickname,
+          profilePictureUrl: post.user.profilePictureUrl,
+        },
+      })),
+    };
   }
 
   @Get(':postId')