From 9afe8879b8ef78b031488d146c18e1ac809b2f79 Mon Sep 17 00:00:00 2001 From: kyeah Date: Wed, 29 May 2024 14:02:10 +0900 Subject: [PATCH 1/4] renewal: update random nickname --- src/auth/auth.controller.ts | 3 + src/common/enums/index.ts | 2 +- src/common/enums/job.enum.ts | 3 + src/common/enums/nickname.enum.ts | 170 +++++++++++++++++++++++------- src/entities/users.entity.ts | 4 +- src/user/user.service.ts | 27 +++-- 6 files changed, 161 insertions(+), 48 deletions(-) diff --git a/src/auth/auth.controller.ts b/src/auth/auth.controller.ts index efec0a1..077845a 100644 --- a/src/auth/auth.controller.ts +++ b/src/auth/auth.controller.ts @@ -71,6 +71,9 @@ export class AuthController { if (page == 17) { const result = await this.authService.checkComplete(id); if (!result) throw new BadRequestException('invalid info'); + + const nickname = await this.userService.pickRandomNickname(); + await this.userService.updateUser(id, 'userNickname', nickname); await this.userService.createSocketUser(id); return { refreshToken: await this.authService.getRefreshToken(id), diff --git a/src/common/enums/index.ts b/src/common/enums/index.ts index 2f9c8c2..b53daa2 100644 --- a/src/common/enums/index.ts +++ b/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'; diff --git a/src/common/enums/job.enum.ts b/src/common/enums/job.enum.ts index 8fec85d..635f45a 100644 --- a/src/common/enums/job.enum.ts +++ b/src/common/enums/job.enum.ts @@ -1,3 +1,6 @@ export enum Job { Student = '학생', + Worker = '직장인', + Etc = '기타직종', + None = '무직', } diff --git a/src/common/enums/nickname.enum.ts b/src/common/enums/nickname.enum.ts index 2106a77..f3a113e 100644 --- a/src/common/enums/nickname.enum.ts +++ b/src/common/enums/nickname.enum.ts @@ -1,34 +1,86 @@ +export enum PreNickname { + 가냘픈, + 거친, + 검은, + 게으른, + 괜찮은, + 귀여운, + 기쁜, + 노란, + 느린, + 늦은, + 동그란, + 멋진, + 무서운, + 밝은, + 붉은, + 빠른, + 성가신, + 센, + 수줍은, + 슬픈, + 엄청난, + 외로운, + 작은, + 점잖은, + 조그만, + 좋은, + 즐거운, + 짓궂은, + 흰, + 조용한, + 사나운, + 예쁜, + 강한, + 약한, + 푸른, + 활기찬, + 다정한, + 재밌는, + 이상한, + 흔한, + 달콤한, + 쓸쓸한, + 시원한, + 차가운, + 힘찬, + 가벼운, + 화려한, + 빨간, + 주황, + 초록, + 파란, + 분홍, + 남색, + 보라, + 다홍, + 연두, + 검정, + 유령, + 바보, +} + export enum Nickname { 오이, 토마토, - 브로콜리, 감자칩, 토끼, 햄스터, 강쥐, 고앵이, 넙떠기, - 바부팅, 쥑쥑, - 퓨퓨, - 츄츄, 우유, - 샤샥, - 도도독, 뽀삐, - 뽀삐뽀, 두부, 크림빵, 바나나, 초코, - 삼합, 아보카도, 녹차, 딸기, 붕어빵, 호두, - 만쥬, - 델리, 맹구, 짱구, 뽀로로, @@ -36,22 +88,15 @@ export enum Nickname { 버찌, 치즈, 뚜비, - 까망, - 베르, 댕댕, 생강, - 피카츄, - 라이츄, - 꼬북, - 파이리, - 꼬렛, + 고래, 크림, 수프, 카레, 레몬, 꼬꼬, 라면, - 두비둡, 공주, 왕자, 감자, @@ -60,12 +105,9 @@ export enum Nickname { 브로, 새싹, 참새, - 뇨끼, 흰둥이, 짱아, - 코스모스, 로봇, - 로켓, 풀잎, 피자, 치킨, @@ -74,29 +116,81 @@ export enum Nickname { 라임, 포도, 홍삼, - 민트, - 핑크, - 블루, - 레드, - 블랙, - 레인보우, 무지개, 지우개, 연필, - 곰, - 반달가슴곰, - 안경, - 농담곰, - 라이언, - 포카리, + 판다, 코코아, - 코코넛, - 코코, - 모구모구, - 샐러드, - 샐러리, 우당탕, 톰, 제리, 우엥, + 라쿤, + 수달, + 미어캣, + 다람쥐, + 공작, + 비둘기, + 호랑이, + 독수리, + 돌고래, + 고릴라, + 코끼리, + 갈매기, + 북극곰, + 원숭이, + 두더지, + 캥거루, + 오소리, + 코알라, + 코뿔소, + 사자, + 물개, + 펭귄, + 기린, + 사슴, + 염소, + 늑대, + 낙타, + 박쥐, + 나비, + 상어, + 오리, + 거위, + 꿀벌, + 조개, + 하마, + 멜론, + 리치, + 앵두, + 자몽, + 자두, + 사과, + 망고, + 체리, + 단감, + 감귤, + 밤, + 밤양갱, + 수박, + 살구, + 복숭아, + 청포도, + 오렌지, + 코코넛, + 가지, + 개나리, + 난초, + 데이지, + 들국화, + 동백꽃, + 모란, + 목화, + 보리, + 벚꽃, + 부들, + 선인장, + 옥수수, + 대나무, + 소나무, } diff --git a/src/entities/users.entity.ts b/src/entities/users.entity.ts index 25c6993..ef61013 100644 --- a/src/entities/users.entity.ts +++ b/src/entities/users.entity.ts @@ -13,8 +13,8 @@ export class UserEntity { @PrimaryGeneratedColumn() id: number; - @Column({ length: 50 }) - userNickname: string; + @Column({ nullable: true, length: 10 }) + userNickname?: string; @Column({ nullable: true }) birth?: Date; diff --git a/src/user/user.service.ts b/src/user/user.service.ts index d29bc00..229751a 100644 --- a/src/user/user.service.ts +++ b/src/user/user.service.ts @@ -5,7 +5,14 @@ import { CACHE_MANAGER } from '@nestjs/cache-manager'; import { Cache } from 'cache-manager'; import { InjectModel } from '@nestjs/mongoose'; import { Model } from 'mongoose'; -import { Sex, SexOrient, Hobby, Character, Nickname } from 'src/common/enums'; +import { + Sex, + SexOrient, + Hobby, + Character, + Nickname, + PreNickname, +} from 'src/common/enums'; import { CharacterMask, HobbyMask } from 'src/common/const'; import { BlurtingGroupEntity, @@ -52,20 +59,26 @@ export class UserService { } async pickRandomNickname() { + const preNicknames = Object.values(PreNickname).filter((key) => { + return isNaN(Number(key)); + }); const nicknames = Object.values(Nickname).filter((key) => { return isNaN(Number(key)); }); - let rand = Math.floor(Math.random() * 1000); - const index = rand % nicknames.length; - rand = Math.floor(Math.random() * 1000); - const nickname = nicknames[index].toString() + rand.toString(); + const index1 = Math.floor(Math.random() * 1000) % preNicknames.length; + const index2 = Math.floor(Math.random() * 1000) % nicknames.length; + const nickname = + preNicknames[index1].toString() + ' ' + nicknames[index2].toString(); + + if (await this.findUserByVal('userNickname', nickname)) { + return this.pickRandomNickname(); + } + return nickname; } async createUser() { - const nickname = await this.pickRandomNickname(); const user = this.userRepository.create({ - userNickname: nickname, point: 0, }); return await this.userRepository.save(user); From 9f87e2c7cf2c369cc2f100e4d51deff49c47d9fe Mon Sep 17 00:00:00 2001 From: kyeah Date: Wed, 29 May 2024 17:50:48 +0900 Subject: [PATCH 2/4] feat(home): today's random users --- src/decorators/swagger/home.decorator.ts | 17 +++++++++++-- src/entities/userInfo.entity.ts | 3 +++ src/home/dtos/homInfoResponse.dto.ts | 21 ++++++++++++++++ src/home/home.controller.ts | 8 ++++++ src/home/home.module.ts | 4 +++ src/home/home.service.ts | 32 +++++++++++++++++++++++- src/repositories/user.repository.ts | 31 ++++++++++++++++++++++- 7 files changed, 112 insertions(+), 4 deletions(-) diff --git a/src/decorators/swagger/home.decorator.ts b/src/decorators/swagger/home.decorator.ts index 33f494a..feddf69 100644 --- a/src/decorators/swagger/home.decorator.ts +++ b/src/decorators/swagger/home.decorator.ts @@ -1,8 +1,14 @@ import { applyDecorators } from '@nestjs/common'; -import { ApiBody, ApiOkResponse, ApiOperation } from '@nestjs/swagger'; +import { + ApiBody, + ApiOkResponse, + ApiOperation, + ApiResponse, +} from '@nestjs/swagger'; import { HomeInfoResponseDto, likeHomeAnswerDto } from 'src/home/dtos'; +import { RandomUserDto } from 'src/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 }), + ); } } diff --git a/src/entities/userInfo.entity.ts b/src/entities/userInfo.entity.ts index db7bb8d..6a710a1 100644 --- a/src/entities/userInfo.entity.ts +++ b/src/entities/userInfo.entity.ts @@ -77,6 +77,9 @@ export class UserInfoEntity { @Column({ nullable: true, type: 'enum', enum: Job }) job?: Job; + @Column({ nullable: true }) + comment?: string; + @OneToOne(() => UserEntity, { onDelete: 'CASCADE', onUpdate: 'CASCADE' }) @JoinColumn() user: UserEntity; diff --git a/src/home/dtos/homInfoResponse.dto.ts b/src/home/dtos/homInfoResponse.dto.ts index d3ac9fd..6e4d35d 100644 --- a/src/home/dtos/homInfoResponse.dto.ts +++ b/src/home/dtos/homInfoResponse.dto.ts @@ -1,6 +1,27 @@ import { ApiProperty } from '@nestjs/swagger'; import { AnswerWithQuestionDto } from './answerWithQuestion.dto'; +export class RandomUserDto { + @ApiProperty({ description: '유저 아이디' }) + id: number; + + @ApiProperty({ description: '유저 닉네임' }) + userNickname: string; + + @ApiProperty({ description: '유저 사진' }) + image: string; + + @ApiProperty({ description: '유저 한줄소개' }) + comment: string; + + constructor(user, images: string[]) { + this.id = user.id; + this.userNickname = user.userNickname; + this.image = images.length > 0 ? images[0] : null; + this.comment = user.comment ?? ''; + } +} + export class HomeInfoResponseDto { @ApiProperty({ description: 'MVP 질문들', type: [AnswerWithQuestionDto] }) answers: AnswerWithQuestionDto[]; diff --git a/src/home/home.controller.ts b/src/home/home.controller.ts index f4e8e9a..d52ad85 100644 --- a/src/home/home.controller.ts +++ b/src/home/home.controller.ts @@ -34,6 +34,14 @@ export class HomeController { await this.homeService.likeAnswer(id, answerId); } + @Get('/todayRandom') + @UseGuards(AuthGuard('access')) + @Docs('random') + async getTodayRandom(@User() userPayload: JwtPayload) { + const { id } = userPayload; + return await this.homeService.getRandomUsers(id); + } + @Get('/version') @Docs('version') async getVersion() { diff --git a/src/home/home.module.ts b/src/home/home.module.ts index 748afb1..c96855e 100644 --- a/src/home/home.module.ts +++ b/src/home/home.module.ts @@ -7,6 +7,7 @@ import { BlurtingAnswerEntity, LikeEntity, UserEntity, + UserImageEntity, } from 'src/entities'; import { MongooseModule } from '@nestjs/mongoose'; import { Chatting, ChattingSchema } from 'src/chat/models'; @@ -16,13 +17,16 @@ import { BlurtingLikeRepository, UserRepository, } from 'src/repositories'; +import { UserModule } from 'src/user/user.module'; @Module({ imports: [ + UserModule, TypeOrmModule.forFeature([ LikeEntity, BlurtingArrowEntity, UserEntity, + UserImageEntity, BlurtingAnswerEntity, ]), MongooseModule.forFeature([ diff --git a/src/home/home.service.ts b/src/home/home.service.ts index e72e9e6..9d94514 100644 --- a/src/home/home.service.ts +++ b/src/home/home.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { HomeInfoResponseDto } from './dtos/homInfoResponse.dto'; +import { HomeInfoResponseDto, RandomUserDto } from './dtos/homInfoResponse.dto'; import { InjectModel } from '@nestjs/mongoose'; import { Chatting } from 'src/chat/models'; import { Model } from 'mongoose'; @@ -11,6 +11,8 @@ import { } from 'src/repositories'; import { compareDateGroupExist, getDateTimeOfNow } from 'src/common/util/time'; import { AnswerWithQuestionDto } from './dtos'; +import { UserService } from 'src/user/user.service'; +import { Sex, SexOrient } from 'src/common/enums'; @Injectable() export class HomeService { @@ -21,6 +23,7 @@ export class HomeService { private readonly answerRepository: BlurtingAnswerRepository, @InjectModel(Chatting.name) private readonly chattingModel: Model, + private readonly userService: UserService, ) {} async likeAnswer(userId: number, answerId: number) { @@ -98,4 +101,31 @@ export class HomeService { likes, }; } + + async getRandomUsers(userId: number): Promise { + const user = await this.userRepository.findOneById(userId); + let oppositeSex: Sex[]; + if (user.userInfo.sexOrient == SexOrient.Bisexual) { + oppositeSex = [Sex.Female, Sex.Male]; + } else if (user.userInfo.sexOrient == SexOrient.Homosexual) { + oppositeSex = [user.userInfo.sex]; + } else if (user.userInfo.sex == Sex.Female) { + oppositeSex = [Sex.Male]; + } else { + oppositeSex = [Sex.Female]; + } + + const randomUsers = await this.userRepository.selectRandom( + 3, + userId, + oppositeSex, + user.userInfo.sexOrient, + ); + return Promise.all( + randomUsers.map(async (user) => { + const images = await this.userService.getUserImages(user.id); + return new RandomUserDto(user, images); + }), + ); + } } diff --git a/src/repositories/user.repository.ts b/src/repositories/user.repository.ts index f101df5..76fc6c3 100644 --- a/src/repositories/user.repository.ts +++ b/src/repositories/user.repository.ts @@ -1,5 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import { Sex, SexOrient } from 'src/common/enums'; import { UserEntity } from 'src/entities'; import { Repository } from 'typeorm'; @@ -10,10 +11,38 @@ export class UserRepository { private readonly userRepository: Repository, ) {} - async findOneById(id: number) { + async findOneById(id: number): Promise { return await this.userRepository.findOne({ where: { id }, relations: ['group', 'userInfo'], }); } + + async selectRandom( + count: number, + id: number, + sex: Sex[], + sexOrient: SexOrient, + ) { + const seed = + new Date().getMonth().toString() + + new Date().getDay().toString() + + id.toString(); + await this.userRepository.query( + `SELECT setseed(${Number(seed) / 10 ** seed.length})`, + ); + + const users = await this.userRepository + .createQueryBuilder('user') + .leftJoinAndSelect('user.userInfo', 'userInfo') + .where('user.token IS NOT NULL') + .andWhere('user.id != :id', { id: id }) + .andWhere('userInfo.sex IN(:...sex)', { sex: sex }) + .andWhere('userInfo.sexOrient = :sexOrient', { sexOrient: sexOrient }) + .orderBy('RANDOM()') + .limit(count) + .getMany(); + + return users; + } } From 23633a02e8d864d191fafdca46f16bee0bc5a5c2 Mon Sep 17 00:00:00 2001 From: overthestream Date: Wed, 5 Jun 2024 09:10:50 +0900 Subject: [PATCH 3/4] fix home time to 3 hour part --- src/home/home.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/home/home.service.ts b/src/home/home.service.ts index e72e9e6..33a2cab 100644 --- a/src/home/home.service.ts +++ b/src/home/home.service.ts @@ -63,7 +63,7 @@ export class HomeService { if (user.group && compareDateGroupExist(user.group.createdAt)) { const timeOffset = getDateTimeOfNow().getTime() - user.group.createdAt.getTime(); - seconds = 8 * 60 * 60 * 1000 - (timeOffset % (8 * 60 * 60 * 1000)); + seconds = 3 * 60 * 60 * 1000 - (timeOffset % (3 * 60 * 60 * 1000)); } const chats = await this.chattingModel.find(); From 04e2c830028aa09dc790d18e377cd42d971ea8be Mon Sep 17 00:00:00 2001 From: overthestream Date: Wed, 5 Jun 2024 09:13:05 +0900 Subject: [PATCH 4/4] fix directory structure --- src/app.controller.spec.ts | 22 ------------------- src/app.module.ts | 22 +++++++++---------- src/decorators/swagger/auth.decorator.ts | 2 +- src/decorators/swagger/blurting.decorator.ts | 2 +- src/decorators/swagger/chat.decorator.ts | 4 ++-- src/decorators/swagger/fcm.decorator.ts | 2 +- src/decorators/swagger/home.decorator.ts | 4 ++-- src/decorators/swagger/point.decorator.ts | 2 +- src/decorators/swagger/report.decorator.ts | 2 +- src/decorators/swagger/user.decorator.ts | 2 +- src/{ => domain}/auth/auth.controller.ts | 4 ++-- src/{ => domain}/auth/auth.module.ts | 6 ++--- src/{ => domain}/auth/auth.service.ts | 4 ++-- src/{ => domain}/auth/dtos/index.ts | 0 .../auth/dtos/signupRequest.dto.ts | 0 .../auth/dtos/tokenResponseDto.ts | 0 src/{ => domain}/auth/guard/access.guard.ts | 0 src/{ => domain}/auth/guard/refresh.guard.ts | 0 src/{ => domain}/auth/guard/signup.guard.ts | 0 src/{ => domain}/auth/passport/index.ts | 0 .../auth/passport/jwt-access.strategy.ts | 0 .../auth/passport/jwt-refresh.strategy.ts | 2 +- .../auth/passport/jwt-signup.strategy.ts | 0 .../blurting/blurting.consumer.ts | 6 ++--- .../blurting/blurting.controller.ts | 4 ++-- src/{ => domain}/blurting/blurting.module.ts | 12 +++++----- src/{ => domain}/blurting/blurting.service.ts | 12 +++++----- .../blurting/blurtingGroup.consumer.ts | 2 +- src/{ => domain}/blurting/dtos/answer.dto.ts | 0 src/{ => domain}/blurting/dtos/arrow.dto.ts | 0 src/{ => domain}/blurting/dtos/index.ts | 0 src/{ => domain}/blurting/dtos/member.dto.ts | 2 +- .../blurting/dtos/pageResponse.dto.ts | 2 +- .../blurting/dtos/question.dto.ts | 0 src/{ => domain}/blurting/dtos/reply.dto.ts | 0 .../blurting/dtos/replyRequest.dto.ts | 0 src/{ => domain}/chat/chat.controller.ts | 4 ++-- src/{ => domain}/chat/chat.gateway.ts | 6 ++--- src/{ => domain}/chat/chat.module.ts | 8 +++---- src/{ => domain}/chat/chat.service.ts | 10 ++++----- .../chat/models/chatting.model.ts | 0 src/{ => domain}/chat/models/index.ts | 0 src/{ => domain}/chat/models/room.model.ts | 2 +- .../chat/models/socketUser.model.ts | 0 src/{ => domain}/dtos/chat.dto.ts | 2 +- src/{ => domain}/dtos/point.dto.ts | 2 +- src/{ => domain}/dtos/user.dto.ts | 4 ++-- src/{ => domain}/entities/authMail.entity.ts | 2 +- .../entities/authPhoneNumber.entity.ts | 0 .../entities/blurtingAnswer.entity.ts | 0 .../entities/blurtingArrow.entity.ts | 0 .../entities/blurtingEvent.entity.ts | 0 .../entities/blurtingGroup.entity.ts | 0 .../entities/blurtingPreQuestion.entity.ts | 0 .../entities/blurtingQuestion.entity.ts | 0 src/{ => domain}/entities/index.ts | 0 src/{ => domain}/entities/like.entity.ts | 0 .../entities/notification.entity.ts | 0 .../entities/pointHistory.entity.ts | 2 +- src/{ => domain}/entities/reply.entity.ts | 0 src/{ => domain}/entities/report.entity.ts | 0 src/{ => domain}/entities/toCheck.entity.ts | 2 +- src/{ => domain}/entities/userImage.entity.ts | 2 +- src/{ => domain}/entities/userInfo.entity.ts | 2 +- src/{ => domain}/entities/users.entity.ts | 2 +- src/{ => domain}/event/dtos/event.dto.ts | 0 src/{ => domain}/event/event.controller.ts | 14 ++++++------ src/{ => domain}/event/event.module.ts | 8 +++---- src/{ => domain}/event/event.service.ts | 12 +++++----- .../firebase/dtos/notificationList.dto.ts | 2 +- src/{ => domain}/firebase/fcm.controller.ts | 2 +- src/{ => domain}/firebase/fcm.module.ts | 4 ++-- src/{ => domain}/firebase/fcm.service.ts | 4 ++-- .../geocoding/geocoding.controller.ts | 0 .../geocoding/geocoding.module.ts | 0 .../geocoding/geocoding.service.ts | 0 .../home/dtos/answerWithQuestion.dto.ts | 4 ++-- .../home/dtos/homInfoResponse.dto.ts | 0 src/{ => domain}/home/dtos/index.ts | 0 .../home/dtos/likeHomeAnswer.dto.ts | 0 src/{ => domain}/home/home.controller.ts | 0 src/{ => domain}/home/home.module.ts | 8 +++---- src/{ => domain}/home/home.service.ts | 6 ++--- src/{ => domain}/point/point.controller.ts | 8 +++---- src/{ => domain}/point/point.module.ts | 8 +++---- src/{ => domain}/point/point.service.ts | 8 +++---- .../report/dtos/reportingRequest.dto.ts | 0 src/{ => domain}/report/report.controller.ts | 0 src/{ => domain}/report/report.module.ts | 4 ++-- src/{ => domain}/report/report.service.ts | 2 +- .../repositories/authMail.repository.ts | 2 +- .../authPhoneNumber.repository.ts | 2 +- .../repositories/blurtingAnswer.repository.ts | 4 ++-- .../repositories/blurtingArrow.repository.ts | 4 ++-- .../repositories/blurtingGroup.repository.ts | 2 +- .../repositories/blurtingLike.repository.ts | 2 +- .../blurtingPreQuestion.repository.ts | 7 ++++-- .../blurtingQuestion.repository.ts | 7 ++++-- .../repositories/blurtingReply.repository.ts | 8 +++++-- src/{ => domain}/repositories/index.ts | 0 .../repositories/notification.repository.ts | 2 +- .../repositories/report.repository.ts | 2 +- .../repositories/user.repository.ts | 2 +- src/{ => domain}/s3/dtos/fileUploadDto.ts | 0 src/{ => domain}/s3/s3.controller.ts | 0 src/{ => domain}/s3/s3.module.ts | 0 src/{ => domain}/s3/s3.service.ts | 0 src/{ => domain}/user/user.controller.ts | 6 ++--- src/{ => domain}/user/user.module.ts | 10 ++++++--- src/{ => domain}/user/user.service.ts | 6 ++--- src/event/event.controller.spec.ts | 18 --------------- src/event/event.service.spec.ts | 18 --------------- src/s3/s3.controller.spec.ts | 18 --------------- src/s3/s3.service.spec.ts | 18 --------------- 114 files changed, 161 insertions(+), 241 deletions(-) delete mode 100644 src/app.controller.spec.ts rename src/{ => domain}/auth/auth.controller.ts (97%) rename src/{ => domain}/auth/auth.module.ts (82%) rename src/{ => domain}/auth/auth.service.ts (97%) rename src/{ => domain}/auth/dtos/index.ts (100%) rename src/{ => domain}/auth/dtos/signupRequest.dto.ts (100%) rename src/{ => domain}/auth/dtos/tokenResponseDto.ts (100%) rename src/{ => domain}/auth/guard/access.guard.ts (100%) rename src/{ => domain}/auth/guard/refresh.guard.ts (100%) rename src/{ => domain}/auth/guard/signup.guard.ts (100%) rename src/{ => domain}/auth/passport/index.ts (100%) rename src/{ => domain}/auth/passport/jwt-access.strategy.ts (100%) rename src/{ => domain}/auth/passport/jwt-refresh.strategy.ts (94%) rename src/{ => domain}/auth/passport/jwt-signup.strategy.ts (100%) rename src/{ => domain}/blurting/blurting.consumer.ts (91%) rename src/{ => domain}/blurting/blurting.controller.ts (98%) rename src/{ => domain}/blurting/blurting.module.ts (89%) rename src/{ => domain}/blurting/blurting.service.ts (98%) rename src/{ => domain}/blurting/blurtingGroup.consumer.ts (94%) rename src/{ => domain}/blurting/dtos/answer.dto.ts (100%) rename src/{ => domain}/blurting/dtos/arrow.dto.ts (100%) rename src/{ => domain}/blurting/dtos/index.ts (100%) rename src/{ => domain}/blurting/dtos/member.dto.ts (93%) rename src/{ => domain}/blurting/dtos/pageResponse.dto.ts (99%) rename src/{ => domain}/blurting/dtos/question.dto.ts (100%) rename src/{ => domain}/blurting/dtos/reply.dto.ts (100%) rename src/{ => domain}/blurting/dtos/replyRequest.dto.ts (100%) rename src/{ => domain}/chat/chat.controller.ts (90%) rename src/{ => domain}/chat/chat.gateway.ts (96%) rename src/{ => domain}/chat/chat.module.ts (78%) rename src/{ => domain}/chat/chat.service.ts (97%) rename src/{ => domain}/chat/models/chatting.model.ts (100%) rename src/{ => domain}/chat/models/index.ts (100%) rename src/{ => domain}/chat/models/room.model.ts (95%) rename src/{ => domain}/chat/models/socketUser.model.ts (100%) rename src/{ => domain}/dtos/chat.dto.ts (98%) rename src/{ => domain}/dtos/point.dto.ts (89%) rename src/{ => domain}/dtos/user.dto.ts (94%) rename src/{ => domain}/entities/authMail.entity.ts (88%) rename src/{ => domain}/entities/authPhoneNumber.entity.ts (100%) rename src/{ => domain}/entities/blurtingAnswer.entity.ts (100%) rename src/{ => domain}/entities/blurtingArrow.entity.ts (100%) rename src/{ => domain}/entities/blurtingEvent.entity.ts (100%) rename src/{ => domain}/entities/blurtingGroup.entity.ts (100%) rename src/{ => domain}/entities/blurtingPreQuestion.entity.ts (100%) rename src/{ => domain}/entities/blurtingQuestion.entity.ts (100%) rename src/{ => domain}/entities/index.ts (100%) rename src/{ => domain}/entities/like.entity.ts (100%) rename src/{ => domain}/entities/notification.entity.ts (100%) rename src/{ => domain}/entities/pointHistory.entity.ts (88%) rename src/{ => domain}/entities/reply.entity.ts (100%) rename src/{ => domain}/entities/report.entity.ts (100%) rename src/{ => domain}/entities/toCheck.entity.ts (84%) rename src/{ => domain}/entities/userImage.entity.ts (87%) rename src/{ => domain}/entities/userInfo.entity.ts (96%) rename src/{ => domain}/entities/users.entity.ts (89%) rename src/{ => domain}/event/dtos/event.dto.ts (100%) rename src/{ => domain}/event/event.controller.ts (95%) rename src/{ => domain}/event/event.module.ts (86%) rename src/{ => domain}/event/event.service.ts (96%) rename src/{ => domain}/firebase/dtos/notificationList.dto.ts (92%) rename src/{ => domain}/firebase/fcm.controller.ts (94%) rename src/{ => domain}/firebase/fcm.module.ts (80%) rename src/{ => domain}/firebase/fcm.service.ts (96%) rename src/{ => domain}/geocoding/geocoding.controller.ts (100%) rename src/{ => domain}/geocoding/geocoding.module.ts (100%) rename src/{ => domain}/geocoding/geocoding.service.ts (100%) rename src/{ => domain}/home/dtos/answerWithQuestion.dto.ts (77%) rename src/{ => domain}/home/dtos/homInfoResponse.dto.ts (100%) rename src/{ => domain}/home/dtos/index.ts (100%) rename src/{ => domain}/home/dtos/likeHomeAnswer.dto.ts (100%) rename src/{ => domain}/home/home.controller.ts (100%) rename src/{ => domain}/home/home.module.ts (83%) rename src/{ => domain}/home/home.service.ts (96%) rename src/{ => domain}/point/point.controller.ts (90%) rename src/{ => domain}/point/point.module.ts (64%) rename src/{ => domain}/point/point.service.ts (94%) rename src/{ => domain}/report/dtos/reportingRequest.dto.ts (100%) rename src/{ => domain}/report/report.controller.ts (100%) rename src/{ => domain}/report/report.module.ts (76%) rename src/{ => domain}/report/report.service.ts (88%) rename src/{ => domain}/repositories/authMail.repository.ts (93%) rename src/{ => domain}/repositories/authPhoneNumber.repository.ts (95%) rename src/{ => domain}/repositories/blurtingAnswer.repository.ts (96%) rename src/{ => domain}/repositories/blurtingArrow.repository.ts (92%) rename src/{ => domain}/repositories/blurtingGroup.repository.ts (89%) rename src/{ => domain}/repositories/blurtingLike.repository.ts (95%) rename src/{ => domain}/repositories/blurtingPreQuestion.repository.ts (86%) rename src/{ => domain}/repositories/blurtingQuestion.repository.ts (90%) rename src/{ => domain}/repositories/blurtingReply.repository.ts (80%) rename src/{ => domain}/repositories/index.ts (100%) rename src/{ => domain}/repositories/notification.repository.ts (89%) rename src/{ => domain}/repositories/report.repository.ts (95%) rename src/{ => domain}/repositories/user.repository.ts (96%) rename src/{ => domain}/s3/dtos/fileUploadDto.ts (100%) rename src/{ => domain}/s3/s3.controller.ts (100%) rename src/{ => domain}/s3/s3.module.ts (100%) rename src/{ => domain}/s3/s3.service.ts (100%) rename src/{ => domain}/user/user.controller.ts (93%) rename src/{ => domain}/user/user.module.ts (85%) rename src/{ => domain}/user/user.service.ts (98%) delete mode 100644 src/event/event.controller.spec.ts delete mode 100644 src/event/event.service.spec.ts delete mode 100644 src/s3/s3.controller.spec.ts delete mode 100644 src/s3/s3.service.spec.ts diff --git a/src/app.controller.spec.ts b/src/app.controller.spec.ts deleted file mode 100644 index d22f389..0000000 --- a/src/app.controller.spec.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { AppController } from './app.controller'; -import { AppService } from './app.service'; - -describe('AppController', () => { - let appController: AppController; - - beforeEach(async () => { - const app: TestingModule = await Test.createTestingModule({ - controllers: [AppController], - providers: [AppService], - }).compile(); - - appController = app.get(AppController); - }); - - describe('root', () => { - it('should return "Hello World!"', () => { - expect(appController.getHello()).toBe('Hello World!'); - }); - }); -}); diff --git a/src/app.module.ts b/src/app.module.ts index f54b6d9..63fe699 100644 --- a/src/app.module.ts +++ b/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: [ diff --git a/src/decorators/swagger/auth.decorator.ts b/src/decorators/swagger/auth.decorator.ts index af04858..cf0d30d 100644 --- a/src/decorators/swagger/auth.decorator.ts +++ b/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( diff --git a/src/decorators/swagger/blurting.decorator.ts b/src/decorators/swagger/blurting.decorator.ts index a416873..dffc5b9 100644 --- a/src/decorators/swagger/blurting.decorator.ts +++ b/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( diff --git a/src/decorators/swagger/chat.decorator.ts b/src/decorators/swagger/chat.decorator.ts index 9a05718..0b3cd1e 100644 --- a/src/decorators/swagger/chat.decorator.ts +++ b/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) { diff --git a/src/decorators/swagger/fcm.decorator.ts b/src/decorators/swagger/fcm.decorator.ts index 4a68816..3875c03 100644 --- a/src/decorators/swagger/fcm.decorator.ts +++ b/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' diff --git a/src/decorators/swagger/home.decorator.ts b/src/decorators/swagger/home.decorator.ts index feddf69..bab1ba1 100644 --- a/src/decorators/swagger/home.decorator.ts +++ b/src/decorators/swagger/home.decorator.ts @@ -5,8 +5,8 @@ import { ApiOperation, ApiResponse, } from '@nestjs/swagger'; -import { HomeInfoResponseDto, likeHomeAnswerDto } from 'src/home/dtos'; -import { RandomUserDto } from 'src/home/dtos/homInfoResponse.dto'; +import { HomeInfoResponseDto, likeHomeAnswerDto } from 'src/domain/home/dtos'; +import { RandomUserDto } from 'src/domain/home/dtos/homInfoResponse.dto'; type HomeEndPoints = 'default' | 'like' | 'version' | 'random'; export function Docs(endpoint: HomeEndPoints) { diff --git a/src/decorators/swagger/point.decorator.ts b/src/decorators/swagger/point.decorator.ts index 3a6bf75..8315be7 100644 --- a/src/decorators/swagger/point.decorator.ts +++ b/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' diff --git a/src/decorators/swagger/report.decorator.ts b/src/decorators/swagger/report.decorator.ts index 07d9ee1..9db938f 100644 --- a/src/decorators/swagger/report.decorator.ts +++ b/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( diff --git a/src/decorators/swagger/user.decorator.ts b/src/decorators/swagger/user.decorator.ts index 001d9da..1af211d 100644 --- a/src/decorators/swagger/user.decorator.ts +++ b/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' diff --git a/src/auth/auth.controller.ts b/src/domain/auth/auth.controller.ts similarity index 97% rename from src/auth/auth.controller.ts rename to src/domain/auth/auth.controller.ts index 077845a..463a104 100644 --- a/src/auth/auth.controller.ts +++ b/src/domain/auth/auth.controller.ts @@ -8,11 +8,11 @@ import { BadRequestException, } from '@nestjs/common'; import { AuthService } from './auth.service'; -import { UserService } from 'src/user/user.service'; +import { UserService } from 'src/domain/user/user.service'; import { JwtPayload, SignupPayload } from 'src/interfaces/auth'; import { SignupGuard } from './guard/signup.guard'; import { Page } from 'src/common/enums/page.enum'; -import { LoginDto } from 'src/dtos/user.dto'; +import { LoginDto } from 'src/domain/dtos/user.dto'; import { ApiTags } from '@nestjs/swagger'; import { SignupTokenResponseDto, diff --git a/src/auth/auth.module.ts b/src/domain/auth/auth.module.ts similarity index 82% rename from src/auth/auth.module.ts rename to src/domain/auth/auth.module.ts index 6b9ef1f..1657b85 100644 --- a/src/auth/auth.module.ts +++ b/src/domain/auth/auth.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { AuthPhoneNumberEntity } from 'src/entities'; +import { AuthPhoneNumberEntity } from 'src/domain/entities'; import { JwtSignupStrategy, JwtAccessStrategy, @@ -11,8 +11,8 @@ import { AuthController } from './auth.controller'; import { AuthService } from './auth.service'; import { PassportModule } from '@nestjs/passport'; import { JwtModule } from '@nestjs/jwt'; -import { UserModule } from 'src/user/user.module'; -import { AuthPhoneNumberRepository } from 'src/repositories'; +import { UserModule } from 'src/domain/user/user.module'; +import { AuthPhoneNumberRepository } from 'src/domain/repositories'; @Module({ imports: [ UserModule, diff --git a/src/auth/auth.service.ts b/src/domain/auth/auth.service.ts similarity index 97% rename from src/auth/auth.service.ts rename to src/domain/auth/auth.service.ts index 393efe8..1238982 100644 --- a/src/auth/auth.service.ts +++ b/src/domain/auth/auth.service.ts @@ -9,9 +9,9 @@ import { } from '@nestjs/common'; import axios from 'axios'; import { JwtService } from '@nestjs/jwt'; -import { UserService } from 'src/user/user.service'; +import { UserService } from 'src/domain/user/user.service'; import { JwtPayload, SignupPayload } from 'src/interfaces/auth'; -import { AuthPhoneNumberRepository } from 'src/repositories'; +import { AuthPhoneNumberRepository } from 'src/domain/repositories'; // eslint-disable-next-line @typescript-eslint/no-var-requires const crypto = require('crypto'); diff --git a/src/auth/dtos/index.ts b/src/domain/auth/dtos/index.ts similarity index 100% rename from src/auth/dtos/index.ts rename to src/domain/auth/dtos/index.ts diff --git a/src/auth/dtos/signupRequest.dto.ts b/src/domain/auth/dtos/signupRequest.dto.ts similarity index 100% rename from src/auth/dtos/signupRequest.dto.ts rename to src/domain/auth/dtos/signupRequest.dto.ts diff --git a/src/auth/dtos/tokenResponseDto.ts b/src/domain/auth/dtos/tokenResponseDto.ts similarity index 100% rename from src/auth/dtos/tokenResponseDto.ts rename to src/domain/auth/dtos/tokenResponseDto.ts diff --git a/src/auth/guard/access.guard.ts b/src/domain/auth/guard/access.guard.ts similarity index 100% rename from src/auth/guard/access.guard.ts rename to src/domain/auth/guard/access.guard.ts diff --git a/src/auth/guard/refresh.guard.ts b/src/domain/auth/guard/refresh.guard.ts similarity index 100% rename from src/auth/guard/refresh.guard.ts rename to src/domain/auth/guard/refresh.guard.ts diff --git a/src/auth/guard/signup.guard.ts b/src/domain/auth/guard/signup.guard.ts similarity index 100% rename from src/auth/guard/signup.guard.ts rename to src/domain/auth/guard/signup.guard.ts diff --git a/src/auth/passport/index.ts b/src/domain/auth/passport/index.ts similarity index 100% rename from src/auth/passport/index.ts rename to src/domain/auth/passport/index.ts diff --git a/src/auth/passport/jwt-access.strategy.ts b/src/domain/auth/passport/jwt-access.strategy.ts similarity index 100% rename from src/auth/passport/jwt-access.strategy.ts rename to src/domain/auth/passport/jwt-access.strategy.ts diff --git a/src/auth/passport/jwt-refresh.strategy.ts b/src/domain/auth/passport/jwt-refresh.strategy.ts similarity index 94% rename from src/auth/passport/jwt-refresh.strategy.ts rename to src/domain/auth/passport/jwt-refresh.strategy.ts index 49224b4..b589176 100644 --- a/src/auth/passport/jwt-refresh.strategy.ts +++ b/src/domain/auth/passport/jwt-refresh.strategy.ts @@ -2,7 +2,7 @@ import { HttpException, Injectable } from '@nestjs/common'; import { PassportStrategy } from '@nestjs/passport'; import { Strategy, ExtractJwt } from 'passport-jwt'; import { JwtPayload } from 'src/interfaces/auth'; -import { UserService } from 'src/user/user.service'; +import { UserService } from 'src/domain/user/user.service'; import { Request } from 'express'; @Injectable() diff --git a/src/auth/passport/jwt-signup.strategy.ts b/src/domain/auth/passport/jwt-signup.strategy.ts similarity index 100% rename from src/auth/passport/jwt-signup.strategy.ts rename to src/domain/auth/passport/jwt-signup.strategy.ts diff --git a/src/blurting/blurting.consumer.ts b/src/domain/blurting/blurting.consumer.ts similarity index 91% rename from src/blurting/blurting.consumer.ts rename to src/domain/blurting/blurting.consumer.ts index b789c66..074c89b 100644 --- a/src/blurting/blurting.consumer.ts +++ b/src/domain/blurting/blurting.consumer.ts @@ -8,9 +8,9 @@ import { } from '@nestjs/bull'; import { Job, Queue } from 'bull'; import { BlurtingService } from './blurting.service'; -import { BlurtingGroupEntity } from 'src/entities'; -import { FcmService } from 'src/firebase/fcm.service'; -import { ChatService } from 'src/chat/chat.service'; +import { BlurtingGroupEntity } from 'src/domain/entities'; +import { FcmService } from 'src/domain/firebase/fcm.service'; +import { ChatService } from 'src/domain/chat/chat.service'; @Processor('blurtingQuestions') export class BlurtingConsumer { diff --git a/src/blurting/blurting.controller.ts b/src/domain/blurting/blurting.controller.ts similarity index 98% rename from src/blurting/blurting.controller.ts rename to src/domain/blurting/blurting.controller.ts index 2e4cb33..f0a7ff1 100644 --- a/src/blurting/blurting.controller.ts +++ b/src/domain/blurting/blurting.controller.ts @@ -13,7 +13,7 @@ import { Response } from 'express'; import { BlurtingService } from './blurting.service'; import { AuthGuard } from '@nestjs/passport'; import { JwtPayload } from 'src/interfaces/auth'; -import { UserService } from 'src/user/user.service'; +import { UserService } from 'src/domain/user/user.service'; import { AnswerRequestDto, OtherPeopleInfoDto, @@ -22,7 +22,7 @@ import { BlurtingPageDto, BlurtingProfileDto, ArrowResultResponseDto, -} from 'src/blurting/dtos'; +} from 'src/domain/blurting/dtos'; import { ApiParam, ApiTags } from '@nestjs/swagger'; import { AnswerDocs, diff --git a/src/blurting/blurting.module.ts b/src/domain/blurting/blurting.module.ts similarity index 89% rename from src/blurting/blurting.module.ts rename to src/domain/blurting/blurting.module.ts index bb1e3f1..6f9b50f 100644 --- a/src/blurting/blurting.module.ts +++ b/src/domain/blurting/blurting.module.ts @@ -12,15 +12,15 @@ import { ReplyEntity, BlurtingPreQuestionEntity, ReportEntity, -} from 'src/entities'; -import { UserModule } from 'src/user/user.module'; +} from 'src/domain/entities'; +import { UserModule } from 'src/domain/user/user.module'; import { CacheModule } from '@nestjs/cache-manager'; import { redisStore } from 'cache-manager-redis-store'; import { BullModule } from '@nestjs/bull'; import { BlurtingConsumer } from './blurting.consumer'; -import { FcmModule } from 'src/firebase/fcm.module'; -import { ChatModule } from 'src/chat/chat.module'; -import { PointModule } from 'src/point/point.module'; +import { FcmModule } from 'src/domain/firebase/fcm.module'; +import { ChatModule } from 'src/domain/chat/chat.module'; +import { PointModule } from 'src/domain/point/point.module'; import { BlurtingAnswerRepository, BlurtingArrowRepository, @@ -31,7 +31,7 @@ import { BlurtingReplyRepository, NotificationRepository, ReportRepository, -} from 'src/repositories'; +} from 'src/domain/repositories'; @Module({ imports: [ diff --git a/src/blurting/blurting.service.ts b/src/domain/blurting/blurting.service.ts similarity index 98% rename from src/blurting/blurting.service.ts rename to src/domain/blurting/blurting.service.ts index a84a787..00fc3ff 100644 --- a/src/blurting/blurting.service.ts +++ b/src/domain/blurting/blurting.service.ts @@ -10,14 +10,14 @@ import { BlurtingGroupEntity, BlurtingQuestionEntity, BlurtingPreQuestionEntity, -} from 'src/entities'; -import { UserService } from 'src/user/user.service'; +} from 'src/domain/entities'; +import { UserService } from 'src/domain/user/user.service'; import { Queue } from 'bull'; import { InjectQueue } from '@nestjs/bull'; import { Sex, SexOrient } from 'src/common/enums'; -import { FcmService } from 'src/firebase/fcm.service'; -import { ChatService } from 'src/chat/chat.service'; -import { PointService } from 'src/point/point.service'; +import { FcmService } from 'src/domain/firebase/fcm.service'; +import { ChatService } from 'src/domain/chat/chat.service'; +import { PointService } from 'src/domain/point/point.service'; import { OtherPeopleInfoDto, BlurtingProfileDto, @@ -38,7 +38,7 @@ import { BlurtingReplyRepository, NotificationRepository, ReportRepository, -} from 'src/repositories'; +} from 'src/domain/repositories'; import { compareDateGroupExist } from 'src/common/util/time'; @Injectable() diff --git a/src/blurting/blurtingGroup.consumer.ts b/src/domain/blurting/blurtingGroup.consumer.ts similarity index 94% rename from src/blurting/blurtingGroup.consumer.ts rename to src/domain/blurting/blurtingGroup.consumer.ts index ca61f65..8db1875 100644 --- a/src/blurting/blurtingGroup.consumer.ts +++ b/src/domain/blurting/blurtingGroup.consumer.ts @@ -8,7 +8,7 @@ import { } from '@nestjs/bull'; import { Job, Queue } from 'bull'; import { BlurtingService } from './blurting.service'; -import { FcmService } from 'src/firebase/fcm.service'; +import { FcmService } from 'src/domain/firebase/fcm.service'; @Processor('renewaledBlurting') export class BlurtingRConsumer { diff --git a/src/blurting/dtos/answer.dto.ts b/src/domain/blurting/dtos/answer.dto.ts similarity index 100% rename from src/blurting/dtos/answer.dto.ts rename to src/domain/blurting/dtos/answer.dto.ts diff --git a/src/blurting/dtos/arrow.dto.ts b/src/domain/blurting/dtos/arrow.dto.ts similarity index 100% rename from src/blurting/dtos/arrow.dto.ts rename to src/domain/blurting/dtos/arrow.dto.ts diff --git a/src/blurting/dtos/index.ts b/src/domain/blurting/dtos/index.ts similarity index 100% rename from src/blurting/dtos/index.ts rename to src/domain/blurting/dtos/index.ts diff --git a/src/blurting/dtos/member.dto.ts b/src/domain/blurting/dtos/member.dto.ts similarity index 93% rename from src/blurting/dtos/member.dto.ts rename to src/domain/blurting/dtos/member.dto.ts index 3ba0b9c..95b9ef0 100644 --- a/src/blurting/dtos/member.dto.ts +++ b/src/domain/blurting/dtos/member.dto.ts @@ -1,7 +1,7 @@ import { ApiProperty, PickType } from '@nestjs/swagger'; import { IsOptional, IsString } from 'class-validator'; import { Sex } from 'src/common/enums'; -import { UserProfileDto } from 'src/dtos/user.dto'; +import { UserProfileDto } from 'src/domain/dtos/user.dto'; export class OtherPeopleInfoDto { @ApiProperty({ description: 'userId' }) diff --git a/src/blurting/dtos/pageResponse.dto.ts b/src/domain/blurting/dtos/pageResponse.dto.ts similarity index 99% rename from src/blurting/dtos/pageResponse.dto.ts rename to src/domain/blurting/dtos/pageResponse.dto.ts index c54f077..fb5ad86 100644 --- a/src/blurting/dtos/pageResponse.dto.ts +++ b/src/domain/blurting/dtos/pageResponse.dto.ts @@ -11,7 +11,7 @@ import { BlurtingGroupEntity, BlurtingQuestionEntity, ReplyEntity, -} from 'src/entities'; +} from 'src/domain/entities'; import { ApiProperty } from '@nestjs/swagger'; import { Mbti, Sex } from 'src/common/enums'; diff --git a/src/blurting/dtos/question.dto.ts b/src/domain/blurting/dtos/question.dto.ts similarity index 100% rename from src/blurting/dtos/question.dto.ts rename to src/domain/blurting/dtos/question.dto.ts diff --git a/src/blurting/dtos/reply.dto.ts b/src/domain/blurting/dtos/reply.dto.ts similarity index 100% rename from src/blurting/dtos/reply.dto.ts rename to src/domain/blurting/dtos/reply.dto.ts diff --git a/src/blurting/dtos/replyRequest.dto.ts b/src/domain/blurting/dtos/replyRequest.dto.ts similarity index 100% rename from src/blurting/dtos/replyRequest.dto.ts rename to src/domain/blurting/dtos/replyRequest.dto.ts diff --git a/src/chat/chat.controller.ts b/src/domain/chat/chat.controller.ts similarity index 90% rename from src/chat/chat.controller.ts rename to src/domain/chat/chat.controller.ts index f90ffb0..a760500 100644 --- a/src/chat/chat.controller.ts +++ b/src/domain/chat/chat.controller.ts @@ -2,8 +2,8 @@ import { Controller, Param, Get, UseGuards } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; import { JwtPayload } from 'src/interfaces/auth'; import { ChatService } from './chat.service'; -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'; import { Docs } from 'src/decorators/swagger/chat.decorator'; import { User } from 'src/decorators/accessUser.decorator'; diff --git a/src/chat/chat.gateway.ts b/src/domain/chat/chat.gateway.ts similarity index 96% rename from src/chat/chat.gateway.ts rename to src/domain/chat/chat.gateway.ts index c890081..1d4d99b 100644 --- a/src/chat/chat.gateway.ts +++ b/src/domain/chat/chat.gateway.ts @@ -9,10 +9,10 @@ import { WebSocketServer, } from '@nestjs/websockets'; import { Server, Socket } from 'socket.io'; -import { AddChatDto, ChatDto, InRoomDto } from 'src/dtos/chat.dto'; +import { AddChatDto, ChatDto, InRoomDto } from 'src/domain/dtos/chat.dto'; import { ChatService } from './chat.service'; -import { ReportService } from 'src/report/report.service'; -import { ReportingRequestDto } from 'src/report/dtos/reportingRequest.dto'; +import { ReportService } from 'src/domain/report/report.service'; +import { ReportingRequestDto } from 'src/domain/report/dtos/reportingRequest.dto'; import { getDateTimeOfNow } from 'src/common/util/time'; @WebSocketGateway({ namespace: 'whisper' }) diff --git a/src/chat/chat.module.ts b/src/domain/chat/chat.module.ts similarity index 78% rename from src/chat/chat.module.ts rename to src/domain/chat/chat.module.ts index 456f25c..ea4abdd 100644 --- a/src/chat/chat.module.ts +++ b/src/domain/chat/chat.module.ts @@ -11,11 +11,11 @@ import { } from './models'; import { ChatService } from './chat.service'; import { ChatController } from './chat.controller'; -import { UserModule } from 'src/user/user.module'; -import { FcmModule } from 'src/firebase/fcm.module'; -import { ReportModule } from 'src/report/report.module'; +import { UserModule } from 'src/domain/user/user.module'; +import { FcmModule } from 'src/domain/firebase/fcm.module'; +import { ReportModule } from 'src/domain/report/report.module'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { NotificationEntity } from 'src/entities'; +import { NotificationEntity } from 'src/domain/entities'; @Module({ imports: [ diff --git a/src/chat/chat.service.ts b/src/domain/chat/chat.service.ts similarity index 97% rename from src/chat/chat.service.ts rename to src/domain/chat/chat.service.ts index fa70d2d..9f30bae 100644 --- a/src/chat/chat.service.ts +++ b/src/domain/chat/chat.service.ts @@ -12,12 +12,12 @@ import { RoomInfoDto, ChatUserDto, RoomChatDto, -} from 'src/dtos/chat.dto'; -import { UserService } from 'src/user/user.service'; -import { FcmService } from 'src/firebase/fcm.service'; -import { NotificationEntity } from 'src/entities'; +} from 'src/domain/dtos/chat.dto'; +import { UserService } from 'src/domain/user/user.service'; +import { FcmService } from 'src/domain/firebase/fcm.service'; +import { NotificationEntity } from 'src/domain/entities'; import { getDateTimeOfNow } from 'src/common/util/time'; -import { UserProfileDtoWithBlur } from 'src/dtos/user.dto'; +import { UserProfileDtoWithBlur } from 'src/domain/dtos/user.dto'; import { BLUR_CHANGE_LIMIT, MESSAGES } from 'src/common/const'; @Injectable() diff --git a/src/chat/models/chatting.model.ts b/src/domain/chat/models/chatting.model.ts similarity index 100% rename from src/chat/models/chatting.model.ts rename to src/domain/chat/models/chatting.model.ts diff --git a/src/chat/models/index.ts b/src/domain/chat/models/index.ts similarity index 100% rename from src/chat/models/index.ts rename to src/domain/chat/models/index.ts diff --git a/src/chat/models/room.model.ts b/src/domain/chat/models/room.model.ts similarity index 95% rename from src/chat/models/room.model.ts rename to src/domain/chat/models/room.model.ts index 39f48cb..b58fa32 100644 --- a/src/chat/models/room.model.ts +++ b/src/domain/chat/models/room.model.ts @@ -1,7 +1,7 @@ import { IsBoolean, IsNotEmpty, IsString, IsDate } from 'class-validator'; import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'; import { Schema as MongooseSchema, Document, SchemaOptions } from 'mongoose'; -import { ChatUserDto } from 'src/dtos/chat.dto'; +import { ChatUserDto } from 'src/domain/dtos/chat.dto'; const options: SchemaOptions = { id: false, diff --git a/src/chat/models/socketUser.model.ts b/src/domain/chat/models/socketUser.model.ts similarity index 100% rename from src/chat/models/socketUser.model.ts rename to src/domain/chat/models/socketUser.model.ts diff --git a/src/dtos/chat.dto.ts b/src/domain/dtos/chat.dto.ts similarity index 98% rename from src/dtos/chat.dto.ts rename to src/domain/dtos/chat.dto.ts index 1452d59..eb33847 100644 --- a/src/dtos/chat.dto.ts +++ b/src/domain/dtos/chat.dto.ts @@ -10,7 +10,7 @@ import { ValidateIf, } from 'class-validator'; import { ApiProperty } from '@nestjs/swagger'; -import { Chatting, SocketUser, Room } from 'src/chat/models'; +import { Chatting, SocketUser, Room } from 'src/domain/chat/models'; import { Sex } from 'src/common/enums'; export class ChatDto { diff --git a/src/dtos/point.dto.ts b/src/domain/dtos/point.dto.ts similarity index 89% rename from src/dtos/point.dto.ts rename to src/domain/dtos/point.dto.ts index 6bcd431..dc7fa42 100644 --- a/src/dtos/point.dto.ts +++ b/src/domain/dtos/point.dto.ts @@ -1,7 +1,7 @@ import { Type } from 'class-transformer'; import { IsDate, IsString } from 'class-validator'; import { ApiProperty } from '@nestjs/swagger'; -import { PointHistoryEntity } from 'src/entities'; +import { PointHistoryEntity } from 'src/domain/entities'; export class PointHistoryDto { @IsString() diff --git a/src/dtos/user.dto.ts b/src/domain/dtos/user.dto.ts similarity index 94% rename from src/dtos/user.dto.ts rename to src/domain/dtos/user.dto.ts index 4f5b0c8..a0823b6 100644 --- a/src/dtos/user.dto.ts +++ b/src/domain/dtos/user.dto.ts @@ -2,8 +2,8 @@ import { IsString, IsNumber, IsOptional } from 'class-validator'; import { Character, Hobby } from 'src/common/enums'; import { CharacterMask, HobbyMask } from 'src/common/const'; import { ApiProperty, OmitType } from '@nestjs/swagger'; -import { UserInfoEntity } from 'src/entities'; -import { SignupUserRequestDto } from 'src/auth/dtos/signupRequest.dto'; +import { UserInfoEntity } from 'src/domain/entities'; +import { SignupUserRequestDto } from 'src/domain/auth/dtos/signupRequest.dto'; export class LoginDto { @IsNumber() diff --git a/src/entities/authMail.entity.ts b/src/domain/entities/authMail.entity.ts similarity index 88% rename from src/entities/authMail.entity.ts rename to src/domain/entities/authMail.entity.ts index 9a3c9cb..f688960 100644 --- a/src/entities/authMail.entity.ts +++ b/src/domain/entities/authMail.entity.ts @@ -1,4 +1,4 @@ -import { UserEntity } from 'src/entities'; +import { UserEntity } from 'src/domain/entities'; import { Column, CreateDateColumn, diff --git a/src/entities/authPhoneNumber.entity.ts b/src/domain/entities/authPhoneNumber.entity.ts similarity index 100% rename from src/entities/authPhoneNumber.entity.ts rename to src/domain/entities/authPhoneNumber.entity.ts diff --git a/src/entities/blurtingAnswer.entity.ts b/src/domain/entities/blurtingAnswer.entity.ts similarity index 100% rename from src/entities/blurtingAnswer.entity.ts rename to src/domain/entities/blurtingAnswer.entity.ts diff --git a/src/entities/blurtingArrow.entity.ts b/src/domain/entities/blurtingArrow.entity.ts similarity index 100% rename from src/entities/blurtingArrow.entity.ts rename to src/domain/entities/blurtingArrow.entity.ts diff --git a/src/entities/blurtingEvent.entity.ts b/src/domain/entities/blurtingEvent.entity.ts similarity index 100% rename from src/entities/blurtingEvent.entity.ts rename to src/domain/entities/blurtingEvent.entity.ts diff --git a/src/entities/blurtingGroup.entity.ts b/src/domain/entities/blurtingGroup.entity.ts similarity index 100% rename from src/entities/blurtingGroup.entity.ts rename to src/domain/entities/blurtingGroup.entity.ts diff --git a/src/entities/blurtingPreQuestion.entity.ts b/src/domain/entities/blurtingPreQuestion.entity.ts similarity index 100% rename from src/entities/blurtingPreQuestion.entity.ts rename to src/domain/entities/blurtingPreQuestion.entity.ts diff --git a/src/entities/blurtingQuestion.entity.ts b/src/domain/entities/blurtingQuestion.entity.ts similarity index 100% rename from src/entities/blurtingQuestion.entity.ts rename to src/domain/entities/blurtingQuestion.entity.ts diff --git a/src/entities/index.ts b/src/domain/entities/index.ts similarity index 100% rename from src/entities/index.ts rename to src/domain/entities/index.ts diff --git a/src/entities/like.entity.ts b/src/domain/entities/like.entity.ts similarity index 100% rename from src/entities/like.entity.ts rename to src/domain/entities/like.entity.ts diff --git a/src/entities/notification.entity.ts b/src/domain/entities/notification.entity.ts similarity index 100% rename from src/entities/notification.entity.ts rename to src/domain/entities/notification.entity.ts diff --git a/src/entities/pointHistory.entity.ts b/src/domain/entities/pointHistory.entity.ts similarity index 88% rename from src/entities/pointHistory.entity.ts rename to src/domain/entities/pointHistory.entity.ts index 2806e8d..15fa846 100644 --- a/src/entities/pointHistory.entity.ts +++ b/src/domain/entities/pointHistory.entity.ts @@ -1,4 +1,4 @@ -import { UserEntity } from 'src/entities'; +import { UserEntity } from 'src/domain/entities'; import { Column, CreateDateColumn, diff --git a/src/entities/reply.entity.ts b/src/domain/entities/reply.entity.ts similarity index 100% rename from src/entities/reply.entity.ts rename to src/domain/entities/reply.entity.ts diff --git a/src/entities/report.entity.ts b/src/domain/entities/report.entity.ts similarity index 100% rename from src/entities/report.entity.ts rename to src/domain/entities/report.entity.ts diff --git a/src/entities/toCheck.entity.ts b/src/domain/entities/toCheck.entity.ts similarity index 84% rename from src/entities/toCheck.entity.ts rename to src/domain/entities/toCheck.entity.ts index d04c868..a6715fb 100644 --- a/src/entities/toCheck.entity.ts +++ b/src/domain/entities/toCheck.entity.ts @@ -1,4 +1,4 @@ -import { UserEntity } from 'src/entities'; +import { UserEntity } from 'src/domain/entities'; import { Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'; @Entity() diff --git a/src/entities/userImage.entity.ts b/src/domain/entities/userImage.entity.ts similarity index 87% rename from src/entities/userImage.entity.ts rename to src/domain/entities/userImage.entity.ts index 0c9f01d..6dca60c 100644 --- a/src/entities/userImage.entity.ts +++ b/src/domain/entities/userImage.entity.ts @@ -5,7 +5,7 @@ import { ManyToOne, JoinColumn, } from 'typeorm'; -import { UserEntity } from 'src/entities'; +import { UserEntity } from 'src/domain/entities'; @Entity('userImage') export class UserImageEntity { diff --git a/src/entities/userInfo.entity.ts b/src/domain/entities/userInfo.entity.ts similarity index 96% rename from src/entities/userInfo.entity.ts rename to src/domain/entities/userInfo.entity.ts index 6a710a1..72100a1 100644 --- a/src/entities/userInfo.entity.ts +++ b/src/domain/entities/userInfo.entity.ts @@ -5,7 +5,7 @@ import { OneToOne, JoinColumn, } from 'typeorm'; -import { UserEntity } from 'src/entities'; +import { UserEntity } from 'src/domain/entities'; import { Sex, SexOrient, diff --git a/src/entities/users.entity.ts b/src/domain/entities/users.entity.ts similarity index 89% rename from src/entities/users.entity.ts rename to src/domain/entities/users.entity.ts index ef61013..a40ffdd 100644 --- a/src/entities/users.entity.ts +++ b/src/domain/entities/users.entity.ts @@ -6,7 +6,7 @@ import { ManyToOne, JoinColumn, } from 'typeorm'; -import { BlurtingGroupEntity, UserInfoEntity } from 'src/entities'; +import { BlurtingGroupEntity, UserInfoEntity } from 'src/domain/entities'; @Entity('users') export class UserEntity { diff --git a/src/event/dtos/event.dto.ts b/src/domain/event/dtos/event.dto.ts similarity index 100% rename from src/event/dtos/event.dto.ts rename to src/domain/event/dtos/event.dto.ts diff --git a/src/event/event.controller.ts b/src/domain/event/event.controller.ts similarity index 95% rename from src/event/event.controller.ts rename to src/domain/event/event.controller.ts index 2b03db9..c7d2b87 100644 --- a/src/event/event.controller.ts +++ b/src/domain/event/event.controller.ts @@ -26,17 +26,17 @@ import { import { JwtPayload } from 'src/interfaces/auth'; import { Request, Response } from 'express'; import { EventRegisterDto } from './dtos/event.dto'; -import { UserService } from 'src/user/user.service'; +import { UserService } from 'src/domain/user/user.service'; import { AnswerRequestDto, BlurtingAnswerDto, BlurtingPageDto, -} from 'src/blurting/dtos'; -import { BlurtingService } from 'src/blurting/blurting.service'; -import { UserProfileDto } from 'src/dtos/user.dto'; -import { OtherPeopleInfoDto } from 'src/blurting/dtos/member.dto'; -import { ArrowInfoResponseDto } from 'src/blurting/dtos/arrow.dto'; -import { AccessGuard } from 'src/auth/guard/access.guard'; +} from 'src/domain/blurting/dtos'; +import { BlurtingService } from 'src/domain/blurting/blurting.service'; +import { UserProfileDto } from 'src/domain/dtos/user.dto'; +import { OtherPeopleInfoDto } from 'src/domain/blurting/dtos/member.dto'; +import { ArrowInfoResponseDto } from 'src/domain/blurting/dtos/arrow.dto'; +import { AccessGuard } from 'src/domain/auth/guard/access.guard'; import { getDateTimeOfNow } from 'src/common/util/time'; @Controller('event') diff --git a/src/event/event.module.ts b/src/domain/event/event.module.ts similarity index 86% rename from src/event/event.module.ts rename to src/domain/event/event.module.ts index e11dcc5..b91e28e 100644 --- a/src/event/event.module.ts +++ b/src/domain/event/event.module.ts @@ -10,12 +10,12 @@ import { BlurtingGroupEntity, BlurtingQuestionEntity, UserEntity, -} from 'src/entities'; -import { FcmModule } from 'src/firebase/fcm.module'; -import { UserModule } from 'src/user/user.module'; +} from 'src/domain/entities'; +import { FcmModule } from 'src/domain/firebase/fcm.module'; +import { UserModule } from 'src/domain/user/user.module'; import { EventController } from './event.controller'; import { EventService } from './event.service'; -import { BlurtingModule } from 'src/blurting/blurting.module'; +import { BlurtingModule } from 'src/domain/blurting/blurting.module'; @Module({ imports: [ diff --git a/src/event/event.service.ts b/src/domain/event/event.service.ts similarity index 96% rename from src/event/event.service.ts rename to src/domain/event/event.service.ts index 9a11da6..84c3c50 100644 --- a/src/event/event.service.ts +++ b/src/domain/event/event.service.ts @@ -12,15 +12,15 @@ import { BlurtingGroupEntity, BlurtingQuestionEntity, UserEntity, -} from 'src/entities'; -import { FcmService } from 'src/firebase/fcm.service'; -import { UserService } from 'src/user/user.service'; +} from 'src/domain/entities'; +import { FcmService } from 'src/domain/firebase/fcm.service'; +import { UserService } from 'src/domain/user/user.service'; import { Repository } from 'typeorm'; import { Sex } from 'src/common/enums'; -import { ArrowInfoResponseDto } from 'src/blurting/dtos/arrow.dto'; -import { OtherPeopleInfoDto } from 'src/blurting/dtos/member.dto'; +import { ArrowInfoResponseDto } from 'src/domain/blurting/dtos/arrow.dto'; +import { OtherPeopleInfoDto } from 'src/domain/blurting/dtos/member.dto'; import axios from 'axios'; -import { UserProfileDtoWithBlur } from 'src/dtos/user.dto'; +import { UserProfileDtoWithBlur } from 'src/domain/dtos/user.dto'; import { getDateTimeOfNow } from 'src/common/util/time'; @Injectable() diff --git a/src/firebase/dtos/notificationList.dto.ts b/src/domain/firebase/dtos/notificationList.dto.ts similarity index 92% rename from src/firebase/dtos/notificationList.dto.ts rename to src/domain/firebase/dtos/notificationList.dto.ts index 0e15bbb..d54f4cd 100644 --- a/src/firebase/dtos/notificationList.dto.ts +++ b/src/domain/firebase/dtos/notificationList.dto.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; import { applyTimeZone } from 'src/common/util/time'; -import { NotificationEntity } from 'src/entities'; +import { NotificationEntity } from 'src/domain/entities'; export class NotificationListDto { @ApiProperty({ description: '알림 message' }) diff --git a/src/firebase/fcm.controller.ts b/src/domain/firebase/fcm.controller.ts similarity index 94% rename from src/firebase/fcm.controller.ts rename to src/domain/firebase/fcm.controller.ts index d37cfc2..099f688 100644 --- a/src/firebase/fcm.controller.ts +++ b/src/domain/firebase/fcm.controller.ts @@ -5,7 +5,7 @@ import { FcmService } from './fcm.service'; import { JwtPayload } from 'src/interfaces/auth'; import { User } from 'src/decorators/accessUser.decorator'; import { Docs } from 'src/decorators/swagger/fcm.decorator'; -import { AccessGuard } from 'src/auth/guard/access.guard'; +import { AccessGuard } from 'src/domain/auth/guard/access.guard'; @Controller('fcm') @ApiTags('fcm') diff --git a/src/firebase/fcm.module.ts b/src/domain/firebase/fcm.module.ts similarity index 80% rename from src/firebase/fcm.module.ts rename to src/domain/firebase/fcm.module.ts index a842173..7a0d45c 100644 --- a/src/firebase/fcm.module.ts +++ b/src/domain/firebase/fcm.module.ts @@ -1,10 +1,10 @@ import { Module } from '@nestjs/common'; import { FcmService } from './fcm.service'; import { MongooseModule } from '@nestjs/mongoose'; -import { SocketUser, SocketUserSchema } from 'src/chat/models'; +import { SocketUser, SocketUserSchema } from 'src/domain/chat/models'; import { fcmController } from './fcm.controller'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { NotificationEntity } from 'src/entities'; +import { NotificationEntity } from 'src/domain/entities'; @Module({ imports: [ diff --git a/src/firebase/fcm.service.ts b/src/domain/firebase/fcm.service.ts similarity index 96% rename from src/firebase/fcm.service.ts rename to src/domain/firebase/fcm.service.ts index 50c1529..bd69786 100644 --- a/src/firebase/fcm.service.ts +++ b/src/domain/firebase/fcm.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectModel } from '@nestjs/mongoose'; import { Model } from 'mongoose'; import * as firebase from 'firebase-admin'; -import { SocketUser } from 'src/chat/models'; +import { SocketUser } from 'src/domain/chat/models'; import { InjectRepository } from '@nestjs/typeorm'; -import { NotificationEntity } from 'src/entities'; +import { NotificationEntity } from 'src/domain/entities'; import { Repository } from 'typeorm'; import { NotificationListDto } from './dtos/notificationList.dto'; diff --git a/src/geocoding/geocoding.controller.ts b/src/domain/geocoding/geocoding.controller.ts similarity index 100% rename from src/geocoding/geocoding.controller.ts rename to src/domain/geocoding/geocoding.controller.ts diff --git a/src/geocoding/geocoding.module.ts b/src/domain/geocoding/geocoding.module.ts similarity index 100% rename from src/geocoding/geocoding.module.ts rename to src/domain/geocoding/geocoding.module.ts diff --git a/src/geocoding/geocoding.service.ts b/src/domain/geocoding/geocoding.service.ts similarity index 100% rename from src/geocoding/geocoding.service.ts rename to src/domain/geocoding/geocoding.service.ts diff --git a/src/home/dtos/answerWithQuestion.dto.ts b/src/domain/home/dtos/answerWithQuestion.dto.ts similarity index 77% rename from src/home/dtos/answerWithQuestion.dto.ts rename to src/domain/home/dtos/answerWithQuestion.dto.ts index c4fd61e..21589e8 100644 --- a/src/home/dtos/answerWithQuestion.dto.ts +++ b/src/domain/home/dtos/answerWithQuestion.dto.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { BlurtingAnswerDto } from 'src/blurting/dtos'; -import { BlurtingAnswerEntity } from 'src/entities'; +import { BlurtingAnswerDto } from 'src/domain/blurting/dtos'; +import { BlurtingAnswerEntity } from 'src/domain/entities'; export class AnswerWithQuestionDto extends BlurtingAnswerDto { @ApiProperty({ description: '질문' }) diff --git a/src/home/dtos/homInfoResponse.dto.ts b/src/domain/home/dtos/homInfoResponse.dto.ts similarity index 100% rename from src/home/dtos/homInfoResponse.dto.ts rename to src/domain/home/dtos/homInfoResponse.dto.ts diff --git a/src/home/dtos/index.ts b/src/domain/home/dtos/index.ts similarity index 100% rename from src/home/dtos/index.ts rename to src/domain/home/dtos/index.ts diff --git a/src/home/dtos/likeHomeAnswer.dto.ts b/src/domain/home/dtos/likeHomeAnswer.dto.ts similarity index 100% rename from src/home/dtos/likeHomeAnswer.dto.ts rename to src/domain/home/dtos/likeHomeAnswer.dto.ts diff --git a/src/home/home.controller.ts b/src/domain/home/home.controller.ts similarity index 100% rename from src/home/home.controller.ts rename to src/domain/home/home.controller.ts diff --git a/src/home/home.module.ts b/src/domain/home/home.module.ts similarity index 83% rename from src/home/home.module.ts rename to src/domain/home/home.module.ts index c96855e..21b06b3 100644 --- a/src/home/home.module.ts +++ b/src/domain/home/home.module.ts @@ -8,16 +8,16 @@ import { LikeEntity, UserEntity, UserImageEntity, -} from 'src/entities'; +} from 'src/domain/entities'; import { MongooseModule } from '@nestjs/mongoose'; -import { Chatting, ChattingSchema } from 'src/chat/models'; +import { Chatting, ChattingSchema } from 'src/domain/chat/models'; import { BlurtingAnswerRepository, BlurtingArrowRepository, BlurtingLikeRepository, UserRepository, -} from 'src/repositories'; -import { UserModule } from 'src/user/user.module'; +} from 'src/domain/repositories'; +import { UserModule } from 'src/domain/user/user.module'; @Module({ imports: [ diff --git a/src/home/home.service.ts b/src/domain/home/home.service.ts similarity index 96% rename from src/home/home.service.ts rename to src/domain/home/home.service.ts index 0514937..59c1eb0 100644 --- a/src/home/home.service.ts +++ b/src/domain/home/home.service.ts @@ -1,17 +1,17 @@ import { Injectable } from '@nestjs/common'; import { HomeInfoResponseDto, RandomUserDto } from './dtos/homInfoResponse.dto'; import { InjectModel } from '@nestjs/mongoose'; -import { Chatting } from 'src/chat/models'; +import { Chatting } from 'src/domain/chat/models'; import { Model } from 'mongoose'; import { BlurtingAnswerRepository, BlurtingArrowRepository, BlurtingLikeRepository, UserRepository, -} from 'src/repositories'; +} from 'src/domain/repositories'; import { compareDateGroupExist, getDateTimeOfNow } from 'src/common/util/time'; import { AnswerWithQuestionDto } from './dtos'; -import { UserService } from 'src/user/user.service'; +import { UserService } from 'src/domain/user/user.service'; import { Sex, SexOrient } from 'src/common/enums'; @Injectable() diff --git a/src/point/point.controller.ts b/src/domain/point/point.controller.ts similarity index 90% rename from src/point/point.controller.ts rename to src/domain/point/point.controller.ts index c75165c..67a691e 100644 --- a/src/point/point.controller.ts +++ b/src/domain/point/point.controller.ts @@ -2,11 +2,11 @@ import { Controller, Body, Get, Post, UseGuards } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; import { JwtPayload } from 'src/interfaces/auth'; import { PointService } from './point.service'; -import { UserService } from 'src/user/user.service'; -import { PointHistoryDto } from 'src/dtos/point.dto'; -import { ReportService } from 'src/report/report.service'; +import { UserService } from 'src/domain/user/user.service'; +import { PointHistoryDto } from 'src/domain/dtos/point.dto'; +import { ReportService } from 'src/domain/report/report.service'; import { User } from 'src/decorators/accessUser.decorator'; -import { AccessGuard } from 'src/auth/guard/access.guard'; +import { AccessGuard } from 'src/domain/auth/guard/access.guard'; import { Docs } from 'src/decorators/swagger/point.decorator'; @Controller('point') diff --git a/src/point/point.module.ts b/src/domain/point/point.module.ts similarity index 64% rename from src/point/point.module.ts rename to src/domain/point/point.module.ts index fda7bbe..11cdb19 100644 --- a/src/point/point.module.ts +++ b/src/domain/point/point.module.ts @@ -1,11 +1,11 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { PointHistoryEntity, UserEntity } from 'src/entities'; +import { PointHistoryEntity, UserEntity } from 'src/domain/entities'; import { PointController } from './point.controller'; import { PointService } from './point.service'; -import { ChatModule } from 'src/chat/chat.module'; -import { ReportModule } from 'src/report/report.module'; -import { UserModule } from 'src/user/user.module'; +import { ChatModule } from 'src/domain/chat/chat.module'; +import { ReportModule } from 'src/domain/report/report.module'; +import { UserModule } from 'src/domain/user/user.module'; @Module({ imports: [ diff --git a/src/point/point.service.ts b/src/domain/point/point.service.ts similarity index 94% rename from src/point/point.service.ts rename to src/domain/point/point.service.ts index 8bb008c..19e7ab5 100644 --- a/src/point/point.service.ts +++ b/src/domain/point/point.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; import { InjectDataSource, InjectRepository } from '@nestjs/typeorm'; -import { ChatService } from 'src/chat/chat.service'; -import { UserService } from 'src/user/user.service'; -import { PointHistoryDto } from 'src/dtos/point.dto'; -import { PointHistoryEntity, UserEntity } from 'src/entities'; +import { ChatService } from 'src/domain/chat/chat.service'; +import { UserService } from 'src/domain/user/user.service'; +import { PointHistoryDto } from 'src/domain/dtos/point.dto'; +import { PointHistoryEntity, UserEntity } from 'src/domain/entities'; import { DataSource, Repository } from 'typeorm'; @Injectable() diff --git a/src/report/dtos/reportingRequest.dto.ts b/src/domain/report/dtos/reportingRequest.dto.ts similarity index 100% rename from src/report/dtos/reportingRequest.dto.ts rename to src/domain/report/dtos/reportingRequest.dto.ts diff --git a/src/report/report.controller.ts b/src/domain/report/report.controller.ts similarity index 100% rename from src/report/report.controller.ts rename to src/domain/report/report.controller.ts diff --git a/src/report/report.module.ts b/src/domain/report/report.module.ts similarity index 76% rename from src/report/report.module.ts rename to src/domain/report/report.module.ts index 605a940..3655ec7 100644 --- a/src/report/report.module.ts +++ b/src/domain/report/report.module.ts @@ -2,8 +2,8 @@ import { Module } from '@nestjs/common'; import { ReportService } from './report.service'; import { ReportController } from './report.controller'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { ReportEntity } from 'src/entities/report.entity'; -import { ReportRepository } from 'src/repositories'; +import { ReportEntity } from 'src/domain/entities/report.entity'; +import { ReportRepository } from 'src/domain/repositories'; @Module({ imports: [TypeOrmModule.forFeature([ReportEntity])], diff --git a/src/report/report.service.ts b/src/domain/report/report.service.ts similarity index 88% rename from src/report/report.service.ts rename to src/domain/report/report.service.ts index f8d46bb..0d11bda 100644 --- a/src/report/report.service.ts +++ b/src/domain/report/report.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { ReportRepository } from 'src/repositories'; +import { ReportRepository } from 'src/domain/repositories'; @Injectable() export class ReportService { diff --git a/src/repositories/authMail.repository.ts b/src/domain/repositories/authMail.repository.ts similarity index 93% rename from src/repositories/authMail.repository.ts rename to src/domain/repositories/authMail.repository.ts index e58eae0..8bd6bd3 100644 --- a/src/repositories/authMail.repository.ts +++ b/src/domain/repositories/authMail.repository.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { AuthMailEntity } from 'src/entities'; +import { AuthMailEntity } from 'src/domain/entities'; import { Repository } from 'typeorm'; @Injectable() diff --git a/src/repositories/authPhoneNumber.repository.ts b/src/domain/repositories/authPhoneNumber.repository.ts similarity index 95% rename from src/repositories/authPhoneNumber.repository.ts rename to src/domain/repositories/authPhoneNumber.repository.ts index 938e6fe..ea5fb12 100644 --- a/src/repositories/authPhoneNumber.repository.ts +++ b/src/domain/repositories/authPhoneNumber.repository.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { AuthPhoneNumberEntity } from 'src/entities'; +import { AuthPhoneNumberEntity } from 'src/domain/entities'; import { Repository } from 'typeorm'; @Injectable() diff --git a/src/repositories/blurtingAnswer.repository.ts b/src/domain/repositories/blurtingAnswer.repository.ts similarity index 96% rename from src/repositories/blurtingAnswer.repository.ts rename to src/domain/repositories/blurtingAnswer.repository.ts index ec4dc3b..a0617ba 100644 --- a/src/repositories/blurtingAnswer.repository.ts +++ b/src/domain/repositories/blurtingAnswer.repository.ts @@ -1,11 +1,11 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { AnswerDto } from 'src/blurting/dtos'; +import { AnswerDto } from 'src/domain/blurting/dtos'; import { BlurtingAnswerEntity, BlurtingQuestionEntity, UserEntity, -} from 'src/entities'; +} from 'src/domain/entities'; import { MoreThan, Repository } from 'typeorm'; @Injectable() diff --git a/src/repositories/blurtingArrow.repository.ts b/src/domain/repositories/blurtingArrow.repository.ts similarity index 92% rename from src/repositories/blurtingArrow.repository.ts rename to src/domain/repositories/blurtingArrow.repository.ts index e498655..27c6c9d 100644 --- a/src/repositories/blurtingArrow.repository.ts +++ b/src/domain/repositories/blurtingArrow.repository.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { ArrowDto } from 'src/blurting/dtos'; -import { BlurtingArrowEntity, BlurtingGroupEntity } from 'src/entities'; +import { ArrowDto } from 'src/domain/blurting/dtos'; +import { BlurtingArrowEntity, BlurtingGroupEntity } from 'src/domain/entities'; import { Repository } from 'typeorm'; @Injectable() diff --git a/src/repositories/blurtingGroup.repository.ts b/src/domain/repositories/blurtingGroup.repository.ts similarity index 89% rename from src/repositories/blurtingGroup.repository.ts rename to src/domain/repositories/blurtingGroup.repository.ts index bf42755..f309ed8 100644 --- a/src/repositories/blurtingGroup.repository.ts +++ b/src/domain/repositories/blurtingGroup.repository.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { BlurtingGroupEntity } from 'src/entities'; +import { BlurtingGroupEntity } from 'src/domain/entities'; import { Repository } from 'typeorm'; @Injectable() diff --git a/src/repositories/blurtingLike.repository.ts b/src/domain/repositories/blurtingLike.repository.ts similarity index 95% rename from src/repositories/blurtingLike.repository.ts rename to src/domain/repositories/blurtingLike.repository.ts index 95cc727..0a824f9 100644 --- a/src/repositories/blurtingLike.repository.ts +++ b/src/domain/repositories/blurtingLike.repository.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { LikeEntity } from 'src/entities'; +import { LikeEntity } from 'src/domain/entities'; import { Repository } from 'typeorm'; @Injectable() diff --git a/src/repositories/blurtingPreQuestion.repository.ts b/src/domain/repositories/blurtingPreQuestion.repository.ts similarity index 86% rename from src/repositories/blurtingPreQuestion.repository.ts rename to src/domain/repositories/blurtingPreQuestion.repository.ts index abb7d8e..63d7047 100644 --- a/src/repositories/blurtingPreQuestion.repository.ts +++ b/src/domain/repositories/blurtingPreQuestion.repository.ts @@ -1,7 +1,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { PreQuestionDto } from 'src/blurting/dtos/question.dto'; -import { BlurtingGroupEntity, BlurtingPreQuestionEntity } from 'src/entities'; +import { PreQuestionDto } from 'src/domain/blurting/dtos/question.dto'; +import { + BlurtingGroupEntity, + BlurtingPreQuestionEntity, +} from 'src/domain/entities'; import { Repository } from 'typeorm'; @Injectable() diff --git a/src/repositories/blurtingQuestion.repository.ts b/src/domain/repositories/blurtingQuestion.repository.ts similarity index 90% rename from src/repositories/blurtingQuestion.repository.ts rename to src/domain/repositories/blurtingQuestion.repository.ts index e1a7c98..c07d857 100644 --- a/src/repositories/blurtingQuestion.repository.ts +++ b/src/domain/repositories/blurtingQuestion.repository.ts @@ -1,7 +1,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { QuestionDto } from 'src/blurting/dtos/question.dto'; -import { BlurtingGroupEntity, BlurtingQuestionEntity } from 'src/entities'; +import { QuestionDto } from 'src/domain/blurting/dtos/question.dto'; +import { + BlurtingGroupEntity, + BlurtingQuestionEntity, +} from 'src/domain/entities'; import { Repository } from 'typeorm'; @Injectable() diff --git a/src/repositories/blurtingReply.repository.ts b/src/domain/repositories/blurtingReply.repository.ts similarity index 80% rename from src/repositories/blurtingReply.repository.ts rename to src/domain/repositories/blurtingReply.repository.ts index 96076aa..f8b5bae 100644 --- a/src/repositories/blurtingReply.repository.ts +++ b/src/domain/repositories/blurtingReply.repository.ts @@ -1,7 +1,11 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { ReplyDto } from 'src/blurting/dtos'; -import { BlurtingAnswerEntity, ReplyEntity, UserEntity } from 'src/entities'; +import { ReplyDto } from 'src/domain/blurting/dtos'; +import { + BlurtingAnswerEntity, + ReplyEntity, + UserEntity, +} from 'src/domain/entities'; import { Repository } from 'typeorm'; @Injectable() diff --git a/src/repositories/index.ts b/src/domain/repositories/index.ts similarity index 100% rename from src/repositories/index.ts rename to src/domain/repositories/index.ts diff --git a/src/repositories/notification.repository.ts b/src/domain/repositories/notification.repository.ts similarity index 89% rename from src/repositories/notification.repository.ts rename to src/domain/repositories/notification.repository.ts index e6ceba8..f3482e2 100644 --- a/src/repositories/notification.repository.ts +++ b/src/domain/repositories/notification.repository.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { NotificationEntity, UserEntity } from 'src/entities'; +import { NotificationEntity, UserEntity } from 'src/domain/entities'; import { Repository } from 'typeorm'; @Injectable() diff --git a/src/repositories/report.repository.ts b/src/domain/repositories/report.repository.ts similarity index 95% rename from src/repositories/report.repository.ts rename to src/domain/repositories/report.repository.ts index 5427f96..b59211e 100644 --- a/src/repositories/report.repository.ts +++ b/src/domain/repositories/report.repository.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { ReportEntity } from 'src/entities'; +import { ReportEntity } from 'src/domain/entities'; import { Repository } from 'typeorm'; @Injectable() diff --git a/src/repositories/user.repository.ts b/src/domain/repositories/user.repository.ts similarity index 96% rename from src/repositories/user.repository.ts rename to src/domain/repositories/user.repository.ts index 76fc6c3..62ac33f 100644 --- a/src/repositories/user.repository.ts +++ b/src/domain/repositories/user.repository.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Sex, SexOrient } from 'src/common/enums'; -import { UserEntity } from 'src/entities'; +import { UserEntity } from 'src/domain/entities'; import { Repository } from 'typeorm'; @Injectable() diff --git a/src/s3/dtos/fileUploadDto.ts b/src/domain/s3/dtos/fileUploadDto.ts similarity index 100% rename from src/s3/dtos/fileUploadDto.ts rename to src/domain/s3/dtos/fileUploadDto.ts diff --git a/src/s3/s3.controller.ts b/src/domain/s3/s3.controller.ts similarity index 100% rename from src/s3/s3.controller.ts rename to src/domain/s3/s3.controller.ts diff --git a/src/s3/s3.module.ts b/src/domain/s3/s3.module.ts similarity index 100% rename from src/s3/s3.module.ts rename to src/domain/s3/s3.module.ts diff --git a/src/s3/s3.service.ts b/src/domain/s3/s3.service.ts similarity index 100% rename from src/s3/s3.service.ts rename to src/domain/s3/s3.service.ts diff --git a/src/user/user.controller.ts b/src/domain/user/user.controller.ts similarity index 93% rename from src/user/user.controller.ts rename to src/domain/user/user.controller.ts index 2239f94..4844363 100644 --- a/src/user/user.controller.ts +++ b/src/domain/user/user.controller.ts @@ -1,9 +1,9 @@ import { Controller, Post, Body, Get, Delete, UseGuards } from '@nestjs/common'; -import { FcmService } from 'src/firebase/fcm.service'; +import { FcmService } from 'src/domain/firebase/fcm.service'; import { JwtPayload } from 'src/interfaces/auth'; -import { UpdateProfileDto, UserProfileDto } from 'src/dtos/user.dto'; +import { UpdateProfileDto, UserProfileDto } from 'src/domain/dtos/user.dto'; import { UserService } from './user.service'; -import { AccessGuard } from 'src/auth/guard/access.guard'; +import { AccessGuard } from 'src/domain/auth/guard/access.guard'; import { Docs } from 'src/decorators/swagger/user.decorator'; import { User } from 'src/decorators/accessUser.decorator'; import { ApiTags } from '@nestjs/swagger'; diff --git a/src/user/user.module.ts b/src/domain/user/user.module.ts similarity index 85% rename from src/user/user.module.ts rename to src/domain/user/user.module.ts index 3bb2906..2426d2d 100644 --- a/src/user/user.module.ts +++ b/src/domain/user/user.module.ts @@ -3,16 +3,20 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { MongooseModule } from '@nestjs/mongoose'; import { CacheModule } from '@nestjs/cache-manager'; import { redisStore } from 'cache-manager-redis-store'; -import { UserEntity, UserInfoEntity, UserImageEntity } from 'src/entities'; +import { + UserEntity, + UserInfoEntity, + UserImageEntity, +} from 'src/domain/entities'; import { SocketUser, SocketUserSchema, Room, RoomSchema, -} from 'src/chat/models'; +} from 'src/domain/chat/models'; import { UserController } from './user.controller'; import { UserService } from './user.service'; -import { FcmModule } from 'src/firebase/fcm.module'; +import { FcmModule } from 'src/domain/firebase/fcm.module'; @Module({ imports: [ diff --git a/src/user/user.service.ts b/src/domain/user/user.service.ts similarity index 98% rename from src/user/user.service.ts rename to src/domain/user/user.service.ts index 229751a..508fa4c 100644 --- a/src/user/user.service.ts +++ b/src/domain/user/user.service.ts @@ -19,9 +19,9 @@ import { UserEntity, UserInfoEntity, UserImageEntity, -} from 'src/entities'; -import { SocketUser } from 'src/chat/models'; -import { UserProfileDto } from 'src/dtos/user.dto'; +} from 'src/domain/entities'; +import { SocketUser } from 'src/domain/chat/models'; +import { UserProfileDto } from 'src/domain/dtos/user.dto'; @Injectable() export class UserService { constructor( diff --git a/src/event/event.controller.spec.ts b/src/event/event.controller.spec.ts deleted file mode 100644 index 989bf72..0000000 --- a/src/event/event.controller.spec.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { EventController } from './event.controller'; - -describe('EventController', () => { - let controller: EventController; - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - controllers: [EventController], - }).compile(); - - controller = module.get(EventController); - }); - - it('should be defined', () => { - expect(controller).toBeDefined(); - }); -}); diff --git a/src/event/event.service.spec.ts b/src/event/event.service.spec.ts deleted file mode 100644 index 78cb816..0000000 --- a/src/event/event.service.spec.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { EventService } from './event.service'; - -describe('EventService', () => { - let service: EventService; - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - providers: [EventService], - }).compile(); - - service = module.get(EventService); - }); - - it('should be defined', () => { - expect(service).toBeDefined(); - }); -}); diff --git a/src/s3/s3.controller.spec.ts b/src/s3/s3.controller.spec.ts deleted file mode 100644 index 4460dfd..0000000 --- a/src/s3/s3.controller.spec.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { S3Controller } from './s3.controller'; - -describe('S3Controller', () => { - let controller: S3Controller; - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - controllers: [S3Controller], - }).compile(); - - controller = module.get(S3Controller); - }); - - it('should be defined', () => { - expect(controller).toBeDefined(); - }); -}); diff --git a/src/s3/s3.service.spec.ts b/src/s3/s3.service.spec.ts deleted file mode 100644 index ea0a47b..0000000 --- a/src/s3/s3.service.spec.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { S3Service } from './s3.service'; - -describe('S3Service', () => { - let service: S3Service; - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - providers: [S3Service], - }).compile(); - - service = module.get(S3Service); - }); - - it('should be defined', () => { - expect(service).toBeDefined(); - }); -});