[Feat] 유저 정보 조회 API 구현

apps/api/src/auth/auth.controller.ts

@@ -41,7 +41,7 @@ export class AuthController {
     this.cookieInsertJWT(response, userId);
   }
 
-  @Post('guest/login')
+  @Get('guest/login')
   @ApiOperation({ summary: '게스트 로그인' })
   @ApiResponse({ status: 302, description: '홈으로 리다이렉션' })
   @UseGuards(ThrottlerGuard)

apps/api/src/auth/auth.service.ts

@@ -32,13 +32,16 @@ export class AuthService {
 
   async createGuestUser() {
     const randomNum = Math.floor(Math.random() * 10000);
+    const response = await fetch('https://api.thecatapi.com/v1/images/search');
+    const catImageUrl = (await response.json())[0].url;
+
     const guestUser = {
       username: `guest_${randomNum}`,
       password: `guest_password_${randomNum}`,
       email: `[email protected]`,
       nickname: `guest_${randomNum}`,
       introduce: `게스트 사용자입니다. `,
-      profileImageUrl: `https://cataas.com/cat?${Date.now()}`,
+      profileImageUrl: catImageUrl,
     };
     const user = await this.userService.findUserByUsername(guestUser.username);
     if (!user) {

apps/api/src/ticle/dto/ticleDetailDto.ts

@@ -7,6 +7,12 @@ export class TickleDetailResponseDto {
   })
   speakerName: string;
 
+  @ApiProperty({
+    example: 1,
+    description: '발표자 유저 아이디',
+  })
+  speakerId: number;
+
   @ApiProperty({
     example: '[email protected]',
     description: '발표자 이메일',

apps/api/src/ticle/ticle.service.ts

@@ -144,6 +144,7 @@ export class TicleService {
 
     return {
       ...ticleData,
+      speakerId: ticle.speaker.id,
       tags: tags.map((tag) => tag.name),
       speakerImgUrl: speaker.profileImageUrl,
     };

apps/api/src/user/dto/userProfileDto.ts

@@ -0,0 +1,33 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UserProfileDto {
+  @ApiProperty({
+    example: '1',
+    description: '유저 아이디',
+  })
+  id: number;
+
+  @ApiProperty({
+    example: 'simeunseo',
+    description: '유저 닉네임',
+  })
+  nickname: string;
+
+  @ApiProperty({
+    example: 'https://avatars.githubusercontent.com/u/55528304?v=4',
+    description: '유저 프로필 사진',
+  })
+  profileImageUrl: string;
+
+  @ApiProperty({
+    example: 'github',
+    description: '유저 소셜 로그인 프로바이더',
+  })
+  provider: string;
+
+  @ApiProperty({
+    example: ['개발자를 위한 피그마', '야, 너도 부캠할 수 있어'],
+    description: '유저가 개설한 티클 목록',
+  })
+  ticles: string[];
+}

apps/api/src/user/dto/userProfileOfMeDto.ts

@@ -0,0 +1,27 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UserProfileOfMeDto {
+  @ApiProperty({
+    example: '1',
+    description: '유저 아이디',
+  })
+  id: number;
+
+  @ApiProperty({
+    example: 'simeunseo',
+    description: '유저 닉네임',
+  })
+  nickname: string;
+
+  @ApiProperty({
+    example: 'https://avatars.githubusercontent.com/u/55528304?v=4',
+    description: '유저 프로필 사진',
+  })
+  profileImageUrl: string;
+
+  @ApiProperty({
+    example: 'github',
+    description: '유저 소셜 로그인 프로바이더',
+  })
+  provider: string;
+}

apps/api/src/user/user.controller.ts

@@ -1,12 +1,22 @@
-import { Controller, Get, Patch } from '@nestjs/common';
+import { Controller, Get, Param, UseGuards } from '@nestjs/common';
+
+import { JwtAuthGuard } from '@/auth/jwt/jwt-auth.guard';
+import { GetUserId } from '@/common/decorator/get-userId.decorator';
+
+import { UserService } from './user.service';
 
 @Controller('user')
 export class UserController {
-  constructor() {}
+  constructor(private readonly userService: UserService) {}
 
-  @Get('profile')
-  getUserProfile() {}
+  @Get('me')
+  @UseGuards(JwtAuthGuard)
+  async getUserProfile(@GetUserId() userId: number) {
+    return await this.userService.findUserProfileOfMeByUserId(userId);
+  }
 
-  @Patch('profile')
-  patchUserProfile() {}
+  @Get(':userId')
+  async patchUserProfile(@Param('userId') userId: number) {
+    return await this.userService.findUserProfileByUserId(userId);
+  }
 }

apps/api/src/user/user.service.ts

@@ -1,4 +1,4 @@
-import { ConflictException, Injectable } from '@nestjs/common';
+import { ConflictException, Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import * as bcrypt from 'bcrypt';
 import { Repository } from 'typeorm';
@@ -8,6 +8,8 @@
 
 import { CreateLocalUserDto } from './dto/createLocalUser.dto';
 import { CreateSocialUserDto } from './dto/createSocialUser.dto';
+import { UserProfileDto } from './dto/userProfileDto';
+import { UserProfileOfMeDto } from './dto/userProfileOfMeDto';
 
 @Injectable()
 export class UserService {
@@ -24,7 +26,7 @@
       password: hashedPassword,
     });
     await this.userRepository.save(user);
     const { password, ...result } = user;
     return result;
   }
 
@@ -64,4 +66,39 @@
     }
     return user;
   }
+
+  async findUserProfileOfMeByUserId(userId: number): Promise<UserProfileOfMeDto> {
+    const user = await this.userRepository.findOne({
+      where: { id: userId },
+      select: ['id', 'nickname', 'profileImageUrl', 'provider'],
+    });
+
+    if (!user) {
+      throw new NotFoundException(ErrorMessage.USER_NOT_FOUND);
+    }
+
+    return user;
+  }
+
+  async findUserProfileByUserId(userId: number): Promise<UserProfileDto> {
+    const user = await this.userRepository
+      .createQueryBuilder('user')
+      .leftJoin('user.ticles', 'ticles')
+      .addSelect('ticles.title')
+      .where('user.id = :userId', { userId: userId })
+      .getOne();
+
+    if (!user) {
+      throw new NotFoundException(ErrorMessage.USER_NOT_FOUND);
+    }
+
+    const ticles = user.ticles || [];
+    return {
+      id: user.id,
+      nickname: user.nickname,
+      profileImageUrl: user.profileImageUrl,
+      provider: user.provider,
+      ticles: ticles.map((ticle) => ticle.title),
+    };
+  }
 }

apps/web/index.html

@@ -2,15 +2,19 @@
 <html lang="ko">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.png" />
     <link
       rel="stylesheet"
       as="style"
       crossorigin
       href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/static/pretendard-dynamic-subset.min.css"
     />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Ticle</title>
+    <meta
+      name="Description"
+      content="작은 지식이 모여 큰 성장이 되는 곳 - 실시간 지식 공유 플랫폼 TICLE"
+    />
+    <title>TICLE</title>
   </head>
   <body>
     <div id="root"></div>

apps/web/src/api/auth.ts

@@ -1,4 +1,5 @@
 import axiosInstance from '@/api/axios';
+import { ENV } from '@/constants/env';
 
 type SignUpDto = {
   username: string;
@@ -23,8 +24,12 @@ const signOut = async () => {
   await axiosInstance.post('/auth/logout');
 };
 
-const oauthLogin = async (provider: 'google' | 'github') => {
-  await axiosInstance.get(`/auth/${provider}/login`);
+const guestLogin = () => {
+  window.location.href = `${ENV.API_URL}/auth/guest/login`;
 };
 
-export { logIn, signUp, oauthLogin, signOut };
+const oauthLogin = (provider: 'google' | 'github') => {
+  window.location.href = `${ENV.API_URL}/auth/${provider}/login`;
+};
+
+export { logIn, signUp, oauthLogin, guestLogin, signOut };