Merge pull request #87 from oodd-team/dev

Dev

Author: happbob

package-lock.json

@@ -22,6 +22,8 @@ import { AuthModule } from './auth/auth.module';
 import { DayjsModule } from './common/dayjs/dayjs.module'; // DayjsModule 추가
 import { EventsGateway } from './eventGateway';
 import { ConfigService } from '@nestjs/config';
+import { MatchingEventsGateway } from './matchingEventGateway';
+import { UserStyletagModule } from './user-styletag/user-styletag.module';
 
 const configService: ConfigService = new ConfigService();
 
@@ -64,8 +66,9 @@ const configService: ConfigService = new ConfigService();
     UserBlockModule,
     UserReportModule,
     AuthModule,
+    UserStyletagModule,
   ],
   controllers: [AppController],
-  providers: [AppService, EventsGateway],
+  providers: [AppService, EventsGateway, MatchingEventsGateway],
 })
 export class AppModule {}

src/app.module.ts

@@ -1,4 +1,12 @@
-import { Controller, Get, Query, Req, Res, UseGuards } from '@nestjs/common';
+import {
+  BadRequestException,
+  Controller,
+  Get,
+  Query,
+  Req,
+  Res,
+  UseGuards,
+} from '@nestjs/common';
 import { UserService } from 'src/user/user.service';
 import {
   GetJwtInfoSwagger,
@@ -13,8 +21,6 @@ import { NaverAuthGuard } from './guards/naver.auth.guard';
 import { AuthGuard } from './guards/jwt.auth.guard';
 import { BaseResponse } from '../common/response/dto';
 import { GetUserInfo } from 'src/user/dto/response/user.response';
-import dayjs from 'dayjs';
-
 @Controller('auth')
 @ApiTags('[서비스] Auth 관련')
 export class AuthController {
@@ -66,16 +72,12 @@ export class AuthController {
   @GetJwtInfoSwagger('JWT 토큰 정보 조회 API')
   @Get('/me')
   async test(@Req() req: Request): Promise<BaseResponse<GetUserInfo>> {
-    const user = await this.userService.getUserById(req.user?.id);
-    return new BaseResponse<GetUserInfo>(true, 'SUCCESS', {
-      id: user.id,
-      email: user.email,
-      nickname: user.nickname,
-      profilePictureUrl: user.profilePictureUrl,
-      name: user.name,
-      phoneNumber: user.phoneNumber,
-      birthDate: dayjs(user.birthDate).format('YYYY-MM-DD'),
-      bio: user.bio,
-    });
+    console.log(req.user);
+    const user = await this.userService.getUserWithTag(req.user?.id);
+    if (!user) throw new BadRequestException('User not found');
+
+    const userInfo = new GetUserInfo(user);
+
+    return new BaseResponse<GetUserInfo>(true, 'SUCCESS', userInfo);
   }
 }

src/auth/auth.controller.ts

@@ -3,7 +3,6 @@ import { PassportStrategy } from '@nestjs/passport';
 import { Profile, Strategy } from 'passport-kakao';
 import { SocialUser } from '../dto/auth.dto';
 import { ConfigService } from '@nestjs/config';
-import { Request } from 'express';
 
 @Injectable()
 export class JwtKakaoStrategy extends PassportStrategy(Strategy, 'kakao') {
@@ -16,19 +15,20 @@ export class JwtKakaoStrategy extends PassportStrategy(Strategy, 'kakao') {
     });
   }
 
-  async authenticate(req: Request) {
+  authenticate(req: any, options?: any) {
     if (req.query.redirectUrl) {
       // /auth
       return super.authenticate(req, {
+        ...options,
         state: encodeURIComponent(req.query.redirectUrl as string),
       });
     }
     // /auth/callback
-    return super.authenticate(req);
+    return super.authenticate(req, options);
   }
 
   async validate(
-    req: Request,
+    req: any,
     accessToken: string,
     refreshToken: string,
     profile: Profile,

src/auth/strategies/kakao.strategy.ts

@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { ChatMessage } from 'src/common/entities/chat-message.entity';
 import { ChatRoom } from 'src/common/entities/chat-room.entity';
 import { StatusEnum } from 'src/common/enum/entityStatus';
-import { CreateMatchingReqeust } from 'src/matching/dto/matching.request';
+import { CreateMatchingRequest } from 'src/matching/dto/matching.request';
 import { QueryRunner, Repository } from 'typeorm';
 
 @Injectable()
@@ -80,7 +80,7 @@ export class ChatMessageService {
   async createChatMessage(
     queryRunner: QueryRunner,
     chatRoom: ChatRoom,
-    body: CreateMatchingReqeust,
+    body: CreateMatchingRequest,
   ): Promise<ChatMessage> {
     return queryRunner.manager.save(ChatMessage, {
       chatRoom: chatRoom,

src/chat-message/chat-message.service.ts

@@ -6,7 +6,7 @@ import { Matching } from 'src/common/entities/matching.entity';
 import { StatusEnum } from 'src/common/enum/entityStatus';
 import { MatchingRequestStatusEnum } from 'src/common/enum/matchingRequestStatus';
 import { DataNotFoundException } from 'src/common/exception/service.exception';
-import { CreateMatchingReqeust } from 'src/matching/dto/matching.request';
+import { CreateMatchingRequest } from 'src/matching/dto/matching.request';
 import { Repository, QueryRunner } from 'typeorm';
 
 @Injectable()
@@ -60,6 +60,7 @@ export class ChatRoomService {
 
       const latestMessage =
         room.chatMessages.length > 0 ? room.chatMessages[0] : null; // 가장 최근 메시지 선택
+
       return {
         id: room.id,
         otherUser: otherUserInfo,
@@ -72,7 +73,7 @@ export class ChatRoomService {
   async createChatRoom(
     queryRunner: QueryRunner,
     matching: Matching,
-    body: CreateMatchingReqeust,
+    body: CreateMatchingRequest,
   ): Promise<ChatRoom> {
     // 채팅방 생성 로직
     return await queryRunner.manager.save(ChatRoom, {
@@ -116,6 +117,7 @@ export class ChatRoomService {
         matching: { id: matchingId },
       },
       relations: ['matching'],
+      withDeleted: true, // 소프트 딜리트된 데이터도 조회
     });
   }
 }

src/chat-room/chat-room.service.ts

@@ -1,6 +1,7 @@
 import { Entity, Column, OneToMany } from 'typeorm';
 import { BaseEntity } from './base.entity';
 import { PostStyletag } from './post-styletag.entity';
+import { UserStyletag } from './user-styletag.entity';
 
 @Entity('Styletag')
 export class Styletag extends BaseEntity {
@@ -9,4 +10,7 @@ export class Styletag extends BaseEntity {
 
   @OneToMany(() => PostStyletag, (postStyletag) => postStyletag.styletag)
   postStyletags!: PostStyletag[];
+
+  @OneToMany(() => UserStyletag, (userStyletag) => userStyletag.styletag)
+  userStyletags!: UserStyletag[];
 }

src/common/entities/styletag.entity.ts

@@ -0,0 +1,15 @@
+import { Entity, JoinColumn, ManyToOne } from 'typeorm';
+import { BaseEntity } from './base.entity';
+import { Styletag } from './styletag.entity';
+import { User } from './user.entity';
+
+@Entity('UserStyletag')
+export class UserStyletag extends BaseEntity {
+  @ManyToOne(() => User, (user) => user.userStyletags)
+  @JoinColumn({ name: 'userId' })
+  user!: User;
+
+  @ManyToOne(() => Styletag, (styletag) => styletag.userStyletags)
+  @JoinColumn({ name: 'styletagId' })
+  styletag!: Styletag;
+}

src/common/entities/user-styletag.entity.ts

@@ -8,6 +8,7 @@ import { PostLike } from './post-like.entity';
 import { PostReport } from './post-report.entity';
 import { ChatMessage } from './chat-message.entity';
 import { ApiProperty } from '@nestjs/swagger';
+import { UserStyletag } from './user-styletag.entity';
 
 @Entity('User')
 export class User extends BaseEntity {
@@ -96,6 +97,9 @@ export class User extends BaseEntity {
   @OneToMany(() => PostReport, (postReport) => postReport.reporter)
   postReports!: PostReport[];
 
+  @OneToMany(() => UserStyletag, (userStyletag) => userStyletag.user)
+  userStyletags!: UserStyletag[];
+
   // 대표 게시물 필드 추가
   @OneToOne(() => Post, (post) => post.user)
   representativePost?: Post | null;

src/common/entities/user.entity.ts

@@ -1,7 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsIn, IsInt, IsString, MaxLength, MinLength } from 'class-validator';
 
-export class CreateMatchingReqeust {
+export class CreateMatchingRequest {
   @ApiProperty({ example: 1, description: '신청하는 유저 아이디' })
   @IsInt()
   requesterId: number;
@@ -21,6 +21,10 @@ export class CreateMatchingReqeust {
 }
 
 export class PatchMatchingRequest {
+  @ApiProperty({ example: 1, description: '매칭 아이디' })
+  @IsInt()
+  id: number;
+
   @ApiProperty({
     example: 'accept',
     enum: ['accept', 'reject'],

src/matching/dto/matching.request.ts

@@ -1,19 +1,6 @@
-import { ApiProperty } from '@nestjs/swagger';
+import { ApiProperty, OmitType } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
-
-export class CreateMatchingResponse {
-  @ApiProperty({ example: 1, description: '매칭 ID' })
-  id: number;
-
-  @ApiProperty({ example: 1, description: '채팅방 아이디' })
-  chatRoomId: number;
-
-  @ApiProperty({ example: 1, description: '신청한 유저 아이디' })
-  requesterId: number;
-
-  @ApiProperty({ example: 2, description: '매칭 상대 유저 아이디' })
-  targetId: number;
-}
+import { MatchingRequestStatusEnum } from 'src/common/enum/matchingRequestStatus';
 
 export class PatchMatchingResponse {
   @ApiProperty({ example: 1, description: '매칭 ID' })
@@ -81,7 +68,7 @@ class RequesterResponse {
   representativePost?: RepresentativePost;
 }
 
-class Matching {
+export class MatchingResponse {
   @ApiProperty({ example: 1, description: '매칭 ID' })
   id: number;
 
@@ -93,23 +80,69 @@ class Matching {
   requester: RequesterResponse;
 }
 
-export class GetMatchingsResponse {
+export class CreateMatchingResponse {
+  @ApiProperty({ example: 1, description: '매칭 ID' })
+  id: number;
+
   @ApiProperty({
-    description: '매칭 존재 여부',
-    example: true,
+    description: '매칭 요청 메시지',
+    example: '안녕하세요! 매칭 요청합니다.',
   })
-  hasMatching: boolean;
+  message: string;
+
+  @ApiProperty({ example: 1, description: '채팅방 아이디' })
+  chatRoomId?: number;
 
   @ApiProperty({
-    description: '받은 매칭 수',
-    example: 10,
+    example: '2024-10-11T09:00:00.000Z',
+    description: '신청 시각',
   })
-  matchingsCount: number;
+  createdAt: string;
+
+  @ApiProperty({ example: 2, description: '매칭 상대 유저 아이디' })
+  targetId: number;
 
+  @ApiProperty({
+    description: '매칭 요청자 정보',
+    type: RequesterResponse,
+  })
+  @Type(() => RequesterResponse)
+  requester: RequesterResponse;
+}
+
+export class GetMatchingsResponse {
   @ApiProperty({
     description: '매칭 정보',
-    type: [Matching],
+    type: [MatchingResponse],
+  })
+  @Type(() => MatchingResponse)
+  matching: MatchingResponse[];
+}
+
+export class GetOneMatchingResponse extends OmitType(PatchMatchingResponse, [
+  'chatRoomId',
+] as const) {
+  @ApiProperty({
+    example: '2024-10-11T09:00:00.000Z',
+    description: '신청 시각',
   })
-  @Type(() => Matching)
-  matching: Matching[];
+  createdAt: string;
+}
+
+export interface MatchingRequest {
+  id: number;
+  message: string;
+  createdAt: string;
+  requestStatus: MatchingRequestStatusEnum;
+  chatRoomId: number;
+  targetId: number;
+  requester: {
+    id: number;
+    nickname: string;
+    profilePictureUrl: string;
+    representativePost?: {
+      postImages: { url: string; orderNum: number }[];
+      styleTags: string[];
+    };
+  };
 }

src/matching/dto/matching.response.ts

@@ -19,7 +19,7 @@ import {
 } from './matching.swagger';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import {
-  CreateMatchingReqeust,
+  CreateMatchingRequest,
   PatchMatchingRequest,
 } from './dto/matching.request';
 import { UserService } from 'src/user/user.service';
@@ -31,9 +31,9 @@ import {
 } from 'src/common/exception/service.exception';
 import { BaseResponse } from 'src/common/response/dto';
 import {
-  GetMatchingsResponse,
   PatchMatchingResponse,
   CreateMatchingResponse,
+  GetMatchingsResponse,
 } from './dto/matching.response';
 import { AuthGuard } from 'src/auth/guards/jwt.auth.guard';
 import { PostService } from 'src/post/post.service';
@@ -58,7 +58,7 @@ export class MatchingController {
   @CreateMatchingSwagger('매칭 생성 API')
   async createMatching(
     @Req() req: Request,
-    @Body() body: CreateMatchingReqeust,
+    @Body() body: CreateMatchingRequest,
   ): Promise<BaseResponse<CreateMatchingResponse>> {
     if (req.user.id !== body.requesterId)
       throw UnauthorizedException('권한이 없습니다.');
@@ -82,13 +82,8 @@ export class MatchingController {
     )
       throw InvalidInputValueException('이미 매칭 요청을 보냈습니다.');
 
-    const chatRoom = await this.matchingService.createMatching(body);
-    return new BaseResponse<CreateMatchingResponse>(true, 'SUCCESS', {
-      id: chatRoom.matching.id,
-      chatRoomId: chatRoom.id,
-      targetId: chatRoom.toUser.id,
-      requesterId: chatRoom.fromUser.id,
-    });
+    await this.matchingService.createMatching(body);
+    return new BaseResponse<CreateMatchingResponse>(true, 'SUCCESS');
   }
 
   @Patch(':matchingId')

src/matching/matching.controller.ts

@@ -7,7 +7,6 @@ import { ChatMessageModule } from 'src/chat-message/chat-message.module';
 import { ChatRoomModule } from 'src/chat-room/chat-room.module';
 import { UserModule } from 'src/user/user.module';
 import { PostModule } from 'src/post/post.module';
-import { UserBlock } from 'src/common/entities/user-block.entity';
 import { UserBlockModule } from 'src/user-block/user-block.module';
 
 @Module({