From 0003f33b74dd35d3a147fef019f5d74f1eada155 Mon Sep 17 00:00:00 2001 From: Sim-km Date: Thu, 2 Jan 2025 19:38:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?ASAP-324=20refactor:=20=EA=B8=B0=EC=A1=B4?= =?UTF-8?q?=20api=20=ED=8C=A8=ED=82=A4=EC=A7=80=20web=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=EB=A1=9C=20=EA=B7=B8=EB=A3=B9=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bootstrap/{ => web}/auth/api/AuthApi.kt | 10 +++++----- .../auth/controller/AuthController.kt | 12 ++++++------ .../{ => web}/auth/dto/ReissueRequest.kt | 2 +- .../{ => web}/auth/dto/ReissueResponse.kt | 2 +- .../{ => web}/auth/dto/SocialLoginRequest.kt | 2 +- .../{ => web}/auth/dto/SocialLoginResponse.kt | 2 +- .../bootstrap/{ => web}/image/api/ImageApi.kt | 4 ++-- .../image/controller/ImageController.kt | 6 +++--- .../image/dto/UploadImageResponse.kt | 2 +- .../{ => web}/letter/api/DraftLetterApi.kt | 4 ++-- .../{ => web}/letter/api/LetterApi.kt | 17 +++++++++++++++-- .../{ => web}/letter/api/SpaceLetterApi.kt | 10 +++++----- .../controller/DraftLetterController.kt | 6 +++--- .../letter/controller/LetterController.kt | 19 ++++++++++++++++--- .../controller/SpaceLetterController.kt | 12 ++++++------ .../letter/dto/AddPhysicalLetterRequest.kt | 2 +- .../letter/dto/AddVerifiedLetterRequest.kt | 2 +- .../letter/dto/AllLetterCountResponse.kt | 2 +- .../letter/dto/DeleteSendLettersRequest.kt | 2 +- .../letter/dto/GenerateDraftKeyResponse.kt | 2 +- .../letter/dto/GetAllDraftLetterResponse.kt | 2 +- .../letter/dto/GetDraftLetterCountResponse.kt | 2 +- .../letter/dto/GetDraftLetterResponse.kt | 2 +- .../dto/GetIndependentLetterDetailResponse.kt | 2 +- .../dto/GetIndependentLetterSimpleInfo.kt | 2 +- .../dto/GetSpaceLetterDetailResponse.kt | 2 +- .../letter/dto/GetSpaceLettersResponse.kt | 2 +- .../letter/dto/LetterVerifyRequest.kt | 2 +- .../letter/dto/LetterVerifyResponse.kt | 2 +- .../letter/dto/ModifyLetterRequest.kt | 2 +- .../letter/dto/MoveLetterToSpaceRequest.kt | 2 +- .../letter/dto/SendLetterDetailResponse.kt | 2 +- .../letter/dto/SendLetterHistoryResponse.kt | 2 +- .../{ => web}/letter/dto/SendLetterRequest.kt | 2 +- .../letter/dto/SendLetterResponse.kt | 2 +- .../letter/dto/UpdateDraftLetterRequest.kt | 2 +- .../letter/dto/VerifiedLetterInfoResponse.kt | 2 +- .../letter/handler/DraftLetterEventHandler.kt | 2 +- .../letter/handler/LetterEventHandler.kt | 2 +- .../letter/handler/SpaceLetterEventHandler.kt | 2 +- .../bootstrap/{ => web}/space/api/SpaceApi.kt | 4 ++-- .../space/controller/SpaceController.kt | 6 +++--- .../{ => web}/space/dto/CreateSpaceRequest.kt | 2 +- .../space/dto/DeleteMultipleSpacesRequest.kt | 2 +- .../space/dto/GetAllSpaceResponse.kt | 2 +- .../{ => web}/space/dto/GetSpaceResponse.kt | 2 +- .../space/dto/MainSpaceInfoResponse.kt | 2 +- .../space/dto/UpdateSpaceNameRequest.kt | 2 +- .../space/dto/UpdateSpaceOrderRequest.kt | 2 +- .../space/handler/SpaceEventHandler.kt | 2 +- .../bootstrap/{ => web}/user/api/UserApi.kt | 4 ++-- .../user/controller/UserController.kt | 6 +++--- .../{ => web}/user/dto/LogoutRequest.kt | 2 +- .../{ => web}/user/dto/RegisterUserRequest.kt | 2 +- .../user/dto/RegisterUserResponse.kt | 2 +- .../user/dto/UpdateBirthdayRequest.kt | 2 +- .../{ => web}/user/dto/UserInfoResponse.kt | 2 +- .../auth/controller/AuthControllerTest.kt | 4 ++-- .../controller/DraftLetterControllerTest.kt | 2 +- .../letter/controller/LetterControllerTest.kt | 2 +- .../controller/SpaceLetterControllerTest.kt | 4 ++-- .../space/controller/SpaceControllerTest.kt | 8 ++++---- .../user/controller/UserControllerTest.kt | 15 ++++++++++----- .../auth/AuthApiIntegrationTest.kt | 4 ++-- .../letter/DraftLetterApiIntegrationTest.kt | 2 +- .../letter/DraftLetterEventHandlerTest.kt | 2 +- .../letter/LetterApiIntegrationTest.kt | 2 +- .../letter/LetterEventHandlerTest.kt | 2 +- .../letter/SpaceLetterApiIntegrationTest.kt | 4 ++-- .../letter/SpaceLetterEventHandlerTest.kt | 2 +- .../space/SpaceApiIntegrationTest.kt | 14 +++++++------- .../integration/space/SpaceHandlerTest.kt | 2 +- .../user/UserApiIntegrationTest.kt | 6 +++--- 73 files changed, 156 insertions(+), 125 deletions(-) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/auth/api/AuthApi.kt (92%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/auth/controller/AuthController.kt (83%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/auth/dto/ReissueRequest.kt (60%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/auth/dto/ReissueResponse.kt (69%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/auth/dto/SocialLoginRequest.kt (84%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/auth/dto/SocialLoginResponse.kt (95%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/image/api/ImageApi.kt (93%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/image/controller/ImageController.kt (83%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/image/dto/UploadImageResponse.kt (60%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/api/DraftLetterApi.kt (97%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/api/LetterApi.kt (91%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/api/SpaceLetterApi.kt (92%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/controller/DraftLetterController.kt (95%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/controller/LetterController.kt (89%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/controller/SpaceLetterController.kt (92%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/AddPhysicalLetterRequest.kt (77%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/AddVerifiedLetterRequest.kt (61%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/AllLetterCountResponse.kt (68%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/DeleteSendLettersRequest.kt (63%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/GenerateDraftKeyResponse.kt (60%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/GetAllDraftLetterResponse.kt (86%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/GetDraftLetterCountResponse.kt (60%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/GetDraftLetterResponse.kt (78%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/GetIndependentLetterDetailResponse.kt (90%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/GetIndependentLetterSimpleInfo.kt (75%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/GetSpaceLetterDetailResponse.kt (91%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/GetSpaceLettersResponse.kt (78%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/LetterVerifyRequest.kt (61%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/LetterVerifyResponse.kt (60%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/ModifyLetterRequest.kt (77%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/MoveLetterToSpaceRequest.kt (61%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/SendLetterDetailResponse.kt (85%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/SendLetterHistoryResponse.kt (78%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/SendLetterRequest.kt (80%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/SendLetterResponse.kt (60%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/UpdateDraftLetterRequest.kt (74%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/dto/VerifiedLetterInfoResponse.kt (83%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/handler/DraftLetterEventHandler.kt (95%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/handler/LetterEventHandler.kt (94%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/letter/handler/SpaceLetterEventHandler.kt (93%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/space/api/SpaceApi.kt (98%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/space/controller/SpaceController.kt (96%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/space/dto/CreateSpaceRequest.kt (68%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/space/dto/DeleteMultipleSpacesRequest.kt (65%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/space/dto/GetAllSpaceResponse.kt (86%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/space/dto/GetSpaceResponse.kt (73%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/space/dto/MainSpaceInfoResponse.kt (77%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/space/dto/UpdateSpaceNameRequest.kt (62%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/space/dto/UpdateSpaceOrderRequest.kt (79%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/space/handler/SpaceEventHandler.kt (96%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/user/api/UserApi.kt (97%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/user/controller/UserController.kt (94%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/user/dto/LogoutRequest.kt (59%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/user/dto/RegisterUserRequest.kt (95%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/user/dto/RegisterUserResponse.kt (87%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/user/dto/UpdateBirthdayRequest.kt (70%) rename Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/{ => web}/user/dto/UserInfoResponse.kt (80%) diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/api/AuthApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/api/AuthApi.kt similarity index 92% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/api/AuthApi.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/api/AuthApi.kt index ca2a4c25..84497bf5 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/api/AuthApi.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/api/AuthApi.kt @@ -1,10 +1,10 @@ -package com.asap.bootstrap.auth.api +package com.asap.bootstrap.web.auth.api -import com.asap.bootstrap.auth.dto.ReissueRequest -import com.asap.bootstrap.auth.dto.ReissueResponse -import com.asap.bootstrap.auth.dto.SocialLoginRequest -import com.asap.bootstrap.auth.dto.SocialLoginResponse import com.asap.bootstrap.common.exception.ExceptionResponse +import com.asap.bootstrap.web.auth.dto.ReissueRequest +import com.asap.bootstrap.web.auth.dto.ReissueResponse +import com.asap.bootstrap.web.auth.dto.SocialLoginRequest +import com.asap.bootstrap.web.auth.dto.SocialLoginResponse import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/controller/AuthController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/controller/AuthController.kt similarity index 83% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/controller/AuthController.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/controller/AuthController.kt index 928f66e7..1b76616f 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/controller/AuthController.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/controller/AuthController.kt @@ -1,12 +1,12 @@ -package com.asap.bootstrap.auth.controller +package com.asap.bootstrap.web.auth.controller import com.asap.application.user.port.`in`.ReissueTokenUsecase import com.asap.application.user.port.`in`.SocialLoginUsecase -import com.asap.bootstrap.auth.api.AuthApi -import com.asap.bootstrap.auth.dto.ReissueRequest -import com.asap.bootstrap.auth.dto.ReissueResponse -import com.asap.bootstrap.auth.dto.SocialLoginRequest -import com.asap.bootstrap.auth.dto.SocialLoginResponse +import com.asap.bootstrap.web.auth.api.AuthApi +import com.asap.bootstrap.web.auth.dto.ReissueRequest +import com.asap.bootstrap.web.auth.dto.ReissueResponse +import com.asap.bootstrap.web.auth.dto.SocialLoginRequest +import com.asap.bootstrap.web.auth.dto.SocialLoginResponse import org.springframework.http.HttpStatus import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.RestController diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/ReissueRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/ReissueRequest.kt similarity index 60% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/ReissueRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/ReissueRequest.kt index 299e26cc..3e7e6191 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/ReissueRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/ReissueRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.auth.dto +package com.asap.bootstrap.web.auth.dto data class ReissueRequest( val refreshToken: String diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/ReissueResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/ReissueResponse.kt similarity index 69% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/ReissueResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/ReissueResponse.kt index 27bd147c..8051cbd5 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/ReissueResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/ReissueResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.auth.dto +package com.asap.bootstrap.web.auth.dto data class ReissueResponse( val accessToken: String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/SocialLoginRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/SocialLoginRequest.kt similarity index 84% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/SocialLoginRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/SocialLoginRequest.kt index a924d603..9a23f099 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/SocialLoginRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/SocialLoginRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.auth.dto +package com.asap.bootstrap.web.auth.dto import io.swagger.v3.oas.annotations.media.Schema diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/SocialLoginResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/SocialLoginResponse.kt similarity index 95% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/SocialLoginResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/SocialLoginResponse.kt index 3ea6c842..f6618f7a 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/SocialLoginResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/auth/dto/SocialLoginResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.auth.dto +package com.asap.bootstrap.web.auth.dto import io.swagger.v3.oas.annotations.media.Schema diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/image/api/ImageApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/api/ImageApi.kt similarity index 93% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/image/api/ImageApi.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/api/ImageApi.kt index d305b40d..c2f7e97e 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/image/api/ImageApi.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/api/ImageApi.kt @@ -1,7 +1,7 @@ -package com.asap.bootstrap.image.api +package com.asap.bootstrap.web.image.api import com.asap.bootstrap.common.security.annotation.AccessUser -import com.asap.bootstrap.image.dto.UploadImageResponse +import com.asap.bootstrap.web.image.dto.UploadImageResponse import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.headers.Header import io.swagger.v3.oas.annotations.responses.ApiResponse diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/image/controller/ImageController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/controller/ImageController.kt similarity index 83% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/image/controller/ImageController.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/controller/ImageController.kt index ac6ea940..77b7663a 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/image/controller/ImageController.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/controller/ImageController.kt @@ -1,9 +1,9 @@ -package com.asap.bootstrap.image.controller +package com.asap.bootstrap.web.image.controller import com.asap.application.image.port.`in`.UploadImageUsecase import com.asap.bootstrap.common.util.FileConverter -import com.asap.bootstrap.image.api.ImageApi -import com.asap.bootstrap.image.dto.UploadImageResponse +import com.asap.bootstrap.web.image.api.ImageApi +import com.asap.bootstrap.web.image.dto.UploadImageResponse import org.springframework.web.bind.annotation.RestController import org.springframework.web.multipart.MultipartFile diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/image/dto/UploadImageResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/dto/UploadImageResponse.kt similarity index 60% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/image/dto/UploadImageResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/dto/UploadImageResponse.kt index ae224866..27e1dba7 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/image/dto/UploadImageResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/dto/UploadImageResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.image.dto +package com.asap.bootstrap.web.image.dto data class UploadImageResponse( val imageUrl: String diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/api/DraftLetterApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/DraftLetterApi.kt similarity index 97% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/api/DraftLetterApi.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/DraftLetterApi.kt index e0c2f00c..11189cab 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/api/DraftLetterApi.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/DraftLetterApi.kt @@ -1,7 +1,7 @@ -package com.asap.bootstrap.letter.api +package com.asap.bootstrap.web.letter.api import com.asap.bootstrap.common.security.annotation.AccessUser -import com.asap.bootstrap.letter.dto.* +import com.asap.bootstrap.web.letter.dto.* import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/api/LetterApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/LetterApi.kt similarity index 91% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/api/LetterApi.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/LetterApi.kt index 963241f1..887fbe7c 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/api/LetterApi.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/LetterApi.kt @@ -1,8 +1,21 @@ -package com.asap.bootstrap.letter.api +package com.asap.bootstrap.web.letter.api import com.asap.bootstrap.common.exception.ExceptionResponse import com.asap.bootstrap.common.security.annotation.AccessUser -import com.asap.bootstrap.letter.dto.* +import com.asap.bootstrap.web.letter.dto.AddPhysicalLetterRequest +import com.asap.bootstrap.web.letter.dto.AddVerifiedLetterRequest +import com.asap.bootstrap.web.letter.dto.AllLetterCountResponse +import com.asap.bootstrap.web.letter.dto.DeleteSendLettersRequest +import com.asap.bootstrap.web.letter.dto.GetIndependentLetterDetailResponse +import com.asap.bootstrap.web.letter.dto.GetIndependentLetterSimpleInfo +import com.asap.bootstrap.web.letter.dto.LetterVerifyRequest +import com.asap.bootstrap.web.letter.dto.LetterVerifyResponse +import com.asap.bootstrap.web.letter.dto.ModifyLetterRequest +import com.asap.bootstrap.web.letter.dto.SendLetterDetailResponse +import com.asap.bootstrap.web.letter.dto.SendLetterHistoryResponse +import com.asap.bootstrap.web.letter.dto.SendLetterRequest +import com.asap.bootstrap.web.letter.dto.SendLetterResponse +import com.asap.bootstrap.web.letter.dto.VerifiedLetterInfoResponse import com.asap.common.page.ListResponse import com.asap.common.page.SliceResponse import io.swagger.v3.oas.annotations.Operation diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/api/SpaceLetterApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/SpaceLetterApi.kt similarity index 92% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/api/SpaceLetterApi.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/SpaceLetterApi.kt index 696bb725..06cb5458 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/api/SpaceLetterApi.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/SpaceLetterApi.kt @@ -1,10 +1,10 @@ -package com.asap.bootstrap.letter.api +package com.asap.bootstrap.web.letter.api import com.asap.bootstrap.common.security.annotation.AccessUser -import com.asap.bootstrap.letter.dto.GetSpaceLetterDetailResponse -import com.asap.bootstrap.letter.dto.GetSpaceLettersResponse -import com.asap.bootstrap.letter.dto.ModifyLetterRequest -import com.asap.bootstrap.letter.dto.MoveLetterToSpaceRequest +import com.asap.bootstrap.web.letter.dto.GetSpaceLetterDetailResponse +import com.asap.bootstrap.web.letter.dto.GetSpaceLettersResponse +import com.asap.bootstrap.web.letter.dto.ModifyLetterRequest +import com.asap.bootstrap.web.letter.dto.MoveLetterToSpaceRequest import com.asap.common.page.PageResponse import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.media.Content diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/DraftLetterController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/DraftLetterController.kt similarity index 95% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/DraftLetterController.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/DraftLetterController.kt index eb974bac..e9af244e 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/DraftLetterController.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/DraftLetterController.kt @@ -1,11 +1,11 @@ -package com.asap.bootstrap.letter.controller +package com.asap.bootstrap.web.letter.controller import com.asap.application.letter.port.`in`.GenerateDraftKeyUsecase import com.asap.application.letter.port.`in`.GetDraftLetterUsecase import com.asap.application.letter.port.`in`.RemoveDraftLetterUsecase import com.asap.application.letter.port.`in`.UpdateDraftLetterUsecase -import com.asap.bootstrap.letter.api.DraftLetterApi -import com.asap.bootstrap.letter.dto.* +import com.asap.bootstrap.web.letter.api.DraftLetterApi +import com.asap.bootstrap.web.letter.dto.* import org.springframework.web.bind.annotation.RestController @RestController diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/LetterController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/LetterController.kt similarity index 89% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/LetterController.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/LetterController.kt index 753738c0..72700255 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/LetterController.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/LetterController.kt @@ -1,8 +1,21 @@ -package com.asap.bootstrap.letter.controller +package com.asap.bootstrap.web.letter.controller import com.asap.application.letter.port.`in`.* -import com.asap.bootstrap.letter.api.LetterApi -import com.asap.bootstrap.letter.dto.* +import com.asap.bootstrap.web.letter.api.LetterApi +import com.asap.bootstrap.web.letter.dto.AddPhysicalLetterRequest +import com.asap.bootstrap.web.letter.dto.AddVerifiedLetterRequest +import com.asap.bootstrap.web.letter.dto.AllLetterCountResponse +import com.asap.bootstrap.web.letter.dto.DeleteSendLettersRequest +import com.asap.bootstrap.web.letter.dto.GetIndependentLetterDetailResponse +import com.asap.bootstrap.web.letter.dto.GetIndependentLetterSimpleInfo +import com.asap.bootstrap.web.letter.dto.LetterVerifyRequest +import com.asap.bootstrap.web.letter.dto.LetterVerifyResponse +import com.asap.bootstrap.web.letter.dto.ModifyLetterRequest +import com.asap.bootstrap.web.letter.dto.SendLetterDetailResponse +import com.asap.bootstrap.web.letter.dto.SendLetterHistoryResponse +import com.asap.bootstrap.web.letter.dto.SendLetterRequest +import com.asap.bootstrap.web.letter.dto.SendLetterResponse +import com.asap.bootstrap.web.letter.dto.VerifiedLetterInfoResponse import com.asap.common.page.ListResponse import com.asap.common.page.SliceResponse import org.springframework.web.bind.annotation.RestController diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/SpaceLetterController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/SpaceLetterController.kt similarity index 92% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/SpaceLetterController.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/SpaceLetterController.kt index 9d7923a2..2eb0f778 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/SpaceLetterController.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/SpaceLetterController.kt @@ -1,11 +1,11 @@ -package com.asap.bootstrap.letter.controller +package com.asap.bootstrap.web.letter.controller import com.asap.application.letter.port.`in`.* -import com.asap.bootstrap.letter.api.SpaceLetterApi -import com.asap.bootstrap.letter.dto.GetSpaceLetterDetailResponse -import com.asap.bootstrap.letter.dto.GetSpaceLettersResponse -import com.asap.bootstrap.letter.dto.ModifyLetterRequest -import com.asap.bootstrap.letter.dto.MoveLetterToSpaceRequest +import com.asap.bootstrap.web.letter.api.SpaceLetterApi +import com.asap.bootstrap.web.letter.dto.GetSpaceLetterDetailResponse +import com.asap.bootstrap.web.letter.dto.GetSpaceLettersResponse +import com.asap.bootstrap.web.letter.dto.ModifyLetterRequest +import com.asap.bootstrap.web.letter.dto.MoveLetterToSpaceRequest import com.asap.common.page.PageResponse import org.springframework.web.bind.annotation.RestController diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/AddPhysicalLetterRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AddPhysicalLetterRequest.kt similarity index 77% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/AddPhysicalLetterRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AddPhysicalLetterRequest.kt index b6081637..52f982a6 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/AddPhysicalLetterRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AddPhysicalLetterRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto class AddPhysicalLetterRequest( val senderName: String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/AddVerifiedLetterRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AddVerifiedLetterRequest.kt similarity index 61% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/AddVerifiedLetterRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AddVerifiedLetterRequest.kt index 6fa25ffd..38fbbd1a 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/AddVerifiedLetterRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AddVerifiedLetterRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class AddVerifiedLetterRequest( val letterId: String diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/AllLetterCountResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AllLetterCountResponse.kt similarity index 68% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/AllLetterCountResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AllLetterCountResponse.kt index a8c61c67..2c91ac9b 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/AllLetterCountResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AllLetterCountResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class AllLetterCountResponse( val letterCount: Long, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/DeleteSendLettersRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/DeleteSendLettersRequest.kt similarity index 63% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/DeleteSendLettersRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/DeleteSendLettersRequest.kt index 94353bbc..eb8fdf49 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/DeleteSendLettersRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/DeleteSendLettersRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class DeleteSendLettersRequest( val letterIds: List, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GenerateDraftKeyResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GenerateDraftKeyResponse.kt similarity index 60% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GenerateDraftKeyResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GenerateDraftKeyResponse.kt index d3180e38..e30e7b3b 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GenerateDraftKeyResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GenerateDraftKeyResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class GenerateDraftKeyResponse( val draftId: String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetAllDraftLetterResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetAllDraftLetterResponse.kt similarity index 86% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetAllDraftLetterResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetAllDraftLetterResponse.kt index d493806d..352421bd 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetAllDraftLetterResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetAllDraftLetterResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto import java.time.LocalDateTime diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetDraftLetterCountResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetDraftLetterCountResponse.kt similarity index 60% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetDraftLetterCountResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetDraftLetterCountResponse.kt index 141be798..bcc5cda7 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetDraftLetterCountResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetDraftLetterCountResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class GetDraftLetterCountResponse( val count: Int, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetDraftLetterResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetDraftLetterResponse.kt similarity index 78% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetDraftLetterResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetDraftLetterResponse.kt index 91c94282..7d399a1f 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetDraftLetterResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetDraftLetterResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class GetDraftLetterResponse( val draftKey: String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetIndependentLetterDetailResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetIndependentLetterDetailResponse.kt similarity index 90% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetIndependentLetterDetailResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetIndependentLetterDetailResponse.kt index ae8c9119..c773e4e7 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetIndependentLetterDetailResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetIndependentLetterDetailResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto import java.time.LocalDate diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetIndependentLetterSimpleInfo.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetIndependentLetterSimpleInfo.kt similarity index 75% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetIndependentLetterSimpleInfo.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetIndependentLetterSimpleInfo.kt index ca14e757..66b6fe3f 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetIndependentLetterSimpleInfo.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetIndependentLetterSimpleInfo.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class GetIndependentLetterSimpleInfo( val letterId: String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetSpaceLetterDetailResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetSpaceLetterDetailResponse.kt similarity index 91% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetSpaceLetterDetailResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetSpaceLetterDetailResponse.kt index 0704a295..cee1543d 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetSpaceLetterDetailResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetSpaceLetterDetailResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto import java.time.LocalDate diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetSpaceLettersResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetSpaceLettersResponse.kt similarity index 78% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetSpaceLettersResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetSpaceLettersResponse.kt index 0fd3d223..05498be3 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/GetSpaceLettersResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetSpaceLettersResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto import java.time.LocalDate diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/LetterVerifyRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/LetterVerifyRequest.kt similarity index 61% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/LetterVerifyRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/LetterVerifyRequest.kt index 9097954f..c8f2a173 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/LetterVerifyRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/LetterVerifyRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class LetterVerifyRequest( diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/LetterVerifyResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/LetterVerifyResponse.kt similarity index 60% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/LetterVerifyResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/LetterVerifyResponse.kt index 5fea502f..66f78c95 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/LetterVerifyResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/LetterVerifyResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class LetterVerifyResponse( val letterId: String diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/ModifyLetterRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/ModifyLetterRequest.kt similarity index 77% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/ModifyLetterRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/ModifyLetterRequest.kt index 9d68bac3..9ed7bf81 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/ModifyLetterRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/ModifyLetterRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class ModifyLetterRequest( val senderName: String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/MoveLetterToSpaceRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/MoveLetterToSpaceRequest.kt similarity index 61% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/MoveLetterToSpaceRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/MoveLetterToSpaceRequest.kt index b8d836c5..82ba11e0 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/MoveLetterToSpaceRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/MoveLetterToSpaceRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class MoveLetterToSpaceRequest( val spaceId: String diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterDetailResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterDetailResponse.kt similarity index 85% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterDetailResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterDetailResponse.kt index a40622c7..9d42b31a 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterDetailResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterDetailResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto import java.time.LocalDate diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterHistoryResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterHistoryResponse.kt similarity index 78% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterHistoryResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterHistoryResponse.kt index 85f8bb76..99ed6e48 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterHistoryResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterHistoryResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto import java.time.LocalDate diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterRequest.kt similarity index 80% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterRequest.kt index e88ccfe8..0f936ad0 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class SendLetterRequest( val receiverName:String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterResponse.kt similarity index 60% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterResponse.kt index 3722da50..37722a7c 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/SendLetterResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/SendLetterResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class SendLetterResponse( val letterCode: String diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/UpdateDraftLetterRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/UpdateDraftLetterRequest.kt similarity index 74% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/UpdateDraftLetterRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/UpdateDraftLetterRequest.kt index 57ffe6d7..8a3776ae 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/UpdateDraftLetterRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/UpdateDraftLetterRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto data class UpdateDraftLetterRequest( val content: String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/VerifiedLetterInfoResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/VerifiedLetterInfoResponse.kt similarity index 83% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/VerifiedLetterInfoResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/VerifiedLetterInfoResponse.kt index 3cea5de5..e8f74351 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/VerifiedLetterInfoResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/VerifiedLetterInfoResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.dto +package com.asap.bootstrap.web.letter.dto import java.time.LocalDate diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/handler/DraftLetterEventHandler.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/handler/DraftLetterEventHandler.kt similarity index 95% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/handler/DraftLetterEventHandler.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/handler/DraftLetterEventHandler.kt index 88b8485e..64500663 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/handler/DraftLetterEventHandler.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/handler/DraftLetterEventHandler.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.handler +package com.asap.bootstrap.web.letter.handler import com.asap.application.letter.port.`in`.RemoveDraftLetterUsecase import com.asap.application.user.event.UserEvent diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/handler/LetterEventHandler.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/handler/LetterEventHandler.kt similarity index 94% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/handler/LetterEventHandler.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/handler/LetterEventHandler.kt index 169f7778..8a527677 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/handler/LetterEventHandler.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/handler/LetterEventHandler.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.handler +package com.asap.bootstrap.web.letter.handler import com.asap.application.letter.port.`in`.RemoveLetterUsecase import com.asap.application.user.event.UserEvent diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/handler/SpaceLetterEventHandler.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/handler/SpaceLetterEventHandler.kt similarity index 93% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/handler/SpaceLetterEventHandler.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/handler/SpaceLetterEventHandler.kt index 34ea48e9..82a80df0 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/handler/SpaceLetterEventHandler.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/handler/SpaceLetterEventHandler.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.letter.handler +package com.asap.bootstrap.web.letter.handler import com.asap.application.letter.port.`in`.RemoveLetterUsecase import com.asap.domain.space.event.SpaceEvent diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/api/SpaceApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/api/SpaceApi.kt similarity index 98% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/api/SpaceApi.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/api/SpaceApi.kt index 03cab303..f84fab5a 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/api/SpaceApi.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/api/SpaceApi.kt @@ -1,7 +1,7 @@ -package com.asap.bootstrap.space.api +package com.asap.bootstrap.web.space.api import com.asap.bootstrap.common.security.annotation.AccessUser -import com.asap.bootstrap.space.dto.* +import com.asap.bootstrap.web.space.dto.* import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/controller/SpaceController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/controller/SpaceController.kt similarity index 96% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/controller/SpaceController.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/controller/SpaceController.kt index 0fec8c8c..f65d4ff6 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/controller/SpaceController.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/controller/SpaceController.kt @@ -1,8 +1,8 @@ -package com.asap.bootstrap.space.controller +package com.asap.bootstrap.web.space.controller import com.asap.application.space.port.`in`.* -import com.asap.bootstrap.space.api.SpaceApi -import com.asap.bootstrap.space.dto.* +import com.asap.bootstrap.web.space.api.SpaceApi +import com.asap.bootstrap.web.space.dto.* import org.springframework.web.bind.annotation.RestController @RestController diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/CreateSpaceRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/CreateSpaceRequest.kt similarity index 68% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/CreateSpaceRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/CreateSpaceRequest.kt index 53b88346..e0ee7d9d 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/CreateSpaceRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/CreateSpaceRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.space.dto +package com.asap.bootstrap.web.space.dto data class CreateSpaceRequest( val spaceName: String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/DeleteMultipleSpacesRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/DeleteMultipleSpacesRequest.kt similarity index 65% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/DeleteMultipleSpacesRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/DeleteMultipleSpacesRequest.kt index 805c65f0..40181dc3 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/DeleteMultipleSpacesRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/DeleteMultipleSpacesRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.space.dto +package com.asap.bootstrap.web.space.dto data class DeleteMultipleSpacesRequest( val spaceIds: List diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/GetAllSpaceResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/GetAllSpaceResponse.kt similarity index 86% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/GetAllSpaceResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/GetAllSpaceResponse.kt index 84b46e48..9229c7fe 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/GetAllSpaceResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/GetAllSpaceResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.space.dto +package com.asap.bootstrap.web.space.dto data class GetAllSpaceResponse( val spaces: List, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/GetSpaceResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/GetSpaceResponse.kt similarity index 73% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/GetSpaceResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/GetSpaceResponse.kt index 48af9d0f..72ea4c30 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/GetSpaceResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/GetSpaceResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.space.dto +package com.asap.bootstrap.web.space.dto data class GetSpaceResponse( val spaceId: String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/MainSpaceInfoResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/MainSpaceInfoResponse.kt similarity index 77% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/MainSpaceInfoResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/MainSpaceInfoResponse.kt index 3c08fb2d..269dc583 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/MainSpaceInfoResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/MainSpaceInfoResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.space.dto +package com.asap.bootstrap.web.space.dto data class MainSpaceInfoResponse( val spaceId: String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/UpdateSpaceNameRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/UpdateSpaceNameRequest.kt similarity index 62% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/UpdateSpaceNameRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/UpdateSpaceNameRequest.kt index 73abe27e..0ff4dd28 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/UpdateSpaceNameRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/UpdateSpaceNameRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.space.dto +package com.asap.bootstrap.web.space.dto data class UpdateSpaceNameRequest( val spaceName: String diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/UpdateSpaceOrderRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/UpdateSpaceOrderRequest.kt similarity index 79% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/UpdateSpaceOrderRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/UpdateSpaceOrderRequest.kt index d651382a..d85c6b03 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/dto/UpdateSpaceOrderRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/dto/UpdateSpaceOrderRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.space.dto +package com.asap.bootstrap.web.space.dto data class UpdateSpaceOrderRequest( val orders: List diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/handler/SpaceEventHandler.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/handler/SpaceEventHandler.kt similarity index 96% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/handler/SpaceEventHandler.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/handler/SpaceEventHandler.kt index 95d4905f..3cc96faf 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/space/handler/SpaceEventHandler.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/handler/SpaceEventHandler.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.space.handler +package com.asap.bootstrap.web.space.handler import com.asap.application.space.port.`in`.CreateSpaceUsecase import com.asap.application.space.port.`in`.DeleteSpaceUsecase diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/api/UserApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/api/UserApi.kt similarity index 97% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/api/UserApi.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/api/UserApi.kt index 48dff412..2c4c4068 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/api/UserApi.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/api/UserApi.kt @@ -1,7 +1,7 @@ -package com.asap.bootstrap.user.api +package com.asap.bootstrap.web.user.api import com.asap.bootstrap.common.security.annotation.AccessUser -import com.asap.bootstrap.user.dto.* +import com.asap.bootstrap.web.user.dto.* import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/controller/UserController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/controller/UserController.kt similarity index 94% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/controller/UserController.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/controller/UserController.kt index 0e3f68a5..00275a0c 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/controller/UserController.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/controller/UserController.kt @@ -1,8 +1,8 @@ -package com.asap.bootstrap.user.controller +package com.asap.bootstrap.web.user.controller import com.asap.application.user.port.`in`.* -import com.asap.bootstrap.user.api.UserApi -import com.asap.bootstrap.user.dto.* +import com.asap.bootstrap.web.user.api.UserApi +import com.asap.bootstrap.web.user.dto.* import org.springframework.web.bind.annotation.RestController @RestController diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/LogoutRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/LogoutRequest.kt similarity index 59% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/LogoutRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/LogoutRequest.kt index acb7fea0..96f17998 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/LogoutRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/LogoutRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.user.dto +package com.asap.bootstrap.web.user.dto data class LogoutRequest( val refreshToken: String, diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/RegisterUserRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/RegisterUserRequest.kt similarity index 95% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/RegisterUserRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/RegisterUserRequest.kt index a8b701af..f47ce4c7 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/RegisterUserRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/RegisterUserRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.user.dto +package com.asap.bootstrap.web.user.dto import io.swagger.v3.oas.annotations.media.Schema import java.time.LocalDate diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/RegisterUserResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/RegisterUserResponse.kt similarity index 87% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/RegisterUserResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/RegisterUserResponse.kt index 33a2cb6c..c4a0d4ee 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/RegisterUserResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/RegisterUserResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.user.dto +package com.asap.bootstrap.web.user.dto import io.swagger.v3.oas.annotations.media.Schema diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/UpdateBirthdayRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/UpdateBirthdayRequest.kt similarity index 70% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/UpdateBirthdayRequest.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/UpdateBirthdayRequest.kt index aee35a4e..a0e7e567 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/UpdateBirthdayRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/UpdateBirthdayRequest.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.user.dto +package com.asap.bootstrap.web.user.dto import java.time.LocalDate diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/UserInfoResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/UserInfoResponse.kt similarity index 80% rename from Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/UserInfoResponse.kt rename to Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/UserInfoResponse.kt index 69039933..a00a9dea 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/dto/UserInfoResponse.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/user/dto/UserInfoResponse.kt @@ -1,4 +1,4 @@ -package com.asap.bootstrap.user.dto +package com.asap.bootstrap.web.user.dto import java.time.LocalDate diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/auth/controller/AuthControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/auth/controller/AuthControllerTest.kt index 67a2176e..e2054f42 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/auth/controller/AuthControllerTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/auth/controller/AuthControllerTest.kt @@ -5,8 +5,8 @@ import com.asap.application.user.port.`in`.ReissueTokenUsecase import com.asap.application.user.port.`in`.SocialLoginUsecase import com.asap.application.user.port.`in`.TokenResolveUsecase import com.asap.bootstrap.AcceptanceSupporter -import com.asap.bootstrap.auth.dto.ReissueRequest -import com.asap.bootstrap.auth.dto.SocialLoginRequest +import com.asap.bootstrap.web.auth.dto.ReissueRequest +import com.asap.bootstrap.web.auth.dto.SocialLoginRequest import org.junit.jupiter.api.Test import org.mockito.BDDMockito import org.springframework.boot.test.mock.mockito.MockBean diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/DraftLetterControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/DraftLetterControllerTest.kt index c6e150a4..f2bb1cd0 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/DraftLetterControllerTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/DraftLetterControllerTest.kt @@ -3,7 +3,7 @@ package com.asap.bootstrap.acceptance.letter.controller import com.asap.application.letter.port.`in`.GenerateDraftKeyUsecase import com.asap.application.letter.port.`in`.GetDraftLetterUsecase import com.asap.bootstrap.acceptance.letter.LetterAcceptanceSupporter -import com.asap.bootstrap.letter.dto.UpdateDraftLetterRequest +import com.asap.bootstrap.web.letter.dto.UpdateDraftLetterRequest import org.junit.jupiter.api.Test import org.mockito.BDDMockito import org.springframework.http.MediaType diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/LetterControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/LetterControllerTest.kt index e5030909..afc0c5ea 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/LetterControllerTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/LetterControllerTest.kt @@ -2,7 +2,7 @@ package com.asap.bootstrap.acceptance.letter.controller import com.asap.application.letter.port.`in`.* import com.asap.bootstrap.acceptance.letter.LetterAcceptanceSupporter -import com.asap.bootstrap.letter.dto.* +import com.asap.bootstrap.web.letter.dto.* import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import org.mockito.BDDMockito diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/SpaceLetterControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/SpaceLetterControllerTest.kt index be62c6fe..dfa897d7 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/SpaceLetterControllerTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/SpaceLetterControllerTest.kt @@ -3,8 +3,8 @@ package com.asap.bootstrap.acceptance.letter.controller import com.asap.application.letter.port.`in`.GetSpaceLetterDetailUsecase import com.asap.application.letter.port.`in`.GetSpaceLettersUsecase import com.asap.bootstrap.acceptance.letter.LetterAcceptanceSupporter -import com.asap.bootstrap.letter.dto.ModifyLetterRequest -import com.asap.bootstrap.letter.dto.MoveLetterToSpaceRequest +import com.asap.bootstrap.web.letter.dto.ModifyLetterRequest +import com.asap.bootstrap.web.letter.dto.MoveLetterToSpaceRequest import org.junit.jupiter.api.Test import org.mockito.BDDMockito import org.springframework.http.MediaType diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/space/controller/SpaceControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/space/controller/SpaceControllerTest.kt index 60764c6d..197c8578 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/space/controller/SpaceControllerTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/space/controller/SpaceControllerTest.kt @@ -2,10 +2,10 @@ package com.asap.bootstrap.acceptance.space.controller import com.asap.application.space.port.`in`.* import com.asap.bootstrap.AcceptanceSupporter -import com.asap.bootstrap.space.dto.CreateSpaceRequest -import com.asap.bootstrap.space.dto.DeleteMultipleSpacesRequest -import com.asap.bootstrap.space.dto.UpdateSpaceNameRequest -import com.asap.bootstrap.space.dto.UpdateSpaceOrderRequest +import com.asap.bootstrap.web.space.dto.CreateSpaceRequest +import com.asap.bootstrap.web.space.dto.DeleteMultipleSpacesRequest +import com.asap.bootstrap.web.space.dto.UpdateSpaceNameRequest +import com.asap.bootstrap.web.space.dto.UpdateSpaceOrderRequest import io.kotest.matchers.string.haveLength import org.junit.jupiter.api.Test import org.mockito.BDDMockito diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/user/controller/UserControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/user/controller/UserControllerTest.kt index cae0533b..5bf6b41a 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/user/controller/UserControllerTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/user/controller/UserControllerTest.kt @@ -2,9 +2,9 @@ package com.asap.bootstrap.acceptance.user.controller import com.asap.application.user.port.`in`.* import com.asap.bootstrap.AcceptanceSupporter -import com.asap.bootstrap.user.dto.LogoutRequest -import com.asap.bootstrap.user.dto.RegisterUserRequest -import com.asap.bootstrap.user.dto.UpdateBirthdayRequest +import com.asap.bootstrap.web.user.dto.LogoutRequest +import com.asap.bootstrap.web.user.dto.RegisterUserRequest +import com.asap.bootstrap.web.user.dto.UpdateBirthdayRequest import org.junit.jupiter.api.Test import org.mockito.BDDMockito.given import org.springframework.boot.test.mock.mockito.MockBean @@ -50,7 +50,12 @@ class UserControllerTest : AcceptanceSupporter() { request.birthday, request.realName, ) - given(registerUserUsecase.registerUser(command)).willReturn(RegisterUserUsecase.Response("accessToken", "refreshToken")) + given(registerUserUsecase.registerUser(command)).willReturn( + RegisterUserUsecase.Response( + "accessToken", + "refreshToken" + ) + ) // when val response = mockMvc.post("/api/v1/users") { @@ -140,7 +145,7 @@ class UserControllerTest : AcceptanceSupporter() { } @Test - fun updateBirthday() { + fun updateBirthday() { // given val userId = userMockManager.settingUser() val accessToken = jwtMockManager.generateAccessToken(userId) diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/auth/AuthApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/auth/AuthApiIntegrationTest.kt index 959dddc0..ca044b54 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/auth/AuthApiIntegrationTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/auth/AuthApiIntegrationTest.kt @@ -1,8 +1,8 @@ package com.asap.bootstrap.integration.auth import com.asap.bootstrap.IntegrationSupporter -import com.asap.bootstrap.auth.dto.ReissueRequest -import com.asap.bootstrap.auth.dto.SocialLoginRequest +import com.asap.bootstrap.web.auth.dto.ReissueRequest +import com.asap.bootstrap.web.auth.dto.SocialLoginRequest import com.asap.client.KakaoTestData import com.asap.client.MockServer import com.asap.security.jwt.user.TokenType diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterApiIntegrationTest.kt index 1c231017..caa3cee0 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterApiIntegrationTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterApiIntegrationTest.kt @@ -2,7 +2,7 @@ package com.asap.bootstrap.integration.letter import com.asap.application.letter.LetterMockManager import com.asap.bootstrap.IntegrationSupporter -import com.asap.bootstrap.letter.dto.UpdateDraftLetterRequest +import com.asap.bootstrap.web.letter.dto.UpdateDraftLetterRequest import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired import org.springframework.http.MediaType diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterEventHandlerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterEventHandlerTest.kt index 476a08d2..c6b7dfd3 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterEventHandlerTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterEventHandlerTest.kt @@ -3,7 +3,7 @@ package com.asap.bootstrap.integration.letter import com.asap.application.letter.LetterMockManager import com.asap.application.user.event.UserEvent import com.asap.bootstrap.IntegrationSupporter -import com.asap.bootstrap.letter.handler.DraftLetterEventHandler +import com.asap.bootstrap.web.letter.handler.DraftLetterEventHandler import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired import org.springframework.test.web.servlet.get diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterApiIntegrationTest.kt index 607a6732..e0915396 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterApiIntegrationTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterApiIntegrationTest.kt @@ -3,7 +3,7 @@ package com.asap.bootstrap.integration.letter import com.asap.application.letter.LetterMockManager import com.asap.application.space.SpaceMockManager import com.asap.bootstrap.IntegrationSupporter -import com.asap.bootstrap.letter.dto.* +import com.asap.bootstrap.web.letter.dto.* import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterEventHandlerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterEventHandlerTest.kt index 7aafdc60..075e4cf2 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterEventHandlerTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterEventHandlerTest.kt @@ -3,7 +3,7 @@ package com.asap.bootstrap.integration.letter import com.asap.application.letter.LetterMockManager import com.asap.application.user.event.UserEvent import com.asap.bootstrap.IntegrationSupporter -import com.asap.bootstrap.letter.handler.LetterEventHandler +import com.asap.bootstrap.web.letter.handler.LetterEventHandler import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterApiIntegrationTest.kt index 8cccd2f6..b7cddf27 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterApiIntegrationTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterApiIntegrationTest.kt @@ -3,8 +3,8 @@ package com.asap.bootstrap.integration.letter import com.asap.application.letter.LetterMockManager import com.asap.application.space.SpaceMockManager import com.asap.bootstrap.IntegrationSupporter -import com.asap.bootstrap.letter.dto.ModifyLetterRequest -import com.asap.bootstrap.letter.dto.MoveLetterToSpaceRequest +import com.asap.bootstrap.web.letter.dto.ModifyLetterRequest +import com.asap.bootstrap.web.letter.dto.MoveLetterToSpaceRequest import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterEventHandlerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterEventHandlerTest.kt index a0392775..b7810894 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterEventHandlerTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterEventHandlerTest.kt @@ -3,7 +3,7 @@ package com.asap.bootstrap.integration.letter import com.asap.application.letter.LetterMockManager import com.asap.application.space.SpaceMockManager import com.asap.bootstrap.IntegrationSupporter -import com.asap.bootstrap.space.dto.DeleteMultipleSpacesRequest +import com.asap.bootstrap.web.space.dto.DeleteMultipleSpacesRequest import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceApiIntegrationTest.kt index 5266bb71..ea722543 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceApiIntegrationTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceApiIntegrationTest.kt @@ -2,10 +2,10 @@ package com.asap.bootstrap.integration.space import com.asap.application.space.SpaceMockManager import com.asap.bootstrap.IntegrationSupporter -import com.asap.bootstrap.space.dto.CreateSpaceRequest -import com.asap.bootstrap.space.dto.DeleteMultipleSpacesRequest -import com.asap.bootstrap.space.dto.UpdateSpaceNameRequest -import com.asap.bootstrap.space.dto.UpdateSpaceOrderRequest +import com.asap.bootstrap.web.space.dto.CreateSpaceRequest +import com.asap.bootstrap.web.space.dto.DeleteMultipleSpacesRequest +import com.asap.bootstrap.web.space.dto.UpdateSpaceNameRequest +import com.asap.bootstrap.web.space.dto.UpdateSpaceOrderRequest import io.kotest.matchers.maps.haveValue import io.kotest.matchers.shouldBe import io.kotest.matchers.string.haveLength @@ -445,9 +445,9 @@ class SpaceApiIntegrationTest : IntegrationSupporter() { status { isOk() } } spaceMockManager.getSpaceIndexes(userId) shouldBe - spaceIndexes - .map { it.spaceId to it.index } - .sortedBy { it.second } + spaceIndexes + .map { it.spaceId to it.index } + .sortedBy { it.second } } @Test diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceHandlerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceHandlerTest.kt index be602fb1..70d44238 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceHandlerTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceHandlerTest.kt @@ -3,7 +3,7 @@ package com.asap.bootstrap.integration.space import com.asap.application.space.SpaceMockManager import com.asap.application.user.event.UserEvent import com.asap.bootstrap.IntegrationSupporter -import com.asap.bootstrap.space.handler.SpaceEventHandler +import com.asap.bootstrap.web.space.handler.SpaceEventHandler import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired import org.springframework.test.web.servlet.get diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/user/UserApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/user/UserApiIntegrationTest.kt index e4c60a7f..ff63b9b9 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/user/UserApiIntegrationTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/user/UserApiIntegrationTest.kt @@ -2,9 +2,9 @@ package com.asap.bootstrap.integration.user import com.asap.application.user.exception.UserException import com.asap.bootstrap.IntegrationSupporter -import com.asap.bootstrap.user.dto.LogoutRequest -import com.asap.bootstrap.user.dto.RegisterUserRequest -import com.asap.bootstrap.user.dto.UpdateBirthdayRequest +import com.asap.bootstrap.web.user.dto.LogoutRequest +import com.asap.bootstrap.web.user.dto.RegisterUserRequest +import com.asap.bootstrap.web.user.dto.UpdateBirthdayRequest import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import org.springframework.http.MediaType From 9c12eb722a5c66e8918de8a941593866bc213075 Mon Sep 17 00:00:00 2001 From: Sim-km Date: Sat, 4 Jan 2025 20:03:13 +0900 Subject: [PATCH 2/2] =?UTF-8?q?ASAP-324=20feat:=20=EC=B9=B4=EC=B9=B4?= =?UTF-8?q?=EC=98=A4=20=EC=9B=B9=ED=9B=85=20end=20point=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../letter/port/in/LetterLogUsecase.kt | 14 +++++ .../port/out/LetterLogManagementPort.kt | 9 +++ .../letter/service/LetterLogService.kt | 28 +++++++++ .../letter/service/LetterLogServiceTest.kt | 42 +++++++++++++ .../com/asap/bootstrap/webhook/WebHookApi.kt | 34 +++++++++++ .../webhook/dto/KakaoWebHookRequest.kt | 46 ++++++++++++++ .../acceptance/webhook/WebHookApiTest.kt | 40 +++++++++++++ .../webhook/WebHookApiIntegrationTest.kt | 60 +++++++++++++++++++ .../asap/bootstrap/IntegrationSupporter.kt | 2 + .../com/asap/domain/common/BaseEntity.kt | 6 ++ .../asap/domain/letter/entity/LetterLog.kt | 31 ++++++++++ .../persistence/jpa/letter/LetterLogMapper.kt | 27 +++++++++ .../adapter/LetterLogManagementJpaAdapter.kt | 20 +++++++ .../jpa/letter/entity/LetterLogEntity.kt | 50 ++++++++++++++++ .../repository/LetterLogJpaRepository.kt | 7 +++ .../resources/db/V1_14__create_letter_log.sql | 14 +++++ 16 files changed, 430 insertions(+) create mode 100644 Application-Module/src/main/kotlin/com/asap/application/letter/port/in/LetterLogUsecase.kt create mode 100644 Application-Module/src/main/kotlin/com/asap/application/letter/port/out/LetterLogManagementPort.kt create mode 100644 Application-Module/src/main/kotlin/com/asap/application/letter/service/LetterLogService.kt create mode 100644 Application-Module/src/test/kotlin/com/asap/application/letter/service/LetterLogServiceTest.kt create mode 100644 Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/webhook/WebHookApi.kt create mode 100644 Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/webhook/dto/KakaoWebHookRequest.kt create mode 100644 Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/webhook/WebHookApiTest.kt create mode 100644 Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/webhook/WebHookApiIntegrationTest.kt create mode 100644 Domain-Module/src/main/kotlin/com/asap/domain/common/BaseEntity.kt create mode 100644 Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/LetterLog.kt create mode 100644 Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/LetterLogMapper.kt create mode 100644 Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/adapter/LetterLogManagementJpaAdapter.kt create mode 100644 Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/entity/LetterLogEntity.kt create mode 100644 Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/repository/LetterLogJpaRepository.kt create mode 100644 Infrastructure-Module/Persistence/src/main/resources/db/V1_14__create_letter_log.sql diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/LetterLogUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/LetterLogUsecase.kt new file mode 100644 index 00000000..509e4a0e --- /dev/null +++ b/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/LetterLogUsecase.kt @@ -0,0 +1,14 @@ +package com.asap.application.letter.port.`in` + +import com.asap.domain.letter.entity.LetterLogType + +interface LetterLogUsecase { + + fun log(request: LogRequest) + + data class LogRequest( + val letterCode: String, + val logType: LetterLogType, + val logContent: String, + ) +} \ No newline at end of file diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/port/out/LetterLogManagementPort.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/port/out/LetterLogManagementPort.kt new file mode 100644 index 00000000..ef1d2f77 --- /dev/null +++ b/Application-Module/src/main/kotlin/com/asap/application/letter/port/out/LetterLogManagementPort.kt @@ -0,0 +1,9 @@ +package com.asap.application.letter.port.out + +import com.asap.domain.letter.entity.LetterLog + +interface LetterLogManagementPort { + fun save(log: LetterLog): LetterLog + + fun findAll(): List +} \ No newline at end of file diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/service/LetterLogService.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/service/LetterLogService.kt new file mode 100644 index 00000000..ac90ab99 --- /dev/null +++ b/Application-Module/src/main/kotlin/com/asap/application/letter/service/LetterLogService.kt @@ -0,0 +1,28 @@ +package com.asap.application.letter.service + +import com.asap.application.letter.port.`in`.LetterLogUsecase +import com.asap.application.letter.port.out.LetterLogManagementPort +import com.asap.application.letter.port.out.SendLetterManagementPort +import com.asap.domain.letter.entity.LetterLog +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional + +@Service +@Transactional +class LetterLogService( + private val sendLetterManagementPort: SendLetterManagementPort, + private val letterLogManagementPort: LetterLogManagementPort +) : LetterLogUsecase { + override fun log(request: LetterLogUsecase.LogRequest) { + val letterCode = request.letterCode + val letter = sendLetterManagementPort.getLetterByCodeNotNull(letterCode) + + LetterLog.create( + targetLetterId = letter.id, + logType = request.logType, + content = request.logContent + ).apply { + letterLogManagementPort.save(this) + } + } +} \ No newline at end of file diff --git a/Application-Module/src/test/kotlin/com/asap/application/letter/service/LetterLogServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/letter/service/LetterLogServiceTest.kt new file mode 100644 index 00000000..96ed2e67 --- /dev/null +++ b/Application-Module/src/test/kotlin/com/asap/application/letter/service/LetterLogServiceTest.kt @@ -0,0 +1,42 @@ +package com.asap.application.letter.service + +import com.asap.application.letter.port.`in`.LetterLogUsecase +import com.asap.application.letter.port.out.LetterLogManagementPort +import com.asap.application.letter.port.out.SendLetterManagementPort +import com.asap.domain.LetterFixture +import com.asap.domain.letter.entity.LetterLogType +import io.kotest.core.spec.style.BehaviorSpec +import io.mockk.every +import io.mockk.mockk +import io.mockk.verify + +class LetterLogServiceTest : BehaviorSpec({ + + val letterLogManagementPort = mockk(relaxed = true) + val mockSendLetterManagementPort = mockk(relaxed = true) + + val letterLogService = LetterLogService( + letterLogManagementPort = letterLogManagementPort, + sendLetterManagementPort = mockSendLetterManagementPort, + ) + + given("편지 관련 로그 서비스 테스트") { + val request = LetterLogUsecase.LogRequest( + letterCode = "letterCode", + logType = LetterLogType.SHARE, + logContent = "logContent", + ) + + val mockSendLetter = LetterFixture.generateSendLetter() + + every { mockSendLetterManagementPort.getLetterByCodeNotNull(any()) } returns mockSendLetter + + `when`("편지를 저장 요청하면") { + letterLogService.log(request) + then("편지를 저장한다") { + verify { letterLogManagementPort.save(any()) } + } + } + } +}) { +} \ No newline at end of file diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/webhook/WebHookApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/webhook/WebHookApi.kt new file mode 100644 index 00000000..99bf06d0 --- /dev/null +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/webhook/WebHookApi.kt @@ -0,0 +1,34 @@ +package com.asap.bootstrap.webhook + +import com.asap.application.letter.port.`in`.LetterLogUsecase +import com.asap.bootstrap.webhook.dto.KakaoWebHookRequest +import com.fasterxml.jackson.databind.ObjectMapper +import io.github.oshai.kotlinlogging.KotlinLogging +import org.springframework.web.bind.annotation.* + +@RestController +@RequestMapping("/webhook") +class WebHookApi( + private val letterLogUsecase: LetterLogUsecase, + private val objectMapper: ObjectMapper +) { + private val logger = KotlinLogging.logger { } + + @PostMapping("/kakao") + fun kakaoWebHook( + @RequestHeader("Authorization") authorization: String, + @RequestHeader("X-Kakao-Resource-ID") resourceId: String, + @RequestHeader("User-Agent") userAgent: String, + @RequestBody request: KakaoWebHookRequest + ) { + logger.info { "Authorization: $authorization, Resource Id: $resourceId, agent: $userAgent, request: $request" } + + letterLogUsecase.log( + LetterLogUsecase.LogRequest( + letterCode = request.requestId, + logType = request.requestType, + logContent = objectMapper.writeValueAsString(request) + ) + ) + } +} \ No newline at end of file diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/webhook/dto/KakaoWebHookRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/webhook/dto/KakaoWebHookRequest.kt new file mode 100644 index 00000000..526be9e6 --- /dev/null +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/webhook/dto/KakaoWebHookRequest.kt @@ -0,0 +1,46 @@ +package com.asap.bootstrap.webhook.dto + +import com.asap.bootstrap.webhook.dto.KakaoChatType.entries +import com.asap.domain.letter.entity.LetterLogType +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.core.JsonParser +import com.fasterxml.jackson.databind.DeserializationContext +import com.fasterxml.jackson.databind.JsonDeserializer +import com.fasterxml.jackson.databind.annotation.JsonDeserialize + +data class KakaoWebHookRequest( + @field:JsonProperty("CHAT_TYPE") + val chatType: KakaoChatType, + @field:JsonProperty("HASH_CHAT_ID") + val hashChatId: String, + @field:JsonProperty("TEMPLATE_ID") + val templateId: String, + val requestType: LetterLogType, + val requestId: String +) + +@JsonDeserialize(using = KakaoChatType.KakaoChatTypeDeserializer::class) +enum class KakaoChatType( + val value: String +) { + MEMO_CHAT("MemoChat"), + DIRECT_CHAT("DirectChat"), + MULTI_CHAT("MultiChat"), + OPEN_DIRECT_CHAT("OpenDirectChat"), + OPEN_MULTI_CHAT("OpenMultiChat"), + ; + + companion object { + fun parse(value: String): KakaoChatType { + return entries.firstOrNull { it.value == value || it.name == value } + ?: throw IllegalArgumentException("Unknown KakaoChatType: $value") + } + } + + internal class KakaoChatTypeDeserializer : JsonDeserializer() { + override fun deserialize(p: JsonParser, ctxt: DeserializationContext): KakaoChatType { + return parse(p.text) + } + } + +} \ No newline at end of file diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/webhook/WebHookApiTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/webhook/WebHookApiTest.kt new file mode 100644 index 00000000..7b8bbf80 --- /dev/null +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/webhook/WebHookApiTest.kt @@ -0,0 +1,40 @@ +package com.asap.bootstrap.acceptance.webhook + +import com.asap.application.letter.port.`in`.LetterLogUsecase +import com.asap.bootstrap.AcceptanceSupporter +import com.asap.domain.letter.entity.LetterLogType +import org.junit.jupiter.api.Test +import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.http.MediaType +import org.springframework.test.web.servlet.post + +class WebHookApiTest : AcceptanceSupporter() { + + @MockBean + private lateinit var letterLogUsecase: LetterLogUsecase + + @Test + fun kakaoWebHook() { + //given + val request = mapOf( + "requestId" to "1234567890", + "requestType" to LetterLogType.SHARE.name, + "CHAT_TYPE" to "MemoChat", + "HASH_CHAT_ID" to "1234567890", + "TEMPLATE_ID" to "1234567890" + ) + + //when then + mockMvc.post("/webhook/kakao") { + headers { + set("Authorization", "KakaoAP 1234567890") + set("X-Kakao-Resource-ID", "1234567890") + set("User-Agent", "KakaoAgent") + } + contentType = MediaType.APPLICATION_JSON + content = objectMapper.writeValueAsString(request) + }.andExpect { + status { isOk() } + } + } +} \ No newline at end of file diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/webhook/WebHookApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/webhook/WebHookApiIntegrationTest.kt new file mode 100644 index 00000000..60a0b768 --- /dev/null +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/webhook/WebHookApiIntegrationTest.kt @@ -0,0 +1,60 @@ +package com.asap.bootstrap.integration.webhook + +import com.asap.application.letter.LetterMockManager +import com.asap.application.letter.port.out.LetterLogManagementPort +import com.asap.bootstrap.IntegrationSupporter +import com.asap.bootstrap.webhook.dto.KakaoChatType +import com.asap.bootstrap.webhook.dto.KakaoWebHookRequest +import com.asap.domain.letter.entity.LetterLogType +import com.fasterxml.jackson.module.kotlin.readValue +import io.kotest.matchers.shouldBe +import org.junit.jupiter.api.Test +import org.springframework.http.MediaType +import org.springframework.test.web.servlet.post + +class WebHookApiIntegrationTest( + private val letterLogManagementPort: LetterLogManagementPort, + private val letterMockManager: LetterMockManager +) : IntegrationSupporter() { + + @Test + fun kakaoWebHook() { + //given + val senderId = userMockManager.settingUser(username = "senderUsername") + val userId = userMockManager.settingUser(username = "username") + val accessToken = jwtMockManager.generateAccessToken(userId) + val letter = + letterMockManager.generateMockSendLetter("username", senderId = senderId) + val letterCode = letter.letterCode!! + + + val request = KakaoWebHookRequest( + requestId = letterCode, + requestType = LetterLogType.SHARE, + chatType = KakaoChatType.MEMO_CHAT, + hashChatId = "1234567890", + templateId = "1234567890" + ) + + //when + val response = mockMvc.post("/webhook/kakao") { + headers { + set("Authorization", "KakaoAP 1234567890") + set("X-Kakao-Resource-ID", "1234567890") + set("User-Agent", "KakaoAgent") + } + contentType = MediaType.APPLICATION_JSON + content = objectMapper.writeValueAsString(request) + } + + // then + response.andExpect { + status { isOk() } + } + with(letterLogManagementPort.findAll().first()) { + this.targetLetterId shouldBe letter.id + this.logType shouldBe LetterLogType.SHARE + objectMapper.readValue(this.content) shouldBe request + } + } +} \ No newline at end of file diff --git a/Bootstrap-Module/src/testFixtures/kotlin/com/asap/bootstrap/IntegrationSupporter.kt b/Bootstrap-Module/src/testFixtures/kotlin/com/asap/bootstrap/IntegrationSupporter.kt index 032abe6d..9a5ea624 100644 --- a/Bootstrap-Module/src/testFixtures/kotlin/com/asap/bootstrap/IntegrationSupporter.kt +++ b/Bootstrap-Module/src/testFixtures/kotlin/com/asap/bootstrap/IntegrationSupporter.kt @@ -7,11 +7,13 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.context.ActiveProfiles +import org.springframework.test.context.TestConstructor import org.springframework.test.web.servlet.MockMvc @SpringBootTest @AutoConfigureMockMvc @ActiveProfiles("test") +@TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) abstract class IntegrationSupporter { @Autowired lateinit var mockMvc: MockMvc diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/common/BaseEntity.kt b/Domain-Module/src/main/kotlin/com/asap/domain/common/BaseEntity.kt new file mode 100644 index 00000000..1cf328e9 --- /dev/null +++ b/Domain-Module/src/main/kotlin/com/asap/domain/common/BaseEntity.kt @@ -0,0 +1,6 @@ +package com.asap.domain.common + +abstract class BaseEntity( + val id: DomainId = DomainId.generate() +) { +} \ No newline at end of file diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/LetterLog.kt b/Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/LetterLog.kt new file mode 100644 index 00000000..e14fddc7 --- /dev/null +++ b/Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/LetterLog.kt @@ -0,0 +1,31 @@ +package com.asap.domain.letter.entity + +import com.asap.domain.common.BaseEntity +import com.asap.domain.common.DomainId +import java.time.LocalDateTime + +class LetterLog( + id: DomainId = DomainId.generate(), + val targetLetterId: DomainId, + val loggedAt: LocalDateTime, + val logType: LetterLogType, + val content: String, +) : BaseEntity(id) { + companion object { + fun create( + targetLetterId: DomainId, + logType: LetterLogType, + content: String, + ): LetterLog = + LetterLog( + targetLetterId = targetLetterId, + loggedAt = LocalDateTime.now(), + logType = logType, + content = content, + ) + } +} + +enum class LetterLogType { + SHARE, +} \ No newline at end of file diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/LetterLogMapper.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/LetterLogMapper.kt new file mode 100644 index 00000000..2fb56daa --- /dev/null +++ b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/LetterLogMapper.kt @@ -0,0 +1,27 @@ +package com.asap.persistence.jpa.letter + +import com.asap.domain.common.DomainId +import com.asap.domain.letter.entity.LetterLog +import com.asap.persistence.jpa.letter.entity.LetterLogEntity + +object LetterLogMapper { + fun toEntity(letterLog: LetterLog): LetterLogEntity { + return LetterLogEntity( + id = letterLog.id.value, + targetLetterId = letterLog.targetLetterId.value, + loggedAt = letterLog.loggedAt, + logType = letterLog.logType, + content = letterLog.content + ) + } + + fun toDomain(letterLogEntity: LetterLogEntity): LetterLog { + return LetterLog( + id = DomainId(letterLogEntity.id), + targetLetterId = DomainId(letterLogEntity.targetLetterId), + loggedAt = letterLogEntity.loggedAt, + logType = letterLogEntity.logType, + content = letterLogEntity.content + ) + } +} \ No newline at end of file diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/adapter/LetterLogManagementJpaAdapter.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/adapter/LetterLogManagementJpaAdapter.kt new file mode 100644 index 00000000..17faedba --- /dev/null +++ b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/adapter/LetterLogManagementJpaAdapter.kt @@ -0,0 +1,20 @@ +package com.asap.persistence.jpa.letter.adapter + +import com.asap.application.letter.port.out.LetterLogManagementPort +import com.asap.domain.letter.entity.LetterLog +import com.asap.persistence.jpa.letter.LetterLogMapper +import com.asap.persistence.jpa.letter.repository.LetterLogJpaRepository +import org.springframework.stereotype.Repository + +@Repository +class LetterLogManagementJpaAdapter( + private val letterLogJpaRepository: LetterLogJpaRepository +) : LetterLogManagementPort { + override fun save(log: LetterLog): LetterLog { + return letterLogJpaRepository.save(LetterLogMapper.toEntity(log)).let { LetterLogMapper.toDomain(it) } + } + + override fun findAll(): List { + return letterLogJpaRepository.findAll().map { LetterLogMapper.toDomain(it) } + } +} \ No newline at end of file diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/entity/LetterLogEntity.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/entity/LetterLogEntity.kt new file mode 100644 index 00000000..4106dedb --- /dev/null +++ b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/entity/LetterLogEntity.kt @@ -0,0 +1,50 @@ +package com.asap.persistence.jpa.letter.entity + +import com.asap.domain.letter.entity.LetterLogType +import com.asap.persistence.jpa.common.BaseEntity +import jakarta.persistence.* +import java.time.LocalDateTime + +@Entity +@Table( + name = "letter_logs" +) +class LetterLogEntity( + id: String, + targetLetterId: String, + loggedAt: LocalDateTime, + logType: LetterLogType, + content: String +):BaseEntity(id) { + @Column( + name = "target_letter_id", + nullable = false, + ) + var targetLetterId: String = targetLetterId + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn( + name = "target_letter_id", + insertable = false, + updatable = false, + ) + lateinit var targetLetter: SendLetterEntity + + + var loggedAt: LocalDateTime = loggedAt + + @Enumerated(EnumType.STRING) + @Column( + name = "log_type", + nullable = false, + columnDefinition = "VARCHAR(20)", + ) + var logType: LetterLogType = logType + + @Column( + name = "content", + nullable = false, + columnDefinition = "varchar(500)", + ) + var content: String = content +} \ No newline at end of file diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/repository/LetterLogJpaRepository.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/repository/LetterLogJpaRepository.kt new file mode 100644 index 00000000..7b03cbe2 --- /dev/null +++ b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/repository/LetterLogJpaRepository.kt @@ -0,0 +1,7 @@ +package com.asap.persistence.jpa.letter.repository + +import com.asap.persistence.jpa.letter.entity.LetterLogEntity +import org.springframework.data.jpa.repository.JpaRepository + +interface LetterLogJpaRepository: JpaRepository { +} \ No newline at end of file diff --git a/Infrastructure-Module/Persistence/src/main/resources/db/V1_14__create_letter_log.sql b/Infrastructure-Module/Persistence/src/main/resources/db/V1_14__create_letter_log.sql new file mode 100644 index 00000000..d0392cc7 --- /dev/null +++ b/Infrastructure-Module/Persistence/src/main/resources/db/V1_14__create_letter_log.sql @@ -0,0 +1,14 @@ +CREATE TABLE letter_logs +( + id VARCHAR(255) NOT NULL, + created_at datetime NULL, + updated_at datetime NULL, + target_letter_id VARCHAR(255) NOT NULL, + logged_at datetime NULL, + log_type VARCHAR(20) NOT NULL, + content VARCHAR(500) NOT NULL, + CONSTRAINT pk_letter_logs PRIMARY KEY (id) +); + +ALTER TABLE letter_logs + ADD CONSTRAINT FK_LETTER_LOGS_ON_TARGET_LETTER FOREIGN KEY (target_letter_id) REFERENCES send_letter (id); \ No newline at end of file