Merge branch 'renewal' of https://github.com/DevKor-github/BLURTING-back

 into renewal

src/app.module.ts

@@ -3,20 +3,20 @@ import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ConfigModule } from '@nestjs/config';
-import { UserModule } from './user/user.module';
-import { AuthModule } from './auth/auth.module';
+import { UserModule } from './domain/user/user.module';
+import { AuthModule } from './domain/auth/auth.module';
 import { MailerModule } from '@nestjs-modules/mailer';
-import { S3Module } from './s3/s3.module';
-import { GeocodingModule } from './geocoding/geocoding.module';
-import { ChatModule } from './chat/chat.module';
+import { S3Module } from './domain/s3/s3.module';
+import { GeocodingModule } from './domain/geocoding/geocoding.module';
+import { ChatModule } from './domain/chat/chat.module';
 import { MongooseModule } from '@nestjs/mongoose';
-import { FcmModule } from './firebase/fcm.module';
-import { BlurtingModule } from './blurting/blurting.module';
-import { PointModule } from './point/point.module';
+import { FcmModule } from './domain/firebase/fcm.module';
+import { BlurtingModule } from './domain/blurting/blurting.module';
+import { PointModule } from './domain/point/point.module';
 import { BullModule } from '@nestjs/bull';
-import { HomeModule } from './home/home.module';
-import { ReportModule } from './report/report.module';
-import { EventModule } from './event/event.module';
+import { HomeModule } from './domain/home/home.module';
+import { ReportModule } from './domain/report/report.module';
+import { EventModule } from './domain/event/event.module';
 
 @Module({
   imports: [

src/common/enums/index.ts

@@ -3,7 +3,7 @@ export { Degree } from './degree.enum';
 export { Hobby } from './hobby.enum';
 export { Major } from './major.enum';
 export { Mbti } from './mbti.enum';
-export { Nickname } from './nickname.enum';
+export { PreNickname, Nickname } from './nickname.enum';
 export { Page } from './page.enum';
 export { Sex } from './sex.enum';
 export { SexOrient } from './sexOrient.enum';

src/common/enums/job.enum.ts

@@ -1,3 +1,6 @@
 export enum Job {
   Student = '학생',
+  Worker = '직장인',
+  Etc = '기타직종',
+  None = '무직',
 }

src/common/enums/nickname.enum.ts

@@ -1,57 +1,102 @@
+export enum PreNickname {
+  가냘픈,
+  거친,
+  검은,
+  게으른,
+  괜찮은,
+  귀여운,
+  기쁜,
+  노란,
+  느린,
+  늦은,
+  동그란,
+  멋진,
+  무서운,
+  밝은,
+  붉은,
+  빠른,
+  성가신,
+  센,
+  수줍은,
+  슬픈,
+  엄청난,
+  외로운,
+  작은,
+  점잖은,
+  조그만,
+  좋은,
+  즐거운,
+  짓궂은,
+  흰,
+  조용한,
+  사나운,
+  예쁜,
+  강한,
+  약한,
+  푸른,
+  활기찬,
+  다정한,
+  재밌는,
+  이상한,
+  흔한,
+  달콤한,
+  쓸쓸한,
+  시원한,
+  차가운,
+  힘찬,
+  가벼운,
+  화려한,
+  빨간,
+  주황,
+  초록,
+  파란,
+  분홍,
+  남색,
+  보라,
+  다홍,
+  연두,
+  검정,
+  유령,
+  바보,
+}
+
 export enum Nickname {
   오이,
   토마토,
-  브로콜리,
   감자칩,
   토끼,
   햄스터,
   강쥐,
   고앵이,
   넙떠기,
-  바부팅,
   쥑쥑,
-  퓨퓨,
-  츄츄,
   우유,
-  샤샥,
-  도도독,
   뽀삐,
-  뽀삐뽀,
   두부,
   크림빵,
   바나나,
   초코,
-  삼합,
   아보카도,
   녹차,
   딸기,
   붕어빵,
   호두,
-  만쥬,
-  델리,
   맹구,
   짱구,
   뽀로로,
   둘리,
   버찌,
   치즈,
   뚜비,
-  까망,
-  베르,
   댕댕,
   생강,
-  피카츄,
-  라이츄,
-  꼬북,
-  파이리,
-  꼬렛,
+  고래,
   크림,
   수프,
   카레,
   레몬,
   꼬꼬,
   라면,
-  두비둡,
   공주,
   왕자,
   감자,
@@ -60,12 +105,9 @@ export enum Nickname {
   브로,
   새싹,
   참새,
-  뇨끼,
   흰둥이,
   짱아,
-  코스모스,
   로봇,
-  로켓,
   풀잎,
   피자,
   치킨,
@@ -74,29 +116,81 @@ export enum Nickname {
   라임,
   포도,
   홍삼,
-  민트,
-  핑크,
-  블루,
-  레드,
-  블랙,
-  레인보우,
   무지개,
   지우개,
   연필,
-  곰,
-  반달가슴곰,
-  안경,
-  농담곰,
-  라이언,
-  포카리,
+  판다,
   코코아,
-  코코넛,
-  코코,
-  모구모구,
-  샐러드,
-  샐러리,
   우당탕,
   톰,
   제리,
   우엥,
+  라쿤,
+  수달,
+  미어캣,
+  다람쥐,
+  공작,
+  비둘기,
+  호랑이,
+  독수리,
+  돌고래,
+  고릴라,
+  코끼리,
+  갈매기,
+  북극곰,
+  원숭이,
+  두더지,
+  캥거루,
+  오소리,
+  코알라,
+  코뿔소,
+  사자,
+  물개,
+  펭귄,
+  기린,
+  사슴,
+  염소,
+  늑대,
+  낙타,
+  박쥐,
+  나비,
+  상어,
+  오리,
+  거위,
+  꿀벌,
+  조개,
+  하마,
+  멜론,
+  리치,
+  앵두,
+  자몽,
+  자두,
+  사과,
+  망고,
+  체리,
+  단감,
+  감귤,
+  밤,
+  밤양갱,
+  수박,
+  살구,
+  복숭아,
+  청포도,
+  오렌지,
+  코코넛,
+  가지,
+  개나리,
+  난초,
+  데이지,
+  들국화,
+  동백꽃,
+  모란,
+  목화,
+  보리,
+  벚꽃,
+  부들,
+  선인장,
+  옥수수,
+  대나무,
+  소나무,
 }

src/decorators/swagger/auth.decorator.ts

@@ -18,7 +18,7 @@ import {
   SignupPhoneRequestDto,
   SignupUserRequestDto,
   TokenResponseDto,
-} from 'src/auth/dtos';
+} from 'src/domain/auth/dtos';
 
 export function CheckCodeDocs() {
   return applyDecorators(

src/decorators/swagger/blurting.decorator.ts

@@ -17,7 +17,7 @@ import {
   ReplyRequestDto,
   BlurtingProfileDto,
   BlurtingPageDto,
-} from 'src/blurting/dtos';
+} from 'src/domain/blurting/dtos';
 
 export function BlurtingStateDocs() {
   return applyDecorators(

src/decorators/swagger/chat.decorator.ts

@@ -5,8 +5,8 @@ import {
   ApiOperation,
   ApiParam,
 } from '@nestjs/swagger';
-import { RoomChatDto, RoomInfoDto } from 'src/dtos/chat.dto';
-import { UserProfileDto } from 'src/dtos/user.dto';
+import { RoomChatDto, RoomInfoDto } from 'src/domain/dtos/chat.dto';
+import { UserProfileDto } from 'src/domain/dtos/user.dto';
 
 type ChatEndpoints = 'getChatRooms' | 'getChats' | 'getUserProfile';
 export function Docs(endpoint: ChatEndpoints) {

src/decorators/swagger/fcm.decorator.ts

@@ -1,6 +1,6 @@
 import { applyDecorators } from '@nestjs/common';
 import { ApiOkResponse, ApiOperation } from '@nestjs/swagger';
-import { NotificationListDto } from 'src/firebase/dtos/notificationList.dto';
+import { NotificationListDto } from 'src/domain/firebase/dtos/notificationList.dto';
 
 type FcmEndpoints =
   | 'getNotificationList'

src/decorators/swagger/home.decorator.ts

@@ -1,8 +1,14 @@
 import { applyDecorators } from '@nestjs/common';
-import { ApiBody, ApiOkResponse, ApiOperation } from '@nestjs/swagger';
-import { HomeInfoResponseDto, likeHomeAnswerDto } from 'src/home/dtos';
+import {
+  ApiBody,
+  ApiOkResponse,
+  ApiOperation,
+  ApiResponse,
+} from '@nestjs/swagger';
+import { HomeInfoResponseDto, likeHomeAnswerDto } from 'src/domain/home/dtos';
+import { RandomUserDto } from 'src/domain/home/dtos/homInfoResponse.dto';
 
-type HomeEndPoints = 'default' | 'like' | 'version';
+type HomeEndPoints = 'default' | 'like' | 'version' | 'random';
 export function Docs(endpoint: HomeEndPoints) {
   switch (endpoint) {
     case 'default':
@@ -31,5 +37,12 @@ export function Docs(endpoint: HomeEndPoints) {
           description: 'latestVersion: 최신 버전 정보 반환',
         }),
       );
+    case 'random':
+      return applyDecorators(
+        ApiOperation({
+          summary: '오늘의 인연',
+        }),
+        ApiResponse({ type: RandomUserDto, isArray: true }),
+      );
   }
 }

src/decorators/swagger/point.decorator.ts

@@ -6,7 +6,7 @@ import {
   ApiOperation,
   ApiResponse,
 } from '@nestjs/swagger';
-import { PointHistoryDto } from 'src/dtos/point.dto';
+import { PointHistoryDto } from 'src/domain/dtos/point.dto';
 
 type PointEndpoints =
   | 'checkPoint'

src/decorators/swagger/report.decorator.ts

@@ -1,6 +1,6 @@
 import { applyDecorators } from '@nestjs/common';
 import { ApiBody, ApiOperation, ApiParam } from '@nestjs/swagger';
-import { ReportingRequestDto } from 'src/report/dtos/reportingRequest.dto';
+import { ReportingRequestDto } from 'src/domain/report/dtos/reportingRequest.dto';
 
 export function ReportDocs() {
   return applyDecorators(

src/decorators/swagger/user.decorator.ts

@@ -6,7 +6,7 @@ import {
   ApiOperation,
   ApiResponse,
 } from '@nestjs/swagger';
-import { UpdateProfileDto, UserProfileDto } from 'src/dtos/user.dto';
+import { UpdateProfileDto, UserProfileDto } from 'src/domain/dtos/user.dto';
 
 type UserEndpoints =
   | 'setNotificationToken'