diff --git a/.gitignore b/.gitignore index 43785f5..0b34e8c 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,6 @@ pids # Diagnostic reports (https://nodejs.org/api/report.html) report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +#REST Client +httpTest/ \ No newline at end of file diff --git a/httpTest/chat.http b/httpTest/chat.http deleted file mode 100644 index 1f17eff..0000000 --- a/httpTest/chat.http +++ /dev/null @@ -1,45 +0,0 @@ -@CHAT_HOST_NAME=http://localhost:4000/chats -@DREAMER1_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI2Njg4NWEzYy01MGY0LTQyN2ItOGE5Mi0zNzAyYzY5NzZmYjAiLCJyb2xlIjoiRFJFQU1FUiIsImlhdCI6MTczNzk4MzQ1MSwiZXhwIjoxNzQxNDM5NDUxfQ.V2qa2oB-m757NnAXYkefAWL_Vewwh526s97SYh2LuJc -@MAKER1_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIwMzJkN2JkNC0xMTZjLTQ2N2ItOTM1Mi1hMTRiMGQ0OTRlZjkiLCJyb2xlIjoiTUFLRVIiLCJpYXQiOjE3Mzc5ODM0MjYsImV4cCI6MTc0MTQzOTQyNn0.v5caBNbWAusy25h275WtSiJwYXPqyFC8vWPG3fO6r7E - -@CHATROOM1_ID=67a4e29ba4b7b6ddc6ef5ac6 - -@EXAMPLE_CHAT_ROOM=67a4e29ba4b7b6ddc6ef5ac6 -GET http://localhost:4000/chatRooms -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET http://localhost:4000/chatRooms/{{EXAMPLE_CHAT_ROOM}}/chats -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET http://localhost:4000/chatRooms/{{CHATROOM1_ID}}/chats -Authorization: Bearer {{DREAMER1_TOKEN}} -### -DELETE http://localhost:4000/chats/67b32df2e96b9068eb17deae -Authorization: Bearer MAKER -### -POST http://localhost:4000/chatRooms -Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIwMzJkN2JkNC0xMTZjLTQ2N2ItOTM1Mi1hMTRiMGQ0OTRlZjkiLCJyb2xlIjoiTUFLRVIiLCJpYXQiOjE3Mzc3MjU0NzUsImV4cCI6MTczNzgxMTg3NX0.Q6afR4kJ1KtTbabL9dqtHEtT9cYSoF698ngtulSy0yY -Content-Type: application/json - -{ - "otherUserId": "a08d9856-adfa-4f83-9e9a-48401f3d0ef3" -} -### -POST http://localhost:4000/chatRooms/{{CHATROOM1_ID}}/chats -Authorization: Bearer {{DREAMER1_TOKEN}} -Content-Type: application/json - -{ - "content": "마지막채팅123123213" -} -### -GET http://localhost:4000/chats/6792f34d2f7696df3e742d33 -### -GET http://localhost:4000/chatRooms/67a1abf23f71fe22f15b7639/chats?pageSize=30 -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET http://localhost:4000/chats/67b09c4dfb9313f91285cd83/downloadFile -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET http://localhost:4000/chatRooms -Authorization: Bearer {{DREAMER1_TOKEN}} \ No newline at end of file diff --git a/httpTest/notification.http b/httpTest/notification.http deleted file mode 100644 index bb70a6e..0000000 --- a/httpTest/notification.http +++ /dev/null @@ -1,6 +0,0 @@ -GET http://localhost:3100/notifications -Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiJhMWIyYzNkNC1lNWY2LTc4OTAtYWJjZC0xMjM0NTY3ODkwZWYiLCJpYXQiOjE3MzY0MTA2MjAsImV4cCI6MTczNzAxNTQyMH0.QSEffVkwc-geOT4ftwTfIfQKNvd_EMfXa424F6pH0oA" - -### -PATCH http://localhost:3100/notifications/677e7b8a49b858d2516eb42a -Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiJhMWIyYzNkNC1lNWY2LTc4OTAtYWJjZC0xMjM0NTY3ODkwZWYiLCJpYXQiOjE3MzYzMjYzNTEsImV4cCI6MTczNjkzMTE1MX0.4ZB7HY3JINOcnqxJs7zNzABb1KFpkcB66vlAnU6hQY8 diff --git a/httpTest/plan.http b/httpTest/plan.http deleted file mode 100644 index 3b15b50..0000000 --- a/httpTest/plan.http +++ /dev/null @@ -1,99 +0,0 @@ -@HOST_NAME=http://localhost:4000/plans -@SERVER_NAME=https://www.goforme.duckdns.org/plans -@MAKER1_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIwMzJkN2JkNC0xMTZjLTQ2N2ItOTM1Mi1hMTRiMGQ0OTRlZjkiLCJyb2xlIjoiTUFLRVIiLCJpYXQiOjE3MzgyODY3MDAsImV4cCI6MTc0MTc0MjcwMH0.7SDoUJEj6C3ucUbJhqqaPiB_obs-iuhXdKWcuInxmKM -@MAKER2_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiJlZjg0NjUxOS0yYjczLTRiZTQtODA3ZS1mNmVmMWMwN2ViNjAiLCJyb2xlIjoiTUFLRVIiLCJpYXQiOjE3NDAwNTEwMTksImV4cCI6MTc0MzUwNzAxOX0.di5lEQVNKdhkyXaEoKSITPHy1Q-m3MA64faZo_s3RNk -@MAKER3_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiJhMDhkOTg1Ni1hZGZhLTRmODMtOWU5YS00ODQwMWYzZDBlZjMiLCJyb2xlIjoiTUFLRVIiLCJpYXQiOjE3Mzg2Nzc3NjAsImV4cCI6MTc0MjEzMzc2MH0.SFh1raM_FaliSjm3QlqJYR0OMgzasmc9_8Qj3Nyk5YI -@DREAMER1_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI2Njg4NWEzYy01MGY0LTQyN2ItOGE5Mi0zNzAyYzY5NzZmYjAiLCJyb2xlIjoiRFJFQU1FUiIsImlhdCI6MTczODMxNjA4OSwiZXhwIjoxNzQxNzcyMDg5fQ.eq2atkVBmm8RiGC1PYqBwCXP14hukjyElCkdx_PHOIo -@DREAMER2_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI1NTVkNDYzZS0zN2I2LTQxMGItOTA2MS0xMWE5ZDY4MjJiZGQiLCJyb2xlIjoiRFJFQU1FUiIsImlhdCI6MTczODg1MTMwNCwiZXhwIjoxNzQyMzA3MzA0fQ.HAP5l-hpW9GYpNEZJD1LZfYc0ydReNXN_CzMye8pIpw -@asdf2_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiJkZjMyMTlmZC1mOTU5LTQ4NGYtODhlNi00YjBjYTA0MDc1YzEiLCJyb2xlIjoiRFJFQU1FUiIsImlhdCI6MTc0MDA0NTkxNCwiZXhwIjoxNzQzNTAxOTE0fQ.dQtT2FX7cdl7vQbwUuWgSCKrtH2olUl7fDOmcDstyL4 -@PLAN1_ID=b198135d-9865-445b-a04b-742ca9939ee1 -@CONFIRMED_PLAN1=9004bc52-a8b0-4587-af53-59914168582f -@CONFIRMED_PLAN2=6d201a98-1d06-4497-806a-fa123599019a -@CONFIRMED_PLAN3=068eb509-ab56-4a95-b750-09be1e8db28e -@CONFIRMED_PLAN4=07cb9492-2685-4890-806c-c0e502b9853e -@QUOTE1_ID=1c9cde67-ccbf-4c00-a53a-63d79f4772c3 -GET {{HOST_NAME}}/maker -Authorization: Bearer {{MAKER1_TOKEN}} -### -GET {{HOST_NAME}}/dreamer?pageSize=2&hasReview=false -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET {{HOST_NAME}}/16865772-f792-4bb6-8ac8-504fcb4064e3 -Authorization: Bearer {{DREAMER1_TOKEN}} -### -POST {{HOST_NAME}} -Authorization: Bearer {{DREAMER1_TOKEN}} -Content-Type: application/json - -{ - "title": "제목", - "tripDate": "2025-01-19T00:00:00.000Z", - "tripType": "SHOPPING", - "serviceArea": "SEOUL", - "details": "상세내용", - "address": "청와대 1호실" -} -### - - -GET {{HOST_NAME}}/dreamer?status=OVERDUE -Authorization: Bearer {{DREAMER1_TOKEN}} -### -PATCH {{HOST_NAME}}/{{CONFIRMED_PLAN1}}/complete -Authorization: Bearer {{DREAMER1_TOKEN}} -### -PATCH {{HOST_NAME}}/{{CONFIRMED_PLAN2}}/complete -Authorization: Bearer {{DREAMER1_TOKEN}} -### -PATCH {{HOST_NAME}}/{{CONFIRMED_PLAN3}}/complete -Authorization: Bearer {{DREAMER2_TOKEN}} -### -PATCH {{HOST_NAME}}/{{CONFIRMED_PLAN4}}/complete -Authorization: Bearer {{DREAMER2_TOKEN}} -### -DELETE {{HOST_NAME}}/16865772-f792-4bb6-8ac8-504fcb4064e3 -Authorization: Bearer {{DREAMER1_TOKEN}} -### -POST {{HOST_NAME}}/16865772-f792-4bb6-8ac8-504fcb4064e3/assign -Authorization: Bearer {{DREAMER1_TOKEN}} -Content-Type: application/json - -{ - //"assigneeId": "ef846519-2b73-4be4-807e-f6ef1c07eb60" - "assigneeId": "a08d9856-adfa-4f83-9e9a-48401f3d0ef3" -} -### -DELETE {{HOST_NAME}}/16865772-f792-4bb6-8ac8-504fcb4064e3/assign -Authorization: Bearer {{MAKER2_TOKEN}} -### -PATCH {{HOST_NAME}}/{{CONFIRMED_PLAN1}}/complete -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET {{HOST_NAME}}/dreamer?readyToComplete=true -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET {{HOST_NAME}}/dreamer?readyToComplete=true -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET {{HOST_NAME}}/dreamer?reviewed=false -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET https://www.goforme.duckdns.org/plans/dreamer?readyToComplete=true -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET https://www.goforme.duckdns.org/plans/dreamer?reviewed=false -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET https://www.goforme.duckdns.org/plans/dreamer?readyToComplete=true&page=1&pageSize=6 -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET {{HOST_NAME}}/dreamer?readyToComplete=true&page=1&pageSize=6 -Authorization: Bearer {{DREAMER1_TOKEN}} -### -PATCH {{HOST_NAME}}/6d201a98-1d06-4497-806a-fa123599019a/complete -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET {{HOST_NAME}}/groupCount -### -GET {{HOST_NAME}}/maker?pageSize=10 -Authorization: Bearer {{MAKER1_TOKEN}} \ No newline at end of file diff --git a/httpTest/quote.http b/httpTest/quote.http deleted file mode 100644 index 3afa91b..0000000 --- a/httpTest/quote.http +++ /dev/null @@ -1,38 +0,0 @@ -@HOST_NAME=http://localhost:4000/quotes -@MAKER1_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIwMzJkN2JkNC0xMTZjLTQ2N2ItOTM1Mi1hMTRiMGQ0OTRlZjkiLCJyb2xlIjoiTUFLRVIiLCJpYXQiOjE3Mzc5ODM0MjYsImV4cCI6MTc0MTQzOTQyNn0.v5caBNbWAusy25h275WtSiJwYXPqyFC8vWPG3fO6r7E -@MAKER3_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiJhMDhkOTg1Ni1hZGZhLTRmODMtOWU5YS00ODQwMWYzZDBlZjMiLCJyb2xlIjoiTUFLRVIiLCJpYXQiOjE3Mzg2Nzc3NjAsImV4cCI6MTc0MjEzMzc2MH0.SFh1raM_FaliSjm3QlqJYR0OMgzasmc9_8Qj3Nyk5YI -@DREAMER1_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI2Njg4NWEzYy01MGY0LTQyN2ItOGE5Mi0zNzAyYzY5NzZmYjAiLCJyb2xlIjoiRFJFQU1FUiIsImlhdCI6MTczNzk4MzQ1MSwiZXhwIjoxNzQxNDM5NDUxfQ.V2qa2oB-m757NnAXYkefAWL_Vewwh526s97SYh2LuJc -@DREAMER2_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI1NTVkNDYzZS0zN2I2LTQxMGItOTA2MS0xMWE5ZDY4MjJiZGQiLCJyb2xlIjoiRFJFQU1FUiIsImlhdCI6MTczODY3NzUzMCwiZXhwIjoxNzQyMTMzNTMwfQ.XuLkyfKlskKRMfeABpwVEBCs0D0vuLyszKbef9V3m3k -@PLAN1_ID=16865772-f792-4bb6-8ac8-504fcb4064e3 -@PLAN2_ID=6d201a98-1d06-4497-806a-fa123599019a -@QUOTE1_ID=a6d79d0c-c834-498a-a0bd-e4727ee938f5 -@QUOTE2_ID=45ec04f9-a890-4992-adca-7f309a5b2cdc -@QUOTE3_ID=4cefee11-a095-4005-9158-67d3b49519ba -@CONFIRMED_QUOTE_ID = 2f7ae418-6114-40ce-a55e-fb0504040613 -GET http://localhost:4000/plans/{{PLAN2_ID}}/quotes -Authorization: Bearer {{DREAMER1_TOKEN}} -###드리머의 견적 리스트 -GET http://localhost:4000/quotes?isSent=true -Authorization: Bearer {{MAKER1_TOKEN}} -###메이커의 견적 리스트 -GET http://localhost:4000/quotes/{{QUOTE1_ID}} -Authorization: Bearer {{DREAMER1_TOKEN}} -###메이커의 견적 상세보기 -GET http://localhost:4000/quotes/{{CONFIRMED_QUOTE_ID}} -Authorization: Bearer {{DREAMER2_TOKEN}} -###드리머의 견적 상세보기 -GET {{HOST_NAME}}/{{CONFIRMED_QUOTE_ID}} -Authorization: Bearer {{MAKER3_TOKEN}} -### -PATCH {{HOST_NAME}}/{{QUOTE1_ID}}/confirm -Authorization: Bearer {{DREAMER1_TOKEN}} -### -PATCH {{HOST_NAME}}/{{QUOTE2_ID}}/confirm -Authorization: Bearer {{DREAMER1_TOKEN}} -### -PATCH {{HOST_NAME}}/{{QUOTE3_ID}}/confirm -Authorization: Bearer {{DREAMER1_TOKEN}} -### -GET http://localhost:4000/plans/16865772-f792-4bb6-8ac8-504fcb4064e3/quotes -Authorization: Bearer {{DREAMER1_TOKEN}} -### diff --git a/httpTest/user.http b/httpTest/user.http deleted file mode 100644 index 290feeb..0000000 --- a/httpTest/user.http +++ /dev/null @@ -1,78 +0,0 @@ -POST http://localhost:3100/user/signup -Content-Type: application/json - -{ - "user": { - "role": "DREAMER", - "nickName": "dagdsg", - "email": "asdfdfasd@naver.com", - "password": "123456789", - "phoneNumber": "01012345678" - }, - "profile": { - "image": "DEFAULT_1", - "tripTypes": ["FOOD_TOUR"], - "serviceArea": ["SEOUL", "INCHEON"] - } -} - -### -POST http://localhost:3100/user/login -Content-Type: application/json - -{ - "email": "asdfdfasd@naver.com", - "password": "12345678" -} - -### -PATCH http://localhost:3100/user/update -Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI3ZDI5ZWRmNi1iMWQxLTQxNWEtOWI3OS1jNWU2NGRmY2E3YmEiLCJyb2xlIjoiRFJFQU1FUiIsImlhdCI6MTczNjc1NzM2NCwiZXhwIjoxNzM2ODQzNzY0fQ.gkcFRuf3Il8_fvyJTHJYbdo1jwB4IoeANWWalIO6Jnk -Content-Type: application/json - -{ - "nickName": "닉네임 수정 테스트" -} - -### -POST http://localhost:3100/follow -Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIwZWY3MmFjNy1hZmViLTQyNzItYjc2Yi1iNjRkOTNhZTc4NzkiLCJpYXQiOjE3MzYyMjc3NzgsImV4cCI6MTczNjMxNDE3OH0.15V3Va4QzmCeUH2ua3Zt5wM7NVp5v9cfwAlHnTtKpME -Content-Type: application/json - -{ - "makerId": "5d0b3e03-d70c-4c15-bd30-cfd805823173" -} - -### -DELETE http://localhost:3100/follow -Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIwZWY3MmFjNy1hZmViLTQyNzItYjc2Yi1iNjRkOTNhZTc4NzkiLCJpYXQiOjE3MzYyMjc3NzgsImV4cCI6MTczNjMxNDE3OH0.15V3Va4QzmCeUH2ua3Zt5wM7NVp5v9cfwAlHnTtKpME -Content-Type: application/json - -{ - "makerId": "5d0b3e03-d70c-4c15-bd30-cfd805823173" -} - -### -POST http://localhost:4000/auth/login -Content-Type: application/json - -{ - "email": "maker2@test.com", - "password": "12345678" -} -### -POST http://localhost:4000/auth/login -Content-Type: application/json - -{ - "email": "dreamer2@test.com", - "password": "12345678" -} -### -POST http://localhost:4000/auth/login -Content-Type: application/json - -{ - "email": "asdf2@naver.com", - "password": "123456" -} \ No newline at end of file diff --git a/src/common/domains/pointLog/pointLog.interface.ts b/src/common/domains/pointLog/pointLog.interface.ts deleted file mode 100644 index 820c7d0..0000000 --- a/src/common/domains/pointLog/pointLog.interface.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { PointLogProperties } from 'src/common/types/pointLog/pointLog.type'; - -export default interface IPointLog { - get(): PointLogProperties; -} diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts index 6c1a22d..9b3a7ca 100644 --- a/src/modules/auth/auth.controller.ts +++ b/src/modules/auth/auth.controller.ts @@ -9,15 +9,15 @@ import { ApiOperation, ApiUnauthorizedResponse } from '@nestjs/swagger'; -import SignupDTO from 'src/common/types/user/signup.dto'; -import LoginDTO from 'src/common/types/user/login.dto'; +import SignupDTO from 'src/modules/user/types/signup.dto'; +import LoginDTO from 'src/modules/user/types/login.dto'; import { Cookies } from 'src/common/decorators/cookie.decorator'; import UnauthorizedError from 'src/common/errors/unauthorizedError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; import { Response } from 'express'; import { AuthGuard } from '@nestjs/passport'; import { User } from 'src/common/decorators/user.decorator'; -import { OAuthProperties } from 'src/common/types/user/user.types'; +import { OAuthProperties } from 'src/modules/user/types/user.types'; import { OAuthProvider } from 'src/common/constants/oauth.type'; @Controller('auth') diff --git a/src/modules/auth/auth.repository.ts b/src/modules/auth/auth.repository.ts index 2778de9..5ed0be9 100644 --- a/src/modules/auth/auth.repository.ts +++ b/src/modules/auth/auth.repository.ts @@ -1,10 +1,10 @@ import { Injectable } from '@nestjs/common'; -import { IDreamerProfile, IMakerProfile } from 'src/common/domains/user/profile.interface'; -import { DreamerProfileMapper, MakerProfileMapper } from 'src/common/domains/user/profile.mapper'; -import { IUser } from 'src/common/domains/user/user.interface'; -import UserMapper from 'src/common/domains/user/user.mapper'; -import { DreamerProfileProperties, MakerProfileProperties } from 'src/common/types/user/profile.types'; -import { OAuthProperties, SignupProperties } from 'src/common/types/user/user.types'; +import { IDreamerProfile, IMakerProfile } from 'src/modules/user/domain/profile.interface'; +import { DreamerProfileMapper, MakerProfileMapper } from 'src/modules/user/domain/profile.mapper'; +import { IUser } from 'src/modules/user/domain/user.interface'; +import UserMapper from 'src/modules/user/domain/user.mapper'; +import { DreamerProfileProperties, MakerProfileProperties } from 'src/modules/user/types/profile.types'; +import { OAuthProperties, SignupProperties } from 'src/modules/user/types/user.types'; import DBClient from 'src/providers/database/prisma/DB.client'; @Injectable() diff --git a/src/modules/auth/auth.service.ts b/src/modules/auth/auth.service.ts index 2b433e1..08e0a6d 100644 --- a/src/modules/auth/auth.service.ts +++ b/src/modules/auth/auth.service.ts @@ -2,13 +2,13 @@ import ErrorMessage from 'src/common/constants/errorMessage.enum'; import BadRequestError from 'src/common/errors/badRequestError'; import { JwtService } from '@nestjs/jwt'; import { Injectable } from '@nestjs/common'; -import User from 'src/common/domains/user/user.domain'; -import { DreamerProfile, MakerProfile } from 'src/common/domains/user/profile.domain'; +import User from 'src/modules/user/domain/user.domain'; +import { DreamerProfile, MakerProfile } from 'src/modules/user/domain/profile.domain'; import UserStatsService from '../userStats/userStats.service'; -import { FilteredUserProperties, OAuthProperties, UserProperties } from 'src/common/types/user/user.types'; +import { FilteredUserProperties, OAuthProperties, UserProperties } from 'src/modules/user/types/user.types'; import AuthRepository from './auth.repository'; import { Role, RoleValues } from 'src/common/constants/role.type'; -import { DreamerProfileProperties, MakerProfileProperties } from 'src/common/types/user/profile.types'; +import { DreamerProfileProperties, MakerProfileProperties } from 'src/modules/user/types/profile.types'; import { OAuthProvider } from 'src/common/constants/oauth.type'; import UnauthorizedError from 'src/common/errors/unauthorizedError'; diff --git a/src/modules/chat/chat.controller.ts b/src/modules/chat/chat.controller.ts index 9755f8a..8460db7 100644 --- a/src/modules/chat/chat.controller.ts +++ b/src/modules/chat/chat.controller.ts @@ -1,7 +1,7 @@ import { Controller, Delete, Get, HttpCode, HttpStatus, Param, UsePipes, ValidationPipe } from '@nestjs/common'; import ChatService from './chat.service'; import { UserId } from 'src/common/decorators/user.decorator'; -import { ChatIdDTO } from 'src/common/types/chat/chat.dto'; +import { ChatIdDTO } from 'src/modules/chat/types/chat.dto'; @Controller('chats') export default class ChatController { diff --git a/src/modules/chat/chat.repository.ts b/src/modules/chat/chat.repository.ts index 8c9307e..6e6ea63 100644 --- a/src/modules/chat/chat.repository.ts +++ b/src/modules/chat/chat.repository.ts @@ -2,10 +2,10 @@ import { Injectable } from '@nestjs/common'; import { InjectModel } from '@nestjs/mongoose'; import { Model } from 'mongoose'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; -import IChat from 'src/common/domains/chat/chat.interface'; -import ChatMapper from 'src/common/domains/chat/chat.mapper'; +import IChat from './domain/chat.interface'; +import ChatMapper from './domain/chat.mapper'; import InternalServerError from 'src/common/errors/internalServerError'; -import { ChatQueryOptions } from 'src/common/types/chat/chat.type'; +import { ChatQueryOptions } from 'src/modules/chat/types/chat.type'; import { Chat } from 'src/providers/database/mongoose/chat.schema'; import { ChatRoom } from 'src/providers/database/mongoose/chatRoom.schema'; import TransactionManager from 'src/providers/database/transaction/transaction.manager'; diff --git a/src/modules/chat/chat.service.ts b/src/modules/chat/chat.service.ts index aaac643..d4e6bcd 100644 --- a/src/modules/chat/chat.service.ts +++ b/src/modules/chat/chat.service.ts @@ -1,9 +1,9 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common'; import ChatRepository from './chat.repository'; -import { ChatCreateData, ChatQueryOptions } from 'src/common/types/chat/chat.type'; -import Chat from 'src/common/domains/chat/chat.domain'; -import { ChatToClientProperties } from 'src/common/domains/chat/chat.properties'; -import { FileUploadData } from 'src/common/types/chatRoom/chatRoom.type'; +import { ChatCreateData, ChatQueryOptions } from 'src/modules/chat/types/chat.type'; +import Chat from './domain/chat.domain'; +import { ChatToClientProperties } from './domain/chat.properties'; +import { FileUploadData } from 'src/modules/chatRoom/types/chatRoom.type'; import { S3Service } from 'src/providers/storage/s3/s3.service'; import { ChatType } from 'src/common/constants/chat.type'; import ChatRoomService from '../chatRoom/chatRoom.service'; diff --git a/src/common/domains/chat/chat.domain.ts b/src/modules/chat/domain/chat.domain.ts similarity index 100% rename from src/common/domains/chat/chat.domain.ts rename to src/modules/chat/domain/chat.domain.ts diff --git a/src/common/domains/chat/chat.interface.ts b/src/modules/chat/domain/chat.interface.ts similarity index 100% rename from src/common/domains/chat/chat.interface.ts rename to src/modules/chat/domain/chat.interface.ts diff --git a/src/common/domains/chat/chat.mapper.ts b/src/modules/chat/domain/chat.mapper.ts similarity index 100% rename from src/common/domains/chat/chat.mapper.ts rename to src/modules/chat/domain/chat.mapper.ts diff --git a/src/common/domains/chat/chat.properties.ts b/src/modules/chat/domain/chat.properties.ts similarity index 100% rename from src/common/domains/chat/chat.properties.ts rename to src/modules/chat/domain/chat.properties.ts diff --git a/src/common/types/chat/chat.dto.ts b/src/modules/chat/types/chat.dto.ts similarity index 100% rename from src/common/types/chat/chat.dto.ts rename to src/modules/chat/types/chat.dto.ts diff --git a/src/common/types/chat/chat.type.ts b/src/modules/chat/types/chat.type.ts similarity index 100% rename from src/common/types/chat/chat.type.ts rename to src/modules/chat/types/chat.type.ts diff --git a/src/modules/chatRoom/chatRoom.controller.ts b/src/modules/chatRoom/chatRoom.controller.ts index f43039e..cc11605 100644 --- a/src/modules/chatRoom/chatRoom.controller.ts +++ b/src/modules/chatRoom/chatRoom.controller.ts @@ -11,13 +11,13 @@ import { ValidationPipe } from '@nestjs/common'; import { UserId } from 'src/common/decorators/user.decorator'; -import { ChatRoomWithUserInfo } from 'src/common/domains/chatRoom/chatRoom.properties'; +import { ChatRoomWithUserInfo } from './domain/chatRoom.properties'; import ChatRoomService from './chatRoom.service'; -import { ChatProperties } from 'src/common/domains/chat/chat.properties'; +import { ChatProperties } from '../chat/domain/chat.properties'; import { FileInterceptor } from '@nestjs/platform-express'; import { ChatType, MB } from 'src/common/constants/chat.type'; import { FileValidationPipe } from 'src/common/pipes/fileValidation.pipe'; -import { ChatRoomIdDTO, ChatRoomQueryDTO } from 'src/common/types/chatRoom/chatRoom.dto'; +import { ChatRoomIdDTO, ChatRoomQueryDTO } from 'src/modules/chatRoom/types/chatRoom.dto'; @Controller('chatRooms') export default class ChatRoomController { diff --git a/src/modules/chatRoom/chatRoom.repository.ts b/src/modules/chatRoom/chatRoom.repository.ts index fdab640..675219d 100644 --- a/src/modules/chatRoom/chatRoom.repository.ts +++ b/src/modules/chatRoom/chatRoom.repository.ts @@ -1,10 +1,10 @@ import { Injectable } from '@nestjs/common'; import { InjectModel } from '@nestjs/mongoose'; import { Model } from 'mongoose'; -import IChatRoom from 'src/common/domains/chatRoom/chatRoom.interface'; -import ChatRoomMapper from 'src/common/domains/chatRoom/chatRoom.mapper'; -import { ChatQueryOptions } from 'src/common/types/chat/chat.type'; -import { FindChatRoomByIdOptions } from 'src/common/types/chatRoom/chatRoom.type'; +import IChatRoom from './domain/chatRoom.interface'; +import ChatRoomMapper from './domain/chatRoom.mapper'; +import { ChatQueryOptions } from 'src/modules/chat/types/chat.type'; +import { FindChatRoomByIdOptions } from 'src/modules/chatRoom/types/chatRoom.type'; import { ChatRoom } from 'src/providers/database/mongoose/chatRoom.schema'; import { ObjectId } from 'mongodb'; diff --git a/src/modules/chatRoom/chatRoom.service.ts b/src/modules/chatRoom/chatRoom.service.ts index fda9bd0..441118b 100644 --- a/src/modules/chatRoom/chatRoom.service.ts +++ b/src/modules/chatRoom/chatRoom.service.ts @@ -1,17 +1,17 @@ import { Injectable } from '@nestjs/common'; -import { ChatCreateData, ChatQueryOptions } from 'src/common/types/chat/chat.type'; +import { ChatCreateData, ChatQueryOptions } from 'src/modules/chat/types/chat.type'; import ChatRoomRepository from './chatRoom.repository'; -import { ChatRoomProperties, ChatRoomWithUserInfo } from 'src/common/domains/chatRoom/chatRoom.properties'; +import { ChatRoomProperties, ChatRoomWithUserInfo } from './domain/chatRoom.properties'; import ForbiddenError from 'src/common/errors/forbiddenError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; -import ChatRoom from 'src/common/domains/chatRoom/chatRoom.domain'; +import ChatRoom from './domain/chatRoom.domain'; import ChatService from '../chat/chat.service'; -import { ChatProperties, ChatToClientProperties } from 'src/common/domains/chat/chat.properties'; +import { ChatProperties, ChatToClientProperties } from '../chat/domain/chat.properties'; import UserService from '../user/user.service'; import { Socket } from 'socket.io'; -import { ChatReference, FileUploadData, FindChatRoomByIdOptions } from 'src/common/types/chatRoom/chatRoom.type'; +import { ChatReference, FileUploadData, FindChatRoomByIdOptions } from 'src/modules/chatRoom/types/chatRoom.type'; import NotFoundError from 'src/common/errors/notFoundError'; -import IChatRoom from 'src/common/domains/chatRoom/chatRoom.interface'; +import IChatRoom from './domain/chatRoom.interface'; import BadRequestError from 'src/common/errors/badRequestError'; import Transactional from 'src/common/decorators/transaction.decorator'; diff --git a/src/common/domains/chatRoom/chatRoom.domain.ts b/src/modules/chatRoom/domain/chatRoom.domain.ts similarity index 100% rename from src/common/domains/chatRoom/chatRoom.domain.ts rename to src/modules/chatRoom/domain/chatRoom.domain.ts diff --git a/src/common/domains/chatRoom/chatRoom.interface.ts b/src/modules/chatRoom/domain/chatRoom.interface.ts similarity index 100% rename from src/common/domains/chatRoom/chatRoom.interface.ts rename to src/modules/chatRoom/domain/chatRoom.interface.ts diff --git a/src/common/domains/chatRoom/chatRoom.mapper.ts b/src/modules/chatRoom/domain/chatRoom.mapper.ts similarity index 100% rename from src/common/domains/chatRoom/chatRoom.mapper.ts rename to src/modules/chatRoom/domain/chatRoom.mapper.ts diff --git a/src/common/domains/chatRoom/chatRoom.properties.ts b/src/modules/chatRoom/domain/chatRoom.properties.ts similarity index 100% rename from src/common/domains/chatRoom/chatRoom.properties.ts rename to src/modules/chatRoom/domain/chatRoom.properties.ts diff --git a/src/common/types/chatRoom/chatRoom.dto.ts b/src/modules/chatRoom/types/chatRoom.dto.ts similarity index 100% rename from src/common/types/chatRoom/chatRoom.dto.ts rename to src/modules/chatRoom/types/chatRoom.dto.ts diff --git a/src/common/types/chatRoom/chatRoom.type.ts b/src/modules/chatRoom/types/chatRoom.type.ts similarity index 100% rename from src/common/types/chatRoom/chatRoom.type.ts rename to src/modules/chatRoom/types/chatRoom.type.ts diff --git a/src/common/domains/follow/follow.domain.ts b/src/modules/follow/domain/follow.domain.ts similarity index 91% rename from src/common/domains/follow/follow.domain.ts rename to src/modules/follow/domain/follow.domain.ts index 9ab2d61..117a721 100644 --- a/src/common/domains/follow/follow.domain.ts +++ b/src/modules/follow/domain/follow.domain.ts @@ -1,4 +1,4 @@ -import { FollowProperties } from '../../types/follow/follow.types'; +import { FollowProperties } from '../../../modules/follow/types/follow.types'; import IFollow from './follow.interface'; export default class Follow implements IFollow { diff --git a/src/common/domains/follow/follow.interface.ts b/src/modules/follow/domain/follow.interface.ts similarity index 58% rename from src/common/domains/follow/follow.interface.ts rename to src/modules/follow/domain/follow.interface.ts index 2dcf4c7..c2711d6 100644 --- a/src/common/domains/follow/follow.interface.ts +++ b/src/modules/follow/domain/follow.interface.ts @@ -1,4 +1,4 @@ -import { FollowProperties } from '../../types/follow/follow.types'; +import { FollowProperties } from '../../../modules/follow/types/follow.types'; export default interface IFollow { getMakerId(): string; diff --git a/src/common/domains/follow/follow.mapper.ts b/src/modules/follow/domain/follow.mapper.ts similarity index 83% rename from src/common/domains/follow/follow.mapper.ts rename to src/modules/follow/domain/follow.mapper.ts index 97728fc..d6bfda3 100644 --- a/src/common/domains/follow/follow.mapper.ts +++ b/src/modules/follow/domain/follow.mapper.ts @@ -1,4 +1,4 @@ -import { FollowProperties } from '../../types/follow/follow.types'; +import { FollowProperties } from '../../../modules/follow/types/follow.types'; import Follow from './follow.domain'; export default class FollowMapper { diff --git a/src/modules/follow/follow.repository.ts b/src/modules/follow/follow.repository.ts index ad8d759..91a4cb0 100644 --- a/src/modules/follow/follow.repository.ts +++ b/src/modules/follow/follow.repository.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import DBClient from 'src/providers/database/prisma/DB.client'; -import FollowMapper from '../../common/domains/follow/follow.mapper'; -import IFollow from '../../common/domains/follow/follow.interface'; -import { PaginationQueryDTO } from 'src/common/types/user/query.dto'; +import FollowMapper from './domain/follow.mapper'; +import IFollow from './domain/follow.interface'; +import { PaginationQueryDTO } from 'src/modules/user/types/query.dto'; @Injectable() export default class FollowRepository { diff --git a/src/modules/follow/follow.service.ts b/src/modules/follow/follow.service.ts index 1e00575..c739507 100644 --- a/src/modules/follow/follow.service.ts +++ b/src/modules/follow/follow.service.ts @@ -2,12 +2,12 @@ import { Injectable } from '@nestjs/common'; import FollowRepository from './follow.repository'; import BadRequestError from 'src/common/errors/badRequestError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; -import Follow from '../../common/domains/follow/follow.domain'; -import { FollowProperties } from 'src/common/types/follow/follow.types'; +import Follow from './domain/follow.domain'; +import { FollowProperties } from 'src/modules/follow/types/follow.types'; import { Queue } from 'bullmq'; import { InjectQueue } from '@nestjs/bullmq'; import { EventType } from 'src/common/constants/event.type'; -import { PaginationQueryDTO } from 'src/common/types/user/query.dto'; +import { PaginationQueryDTO } from 'src/modules/user/types/query.dto'; @Injectable() export default class FollowService { diff --git a/src/common/types/follow/follow.types.ts b/src/modules/follow/types/follow.types.ts similarity index 100% rename from src/common/types/follow/follow.types.ts rename to src/modules/follow/types/follow.types.ts diff --git a/src/common/domains/notification/notification.domain.ts b/src/modules/notification/domain/notification.domain.ts similarity index 95% rename from src/common/domains/notification/notification.domain.ts rename to src/modules/notification/domain/notification.domain.ts index c35ca09..7411802 100644 --- a/src/common/domains/notification/notification.domain.ts +++ b/src/modules/notification/domain/notification.domain.ts @@ -1,4 +1,4 @@ -import { NotificationEvent, NotificationProperties } from '../../types/notification/notification.types'; +import { NotificationEvent, NotificationProperties } from '../../../modules/notification/types/notification.types'; import INotification from './notification.interface'; export default class Notification implements INotification { diff --git a/src/common/domains/notification/notification.interface.ts b/src/modules/notification/domain/notification.interface.ts similarity index 50% rename from src/common/domains/notification/notification.interface.ts rename to src/modules/notification/domain/notification.interface.ts index df3afa2..3a0e7d7 100644 --- a/src/common/domains/notification/notification.interface.ts +++ b/src/modules/notification/domain/notification.interface.ts @@ -1,4 +1,4 @@ -import { NotificationProperties } from 'src/common/types/notification/notification.types'; +import { NotificationProperties } from 'src/modules/notification/types/notification.types'; export default interface INotification { update(): void; diff --git a/src/common/domains/notification/notification.mapper.ts b/src/modules/notification/domain/notification.mapper.ts similarity index 100% rename from src/common/domains/notification/notification.mapper.ts rename to src/modules/notification/domain/notification.mapper.ts diff --git a/src/modules/notification/notification.controller.ts b/src/modules/notification/notification.controller.ts index bbe475a..2dba60a 100644 --- a/src/modules/notification/notification.controller.ts +++ b/src/modules/notification/notification.controller.ts @@ -3,7 +3,7 @@ import NotificationService from './notification.service'; import { UserId } from 'src/common/decorators/user.decorator'; import { map, Observable } from 'rxjs'; import { Public } from 'src/common/decorators/public.decorator'; -import { NotificationEventName, NotificationProperties } from '../../common/types/notification/notification.types'; +import { NotificationEventName, NotificationProperties } from './types/notification.types'; @Controller('notifications') export default class NotificationController { diff --git a/src/modules/notification/notification.repository.ts b/src/modules/notification/notification.repository.ts index 6ee1262..e06154b 100644 --- a/src/modules/notification/notification.repository.ts +++ b/src/modules/notification/notification.repository.ts @@ -2,9 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectModel } from '@nestjs/mongoose'; import { Notification } from 'src/providers/database/mongoose/notification.schema'; import { Model } from 'mongoose'; -import { NotificationProperties } from '../../common/types/notification/notification.types'; -import INotification from 'src/common/domains/notification/notification.interface'; -import NotificationMapper from 'src/common/domains/notification/notification.mapper'; +import { NotificationProperties } from './types/notification.types'; +import INotification from './domain/notification.interface'; +import NotificationMapper from './domain/notification.mapper'; @Injectable() export default class NotificationRepository { diff --git a/src/modules/notification/notification.service.ts b/src/modules/notification/notification.service.ts index 6b90b92..4aa0a7e 100644 --- a/src/modules/notification/notification.service.ts +++ b/src/modules/notification/notification.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import NotificationRepository from './notification.repository'; import { EventEmitter2 } from '@nestjs/event-emitter'; -import { NotificationEvent, NotificationProperties } from '../../common/types/notification/notification.types'; +import { NotificationEvent, NotificationProperties } from './types/notification.types'; import BadRequestError from 'src/common/errors/badRequestError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; import { Observable } from 'rxjs'; diff --git a/src/common/types/notification/notification.types.ts b/src/modules/notification/types/notification.types.ts similarity index 100% rename from src/common/types/notification/notification.types.ts rename to src/modules/notification/types/notification.types.ts diff --git a/src/common/domains/payment/payment.domain.ts b/src/modules/payment/domain/payment.domain.ts similarity index 92% rename from src/common/domains/payment/payment.domain.ts rename to src/modules/payment/domain/payment.domain.ts index 3eb53a1..27b9fd4 100644 --- a/src/common/domains/payment/payment.domain.ts +++ b/src/modules/payment/domain/payment.domain.ts @@ -1,4 +1,8 @@ -import { PaymentProperties, PaymentStatusEnum, PaymentToClientProperties } from 'src/common/types/payment/payment.type'; +import { + PaymentProperties, + PaymentStatusEnum, + PaymentToClientProperties +} from 'src/modules/payment/types/payment.type'; import { IPayment } from './payment.interface'; export default class Payment implements IPayment { diff --git a/src/common/domains/payment/payment.interface.ts b/src/modules/payment/domain/payment.interface.ts similarity index 64% rename from src/common/domains/payment/payment.interface.ts rename to src/modules/payment/domain/payment.interface.ts index 3e1616c..a14ef25 100644 --- a/src/common/domains/payment/payment.interface.ts +++ b/src/modules/payment/domain/payment.interface.ts @@ -1,4 +1,8 @@ -import { PaymentProperties, PaymentStatusEnum, PaymentToClientProperties } from 'src/common/types/payment/payment.type'; +import { + PaymentProperties, + PaymentStatusEnum, + PaymentToClientProperties +} from 'src/modules/payment/types/payment.type'; export interface IPayment { update(status: PaymentStatusEnum): void; diff --git a/src/common/domains/payment/payment.mapper.ts b/src/modules/payment/domain/payment.mapper.ts similarity index 89% rename from src/common/domains/payment/payment.mapper.ts rename to src/modules/payment/domain/payment.mapper.ts index 309ba15..4e017c9 100644 --- a/src/common/domains/payment/payment.mapper.ts +++ b/src/modules/payment/domain/payment.mapper.ts @@ -1,4 +1,4 @@ -import { PaymentProperties } from 'src/common/types/payment/payment.type'; +import { PaymentProperties } from 'src/modules/payment/types/payment.type'; import Payment from './payment.domain'; export default class PaymentMapper { diff --git a/src/modules/payment/payment.controller.ts b/src/modules/payment/payment.controller.ts index edcbf1e..1a430af 100644 --- a/src/modules/payment/payment.controller.ts +++ b/src/modules/payment/payment.controller.ts @@ -1,8 +1,8 @@ import { Body, Controller, Get, Param, Post } from '@nestjs/common'; import PaymentService from './payment.service'; import { UserId } from 'src/common/decorators/user.decorator'; -import { PaymentToClientProperties } from 'src/common/types/payment/payment.type'; -import { SavePaymentDTO } from 'src/common/types/payment/payment.dto'; +import { PaymentToClientProperties } from 'src/modules/payment/types/payment.type'; +import { SavePaymentDTO } from 'src/modules/payment/types/payment.dto'; @Controller('payments') export default class PaymentController { diff --git a/src/modules/payment/payment.repository.ts b/src/modules/payment/payment.repository.ts index 91c2fb5..772cb02 100644 --- a/src/modules/payment/payment.repository.ts +++ b/src/modules/payment/payment.repository.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; import { InjectModel } from '@nestjs/mongoose'; import { Model } from 'mongoose'; -import { IPayment } from 'src/common/domains/payment/payment.interface'; -import PaymentMapper from 'src/common/domains/payment/payment.mapper'; -import { PaymentProperties } from 'src/common/types/payment/payment.type'; +import { IPayment } from './domain/payment.interface'; +import PaymentMapper from './domain/payment.mapper'; +import { PaymentProperties } from 'src/modules/payment/types/payment.type'; import { Payment } from 'src/providers/database/mongoose/payment.schema'; @Injectable() diff --git a/src/modules/payment/payment.service.ts b/src/modules/payment/payment.service.ts index a14a5d0..6b35d8e 100644 --- a/src/modules/payment/payment.service.ts +++ b/src/modules/payment/payment.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@nestjs/common'; import PaymentRepository from './payment.repository'; -import { PaymentStatusEnum, PaymentToClientProperties } from 'src/common/types/payment/payment.type'; -import Payment from 'src/common/domains/payment/payment.domain'; +import { PaymentStatusEnum, PaymentToClientProperties } from 'src/modules/payment/types/payment.type'; +import Payment from './domain/payment.domain'; import UnauthorizedError from 'src/common/errors/unauthorizedError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; import NotFoundError from 'src/common/errors/notFoundError'; import InternalServerError from 'src/common/errors/internalServerError'; import BadRequestError from 'src/common/errors/badRequestError'; -import { SavePaymentDTO } from 'src/common/types/payment/payment.dto'; +import { SavePaymentDTO } from 'src/modules/payment/types/payment.dto'; import { PGService } from 'src/providers/pg/pg.service'; import { Queue } from 'bullmq'; import { InjectQueue } from '@nestjs/bullmq'; diff --git a/src/common/types/payment/payment.dto.ts b/src/modules/payment/types/payment.dto.ts similarity index 100% rename from src/common/types/payment/payment.dto.ts rename to src/modules/payment/types/payment.dto.ts diff --git a/src/common/types/payment/payment.type.ts b/src/modules/payment/types/payment.type.ts similarity index 100% rename from src/common/types/payment/payment.type.ts rename to src/modules/payment/types/payment.type.ts diff --git a/src/common/domains/plan/plan.domain.ts b/src/modules/plan/domain/plan.domain.ts similarity index 96% rename from src/common/domains/plan/plan.domain.ts rename to src/modules/plan/domain/plan.domain.ts index f859912..c44fbcb 100644 --- a/src/common/domains/plan/plan.domain.ts +++ b/src/modules/plan/domain/plan.domain.ts @@ -2,13 +2,13 @@ import { TripType, TripTypeValues } from 'src/common/constants/tripType.type'; import IPlan from './plan.interface'; import { ServiceArea } from 'src/common/constants/serviceArea.type'; import { Status, StatusValues } from 'src/common/constants/status.type'; -import { PlanProperties, PlanToClientProperties } from 'src/common/types/plan/plan.properties'; +import { PlanProperties, PlanToClientProperties } from 'src/modules/plan/types/plan.properties'; import ConflictError from 'src/common/errors/conflictError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; import BadRequestError from 'src/common/errors/badRequestError'; -import { AssignData } from 'src/common/types/plan/plan.type'; +import { AssignData } from 'src/modules/plan/types/plan.type'; import ForbiddenError from 'src/common/errors/forbiddenError'; -import { UserReference } from 'src/common/types/user/user.types'; +import { UserReference } from 'src/modules/user/types/user.types'; import { ProfileImage } from 'src/common/constants/image.type'; export default class Plan implements IPlan { diff --git a/src/common/domains/plan/plan.interface.ts b/src/modules/plan/domain/plan.interface.ts similarity index 85% rename from src/common/domains/plan/plan.interface.ts rename to src/modules/plan/domain/plan.interface.ts index c3fc026..5ffa777 100644 --- a/src/common/domains/plan/plan.interface.ts +++ b/src/modules/plan/domain/plan.interface.ts @@ -1,6 +1,6 @@ -import { PlanProperties, PlanToClientProperties } from 'src/common/types/plan/plan.properties'; +import { PlanProperties, PlanToClientProperties } from 'src/modules/plan/types/plan.properties'; import { Status } from 'src/common/constants/status.type'; -import { AssignData } from 'src/common/types/plan/plan.type'; +import { AssignData } from 'src/modules/plan/types/plan.type'; import { TripType } from 'src/common/constants/tripType.type'; import { ServiceArea } from 'src/common/constants/serviceArea.type'; diff --git a/src/common/domains/plan/plan.mapper.ts b/src/modules/plan/domain/plan.mapper.ts similarity index 93% rename from src/common/domains/plan/plan.mapper.ts rename to src/modules/plan/domain/plan.mapper.ts index fde8a18..bb9c6a7 100644 --- a/src/common/domains/plan/plan.mapper.ts +++ b/src/modules/plan/domain/plan.mapper.ts @@ -1,4 +1,4 @@ -import { PlanMapperProperties } from 'src/common/types/plan/plan.properties'; +import { PlanMapperProperties } from 'src/modules/plan/types/plan.properties'; import IPlan from './plan.interface'; import Plan from './plan.domain'; import { StatusValues } from 'src/common/constants/status.type'; diff --git a/src/modules/plan/plan.controller.ts b/src/modules/plan/plan.controller.ts index 4eb804f..66369ab 100644 --- a/src/modules/plan/plan.controller.ts +++ b/src/modules/plan/plan.controller.ts @@ -1,12 +1,12 @@ import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Patch, Post, Query } from '@nestjs/common'; import { UserId } from 'src/common/decorators/user.decorator'; -import { CreatePlanDataDTO, MyPlanQueryDTO, PlanQueryOptionDTO, ServiceAreaDTO } from 'src/common/types/plan/plan.dto'; +import { CreatePlanDataDTO, MyPlanQueryDTO, PlanQueryOptionDTO, ServiceAreaDTO } from 'src/modules/plan/types/plan.dto'; import PlanService from './plan.service'; -import { CreatePlanData, GroupByCount } from 'src/common/types/plan/plan.type'; -import { CreateQuoteDataDTO, DreamerQuoteQueryOptionsDTO } from 'src/common/types/quote/quote.dto'; -import { QuoteToClientProperties } from 'src/common/types/quote/quoteProperties'; +import { CreatePlanData, GroupByCount } from 'src/modules/plan/types/plan.type'; +import { CreateQuoteDataDTO, DreamerQuoteQueryOptionsDTO } from 'src/modules/quote/types/quote.dto'; +import { QuoteToClientProperties } from 'src/modules/quote/types/quoteProperties'; import { Role } from 'src/common/decorators/roleGuard.decorator'; -import { PlanToClientProperties } from 'src/common/types/plan/plan.properties'; +import { PlanToClientProperties } from 'src/modules/plan/types/plan.properties'; import { Public } from 'src/common/decorators/public.decorator'; @Controller('plans') diff --git a/src/modules/plan/plan.repository.ts b/src/modules/plan/plan.repository.ts index 96e87a3..f84ae97 100644 --- a/src/modules/plan/plan.repository.ts +++ b/src/modules/plan/plan.repository.ts @@ -4,11 +4,11 @@ import PlanOrder from 'src/common/constants/planOrder.enum'; import { RoleValues } from 'src/common/constants/role.type'; import SortOrder from 'src/common/constants/sortOrder.enum'; import { Status, StatusValues } from 'src/common/constants/status.type'; -import IPlan from 'src/common/domains/plan/plan.interface'; -import PlanMapper from 'src/common/domains/plan/plan.mapper'; -import { GroupByCount, PlanWhereConditions } from 'src/common/types/plan/plan.type'; -import { PlanOrderByField } from 'src/common/types/plan/plan.type'; -import { PlanQueryOptions } from 'src/common/types/plan/plan.type'; +import IPlan from './domain/plan.interface'; +import PlanMapper from './domain/plan.mapper'; +import { GroupByCount, PlanWhereConditions } from 'src/modules/plan/types/plan.type'; +import { PlanOrderByField } from 'src/modules/plan/types/plan.type'; +import { PlanQueryOptions } from 'src/modules/plan/types/plan.type'; import DBClient from 'src/providers/database/prisma/DB.client'; import TransactionManager from 'src/providers/database/transaction/transaction.manager'; diff --git a/src/modules/plan/plan.service.ts b/src/modules/plan/plan.service.ts index 589ee7a..8bb2413 100644 --- a/src/modules/plan/plan.service.ts +++ b/src/modules/plan/plan.service.ts @@ -2,21 +2,21 @@ import { Injectable } from '@nestjs/common'; import PlanRepository from './plan.repository'; import QuoteService from 'src/modules/quote/quote.service'; import { EventEmitter2 } from '@nestjs/event-emitter'; -import { AssignData, GroupByCount, PlanQueryOptions } from 'src/common/types/plan/plan.type'; -import { PlanToClientProperties } from 'src/common/types/plan/plan.properties'; +import { AssignData, GroupByCount, PlanQueryOptions } from 'src/modules/plan/types/plan.type'; +import { PlanToClientProperties } from 'src/modules/plan/types/plan.properties'; import NotFoundError from 'src/common/errors/notFoundError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; -import { CreateOptionalQuoteData, QuoteQueryOptions } from 'src/common/types/quote/quote.type'; -import { QuoteToClientProperties } from 'src/common/types/quote/quoteProperties'; -import { CreatePlanData } from 'src/common/types/plan/plan.type'; +import { CreateOptionalQuoteData, QuoteQueryOptions } from 'src/modules/quote/types/quote.type'; +import { QuoteToClientProperties } from 'src/modules/quote/types/quoteProperties'; +import { CreatePlanData } from 'src/modules/plan/types/plan.type'; import ForbiddenError from 'src/common/errors/forbiddenError'; import { ServiceArea } from 'src/common/constants/serviceArea.type'; import { RoleValues } from 'src/common/constants/role.type'; import BadRequestError from 'src/common/errors/badRequestError'; import { StatusValues } from 'src/common/constants/status.type'; -import { NotificationEventName } from 'src/common/types/notification/notification.types'; +import { NotificationEventName } from 'src/modules/notification/types/notification.types'; import UserService from '../user/user.service'; -import Plan from 'src/common/domains/plan/plan.domain'; +import Plan from './domain/plan.domain'; import ChatRoomService from '../chatRoom/chatRoom.service'; import GroupField from 'src/common/constants/groupByField.enum'; import { InjectQueue } from '@nestjs/bullmq'; diff --git a/src/common/types/plan/plan.dto.ts b/src/modules/plan/types/plan.dto.ts similarity index 100% rename from src/common/types/plan/plan.dto.ts rename to src/modules/plan/types/plan.dto.ts diff --git a/src/common/types/plan/plan.properties.ts b/src/modules/plan/types/plan.properties.ts similarity index 96% rename from src/common/types/plan/plan.properties.ts rename to src/modules/plan/types/plan.properties.ts index 156dbcd..924c7e9 100644 --- a/src/common/types/plan/plan.properties.ts +++ b/src/modules/plan/types/plan.properties.ts @@ -2,7 +2,7 @@ import { ProfileImage } from 'src/common/constants/image.type'; import { ServiceArea } from 'src/common/constants/serviceArea.type'; import { Status } from 'src/common/constants/status.type'; import { TripType } from 'src/common/constants/tripType.type'; -import { UserReference } from 'src/common/types/user/user.types'; +import { UserReference } from 'src/modules/user/types/user.types'; export interface PlanProperties { id?: string; diff --git a/src/common/types/plan/plan.type.ts b/src/modules/plan/types/plan.type.ts similarity index 97% rename from src/common/types/plan/plan.type.ts rename to src/modules/plan/types/plan.type.ts index ad27bf1..3d7cc80 100644 --- a/src/common/types/plan/plan.type.ts +++ b/src/modules/plan/types/plan.type.ts @@ -4,7 +4,7 @@ import { ServiceArea } from 'src/common/constants/serviceArea.type'; import SortOrder from 'src/common/constants/sortOrder.enum'; import { Status } from 'src/common/constants/status.type'; import { TripType } from 'src/common/constants/tripType.type'; -import { UserReference } from '../user/user.types'; +import { UserReference } from '../../user/types/user.types'; export type PlanOrderByField = { createdAt: SortOrder.DESC } | { tripDate: SortOrder.ASC }; diff --git a/src/common/domains/pointLog/pointLog.domain.ts b/src/modules/pointLog/domain/pointLog.domain.ts similarity index 92% rename from src/common/domains/pointLog/pointLog.domain.ts rename to src/modules/pointLog/domain/pointLog.domain.ts index 67ca4a5..fb81186 100644 --- a/src/common/domains/pointLog/pointLog.domain.ts +++ b/src/modules/pointLog/domain/pointLog.domain.ts @@ -1,5 +1,5 @@ import { PointEventEnum } from 'src/common/constants/pointEvent.type'; -import { PointLogProperties } from 'src/common/types/pointLog/pointLog.type'; +import { PointLogProperties } from 'src/modules/pointLog/types/pointLog.type'; import IPointLog from './pointLog.interface'; export default class PointLog implements IPointLog { diff --git a/src/modules/pointLog/domain/pointLog.interface.ts b/src/modules/pointLog/domain/pointLog.interface.ts new file mode 100644 index 0000000..90f94dd --- /dev/null +++ b/src/modules/pointLog/domain/pointLog.interface.ts @@ -0,0 +1,5 @@ +import { PointLogProperties } from 'src/modules/pointLog/types/pointLog.type'; + +export default interface IPointLog { + get(): PointLogProperties; +} diff --git a/src/common/domains/pointLog/pointLog.mapper.ts b/src/modules/pointLog/domain/pointLog.mapper.ts similarity index 84% rename from src/common/domains/pointLog/pointLog.mapper.ts rename to src/modules/pointLog/domain/pointLog.mapper.ts index b0467ba..4d4362c 100644 --- a/src/common/domains/pointLog/pointLog.mapper.ts +++ b/src/modules/pointLog/domain/pointLog.mapper.ts @@ -1,4 +1,4 @@ -import { PointLogProperties } from 'src/common/types/pointLog/pointLog.type'; +import { PointLogProperties } from 'src/modules/pointLog/types/pointLog.type'; import PointLog from './pointLog.domain'; export default class PointLogMapper { diff --git a/src/modules/pointLog/pointLog.controller.ts b/src/modules/pointLog/pointLog.controller.ts index 872aa12..9fb7bb4 100644 --- a/src/modules/pointLog/pointLog.controller.ts +++ b/src/modules/pointLog/pointLog.controller.ts @@ -1,8 +1,8 @@ import { Body, Controller, Get, Post, Query } from '@nestjs/common'; import PointLogService from './pointLog.service'; import { UserId } from 'src/common/decorators/user.decorator'; -import { GetPointLogQueryDTO } from 'src/common/types/pointLog/pointLog.dto'; -import { PointLogProperties } from 'src/common/types/pointLog/pointLog.type'; +import { GetPointLogQueryDTO } from 'src/modules/pointLog/types/pointLog.dto'; +import { PointLogProperties } from 'src/modules/pointLog/types/pointLog.type'; @Controller('coconuts') export default class PointLogController { diff --git a/src/modules/pointLog/pointLog.repository.ts b/src/modules/pointLog/pointLog.repository.ts index 54c906c..765d268 100644 --- a/src/modules/pointLog/pointLog.repository.ts +++ b/src/modules/pointLog/pointLog.repository.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; import { InjectModel } from '@nestjs/mongoose'; import { Model } from 'mongoose'; -import IPointLog from 'src/common/domains/pointLog/pointLog.interface'; -import PointLogMapper from 'src/common/domains/pointLog/pointLog.mapper'; -import { GetPointLogQueryDTO } from 'src/common/types/pointLog/pointLog.dto'; +import IPointLog from './domain//pointLog.interface'; +import PointLogMapper from './domain//pointLog.mapper'; +import { GetPointLogQueryDTO } from 'src/modules/pointLog/types/pointLog.dto'; import { PointLog } from 'src/providers/database/mongoose/pointLog.schema'; @Injectable() diff --git a/src/modules/pointLog/pointLog.service.ts b/src/modules/pointLog/pointLog.service.ts index 32d38a7..a1c6a9d 100644 --- a/src/modules/pointLog/pointLog.service.ts +++ b/src/modules/pointLog/pointLog.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import PointLogRepository from './pointLog.repository'; -import { PointLogProperties } from 'src/common/types/pointLog/pointLog.type'; -import PointLog from 'src/common/domains/pointLog/pointLog.domain'; -import { GetPointLogQueryDTO } from 'src/common/types/pointLog/pointLog.dto'; +import { PointLogProperties } from 'src/modules/pointLog/types/pointLog.type'; +import PointLog from './domain/pointLog.domain'; +import { GetPointLogQueryDTO } from 'src/modules/pointLog/types/pointLog.dto'; @Injectable() export default class PointLogService { diff --git a/src/common/types/pointLog/pointLog.dto.ts b/src/modules/pointLog/types/pointLog.dto.ts similarity index 100% rename from src/common/types/pointLog/pointLog.dto.ts rename to src/modules/pointLog/types/pointLog.dto.ts diff --git a/src/common/types/pointLog/pointLog.type.ts b/src/modules/pointLog/types/pointLog.type.ts similarity index 100% rename from src/common/types/pointLog/pointLog.type.ts rename to src/modules/pointLog/types/pointLog.type.ts diff --git a/src/common/domains/quote/quote.domain.ts b/src/modules/quote/domain/quote.domain.ts similarity index 92% rename from src/common/domains/quote/quote.domain.ts rename to src/modules/quote/domain/quote.domain.ts index c3d6ce4..eb93e3f 100644 --- a/src/common/domains/quote/quote.domain.ts +++ b/src/modules/quote/domain/quote.domain.ts @@ -1,11 +1,11 @@ import IQuote from './quote.interface'; import ConflictError from 'src/common/errors/conflictError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; -import { QuoteProperties, QuoteToClientProperties } from 'src/common/types/quote/quoteProperties'; +import { QuoteProperties, QuoteToClientProperties } from 'src/modules/quote/types/quoteProperties'; import { Status, StatusValues } from 'src/common/constants/status.type'; -import { PlanReference } from 'src/common/types/plan/plan.type'; -import { UserReference } from 'src/common/types/user/user.types'; -import { toChatRoomData } from 'src/common/types/quote/quote.type'; +import { PlanReference } from 'src/modules/plan/types/plan.type'; +import { UserReference } from 'src/modules/user/types/user.types'; +import { toChatRoomData } from 'src/modules/quote/types/quote.type'; import { TripTypeValues } from 'src/common/constants/tripType.type'; export default class Quote implements IQuote { diff --git a/src/common/domains/quote/quote.interface.ts b/src/modules/quote/domain/quote.interface.ts similarity index 76% rename from src/common/domains/quote/quote.interface.ts rename to src/modules/quote/domain/quote.interface.ts index bbaeb7b..c754bc2 100644 --- a/src/common/domains/quote/quote.interface.ts +++ b/src/modules/quote/domain/quote.interface.ts @@ -1,6 +1,6 @@ import { Status } from 'src/common/constants/status.type'; -import { toChatRoomData } from 'src/common/types/quote/quote.type'; -import { QuoteProperties, QuoteToClientProperties } from 'src/common/types/quote/quoteProperties'; +import { toChatRoomData } from 'src/modules/quote/types/quote.type'; +import { QuoteProperties, QuoteToClientProperties } from 'src/modules/quote/types/quoteProperties'; export default interface IQuote { update(data: Partial): IQuote; diff --git a/src/common/domains/quote/quote.mapper.ts b/src/modules/quote/domain/quote.mapper.ts similarity index 90% rename from src/common/domains/quote/quote.mapper.ts rename to src/modules/quote/domain/quote.mapper.ts index 7eb2825..5ae1954 100644 --- a/src/common/domains/quote/quote.mapper.ts +++ b/src/modules/quote/domain/quote.mapper.ts @@ -1,4 +1,4 @@ -import { QuoteMapperProperties } from 'src/common/types/quote/quoteProperties'; +import { QuoteMapperProperties } from 'src/modules/quote/types/quoteProperties'; import Quote from './quote.domain'; import IQuote from './quote.interface'; diff --git a/src/modules/quote/quote.controller.ts b/src/modules/quote/quote.controller.ts index 2869141..a104a19 100644 --- a/src/modules/quote/quote.controller.ts +++ b/src/modules/quote/quote.controller.ts @@ -1,8 +1,8 @@ import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Patch, Query } from '@nestjs/common'; import QuoteService from './quote.service'; -import { QuoteToClientProperties } from '../../common/types/quote/quoteProperties'; +import { QuoteToClientProperties } from './types/quoteProperties'; import { UserId } from 'src/common/decorators/user.decorator'; -import { MakerQuoteQueryOptionsDTO, UpdateQuoteDataDTO } from '../../common/types/quote/quote.dto'; +import { MakerQuoteQueryOptionsDTO, UpdateQuoteDataDTO } from './types/quote.dto'; import { Role } from 'src/common/decorators/roleGuard.decorator'; import { UserRole } from 'src/common/decorators/role.decorator'; import { Role as RoleType } from 'src/common/constants/role.type'; diff --git a/src/modules/quote/quote.repository.ts b/src/modules/quote/quote.repository.ts index 3cd4921..a0947e7 100644 --- a/src/modules/quote/quote.repository.ts +++ b/src/modules/quote/quote.repository.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; import DBClient from 'src/providers/database/prisma/DB.client'; import SortOrder from 'src/common/constants/sortOrder.enum'; -import { QuoteIncludeConditions, QuoteQueryOptions, QuoteWhereConditions } from '../../common/types/quote/quote.type'; -import IQuote from 'src/common/domains/quote/quote.interface'; -import QuoteMapper from 'src/common/domains/quote/quote.mapper'; +import { QuoteIncludeConditions, QuoteQueryOptions, QuoteWhereConditions } from './types/quote.type'; +import IQuote from './domain/quote.interface'; +import QuoteMapper from './domain/quote.mapper'; import { StatusValues } from 'src/common/constants/status.type'; @Injectable() diff --git a/src/modules/quote/quote.service.ts b/src/modules/quote/quote.service.ts index 0438ba4..761c7ec 100644 --- a/src/modules/quote/quote.service.ts +++ b/src/modules/quote/quote.service.ts @@ -1,16 +1,16 @@ import { Injectable } from '@nestjs/common'; import QuoteRepository from './quote.repository'; -import { QuoteProperties, QuoteToClientProperties } from '../../common/types/quote/quoteProperties'; +import { QuoteProperties, QuoteToClientProperties } from './types/quoteProperties'; import NotFoundError from 'src/common/errors/notFoundError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; import ForbiddenError from 'src/common/errors/forbiddenError'; -import { QuoteQueryOptions } from '../../common/types/quote/quote.type'; +import { QuoteQueryOptions } from './types/quote.type'; import { StatusValues } from 'src/common/constants/status.type'; import ConflictError from 'src/common/errors/conflictError'; -import IQuote from '../../common/domains/quote/quote.interface'; +import IQuote from './domain/quote.interface'; import BadRequestError from 'src/common/errors/badRequestError'; import { Role, RoleValues } from 'src/common/constants/role.type'; -import Quote from 'src/common/domains/quote/quote.domain'; +import Quote from './domain/quote.domain'; import UserService from '../user/user.service'; import ChatRoomService from '../chatRoom/chatRoom.service'; import { InjectQueue } from '@nestjs/bullmq'; diff --git a/src/common/types/quote/quote.dto.ts b/src/modules/quote/types/quote.dto.ts similarity index 100% rename from src/common/types/quote/quote.dto.ts rename to src/modules/quote/types/quote.dto.ts diff --git a/src/common/types/quote/quote.type.ts b/src/modules/quote/types/quote.type.ts similarity index 100% rename from src/common/types/quote/quote.type.ts rename to src/modules/quote/types/quote.type.ts diff --git a/src/common/types/quote/quoteProperties.ts b/src/modules/quote/types/quoteProperties.ts similarity index 87% rename from src/common/types/quote/quoteProperties.ts rename to src/modules/quote/types/quoteProperties.ts index efdbd2a..1ef1d4e 100644 --- a/src/common/types/quote/quoteProperties.ts +++ b/src/modules/quote/types/quoteProperties.ts @@ -1,5 +1,5 @@ -import { UserReference } from '../user/user.types'; -import { PlanReference } from '../plan/plan.type'; +import { UserReference } from '../../user/types/user.types'; +import { PlanReference } from '../../plan/types/plan.type'; export interface QuoteProperties { id?: string; diff --git a/src/common/domains/review/review.domain.ts b/src/modules/review/domain/review.domain.ts similarity index 88% rename from src/common/domains/review/review.domain.ts rename to src/modules/review/domain/review.domain.ts index ffb8dec..a39e00a 100644 --- a/src/common/domains/review/review.domain.ts +++ b/src/modules/review/domain/review.domain.ts @@ -1,6 +1,6 @@ -import { PlanReference } from 'src/common/types/plan/plan.type'; -import { ReviewAllProperties, ReviewProperties } from 'src/common/types/review/review.types'; -import { UserReference } from 'src/common/types/user/user.types'; +import { PlanReference } from 'src/modules/plan/types/plan.type'; +import { ReviewAllProperties, ReviewProperties } from 'src/modules/review/types/review.types'; +import { UserReference } from 'src/modules/user/types/user.types'; export default class Review { private readonly id?: string; diff --git a/src/common/domains/review/review.interface.ts b/src/modules/review/domain/review.interface.ts similarity index 63% rename from src/common/domains/review/review.interface.ts rename to src/modules/review/domain/review.interface.ts index f5430c1..cc21608 100644 --- a/src/common/domains/review/review.interface.ts +++ b/src/modules/review/domain/review.interface.ts @@ -1,4 +1,4 @@ -import { ReviewAllProperties, ReviewProperties } from 'src/common/types/review/review.types'; +import { ReviewAllProperties, ReviewProperties } from 'src/modules/review/types/review.types'; export default interface IReview { toDB(): ReviewProperties; diff --git a/src/common/domains/review/review.mapper.ts b/src/modules/review/domain/review.mapper.ts similarity index 88% rename from src/common/domains/review/review.mapper.ts rename to src/modules/review/domain/review.mapper.ts index 60fa7f8..55681f6 100644 --- a/src/common/domains/review/review.mapper.ts +++ b/src/modules/review/domain/review.mapper.ts @@ -1,4 +1,4 @@ -import { ReviewAllProperties } from 'src/common/types/review/review.types'; +import { ReviewAllProperties } from 'src/modules/review/types/review.types'; import Review from './review.domain'; export default class ReviewMapper { diff --git a/src/modules/review/review.controller.ts b/src/modules/review/review.controller.ts index 5b2b549..8845c80 100644 --- a/src/modules/review/review.controller.ts +++ b/src/modules/review/review.controller.ts @@ -1,8 +1,8 @@ import { Body, Controller, Get, Param, Post, Query } from '@nestjs/common'; import ReviewService from './review.service'; import { UserId } from 'src/common/decorators/user.decorator'; -import { CreateReviewDTO, GetReviewsQueryDTO, GetReviewsResponseDTO } from 'src/common/types/review/review.dto'; -import { ReviewProperties } from 'src/common/types/review/review.types'; +import { CreateReviewDTO, GetReviewsQueryDTO, GetReviewsResponseDTO } from 'src/modules/review/types/review.dto'; +import { ReviewProperties } from 'src/modules/review/types/review.types'; import { Role } from 'src/common/decorators/roleGuard.decorator'; import { Public } from 'src/common/decorators/public.decorator'; diff --git a/src/modules/review/review.repository.ts b/src/modules/review/review.repository.ts index 2343f38..de4d9fa 100644 --- a/src/modules/review/review.repository.ts +++ b/src/modules/review/review.repository.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; -import IReview from 'src/common/domains/review/review.interface'; -import ReviewMapper from 'src/common/domains/review/review.mapper'; -import { GetReviewsQueryDTO } from 'src/common/types/review/review.dto'; -import { ReviewSelect } from 'src/common/types/review/review.types'; +import IReview from './domain/review.interface'; +import ReviewMapper from './domain/review.mapper'; +import { GetReviewsQueryDTO } from 'src/modules/review/types/review.dto'; +import { ReviewSelect } from 'src/modules/review/types/review.types'; import DBClient from 'src/providers/database/prisma/DB.client'; @Injectable() diff --git a/src/modules/review/review.service.ts b/src/modules/review/review.service.ts index 081b47d..07ea5ef 100644 --- a/src/modules/review/review.service.ts +++ b/src/modules/review/review.service.ts @@ -4,8 +4,8 @@ import PlanService from '../plan/plan.service'; import { StatusValues } from 'src/common/constants/status.type'; import BadRequestError from 'src/common/errors/badRequestError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; -import { CreateReviewDTO, GetReviewsQueryDTO, GetReviewsResponseDTO } from 'src/common/types/review/review.dto'; -import Review from 'src/common/domains/review/review.domain'; +import { CreateReviewDTO, GetReviewsQueryDTO, GetReviewsResponseDTO } from 'src/modules/review/types/review.dto'; +import Review from './domain/review.domain'; import { InjectQueue } from '@nestjs/bullmq'; import { Queue } from 'bullmq'; import { EventType } from 'src/common/constants/event.type'; diff --git a/src/common/types/review/review.dto.ts b/src/modules/review/types/review.dto.ts similarity index 100% rename from src/common/types/review/review.dto.ts rename to src/modules/review/types/review.dto.ts diff --git a/src/common/types/review/review.types.ts b/src/modules/review/types/review.types.ts similarity index 89% rename from src/common/types/review/review.types.ts rename to src/modules/review/types/review.types.ts index 886f7ea..71f9327 100644 --- a/src/common/types/review/review.types.ts +++ b/src/modules/review/types/review.types.ts @@ -1,5 +1,5 @@ -import { PlanReference } from '../plan/plan.type'; -import { UserReference } from '../user/user.types'; +import { PlanReference } from '../../plan/types/plan.type'; +import { UserReference } from '../../user/types/user.types'; export interface ReviewProperties { id?: string; diff --git a/src/common/domains/user/profile.domain.ts b/src/modules/user/domain/profile.domain.ts similarity index 99% rename from src/common/domains/user/profile.domain.ts rename to src/modules/user/domain/profile.domain.ts index 846bacc..8535056 100644 --- a/src/common/domains/user/profile.domain.ts +++ b/src/modules/user/domain/profile.domain.ts @@ -1,4 +1,4 @@ -import { DreamerProfileProperties, MakerProfileProperties } from '../../types/user/profile.types'; +import { DreamerProfileProperties, MakerProfileProperties } from '../types/profile.types'; import { IDreamerProfile, IMakerProfile } from './profile.interface'; import { ProfileImage } from 'src/common/constants/image.type'; import { ServiceArea } from 'src/common/constants/serviceArea.type'; diff --git a/src/common/domains/user/profile.interface.ts b/src/modules/user/domain/profile.interface.ts similarity index 89% rename from src/common/domains/user/profile.interface.ts rename to src/modules/user/domain/profile.interface.ts index e7ee596..bef8524 100644 --- a/src/common/domains/user/profile.interface.ts +++ b/src/modules/user/domain/profile.interface.ts @@ -1,4 +1,4 @@ -import { DreamerProfileProperties, MakerProfileProperties } from 'src/common/types/user/profile.types'; +import { DreamerProfileProperties, MakerProfileProperties } from 'src/modules/user/types/profile.types'; export interface IDreamerProfile { update(data: Partial): DreamerProfileProperties; diff --git a/src/common/domains/user/profile.mapper.ts b/src/modules/user/domain/profile.mapper.ts similarity index 96% rename from src/common/domains/user/profile.mapper.ts rename to src/modules/user/domain/profile.mapper.ts index 6a4e1c7..30bd9ef 100644 --- a/src/common/domains/user/profile.mapper.ts +++ b/src/modules/user/domain/profile.mapper.ts @@ -1,4 +1,4 @@ -import { DreamerProfileProperties, MakerProfileProperties } from '../../types/user/profile.types'; +import { DreamerProfileProperties, MakerProfileProperties } from '../types/profile.types'; import { DreamerProfile, MakerProfile } from './profile.domain'; export class DreamerProfileMapper { diff --git a/src/common/domains/user/user.domain.ts b/src/modules/user/domain/user.domain.ts similarity index 96% rename from src/common/domains/user/user.domain.ts rename to src/modules/user/domain/user.domain.ts index 9b2b59d..36b7acb 100644 --- a/src/common/domains/user/user.domain.ts +++ b/src/modules/user/domain/user.domain.ts @@ -6,13 +6,13 @@ import { SignupProperties, UserProperties, UserPropertiesFromDB -} from '../../types/user/user.types'; -import { ComparePassword, HashingPassword } from '../../utilities/hashingPassword'; +} from '../types/user.types'; +import { ComparePassword, HashingPassword } from '../../../common/utilities/hashingPassword'; import { IUser } from './user.interface'; import BadRequestError from 'src/common/errors/badRequestError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; -import { MakerInfoAndProfileProperties, MakerProfileProperties } from 'src/common/types/user/profile.types'; -import { UserStatsProperties, UserStatsToClientProperties } from 'src/common/types/userStats/userStats.types'; +import { MakerInfoAndProfileProperties, MakerProfileProperties } from 'src/modules/user/types/profile.types'; +import { UserStatsProperties, UserStatsToClientProperties } from 'src/modules/userStats/types/userStats.types'; import { OAuthProvider } from 'src/common/constants/oauth.type'; export default class User implements IUser { diff --git a/src/common/domains/user/user.interface.ts b/src/modules/user/domain/user.interface.ts similarity index 78% rename from src/common/domains/user/user.interface.ts rename to src/modules/user/domain/user.interface.ts index 628307f..1b803c2 100644 --- a/src/common/domains/user/user.interface.ts +++ b/src/modules/user/domain/user.interface.ts @@ -1,13 +1,13 @@ import { Role } from 'src/common/constants/role.type'; -import { MakerInfoAndProfileProperties } from 'src/common/types/user/profile.types'; +import { MakerInfoAndProfileProperties } from 'src/modules/user/types/profile.types'; import { FilteredUserProperties, OAuthProperties, PasswordProperties, SignupProperties, UserProperties -} from 'src/common/types/user/user.types'; -import { UserStatsToClientProperties } from 'src/common/types/userStats/userStats.types'; +} from 'src/modules/user/types/user.types'; +import { UserStatsToClientProperties } from 'src/modules/userStats/types/userStats.types'; export interface IUser { validatePassword(password: string): Promise; diff --git a/src/common/domains/user/user.mapper.ts b/src/modules/user/domain/user.mapper.ts similarity index 91% rename from src/common/domains/user/user.mapper.ts rename to src/modules/user/domain/user.mapper.ts index 5ac7e47..941deec 100644 --- a/src/common/domains/user/user.mapper.ts +++ b/src/modules/user/domain/user.mapper.ts @@ -1,4 +1,4 @@ -import { UserPropertiesFromDB } from '../../types/user/user.types'; +import { UserPropertiesFromDB } from '../types/user.types'; import User from './user.domain'; export default class UserMapper { diff --git a/src/common/types/user/login.dto.ts b/src/modules/user/types/login.dto.ts similarity index 100% rename from src/common/types/user/login.dto.ts rename to src/modules/user/types/login.dto.ts diff --git a/src/common/types/user/profile.types.ts b/src/modules/user/types/profile.types.ts similarity index 100% rename from src/common/types/user/profile.types.ts rename to src/modules/user/types/profile.types.ts diff --git a/src/common/types/user/query.dto.ts b/src/modules/user/types/query.dto.ts similarity index 100% rename from src/common/types/user/query.dto.ts rename to src/modules/user/types/query.dto.ts diff --git a/src/common/types/user/signup.dto.ts b/src/modules/user/types/signup.dto.ts similarity index 100% rename from src/common/types/user/signup.dto.ts rename to src/modules/user/types/signup.dto.ts diff --git a/src/common/types/user/updateProfile.dto.ts b/src/modules/user/types/updateProfile.dto.ts similarity index 100% rename from src/common/types/user/updateProfile.dto.ts rename to src/modules/user/types/updateProfile.dto.ts diff --git a/src/common/types/user/updateUser.dto.ts b/src/modules/user/types/updateUser.dto.ts similarity index 100% rename from src/common/types/user/updateUser.dto.ts rename to src/modules/user/types/updateUser.dto.ts diff --git a/src/common/types/user/user.response.dto.ts b/src/modules/user/types/user.response.dto.ts similarity index 100% rename from src/common/types/user/user.response.dto.ts rename to src/modules/user/types/user.response.dto.ts diff --git a/src/common/types/user/user.types.ts b/src/modules/user/types/user.types.ts similarity index 96% rename from src/common/types/user/user.types.ts rename to src/modules/user/types/user.types.ts index c130c5f..5e77fcb 100644 --- a/src/common/types/user/user.types.ts +++ b/src/modules/user/types/user.types.ts @@ -3,7 +3,7 @@ import { Role } from 'src/common/constants/role.type'; import { TripType } from 'src/common/constants/tripType.type'; import { MakerProfileProperties } from './profile.types'; import SortOrder from 'src/common/constants/sortOrder.enum'; -import { UserStatsProperties } from '../userStats/userStats.types'; +import { UserStatsProperties } from '../../userStats/types/userStats.types'; import { OAuthProvider } from 'src/common/constants/oauth.type'; export interface UserProperties { diff --git a/src/modules/user/user.controller.ts b/src/modules/user/user.controller.ts index b320cc5..d7066d8 100644 --- a/src/modules/user/user.controller.ts +++ b/src/modules/user/user.controller.ts @@ -16,14 +16,14 @@ import { followResponseDTO, MakerProfileResponseDTO, UserResponseDTO -} from '../../common/types/user/user.response.dto'; -import UpdateProfileDTO from '../../common/types/user/updateProfile.dto'; -import { DreamerProfileProperties, MakerProfileProperties } from '../../common/types/user/profile.types'; -import { FilteredUserProperties, UserProperties } from '../../common/types/user/user.types'; -import UpdateUserDTO from '../../common/types/user/updateUser.dto'; +} from './types/user.response.dto'; +import UpdateProfileDTO from './types/updateProfile.dto'; +import { DreamerProfileProperties, MakerProfileProperties } from './types/profile.types'; +import { FilteredUserProperties, UserProperties } from './types/user.types'; +import UpdateUserDTO from './types/updateUser.dto'; import { UserRole } from 'src/common/decorators/role.decorator'; import { Role } from 'src/common/decorators/roleGuard.decorator'; -import { GetMakerListQueryDTO, PaginationQueryDTO } from 'src/common/types/user/query.dto'; +import { GetMakerListQueryDTO, PaginationQueryDTO } from 'src/modules/user/types/query.dto'; @Controller('users') export default class UserController { diff --git a/src/modules/user/user.repository.ts b/src/modules/user/user.repository.ts index e96652d..7283edb 100644 --- a/src/modules/user/user.repository.ts +++ b/src/modules/user/user.repository.ts @@ -1,14 +1,14 @@ import { Injectable } from '@nestjs/common'; import DBClient from 'src/providers/database/prisma/DB.client'; -import UserMapper from '../../common/domains/user/user.mapper'; -import { MakerOrderBy, MakerOrderByField, UserProperties } from '../../common/types/user/user.types'; -import { DreamerProfileProperties, MakerProfileProperties } from '../../common/types/user/profile.types'; -import { DreamerProfileMapper, MakerProfileMapper } from '../../common/domains/user/profile.mapper'; -import { IUser } from '../../common/domains/user/user.interface'; -import { IDreamerProfile, IMakerProfile } from '../../common/domains/user/profile.interface'; +import UserMapper from './domain/user.mapper'; +import { MakerOrderBy, MakerOrderByField, UserProperties } from './types/user.types'; +import { DreamerProfileProperties, MakerProfileProperties } from './types/profile.types'; +import { DreamerProfileMapper, MakerProfileMapper } from './domain/profile.mapper'; +import { IUser } from './domain/user.interface'; +import { IDreamerProfile, IMakerProfile } from './domain/profile.interface'; import { RoleValues } from 'src/common/constants/role.type'; import SortOrder from 'src/common/constants/sortOrder.enum'; -import { GetMakerListQueryDTO } from 'src/common/types/user/query.dto'; +import { GetMakerListQueryDTO } from 'src/modules/user/types/query.dto'; @Injectable() export default class UserRepository { diff --git a/src/modules/user/user.service.ts b/src/modules/user/user.service.ts index 2275f10..b6f0b7d 100644 --- a/src/modules/user/user.service.ts +++ b/src/modules/user/user.service.ts @@ -2,16 +2,12 @@ import { Injectable } from '@nestjs/common'; import UserRepository from './user.repository'; import BadRequestError from 'src/common/errors/badRequestError'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; -import { FilteredUserProperties, PasswordProperties, UserProperties } from '../../common/types/user/user.types'; -import { - DreamerProfileProperties, - MakerInfoAndProfileProperties, - MakerProfileProperties -} from '../../common/types/user/profile.types'; +import { FilteredUserProperties, PasswordProperties, UserProperties } from './types/user.types'; +import { DreamerProfileProperties, MakerInfoAndProfileProperties, MakerProfileProperties } from './types/profile.types'; import UserStatsService from '../userStats/userStats.service'; import FollowService from '../follow/follow.service'; -import { GetMakerListQueryDTO, PaginationQueryDTO } from 'src/common/types/user/query.dto'; -import { followResponseDTO, ProfileCardResponseDTO } from 'src/common/types/user/user.response.dto'; +import { GetMakerListQueryDTO, PaginationQueryDTO } from 'src/modules/user/types/query.dto'; +import { followResponseDTO, ProfileCardResponseDTO } from 'src/modules/user/types/user.response.dto'; @Injectable() export default class UserService { diff --git a/src/common/domains/userStats/userStats.domain.ts b/src/modules/userStats/domain/userStats.domain.ts similarity index 97% rename from src/common/domains/userStats/userStats.domain.ts rename to src/modules/userStats/domain/userStats.domain.ts index 0913977..f8c319f 100644 --- a/src/common/domains/userStats/userStats.domain.ts +++ b/src/modules/userStats/domain/userStats.domain.ts @@ -1,4 +1,4 @@ -import { UserStatsProperties, UserStatsToClientProperties } from 'src/common/types/userStats/userStats.types'; +import { UserStatsProperties, UserStatsToClientProperties } from 'src/modules/userStats/types/userStats.types'; import { IUserStats } from './userStats.interface'; export default class UserStats implements IUserStats { diff --git a/src/common/domains/userStats/userStats.interface.ts b/src/modules/userStats/domain/userStats.interface.ts similarity index 83% rename from src/common/domains/userStats/userStats.interface.ts rename to src/modules/userStats/domain/userStats.interface.ts index 918774b..9987187 100644 --- a/src/common/domains/userStats/userStats.interface.ts +++ b/src/modules/userStats/domain/userStats.interface.ts @@ -1,4 +1,4 @@ -import { UserStatsProperties, UserStatsToClientProperties } from 'src/common/types/userStats/userStats.types'; +import { UserStatsProperties, UserStatsToClientProperties } from 'src/modules/userStats/types/userStats.types'; export interface IUserStats { update(data: Partial): void; diff --git a/src/common/domains/userStats/userStats.mapper.ts b/src/modules/userStats/domain/userStats.mapper.ts similarity index 86% rename from src/common/domains/userStats/userStats.mapper.ts rename to src/modules/userStats/domain/userStats.mapper.ts index f48bc29..e617e97 100644 --- a/src/common/domains/userStats/userStats.mapper.ts +++ b/src/modules/userStats/domain/userStats.mapper.ts @@ -1,4 +1,4 @@ -import { UserStatsProperties } from 'src/common/types/userStats/userStats.types'; +import { UserStatsProperties } from 'src/modules/userStats/types/userStats.types'; import UserStats from './userStats.domain'; export default class UserStatsMapper { diff --git a/src/common/types/userStats/userStats.types.ts b/src/modules/userStats/types/userStats.types.ts similarity index 100% rename from src/common/types/userStats/userStats.types.ts rename to src/modules/userStats/types/userStats.types.ts diff --git a/src/modules/userStats/userStats.repository.ts b/src/modules/userStats/userStats.repository.ts index fb40286..2cb7b32 100644 --- a/src/modules/userStats/userStats.repository.ts +++ b/src/modules/userStats/userStats.repository.ts @@ -1,8 +1,9 @@ import { Injectable } from '@nestjs/common'; -import { IUserStats } from 'src/common/domains/userStats/userStats.interface'; -import UserStatsMapper from 'src/common/domains/userStats/userStats.mapper'; -import { UserStatsProperties } from 'src/common/types/userStats/userStats.types'; + +import { UserStatsProperties } from 'src/modules/userStats/types/userStats.types'; import DBClient from 'src/providers/database/prisma/DB.client'; +import { IUserStats } from './domain/userStats.interface'; +import UserStatsMapper from './domain/userStats.mapper'; @Injectable() export default class UserStatsRepository { diff --git a/src/modules/userStats/userStats.service.ts b/src/modules/userStats/userStats.service.ts index f8d646e..ce7e69b 100644 --- a/src/modules/userStats/userStats.service.ts +++ b/src/modules/userStats/userStats.service.ts @@ -1,10 +1,11 @@ import { Injectable } from '@nestjs/common'; import UserStatsRepository from './userStats.repository'; -import UserStats from 'src/common/domains/userStats/userStats.domain'; -import { UserStatsProperties, UserStatsToClientProperties } from 'src/common/types/userStats/userStats.types'; + +import { UserStatsProperties, UserStatsToClientProperties } from 'src/modules/userStats/types/userStats.types'; import RedisService from 'src/providers/cache/redis.service'; -import UserStatsMapper from 'src/common/domains/userStats/userStats.mapper'; -import { IUserStats } from 'src/common/domains/userStats/userStats.interface'; +import { IUserStats } from './domain/userStats.interface'; +import UserStatsMapper from './domain/userStats.mapper'; +import UserStats from './domain/userStats.domain'; @Injectable() export default class UserStatsService { diff --git a/src/providers/cache/redis.service.ts b/src/providers/cache/redis.service.ts index 486b105..e595826 100644 --- a/src/providers/cache/redis.service.ts +++ b/src/providers/cache/redis.service.ts @@ -1,6 +1,6 @@ import { Inject, Injectable } from '@nestjs/common'; import Redis from 'ioredis'; -import { UserStatsToClientProperties } from 'src/common/types/userStats/userStats.types'; +import { UserStatsToClientProperties } from 'src/modules/userStats/types/userStats.types'; @Injectable() export default class RedisService { diff --git a/src/providers/database/mongoose/notification.schema.ts b/src/providers/database/mongoose/notification.schema.ts index d7bcd42..9dc0297 100644 --- a/src/providers/database/mongoose/notification.schema.ts +++ b/src/providers/database/mongoose/notification.schema.ts @@ -1,6 +1,6 @@ import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'; import mongoose, { HydratedDocument, Types } from 'mongoose'; -import { NotificationEvent } from 'src/common/types/notification/notification.types'; +import { NotificationEvent } from 'src/modules/notification/types/notification.types'; @Schema({ timestamps: true }) export class Notification { diff --git a/src/providers/database/mongoose/payment.schema.ts b/src/providers/database/mongoose/payment.schema.ts index 62089ba..e76d3ef 100644 --- a/src/providers/database/mongoose/payment.schema.ts +++ b/src/providers/database/mongoose/payment.schema.ts @@ -1,6 +1,6 @@ import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'; import { HydratedDocument, Types } from 'mongoose'; -import { PaymentStatusEnum } from 'src/common/types/payment/payment.type'; +import { PaymentStatusEnum } from 'src/modules/payment/types/payment.type'; @Schema({ timestamps: true }) export class Payment { diff --git a/src/providers/queue/userStats.processor.ts b/src/providers/queue/userStats.processor.ts index aaa7120..a8107df 100644 --- a/src/providers/queue/userStats.processor.ts +++ b/src/providers/queue/userStats.processor.ts @@ -3,7 +3,7 @@ import RedisService from '../cache/redis.service'; import ErrorMessage from 'src/common/constants/errorMessage.enum'; import { Job } from 'bullmq'; import UserStatsService from 'src/modules/userStats/userStats.service'; -import { UserStatsProperties } from 'src/common/types/userStats/userStats.types'; +import { UserStatsProperties } from 'src/modules/userStats/types/userStats.types'; import CustomError from 'src/common/errors/customError'; import { HttpStatus } from '@nestjs/common'; import { EventType } from 'src/common/constants/event.type'; diff --git a/src/providers/storage/s3/s3.service.ts b/src/providers/storage/s3/s3.service.ts index 097fcc4..1e42008 100644 --- a/src/providers/storage/s3/s3.service.ts +++ b/src/providers/storage/s3/s3.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { S3Client, PutObjectCommand, GetObjectCommand } from '@aws-sdk/client-s3'; import { getSignedUrl } from '@aws-sdk/s3-request-presigner'; -import { ChatToS3Properties } from 'src/common/domains/chat/chat.properties'; +import { ChatToS3Properties } from 'src/modules/chat/domain/chat.properties'; import { ORIGIN } from 'src/common/constants/s3.constants'; import { v4 as uuidV4 } from 'uuid'; import InternalServerError from 'src/common/errors/internalServerError';