feat: merge from dev

Author: happbob

src/auth/auth.service.ts

@@ -15,7 +15,6 @@ export class AuthService {
     user: SocialUser,
     provider: 'kakao' | 'naver',
   ): Promise<string> {
-    console.log(user);
     let userBySocial;
     if (provider === 'kakao')
       userBySocial = await this.userSerivce.getUserByKaKaoId(user.kakaoId);

src/auth/strategies/kakao.strategy.ts

@@ -35,7 +35,6 @@ export class JwtKakaoStrategy extends PassportStrategy(Strategy, 'kakao') {
     done: (error: any, user?: SocialUser, info?: any) => void,
   ) {
     try {
-      console.log('profile', profile);
       const { _json } = profile;
       const kakaoUser: SocialUser = {
         kakaoId: _json.id,

src/auth/strategies/naver.strategy.ts

@@ -36,7 +36,6 @@ export class NaverStrategy extends PassportStrategy(Strategy, 'naver') {
   ): Promise<any> {
     try {
       const { _json } = profile;
-      console.log('profile', profile);
       const naverUser: SocialUser = {
         naverId: _json.id,
         email: _json.email,

src/clothing/clothing.service.ts

@@ -2,9 +2,9 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { QueryRunner, Repository } from 'typeorm';
 import { Clothing } from 'src/common/entities/clothing.entity';
-import { UploadClothingDto } from 'src/post/dtos/post.request';
+import { UploadClothingDto } from 'src/post/dto/request/post.request';
 import { DataNotFoundException } from 'src/common/exception/service.exception';
-import { PatchClothingDto } from 'src/post/dtos/post.request';
+import { PatchClothingDto } from 'src/post/dto/request/post.request';
 
 @Injectable()
 export class ClothingService {

src/common/entities/matching.entity.ts

@@ -3,6 +3,7 @@ import { BaseEntity } from './base.entity';
 import { User } from './user.entity';
 import { ChatRoom } from './chat-room.entity';
 import { ApiProperty } from '@nestjs/swagger';
+import { MatchingRequestStatusEnum } from '../enum/matchingRequestStatus';
 
 @Entity('Matching')
 export class Matching extends BaseEntity {
@@ -23,13 +24,13 @@ export class Matching extends BaseEntity {
   })
   message!: string;
 
-  @Column({ type: 'enum', enum: ['pending', 'accepted', 'rejected'] })
+  @Column({ type: 'enum', enum: MatchingRequestStatusEnum })
   @ApiProperty({
-    enum: ['pending', 'accepted', 'rejected'],
+    enum: MatchingRequestStatusEnum,
     description: '매칭 상태',
     example: 'pending',
   })
-  requestStatus: 'pending' | 'accepted' | 'rejected' = 'pending';
+  requestStatus: MatchingRequestStatusEnum = MatchingRequestStatusEnum.PENDING;
 
   @Column({ type: 'datetime', nullable: true })
   rejectedAt: Date = null;

src/common/entities/post.entity.ts

@@ -7,7 +7,6 @@ import { PostLike } from './post-like.entity';
 import { PostStyletag } from './post-styletag.entity';
 import { PostClothing } from './post-clothing.entity';
 import { PostReport } from './post-report.entity';
-
 @Entity('Post')
 export class Post extends BaseEntity {
   @ManyToOne(() => User, (user) => user.posts)
@@ -38,15 +37,16 @@ export class Post extends BaseEntity {
 
   @OneToMany(() => PostReport, (postReport) => postReport.post)
   postReports!: PostReport[];
-    images: string[];
+
+  images: string[];
 
   // 댓글 수
   get commentCount(): number {
-    return this.postComments? this.postComments.length : 0;
+    return this.postComments ? this.postComments.length : 0;
   }
 
   // Like 수
   get likeCount(): number {
-    return this.postLikes? this.postLikes.length : 0;
+    return this.postLikes ? this.postLikes.length : 0;
   }
 }

src/common/entities/user.entity.ts

@@ -85,10 +85,10 @@ export class User extends BaseEntity {
   sentChatMessages?: ChatMessage[];
 
   @OneToMany(() => Matching, (matching) => matching.requester)
-  requestedMatchings?: Matching[];
+  requestedMatchings: Matching[];
 
   @OneToMany(() => Matching, (matching) => matching.target)
-  targetedMatchings?: Matching[];
+  targetedMatchings: Matching[];
 
   @OneToMany(() => PostLike, (postLike) => postLike.user)
   postLikes!: PostLike[];

src/common/enum/matchingRequestStatus.ts

@@ -0,0 +1,5 @@
+export enum MatchingRequestStatusEnum {
+  PENDING = 'pending',
+  ACCEPTED = 'accepted',
+  REJECTED = 'rejected',
+}

src/common/response/page.dto.ts

@@ -1,11 +1,11 @@
 import { IsArray } from 'class-validator';
 import { PageMetaDto } from './page-meta.dto';
 import { ApiProperty } from '@nestjs/swagger';
-import { GetAllPostsResponse } from '../../post/dtos/all-posts.response';
+import { GetAllPostsResponse } from '../../post/dto/all-posts.response';
 import {
   GetMyPostsResponse,
   GetOtherPostsResponse,
-} from '../../post/dtos/user-posts.response';
+} from '../../post/dto/user-posts.response';
 
 export class PageDto<T> {
   @ApiProperty({

src/matching/matching.controller.ts

@@ -75,6 +75,14 @@ export class MatchingController {
       throw DataNotFoundException('신청 유저의 게시물이 존재하지 않습니다.');
     }
 
+    if (
+      await this.matchingService.getMatchingByUserId(
+        body.requesterId,
+        body.targetId,
+      )
+    )
+      throw InvalidInputValueException('이미 매칭 요청을 보냈습니다.');
+
     const chatRoom = await this.matchingService.createMatching(body);
     return new BaseResponse<PostMatchingResponse>(true, 'SUCCESS', {
       chatRoomId: chatRoom.id,

src/matching/matching.service.ts

@@ -14,6 +14,7 @@ import { ChatMessageService } from 'src/chat-message/chat-message.service';
 import { ChatRoom } from 'src/common/entities/chat-room.entity';
 import { InjectRepository } from '@nestjs/typeorm';
 import { GetMatchingsResponse } from './dto/matching.response';
+import { MatchingRequestStatusEnum } from 'src/common/enum/matchingRequestStatus';
 
 @Injectable()
 export class MatchingService {
@@ -24,6 +25,35 @@ export class MatchingService {
     private readonly chatMessageService: ChatMessageService,
     private readonly dataSource: DataSource,
   ) {}
+  async getMatchingByUserId(
+    requesterId: number,
+    targetId: number,
+  ): Promise<Matching> {
+    return await this.matchingRepository.findOne({
+      where: [
+        {
+          requester: { id: requesterId },
+          target: { id: targetId },
+          status: 'activated',
+        },
+        {
+          requester: { id: targetId },
+          target: { id: requesterId },
+          status: 'activated',
+        },
+      ],
+    });
+  }
+
+  async getMatchingsByCurrentId(currentUserId: number): Promise<Matching[]> {
+    return await this.matchingRepository.find({
+      relations: ['requester', 'target'],
+      where: [
+        { requester: { id: currentUserId }, status: 'activated' },
+        { target: { id: currentUserId }, status: 'activated' },
+      ],
+    });
+  }
 
   async createMatching(body: CreateMatchingReqeust): Promise<ChatRoom> {
     let matching, chatRoom;
@@ -68,10 +98,10 @@ export class MatchingService {
 
     try {
       if (body.requestStatus === 'accept') {
-        matching.requestStatus = 'accepted';
+        matching.requestStatus = MatchingRequestStatusEnum.ACCEPTED;
         matching.acceptedAt = new Date();
       } else if (body.requestStatus === 'reject') {
-        matching.requestStatus = 'rejected';
+        matching.requestStatus = MatchingRequestStatusEnum.REJECTED;
         matching.rejectedAt = new Date();
       }
 
@@ -157,13 +187,13 @@ export class MatchingService {
         {
           requester: { id: requesterId },
           target: { id: targetId },
-          requestStatus: 'accepted',
+          requestStatus: MatchingRequestStatusEnum.ACCEPTED,
           status: 'activated',
         },
         {
           requester: { id: targetId },
           target: { id: requesterId },
-          requestStatus: 'accepted',
+          requestStatus: MatchingRequestStatusEnum.ACCEPTED,
           status: 'activated',
         },
       ],

src/post-clothing/post-clothing.service.ts

@@ -4,8 +4,8 @@ import { ClothingService } from 'src/clothing/clothing.service';
 import { Clothing } from 'src/common/entities/clothing.entity';
 import { PostClothing } from 'src/common/entities/post-clothing.entity';
 import { Post } from 'src/common/entities/post.entity';
-import { UploadClothingDto } from 'src/post/dtos/post.request';
-import { PatchClothingDto } from 'src/post/dtos/post.request';
+import { UploadClothingDto } from 'src/post/dto/request/post.request';
+import { PatchClothingDto } from 'src/post/dto/request/post.request';
 import { QueryRunner, Repository } from 'typeorm';
 
 @Injectable()

src/post-comment/post-comment.controller.ts

@@ -18,12 +18,12 @@ import {
 import { CreateCommentDto } from './dtos/create-comment.dto';
 import { Request } from 'express';
 import { BaseResponse } from 'src/common/response/dto';
-import { PostService } from 'src/post/post.service';
 import { AuthGuard } from 'src/auth/guards/jwt.auth.guard';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { PostComment } from 'src/common/entities/post-comment.entity';
 import { GetCommentsDto } from './dtos/get-comment.dto';
 import dayjs from 'dayjs';
+import { UserBlockService } from 'src/user-block/user-block.service';
 
 @ApiBearerAuth('Authorization')
 @Controller('post-comment')
@@ -32,7 +32,7 @@ import dayjs from 'dayjs';
 export class PostCommentController {
   constructor(
     private readonly postCommentService: PostCommentService,
-    private readonly postService: PostService,
+    private readonly userBlockService: UserBlockService,
   ) {}
 
   @Post()
@@ -61,7 +61,13 @@ export class PostCommentController {
   ): Promise<BaseResponse<GetCommentsDto>> {
     const currentUserId = req.user.id;
 
-    const comments = await this.postCommentService.getPostComments(postId);
+    const blockedUserIds: number[] =
+      await this.userBlockService.getBlockedUserIds(currentUserId);
+
+    const comments = await this.postCommentService.getPostComments(
+      postId,
+      blockedUserIds,
+    );
 
     const commenteResponse: GetCommentsDto = {
       comments: comments.map((comment) => ({

src/post-comment/post-comment.module.ts

@@ -5,12 +5,14 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { PostComment } from 'src/common/entities/post-comment.entity';
 import { PostModule } from 'src/post/post.module';
 import { UserModule } from 'src/user/user.module';
+import { UserBlockModule } from 'src/user-block/user-block.module';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([PostComment]),
     forwardRef(() => UserModule),
     forwardRef(() => PostModule),
+    UserBlockModule,
   ],
   controllers: [PostCommentController],
   providers: [PostCommentService],

src/post-comment/post-comment.service.ts

@@ -1,6 +1,6 @@
 import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { PostComment } from 'src/common/entities/post-comment.entity';
-import { QueryRunner } from 'typeorm';
+import { In, Not, QueryRunner } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { CreateCommentDto } from './dtos/create-comment.dto';
@@ -85,16 +85,27 @@ export class PostCommentService {
   }
 
   // 댓글 리스트 조회
-  async getPostComments(postId: number): Promise<PostComment[]> {
+  async getPostComments(
+    postId: number,
+    blockedUserIds: number[],
+  ): Promise<PostComment[]> {
     return await this.postCommentRepository.find({
-      where: { post: { id: postId }, status: 'activated' },
+      where: {
+        post: { id: postId },
+        status: 'activated',
+        user: { status: 'activated', id: Not(In(blockedUserIds)) },
+      },
       relations: ['user'],
     });
   }
 
   private async findCommentById(commentId: number): Promise<PostComment> {
     const comment = await this.postCommentRepository.findOne({
-      where: { id: commentId, status: 'activated' },
+      where: {
+        id: commentId,
+        status: 'activated',
+        user: { status: 'activated' },
+      },
       relations: ['user'],
     });
 

src/post-image/post-image.service.ts

@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { PostImage } from 'src/common/entities/post-image.entity';
 import { Repository, QueryRunner } from 'typeorm';
 import { Post } from 'src/common/entities/post.entity';
-import { UploadImageDto } from 'src/post/dtos/post.request';
+import { UploadImageDto } from 'src/post/dto/request/post.request';
 import { InvalidInputValueException } from 'src/common/exception/service.exception';
 
 @Injectable()

src/post/dto/all-posts.response.ts

@@ -0,0 +1,59 @@
+import { ApiProperty } from '@nestjs/swagger';
+import dayjs from 'dayjs';
+import { GetAllPostDto, UserDto } from './dto/get-all-posts.dto';
+import { MatchingRequestStatusEnum } from '../../common/enum/matchingRequestStatus';
+import { Matching } from 'src/common/entities/matching.entity';
+
+export class PostDto extends GetAllPostDto {
+  @ApiProperty({
+    description: '게시글에 좋아요 눌렀는지 여부입니다.',
+    example: true,
+  })
+  isPostLike: boolean;
+
+  @ApiProperty({
+    required: false,
+    enum: MatchingRequestStatusEnum,
+    description: '매칭 요청 상태입니다.',
+  })
+  requestStatus?: MatchingRequestStatusEnum | null;
+
+  constructor(
+    post: GetAllPostDto,
+    currentUserId: number,
+    requestStatus?: MatchingRequestStatusEnum | null,
+  ) {
+    super();
+    this.id = post.id;
+    this.content = post.content;
+    this.createdAt = dayjs(post.createdAt).format('YYYY-MM-DDTHH:mm:ssZ');
+    this.postImages = post.postImages ?? [];
+    this.isPostLike =
+      post.postLikesUserIds?.some((like) => like === currentUserId) || false;
+    this.requestStatus = requestStatus;
+    this.user = new UserDto(post.user);
+  }
+}
+
+export class GetAllPostsResponse {
+  @ApiProperty({
+    type: [PostDto],
+    description: '조회된 게시글 목록입니다.',
+  })
+  post: PostDto[];
+
+  constructor(
+    posts: GetAllPostDto[],
+    currentUserId: number,
+    matchings?: Matching[],
+  ) {
+    this.post = posts.map((post) => {
+      const matching = matchings?.find(
+        (matching) =>
+          matching.requester.id === post.user.id ||
+          matching.target.id === post.user.id,
+      );
+      return new PostDto(post, currentUserId, matching?.requestStatus ?? null);
+    });
+  }
+}