From ba0d6118414ab697aa28ffdfc6589420e4cbd42b Mon Sep 17 00:00:00 2001 From: eedo_y Date: Thu, 4 Sep 2025 14:01:32 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=F0=9F=93=82=20file=20:=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=EB=93=9C=201=EC=B0=A8=20=EC=9E=AC=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/platform/{domain => }/BaseDomain.java | 2 +- .../{adapter/out/jpa => }/BaseTimeEntity.java | 2 +- .../application}/dto/response/OdsayResponse.java | 2 +- .../presentation}/OdsayAdapter.java | 4 ++-- .../domain/notification/Notification.java | 6 ------ .../server/platform/domain/user/Provider.java | 5 ----- .../service}/FacilityMongoAdapter.java | 9 +++++---- .../application/usecase}/FacilityPort.java | 4 ++-- .../facility => facility/domain}/Animal.java | 4 ++-- .../facility => facility/domain}/Facility.java | 4 ++-- .../facility => facility/domain}/Library.java | 4 ++-- .../facility => facility/domain}/Park.java | 4 ++-- .../facility => facility/domain}/Sport.java | 4 ++-- .../facility => facility/domain}/Walking.java | 4 ++-- .../domain/entity}/AnimalDocument.java | 6 +++--- .../domain/entity}/FacilityType.java | 2 +- .../domain/entity}/LibraryDocument.java | 6 +++--- .../domain/entity}/ParkDocument.java | 6 +++--- .../domain/entity}/SportDocument.java | 6 +++--- .../domain/entity}/WalkingDocument.java | 6 +++--- .../repository}/AnimalDocumentRepository.java | 3 ++- .../repository}/LibraryDocumentRepository.java | 3 ++- .../repository}/ParkDocumentRepository.java | 3 ++- .../repository}/SportDocumentRepository.java | 3 ++- .../repository}/WalkingDocumentRepository.java | 3 ++- .../location => location/domain}/Location.java | 2 +- .../application}/dto/response/InfraDTO.java | 6 +++--- .../application}/dto/response/NoticeDTO.java | 4 ++-- .../dto/response/NoticeSupplyDTO.java | 4 ++-- .../application/service/NoticeInfraService.java | 16 ++++++++-------- .../application/service}/NoticeMongoAdapter.java | 10 +++++----- .../application/service/NoticeService.java | 14 +++++++------- .../application/usecase}/DistancePort.java | 2 +- .../application/usecase}/NoticeInfraUseCase.java | 8 ++++---- .../application/usecase}/NoticePort.java | 4 ++-- .../application/usecase}/NoticeUseCase.java | 8 ++++---- .../{domain/notice => notice/domain}/Notice.java | 4 ++-- .../notice => notice/domain}/NoticeCount.java | 2 +- .../notice => notice/domain}/NoticeInfra.java | 4 ++-- .../domain}/NoticeSupplyInfo.java | 2 +- .../domain/entity}/DepositDocument.java | 4 ++-- .../domain/entity}/NoticeDocument.java | 6 +++--- .../domain/entity}/NoticeSupplyInfoDocument.java | 4 ++-- .../domain/entity}/RecruitmentCountDocument.java | 4 ++-- .../repository}/NoticeDocumentRepository.java | 3 ++- .../web => notice/presentation}/DepositApi.java | 8 ++++---- .../web => notice/presentation}/DistanceApi.java | 8 ++++---- .../web => notice/presentation}/NoticeApi.java | 8 ++++---- .../presentation}/NoticeInfraApi.java | 16 ++++++++-------- .../presentation}/swagger/DepositApiSpec.java | 4 ++-- .../presentation}/swagger/DistanceApiSpec.java | 2 +- .../presentation}/swagger/NoticeApiSpec.java | 4 ++-- .../swagger/NoticeInfraApiSpec.java | 8 ++++---- .../notification/domain/Notification.java | 6 ++++++ .../application/service}/UserJpaAdapter.java | 12 ++++++------ .../application/usecase}/UserPort.java | 6 +++--- .../{domain/user => user/domain}/Gender.java | 2 +- .../server/platform/user/domain/Provider.java | 5 +++++ .../{domain/user => user/domain}/Role.java | 2 +- .../{domain/user => user/domain}/User.java | 2 +- .../user => user/domain}/UserJpaRepository.java | 4 ++-- .../domain/entity}/UserJpaEntity.java | 12 ++++++------ .../in/web => user/presentation}/DevAuthApi.java | 12 ++++++------ .../presentation}/swagger/DevAuthApiSpec.java | 2 +- .../security/config/RequestMatcherHolder.java | 2 +- .../server/security/config/SecurityConfig.java | 4 ++-- .../security/jwt/util/JwtTokenExtractor.java | 4 ++-- .../security/oauth2/domain/PrincipalDetails.java | 2 +- .../oauth2/service/OAuth2UserService.java | 8 ++++---- 69 files changed, 183 insertions(+), 176 deletions(-) rename src/main/java/com/pinHouse/server/platform/{domain => }/BaseDomain.java (88%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/jpa => }/BaseTimeEntity.java (89%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => distance/application}/dto/response/OdsayResponse.java (97%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/external/distance => distance/presentation}/OdsayAdapter.java (91%) delete mode 100644 src/main/java/com/pinHouse/server/platform/domain/notification/Notification.java delete mode 100644 src/main/java/com/pinHouse/server/platform/domain/user/Provider.java rename src/main/java/com/pinHouse/server/platform/{adapter/out => facility/application/service}/FacilityMongoAdapter.java (85%) rename src/main/java/com/pinHouse/server/platform/{application/out/facility => facility/application/usecase}/FacilityPort.java (80%) rename src/main/java/com/pinHouse/server/platform/{domain/facility => facility/domain}/Animal.java (89%) rename src/main/java/com/pinHouse/server/platform/{domain/facility => facility/domain}/Facility.java (58%) rename src/main/java/com/pinHouse/server/platform/{domain/facility => facility/domain}/Library.java (80%) rename src/main/java/com/pinHouse/server/platform/{domain/facility => facility/domain}/Park.java (80%) rename src/main/java/com/pinHouse/server/platform/{domain/facility => facility/domain}/Sport.java (88%) rename src/main/java/com/pinHouse/server/platform/{domain/facility => facility/domain}/Walking.java (92%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/facility => facility/domain/entity}/AnimalDocument.java (94%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web/dto => facility/domain/entity}/FacilityType.java (75%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/facility => facility/domain/entity}/LibraryDocument.java (92%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/facility => facility/domain/entity}/ParkDocument.java (89%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/facility => facility/domain/entity}/SportDocument.java (92%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/facility => facility/domain/entity}/WalkingDocument.java (94%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/facility => facility/domain/repository}/AnimalDocumentRepository.java (78%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/facility => facility/domain/repository}/LibraryDocumentRepository.java (78%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/facility => facility/domain/repository}/ParkDocumentRepository.java (78%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/facility => facility/domain/repository}/SportDocumentRepository.java (78%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/facility => facility/domain/repository}/WalkingDocumentRepository.java (78%) rename src/main/java/com/pinHouse/server/platform/{domain/location => location/domain}/Location.java (90%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => notice/application}/dto/response/InfraDTO.java (96%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => notice/application}/dto/response/NoticeDTO.java (96%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => notice/application}/dto/response/NoticeSupplyDTO.java (93%) rename src/main/java/com/pinHouse/server/platform/{ => notice}/application/service/NoticeInfraService.java (88%) rename src/main/java/com/pinHouse/server/platform/{adapter/out => notice/application/service}/NoticeMongoAdapter.java (76%) rename src/main/java/com/pinHouse/server/platform/{ => notice}/application/service/NoticeService.java (93%) rename src/main/java/com/pinHouse/server/platform/{application/out/distance => notice/application/usecase}/DistancePort.java (83%) rename src/main/java/com/pinHouse/server/platform/{application/in => notice/application/usecase}/NoticeInfraUseCase.java (61%) rename src/main/java/com/pinHouse/server/platform/{application/out/notice => notice/application/usecase}/NoticePort.java (78%) rename src/main/java/com/pinHouse/server/platform/{application/in => notice/application/usecase}/NoticeUseCase.java (79%) rename src/main/java/com/pinHouse/server/platform/{domain/notice => notice/domain}/Notice.java (87%) rename src/main/java/com/pinHouse/server/platform/{domain/notice => notice/domain}/NoticeCount.java (93%) rename src/main/java/com/pinHouse/server/platform/{domain/notice => notice/domain}/NoticeInfra.java (94%) rename src/main/java/com/pinHouse/server/platform/{domain/notice => notice/domain}/NoticeSupplyInfo.java (94%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/notice => notice/domain/entity}/DepositDocument.java (85%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/notice => notice/domain/entity}/NoticeDocument.java (94%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/notice => notice/domain/entity}/NoticeSupplyInfoDocument.java (88%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/notice => notice/domain/entity}/RecruitmentCountDocument.java (84%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/mongo/notice => notice/domain/repository}/NoticeDocumentRepository.java (65%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => notice/presentation}/DepositApi.java (73%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => notice/presentation}/DistanceApi.java (70%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => notice/presentation}/NoticeApi.java (83%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => notice/presentation}/NoticeInfraApi.java (71%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => notice/presentation}/swagger/DepositApiSpec.java (86%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => notice/presentation}/swagger/DistanceApiSpec.java (95%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => notice/presentation}/swagger/NoticeApiSpec.java (88%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => notice/presentation}/swagger/NoticeInfraApiSpec.java (81%) create mode 100644 src/main/java/com/pinHouse/server/platform/notification/domain/Notification.java rename src/main/java/com/pinHouse/server/platform/{adapter/out => user/application/service}/UserJpaAdapter.java (75%) rename src/main/java/com/pinHouse/server/platform/{application/out/user => user/application/usecase}/UserPort.java (65%) rename src/main/java/com/pinHouse/server/platform/{domain/user => user/domain}/Gender.java (93%) create mode 100644 src/main/java/com/pinHouse/server/platform/user/domain/Provider.java rename src/main/java/com/pinHouse/server/platform/{domain/user => user/domain}/Role.java (79%) rename src/main/java/com/pinHouse/server/platform/{domain/user => user/domain}/User.java (97%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/jpa/user => user/domain}/UserJpaRepository.java (79%) rename src/main/java/com/pinHouse/server/platform/{adapter/out/jpa/user => user/domain/entity}/UserJpaEntity.java (85%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => user/presentation}/DevAuthApi.java (87%) rename src/main/java/com/pinHouse/server/platform/{adapter/in/web => user/presentation}/swagger/DevAuthApiSpec.java (90%) diff --git a/src/main/java/com/pinHouse/server/platform/domain/BaseDomain.java b/src/main/java/com/pinHouse/server/platform/BaseDomain.java similarity index 88% rename from src/main/java/com/pinHouse/server/platform/domain/BaseDomain.java rename to src/main/java/com/pinHouse/server/platform/BaseDomain.java index daa8c51..98ba487 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/BaseDomain.java +++ b/src/main/java/com/pinHouse/server/platform/BaseDomain.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.domain; +package com.pinHouse.server.platform; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/jpa/BaseTimeEntity.java b/src/main/java/com/pinHouse/server/platform/BaseTimeEntity.java similarity index 89% rename from src/main/java/com/pinHouse/server/platform/adapter/out/jpa/BaseTimeEntity.java rename to src/main/java/com/pinHouse/server/platform/BaseTimeEntity.java index e9bf836..3ecdc61 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/jpa/BaseTimeEntity.java +++ b/src/main/java/com/pinHouse/server/platform/BaseTimeEntity.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.adapter.out.jpa; +package com.pinHouse.server.platform; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/OdsayResponse.java b/src/main/java/com/pinHouse/server/platform/distance/application/dto/response/OdsayResponse.java similarity index 97% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/OdsayResponse.java rename to src/main/java/com/pinHouse/server/platform/distance/application/dto/response/OdsayResponse.java index b83a19d..0c986fe 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/OdsayResponse.java +++ b/src/main/java/com/pinHouse/server/platform/distance/application/dto/response/OdsayResponse.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.adapter.in.web.dto.response; +package com.pinHouse.server.platform.distance.application.dto.response; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/external/distance/OdsayAdapter.java b/src/main/java/com/pinHouse/server/platform/distance/presentation/OdsayAdapter.java similarity index 91% rename from src/main/java/com/pinHouse/server/platform/adapter/out/external/distance/OdsayAdapter.java rename to src/main/java/com/pinHouse/server/platform/distance/presentation/OdsayAdapter.java index 86e43b3..a36b6a2 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/external/distance/OdsayAdapter.java +++ b/src/main/java/com/pinHouse/server/platform/distance/presentation/OdsayAdapter.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.adapter.out.external.distance; +package com.pinHouse.server.platform.distance.presentation; -import com.pinHouse.server.platform.application.out.distance.DistancePort; +import com.pinHouse.server.platform.notice.application.usecase.DistancePort; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/pinHouse/server/platform/domain/notification/Notification.java b/src/main/java/com/pinHouse/server/platform/domain/notification/Notification.java deleted file mode 100644 index 8c6ec25..0000000 --- a/src/main/java/com/pinHouse/server/platform/domain/notification/Notification.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.pinHouse.server.platform.domain.notification; - -import com.pinHouse.server.platform.domain.BaseDomain; - -public class Notification extends BaseDomain { -} diff --git a/src/main/java/com/pinHouse/server/platform/domain/user/Provider.java b/src/main/java/com/pinHouse/server/platform/domain/user/Provider.java deleted file mode 100644 index 4002a5a..0000000 --- a/src/main/java/com/pinHouse/server/platform/domain/user/Provider.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.pinHouse.server.platform.domain.user; - -public enum Provider { - KAKAO, NAVER -} diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/FacilityMongoAdapter.java b/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityMongoAdapter.java similarity index 85% rename from src/main/java/com/pinHouse/server/platform/adapter/out/FacilityMongoAdapter.java rename to src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityMongoAdapter.java index 4761c0f..cedff8b 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/FacilityMongoAdapter.java +++ b/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityMongoAdapter.java @@ -1,8 +1,9 @@ -package com.pinHouse.server.platform.adapter.out; +package com.pinHouse.server.platform.facility.application.service; -import com.pinHouse.server.platform.adapter.out.mongo.facility.*; -import com.pinHouse.server.platform.application.out.facility.FacilityPort; -import com.pinHouse.server.platform.domain.facility.*; +import com.pinHouse.server.platform.facility.application.usecase.FacilityPort; +import com.pinHouse.server.platform.facility.domain.*; +import com.pinHouse.server.platform.facility.domain.entity.*; +import com.pinHouse.server.platform.facility.domain.repository.*; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/pinHouse/server/platform/application/out/facility/FacilityPort.java b/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityPort.java similarity index 80% rename from src/main/java/com/pinHouse/server/platform/application/out/facility/FacilityPort.java rename to src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityPort.java index c12281f..a01ba78 100644 --- a/src/main/java/com/pinHouse/server/platform/application/out/facility/FacilityPort.java +++ b/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityPort.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.application.out.facility; +package com.pinHouse.server.platform.facility.application.usecase; -import com.pinHouse.server.platform.domain.facility.*; +import com.pinHouse.server.platform.facility.domain.*; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/domain/facility/Animal.java b/src/main/java/com/pinHouse/server/platform/facility/domain/Animal.java similarity index 89% rename from src/main/java/com/pinHouse/server/platform/domain/facility/Animal.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/Animal.java index 9cc8eea..baa8679 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/facility/Animal.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/Animal.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.domain.facility; +package com.pinHouse.server.platform.facility.domain; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.location.domain.Location; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/domain/facility/Facility.java b/src/main/java/com/pinHouse/server/platform/facility/domain/Facility.java similarity index 58% rename from src/main/java/com/pinHouse/server/platform/domain/facility/Facility.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/Facility.java index 5346e8f..fb4f057 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/facility/Facility.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/Facility.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.domain.facility; +package com.pinHouse.server.platform.facility.domain; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.location.domain.Location; public interface Facility { diff --git a/src/main/java/com/pinHouse/server/platform/domain/facility/Library.java b/src/main/java/com/pinHouse/server/platform/facility/domain/Library.java similarity index 80% rename from src/main/java/com/pinHouse/server/platform/domain/facility/Library.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/Library.java index 5909da5..ec0836b 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/facility/Library.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/Library.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.domain.facility; +package com.pinHouse.server.platform.facility.domain; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.location.domain.Location; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/domain/facility/Park.java b/src/main/java/com/pinHouse/server/platform/facility/domain/Park.java similarity index 80% rename from src/main/java/com/pinHouse/server/platform/domain/facility/Park.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/Park.java index 689c82b..8437e39 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/facility/Park.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/Park.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.domain.facility; +package com.pinHouse.server.platform.facility.domain; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.location.domain.Location; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/domain/facility/Sport.java b/src/main/java/com/pinHouse/server/platform/facility/domain/Sport.java similarity index 88% rename from src/main/java/com/pinHouse/server/platform/domain/facility/Sport.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/Sport.java index 882111a..9918965 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/facility/Sport.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/Sport.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.domain.facility; +package com.pinHouse.server.platform.facility.domain; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.location.domain.Location; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/domain/facility/Walking.java b/src/main/java/com/pinHouse/server/platform/facility/domain/Walking.java similarity index 92% rename from src/main/java/com/pinHouse/server/platform/domain/facility/Walking.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/Walking.java index 553febe..acfa7ad 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/facility/Walking.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/Walking.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.domain.facility; +package com.pinHouse.server.platform.facility.domain; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.location.domain.Location; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/AnimalDocument.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/AnimalDocument.java similarity index 94% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/AnimalDocument.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/AnimalDocument.java index 9579862..69c4d27 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/AnimalDocument.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/AnimalDocument.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.adapter.out.mongo.facility; +package com.pinHouse.server.platform.facility.domain.entity; -import com.pinHouse.server.platform.domain.facility.Animal; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.facility.domain.Animal; +import com.pinHouse.server.platform.location.domain.Location; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/FacilityType.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/FacilityType.java similarity index 75% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/FacilityType.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/FacilityType.java index 1f4c419..a2e0c53 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/FacilityType.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/FacilityType.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.adapter.in.web.dto; +package com.pinHouse.server.platform.facility.domain.entity; public enum FacilityType { diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/LibraryDocument.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/LibraryDocument.java similarity index 92% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/LibraryDocument.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/LibraryDocument.java index ef44969..198699f 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/LibraryDocument.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/LibraryDocument.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.adapter.out.mongo.facility; +package com.pinHouse.server.platform.facility.domain.entity; -import com.pinHouse.server.platform.domain.facility.Library; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.facility.domain.Library; +import com.pinHouse.server.platform.location.domain.Location; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/ParkDocument.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/ParkDocument.java similarity index 89% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/ParkDocument.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/ParkDocument.java index a81cbe8..c31b576 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/ParkDocument.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/ParkDocument.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.adapter.out.mongo.facility; +package com.pinHouse.server.platform.facility.domain.entity; -import com.pinHouse.server.platform.domain.facility.Park; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.facility.domain.Park; +import com.pinHouse.server.platform.location.domain.Location; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.GeoSpatialIndexType; import org.springframework.data.mongodb.core.index.GeoSpatialIndexed; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/SportDocument.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/SportDocument.java similarity index 92% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/SportDocument.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/SportDocument.java index 3a98c5b..84da865 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/SportDocument.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/SportDocument.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.adapter.out.mongo.facility; +package com.pinHouse.server.platform.facility.domain.entity; -import com.pinHouse.server.platform.domain.facility.Sport; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.facility.domain.Sport; +import com.pinHouse.server.platform.location.domain.Location; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/WalkingDocument.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/WalkingDocument.java similarity index 94% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/WalkingDocument.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/WalkingDocument.java index f91a679..31fb2d7 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/WalkingDocument.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/WalkingDocument.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.adapter.out.mongo.facility; +package com.pinHouse.server.platform.facility.domain.entity; -import com.pinHouse.server.platform.domain.facility.Walking; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.facility.domain.Walking; +import com.pinHouse.server.platform.location.domain.Location; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.GeoSpatialIndexType; import org.springframework.data.mongodb.core.index.GeoSpatialIndexed; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/AnimalDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/AnimalDocumentRepository.java similarity index 78% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/AnimalDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/repository/AnimalDocumentRepository.java index 5d7d842..11e582c 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/AnimalDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/AnimalDocumentRepository.java @@ -1,5 +1,6 @@ -package com.pinHouse.server.platform.adapter.out.mongo.facility; +package com.pinHouse.server.platform.facility.domain.repository; +import com.pinHouse.server.platform.facility.domain.entity.AnimalDocument; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/LibraryDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/LibraryDocumentRepository.java similarity index 78% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/LibraryDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/repository/LibraryDocumentRepository.java index 7e25140..222ba49 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/LibraryDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/LibraryDocumentRepository.java @@ -1,5 +1,6 @@ -package com.pinHouse.server.platform.adapter.out.mongo.facility; +package com.pinHouse.server.platform.facility.domain.repository; +import com.pinHouse.server.platform.facility.domain.entity.LibraryDocument; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/ParkDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/ParkDocumentRepository.java similarity index 78% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/ParkDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/repository/ParkDocumentRepository.java index a831aa7..f1f6b6a 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/ParkDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/ParkDocumentRepository.java @@ -1,5 +1,6 @@ -package com.pinHouse.server.platform.adapter.out.mongo.facility; +package com.pinHouse.server.platform.facility.domain.repository; +import com.pinHouse.server.platform.facility.domain.entity.ParkDocument; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/SportDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/SportDocumentRepository.java similarity index 78% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/SportDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/repository/SportDocumentRepository.java index 42cce39..d835fc5 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/SportDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/SportDocumentRepository.java @@ -1,5 +1,6 @@ -package com.pinHouse.server.platform.adapter.out.mongo.facility; +package com.pinHouse.server.platform.facility.domain.repository; +import com.pinHouse.server.platform.facility.domain.entity.SportDocument; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/WalkingDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/WalkingDocumentRepository.java similarity index 78% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/WalkingDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/repository/WalkingDocumentRepository.java index f795f21..7626e58 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/facility/WalkingDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/WalkingDocumentRepository.java @@ -1,5 +1,6 @@ -package com.pinHouse.server.platform.adapter.out.mongo.facility; +package com.pinHouse.server.platform.facility.domain.repository; +import com.pinHouse.server.platform.facility.domain.entity.WalkingDocument; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; diff --git a/src/main/java/com/pinHouse/server/platform/domain/location/Location.java b/src/main/java/com/pinHouse/server/platform/location/domain/Location.java similarity index 90% rename from src/main/java/com/pinHouse/server/platform/domain/location/Location.java rename to src/main/java/com/pinHouse/server/platform/location/domain/Location.java index ec4125e..810dc48 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/location/Location.java +++ b/src/main/java/com/pinHouse/server/platform/location/domain/Location.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.domain.location; +package com.pinHouse.server.platform.location.domain; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/InfraDTO.java b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/InfraDTO.java similarity index 96% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/InfraDTO.java rename to src/main/java/com/pinHouse/server/platform/notice/application/dto/response/InfraDTO.java index ecc1f22..01c9414 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/InfraDTO.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/InfraDTO.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.adapter.in.web.dto.response; +package com.pinHouse.server.platform.notice.application.dto.response; -import com.pinHouse.server.platform.domain.facility.*; -import com.pinHouse.server.platform.domain.notice.NoticeInfra; +import com.pinHouse.server.platform.facility.domain.*; +import com.pinHouse.server.platform.notice.domain.NoticeInfra; import io.micrometer.common.lang.Nullable; import lombok.Builder; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/NoticeDTO.java b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeDTO.java similarity index 96% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/NoticeDTO.java rename to src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeDTO.java index e35d0b0..fbd70e9 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/NoticeDTO.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeDTO.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.adapter.in.web.dto.response; +package com.pinHouse.server.platform.notice.application.dto.response; -import com.pinHouse.server.platform.domain.notice.Notice; +import com.pinHouse.server.platform.notice.domain.Notice; import lombok.Builder; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/NoticeSupplyDTO.java b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeSupplyDTO.java similarity index 93% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/NoticeSupplyDTO.java rename to src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeSupplyDTO.java index 9331e7f..6835cac 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/dto/response/NoticeSupplyDTO.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeSupplyDTO.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.adapter.in.web.dto.response; +package com.pinHouse.server.platform.notice.application.dto.response; -import com.pinHouse.server.platform.domain.notice.NoticeSupplyInfo; +import com.pinHouse.server.platform.notice.domain.NoticeSupplyInfo; import lombok.Builder; public record NoticeSupplyDTO() { diff --git a/src/main/java/com/pinHouse/server/platform/application/service/NoticeInfraService.java b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeInfraService.java similarity index 88% rename from src/main/java/com/pinHouse/server/platform/application/service/NoticeInfraService.java rename to src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeInfraService.java index 0410bc2..35799d4 100644 --- a/src/main/java/com/pinHouse/server/platform/application/service/NoticeInfraService.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeInfraService.java @@ -1,13 +1,13 @@ -package com.pinHouse.server.platform.application.service; +package com.pinHouse.server.platform.notice.application.service; import com.pinHouse.server.core.response.response.ErrorCode; -import com.pinHouse.server.platform.adapter.in.web.dto.FacilityType; -import com.pinHouse.server.platform.application.in.NoticeInfraUseCase; -import com.pinHouse.server.platform.application.out.facility.FacilityPort; -import com.pinHouse.server.platform.application.out.notice.NoticePort; -import com.pinHouse.server.platform.domain.facility.*; -import com.pinHouse.server.platform.domain.notice.Notice; -import com.pinHouse.server.platform.domain.notice.NoticeInfra; +import com.pinHouse.server.platform.facility.domain.entity.FacilityType; +import com.pinHouse.server.platform.facility.domain.*; +import com.pinHouse.server.platform.notice.application.usecase.NoticeInfraUseCase; +import com.pinHouse.server.platform.facility.application.usecase.FacilityPort; +import com.pinHouse.server.platform.notice.application.usecase.NoticePort; +import com.pinHouse.server.platform.notice.domain.Notice; +import com.pinHouse.server.platform.notice.domain.NoticeInfra; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/NoticeMongoAdapter.java b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeMongoAdapter.java similarity index 76% rename from src/main/java/com/pinHouse/server/platform/adapter/out/NoticeMongoAdapter.java rename to src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeMongoAdapter.java index 4f317f5..04341a7 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/NoticeMongoAdapter.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeMongoAdapter.java @@ -1,9 +1,9 @@ -package com.pinHouse.server.platform.adapter.out; +package com.pinHouse.server.platform.notice.application.service; -import com.pinHouse.server.platform.adapter.out.mongo.notice.NoticeDocument; -import com.pinHouse.server.platform.adapter.out.mongo.notice.NoticeDocumentRepository; -import com.pinHouse.server.platform.application.out.notice.NoticePort; -import com.pinHouse.server.platform.domain.notice.Notice; +import com.pinHouse.server.platform.notice.domain.entity.NoticeDocument; +import com.pinHouse.server.platform.notice.domain.repository.NoticeDocumentRepository; +import com.pinHouse.server.platform.notice.application.usecase.NoticePort; +import com.pinHouse.server.platform.notice.domain.Notice; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; diff --git a/src/main/java/com/pinHouse/server/platform/application/service/NoticeService.java b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java similarity index 93% rename from src/main/java/com/pinHouse/server/platform/application/service/NoticeService.java rename to src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java index 3f45dc0..c2be832 100644 --- a/src/main/java/com/pinHouse/server/platform/application/service/NoticeService.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java @@ -1,13 +1,13 @@ -package com.pinHouse.server.platform.application.service; +package com.pinHouse.server.platform.notice.application.service; import com.pinHouse.server.core.response.response.ErrorCode; import com.pinHouse.server.core.response.response.pageable.PageRequest; -import com.pinHouse.server.platform.adapter.in.web.dto.response.NoticeDTO; -import com.pinHouse.server.platform.adapter.in.web.dto.response.NoticeSupplyDTO; -import com.pinHouse.server.platform.application.in.NoticeUseCase; -import com.pinHouse.server.platform.application.out.notice.NoticePort; -import com.pinHouse.server.platform.domain.notice.Notice; -import com.pinHouse.server.platform.domain.notice.NoticeSupplyInfo; +import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; +import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; +import com.pinHouse.server.platform.notice.application.usecase.NoticeUseCase; +import com.pinHouse.server.platform.notice.application.usecase.NoticePort; +import com.pinHouse.server.platform.notice.domain.Notice; +import com.pinHouse.server.platform.notice.domain.NoticeSupplyInfo; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; diff --git a/src/main/java/com/pinHouse/server/platform/application/out/distance/DistancePort.java b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/DistancePort.java similarity index 83% rename from src/main/java/com/pinHouse/server/platform/application/out/distance/DistancePort.java rename to src/main/java/com/pinHouse/server/platform/notice/application/usecase/DistancePort.java index 6b90cfd..cf6a767 100644 --- a/src/main/java/com/pinHouse/server/platform/application/out/distance/DistancePort.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/DistancePort.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.application.out.distance; +package com.pinHouse.server.platform.notice.application.usecase; import java.io.UnsupportedEncodingException; diff --git a/src/main/java/com/pinHouse/server/platform/application/in/NoticeInfraUseCase.java b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeInfraUseCase.java similarity index 61% rename from src/main/java/com/pinHouse/server/platform/application/in/NoticeInfraUseCase.java rename to src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeInfraUseCase.java index 3bc27a3..ee9b37d 100644 --- a/src/main/java/com/pinHouse/server/platform/application/in/NoticeInfraUseCase.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeInfraUseCase.java @@ -1,8 +1,8 @@ -package com.pinHouse.server.platform.application.in; +package com.pinHouse.server.platform.notice.application.usecase; -import com.pinHouse.server.platform.adapter.in.web.dto.FacilityType; -import com.pinHouse.server.platform.domain.notice.Notice; -import com.pinHouse.server.platform.domain.notice.NoticeInfra; +import com.pinHouse.server.platform.facility.domain.entity.FacilityType; +import com.pinHouse.server.platform.notice.domain.Notice; +import com.pinHouse.server.platform.notice.domain.NoticeInfra; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/application/out/notice/NoticePort.java b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticePort.java similarity index 78% rename from src/main/java/com/pinHouse/server/platform/application/out/notice/NoticePort.java rename to src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticePort.java index f2f32e3..865f0b0 100644 --- a/src/main/java/com/pinHouse/server/platform/application/out/notice/NoticePort.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticePort.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.application.out.notice; +package com.pinHouse.server.platform.notice.application.usecase; -import com.pinHouse.server.platform.domain.notice.Notice; +import com.pinHouse.server.platform.notice.domain.Notice; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/pinHouse/server/platform/application/in/NoticeUseCase.java b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java similarity index 79% rename from src/main/java/com/pinHouse/server/platform/application/in/NoticeUseCase.java rename to src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java index eb5f909..804f8f0 100644 --- a/src/main/java/com/pinHouse/server/platform/application/in/NoticeUseCase.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java @@ -1,9 +1,9 @@ -package com.pinHouse.server.platform.application.in; +package com.pinHouse.server.platform.notice.application.usecase; import com.pinHouse.server.core.response.response.pageable.PageRequest; -import com.pinHouse.server.platform.adapter.in.web.dto.response.NoticeDTO; -import com.pinHouse.server.platform.adapter.in.web.dto.response.NoticeSupplyDTO; -import com.pinHouse.server.platform.domain.notice.Notice; +import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; +import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; +import com.pinHouse.server.platform.notice.domain.Notice; import org.springframework.data.domain.Page; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/domain/notice/Notice.java b/src/main/java/com/pinHouse/server/platform/notice/domain/Notice.java similarity index 87% rename from src/main/java/com/pinHouse/server/platform/domain/notice/Notice.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/Notice.java index fa4050d..c9acc49 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/notice/Notice.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/Notice.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.domain.notice; +package com.pinHouse.server.platform.notice.domain; -import com.pinHouse.server.platform.domain.location.Location; +import com.pinHouse.server.platform.location.domain.Location; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/domain/notice/NoticeCount.java b/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeCount.java similarity index 93% rename from src/main/java/com/pinHouse/server/platform/domain/notice/NoticeCount.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/NoticeCount.java index 9b868f0..fa5f71d 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/notice/NoticeCount.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeCount.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.domain.notice; +package com.pinHouse.server.platform.notice.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/domain/notice/NoticeInfra.java b/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeInfra.java similarity index 94% rename from src/main/java/com/pinHouse/server/platform/domain/notice/NoticeInfra.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/NoticeInfra.java index 7bf9c30..d54bed8 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/notice/NoticeInfra.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeInfra.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.domain.notice; +package com.pinHouse.server.platform.notice.domain; -import com.pinHouse.server.platform.domain.facility.*; +import com.pinHouse.server.platform.facility.domain.*; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/domain/notice/NoticeSupplyInfo.java b/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeSupplyInfo.java similarity index 94% rename from src/main/java/com/pinHouse/server/platform/domain/notice/NoticeSupplyInfo.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/NoticeSupplyInfo.java index f9902fb..db44e92 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/notice/NoticeSupplyInfo.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeSupplyInfo.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.domain.notice; +package com.pinHouse.server.platform.notice.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/DepositDocument.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/DepositDocument.java similarity index 85% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/DepositDocument.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/entity/DepositDocument.java index bb55df0..3a91c3d 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/DepositDocument.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/DepositDocument.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.adapter.out.mongo.notice; +package com.pinHouse.server.platform.notice.domain.entity; -import com.pinHouse.server.platform.domain.notice.NoticeSupplyInfo; +import com.pinHouse.server.platform.notice.domain.NoticeSupplyInfo; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/NoticeDocument.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeDocument.java similarity index 94% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/NoticeDocument.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeDocument.java index 724ecfb..73c78ec 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/NoticeDocument.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeDocument.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.adapter.out.mongo.notice; +package com.pinHouse.server.platform.notice.domain.entity; -import com.pinHouse.server.platform.domain.location.Location; -import com.pinHouse.server.platform.domain.notice.Notice; +import com.pinHouse.server.platform.location.domain.Location; +import com.pinHouse.server.platform.notice.domain.Notice; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/NoticeSupplyInfoDocument.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupplyInfoDocument.java similarity index 88% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/NoticeSupplyInfoDocument.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupplyInfoDocument.java index 642e708..07d106e 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/NoticeSupplyInfoDocument.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupplyInfoDocument.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.adapter.out.mongo.notice; +package com.pinHouse.server.platform.notice.domain.entity; -import com.pinHouse.server.platform.domain.notice.NoticeSupplyInfo; +import com.pinHouse.server.platform.notice.domain.NoticeSupplyInfo; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/RecruitmentCountDocument.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/RecruitmentCountDocument.java similarity index 84% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/RecruitmentCountDocument.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/entity/RecruitmentCountDocument.java index da949b5..0f11407 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/RecruitmentCountDocument.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/RecruitmentCountDocument.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.adapter.out.mongo.notice; +package com.pinHouse.server.platform.notice.domain.entity; -import com.pinHouse.server.platform.domain.notice.NoticeSupplyInfo; +import com.pinHouse.server.platform.notice.domain.NoticeSupplyInfo; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/NoticeDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/notice/domain/repository/NoticeDocumentRepository.java similarity index 65% rename from src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/NoticeDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/repository/NoticeDocumentRepository.java index aa06921..324c1fd 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/mongo/notice/NoticeDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/repository/NoticeDocumentRepository.java @@ -1,5 +1,6 @@ -package com.pinHouse.server.platform.adapter.out.mongo.notice; +package com.pinHouse.server.platform.notice.domain.repository; +import com.pinHouse.server.platform.notice.domain.entity.NoticeDocument; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/DepositApi.java b/src/main/java/com/pinHouse/server/platform/notice/presentation/DepositApi.java similarity index 73% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/DepositApi.java rename to src/main/java/com/pinHouse/server/platform/notice/presentation/DepositApi.java index 565e92e..9fbe5d6 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/DepositApi.java +++ b/src/main/java/com/pinHouse/server/platform/notice/presentation/DepositApi.java @@ -1,9 +1,9 @@ -package com.pinHouse.server.platform.adapter.in.web; +package com.pinHouse.server.platform.notice.presentation; import com.pinHouse.server.core.response.response.ApiResponse; -import com.pinHouse.server.platform.adapter.in.web.dto.response.NoticeSupplyDTO; -import com.pinHouse.server.platform.adapter.in.web.swagger.DepositApiSpec; -import com.pinHouse.server.platform.application.in.NoticeUseCase; +import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; +import com.pinHouse.server.platform.notice.presentation.swagger.DepositApiSpec; +import com.pinHouse.server.platform.notice.application.usecase.NoticeUseCase; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/DistanceApi.java b/src/main/java/com/pinHouse/server/platform/notice/presentation/DistanceApi.java similarity index 70% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/DistanceApi.java rename to src/main/java/com/pinHouse/server/platform/notice/presentation/DistanceApi.java index aeec857..ea09002 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/DistanceApi.java +++ b/src/main/java/com/pinHouse/server/platform/notice/presentation/DistanceApi.java @@ -1,14 +1,14 @@ -package com.pinHouse.server.platform.adapter.in.web; +package com.pinHouse.server.platform.notice.presentation; -import com.pinHouse.server.platform.adapter.in.web.swagger.DistanceApiSpec; -import com.pinHouse.server.platform.application.out.distance.DistancePort; +import com.pinHouse.server.platform.notice.presentation.swagger.DistanceApiSpec; +import com.pinHouse.server.platform.notice.application.usecase.DistancePort; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.io.UnsupportedEncodingException; @RestController -@RequestMapping("/api/v1/distance") +@RequestMapping("/api/v1/notices/distance") @RequiredArgsConstructor public class DistanceApi implements DistanceApiSpec { diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/NoticeApi.java b/src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeApi.java similarity index 83% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/NoticeApi.java rename to src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeApi.java index 9c6602f..63b8135 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/NoticeApi.java +++ b/src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeApi.java @@ -1,11 +1,11 @@ -package com.pinHouse.server.platform.adapter.in.web; +package com.pinHouse.server.platform.notice.presentation; import com.pinHouse.server.core.response.response.ApiResponse; import com.pinHouse.server.core.response.response.pageable.PageRequest; import com.pinHouse.server.core.response.response.pageable.PageResponse; -import com.pinHouse.server.platform.adapter.in.web.dto.response.NoticeDTO; -import com.pinHouse.server.platform.adapter.in.web.swagger.NoticeApiSpec; -import com.pinHouse.server.platform.application.in.NoticeUseCase; +import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; +import com.pinHouse.server.platform.notice.presentation.swagger.NoticeApiSpec; +import com.pinHouse.server.platform.notice.application.usecase.NoticeUseCase; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/NoticeInfraApi.java b/src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeInfraApi.java similarity index 71% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/NoticeInfraApi.java rename to src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeInfraApi.java index 98d76ba..3bd8a2d 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/NoticeInfraApi.java +++ b/src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeInfraApi.java @@ -1,13 +1,13 @@ -package com.pinHouse.server.platform.adapter.in.web; +package com.pinHouse.server.platform.notice.presentation; import com.pinHouse.server.core.response.response.ApiResponse; -import com.pinHouse.server.platform.adapter.in.web.dto.FacilityType; -import com.pinHouse.server.platform.adapter.in.web.dto.response.InfraDTO; -import com.pinHouse.server.platform.adapter.in.web.dto.response.NoticeDTO; -import com.pinHouse.server.platform.adapter.in.web.swagger.NoticeInfraApiSpec; -import com.pinHouse.server.platform.application.in.NoticeInfraUseCase; -import com.pinHouse.server.platform.domain.notice.Notice; -import com.pinHouse.server.platform.domain.notice.NoticeInfra; +import com.pinHouse.server.platform.facility.domain.entity.FacilityType; +import com.pinHouse.server.platform.notice.application.dto.response.InfraDTO; +import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; +import com.pinHouse.server.platform.notice.presentation.swagger.NoticeInfraApiSpec; +import com.pinHouse.server.platform.notice.application.usecase.NoticeInfraUseCase; +import com.pinHouse.server.platform.notice.domain.Notice; +import com.pinHouse.server.platform.notice.domain.NoticeInfra; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/DepositApiSpec.java b/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DepositApiSpec.java similarity index 86% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/DepositApiSpec.java rename to src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DepositApiSpec.java index 4e6bc9e..dc9d472 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/DepositApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DepositApiSpec.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.adapter.in.web.swagger; +package com.pinHouse.server.platform.notice.presentation.swagger; import com.pinHouse.server.core.response.response.ApiResponse; -import com.pinHouse.server.platform.adapter.in.web.dto.response.NoticeSupplyDTO; +import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/DistanceApiSpec.java b/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DistanceApiSpec.java similarity index 95% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/DistanceApiSpec.java rename to src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DistanceApiSpec.java index e11d649..8489f8b 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/DistanceApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DistanceApiSpec.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.adapter.in.web.swagger; +package com.pinHouse.server.platform.notice.presentation.swagger; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/NoticeApiSpec.java b/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeApiSpec.java similarity index 88% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/NoticeApiSpec.java rename to src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeApiSpec.java index 31f8925..b1c4d69 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/NoticeApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeApiSpec.java @@ -1,9 +1,9 @@ -package com.pinHouse.server.platform.adapter.in.web.swagger; +package com.pinHouse.server.platform.notice.presentation.swagger; import com.pinHouse.server.core.response.response.ApiResponse; import com.pinHouse.server.core.response.response.pageable.PageRequest; import com.pinHouse.server.core.response.response.pageable.PageResponse; -import com.pinHouse.server.platform.adapter.in.web.dto.response.NoticeDTO; +import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/NoticeInfraApiSpec.java b/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeInfraApiSpec.java similarity index 81% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/NoticeInfraApiSpec.java rename to src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeInfraApiSpec.java index e3d91e1..24e0d6d 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/NoticeInfraApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeInfraApiSpec.java @@ -1,9 +1,9 @@ -package com.pinHouse.server.platform.adapter.in.web.swagger; +package com.pinHouse.server.platform.notice.presentation.swagger; import com.pinHouse.server.core.response.response.ApiResponse; -import com.pinHouse.server.platform.adapter.in.web.dto.FacilityType; -import com.pinHouse.server.platform.adapter.in.web.dto.response.InfraDTO; -import com.pinHouse.server.platform.adapter.in.web.dto.response.NoticeDTO; +import com.pinHouse.server.platform.facility.domain.entity.FacilityType; +import com.pinHouse.server.platform.notice.application.dto.response.InfraDTO; +import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/pinHouse/server/platform/notification/domain/Notification.java b/src/main/java/com/pinHouse/server/platform/notification/domain/Notification.java new file mode 100644 index 0000000..13fc80e --- /dev/null +++ b/src/main/java/com/pinHouse/server/platform/notification/domain/Notification.java @@ -0,0 +1,6 @@ +package com.pinHouse.server.platform.notification.domain; + +import com.pinHouse.server.platform.BaseDomain; + +public class Notification extends BaseDomain { +} diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/UserJpaAdapter.java b/src/main/java/com/pinHouse/server/platform/user/application/service/UserJpaAdapter.java similarity index 75% rename from src/main/java/com/pinHouse/server/platform/adapter/out/UserJpaAdapter.java rename to src/main/java/com/pinHouse/server/platform/user/application/service/UserJpaAdapter.java index 29559a0..799c58d 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/UserJpaAdapter.java +++ b/src/main/java/com/pinHouse/server/platform/user/application/service/UserJpaAdapter.java @@ -1,10 +1,10 @@ -package com.pinHouse.server.platform.adapter.out; +package com.pinHouse.server.platform.user.application.service; -import com.pinHouse.server.platform.adapter.out.jpa.user.UserJpaEntity; -import com.pinHouse.server.platform.adapter.out.jpa.user.UserJpaRepository; -import com.pinHouse.server.platform.application.out.user.UserPort; -import com.pinHouse.server.platform.domain.user.Provider; -import com.pinHouse.server.platform.domain.user.User; +import com.pinHouse.server.platform.user.domain.entity.UserJpaEntity; +import com.pinHouse.server.platform.user.domain.UserJpaRepository; +import com.pinHouse.server.platform.user.application.usecase.UserPort; +import com.pinHouse.server.platform.user.domain.Provider; +import com.pinHouse.server.platform.user.domain.User; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/pinHouse/server/platform/application/out/user/UserPort.java b/src/main/java/com/pinHouse/server/platform/user/application/usecase/UserPort.java similarity index 65% rename from src/main/java/com/pinHouse/server/platform/application/out/user/UserPort.java rename to src/main/java/com/pinHouse/server/platform/user/application/usecase/UserPort.java index ac72137..e580ab1 100644 --- a/src/main/java/com/pinHouse/server/platform/application/out/user/UserPort.java +++ b/src/main/java/com/pinHouse/server/platform/user/application/usecase/UserPort.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.application.out.user; +package com.pinHouse.server.platform.user.application.usecase; -import com.pinHouse.server.platform.domain.user.Provider; -import com.pinHouse.server.platform.domain.user.User; +import com.pinHouse.server.platform.user.domain.Provider; +import com.pinHouse.server.platform.user.domain.User; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/com/pinHouse/server/platform/domain/user/Gender.java b/src/main/java/com/pinHouse/server/platform/user/domain/Gender.java similarity index 93% rename from src/main/java/com/pinHouse/server/platform/domain/user/Gender.java rename to src/main/java/com/pinHouse/server/platform/user/domain/Gender.java index ea9a1b8..8988f3e 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/user/Gender.java +++ b/src/main/java/com/pinHouse/server/platform/user/domain/Gender.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.domain.user; +package com.pinHouse.server.platform.user.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/pinHouse/server/platform/user/domain/Provider.java b/src/main/java/com/pinHouse/server/platform/user/domain/Provider.java new file mode 100644 index 0000000..6f041e1 --- /dev/null +++ b/src/main/java/com/pinHouse/server/platform/user/domain/Provider.java @@ -0,0 +1,5 @@ +package com.pinHouse.server.platform.user.domain; + +public enum Provider { + KAKAO, NAVER +} diff --git a/src/main/java/com/pinHouse/server/platform/domain/user/Role.java b/src/main/java/com/pinHouse/server/platform/user/domain/Role.java similarity index 79% rename from src/main/java/com/pinHouse/server/platform/domain/user/Role.java rename to src/main/java/com/pinHouse/server/platform/user/domain/Role.java index 4f8be8b..014fc7a 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/user/Role.java +++ b/src/main/java/com/pinHouse/server/platform/user/domain/Role.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.domain.user; +package com.pinHouse.server.platform.user.domain; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/pinHouse/server/platform/domain/user/User.java b/src/main/java/com/pinHouse/server/platform/user/domain/User.java similarity index 97% rename from src/main/java/com/pinHouse/server/platform/domain/user/User.java rename to src/main/java/com/pinHouse/server/platform/user/domain/User.java index cfc4092..99bd71e 100644 --- a/src/main/java/com/pinHouse/server/platform/domain/user/User.java +++ b/src/main/java/com/pinHouse/server/platform/user/domain/User.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.domain.user; +package com.pinHouse.server.platform.user.domain; import com.pinHouse.server.core.util.BirthDayUtil; import com.pinHouse.server.security.oauth2.domain.OAuth2UserInfo; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/jpa/user/UserJpaRepository.java b/src/main/java/com/pinHouse/server/platform/user/domain/UserJpaRepository.java similarity index 79% rename from src/main/java/com/pinHouse/server/platform/adapter/out/jpa/user/UserJpaRepository.java rename to src/main/java/com/pinHouse/server/platform/user/domain/UserJpaRepository.java index 0d082fc..c78700a 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/jpa/user/UserJpaRepository.java +++ b/src/main/java/com/pinHouse/server/platform/user/domain/UserJpaRepository.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.adapter.out.jpa.user; +package com.pinHouse.server.platform.user.domain; -import com.pinHouse.server.platform.domain.user.Provider; +import com.pinHouse.server.platform.user.domain.entity.UserJpaEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/out/jpa/user/UserJpaEntity.java b/src/main/java/com/pinHouse/server/platform/user/domain/entity/UserJpaEntity.java similarity index 85% rename from src/main/java/com/pinHouse/server/platform/adapter/out/jpa/user/UserJpaEntity.java rename to src/main/java/com/pinHouse/server/platform/user/domain/entity/UserJpaEntity.java index a823dfb..b61b1b5 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/out/jpa/user/UserJpaEntity.java +++ b/src/main/java/com/pinHouse/server/platform/user/domain/entity/UserJpaEntity.java @@ -1,10 +1,10 @@ -package com.pinHouse.server.platform.adapter.out.jpa.user; +package com.pinHouse.server.platform.user.domain.entity; -import com.pinHouse.server.platform.adapter.out.jpa.BaseTimeEntity; -import com.pinHouse.server.platform.domain.user.Gender; -import com.pinHouse.server.platform.domain.user.Provider; -import com.pinHouse.server.platform.domain.user.Role; -import com.pinHouse.server.platform.domain.user.User; +import com.pinHouse.server.platform.BaseTimeEntity; +import com.pinHouse.server.platform.user.domain.Gender; +import com.pinHouse.server.platform.user.domain.Provider; +import com.pinHouse.server.platform.user.domain.Role; +import com.pinHouse.server.platform.user.domain.User; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/DevAuthApi.java b/src/main/java/com/pinHouse/server/platform/user/presentation/DevAuthApi.java similarity index 87% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/DevAuthApi.java rename to src/main/java/com/pinHouse/server/platform/user/presentation/DevAuthApi.java index 4dee3ca..efdc40c 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/DevAuthApi.java +++ b/src/main/java/com/pinHouse/server/platform/user/presentation/DevAuthApi.java @@ -1,12 +1,12 @@ -package com.pinHouse.server.platform.adapter.in.web; +package com.pinHouse.server.platform.user.presentation; import com.pinHouse.server.core.response.response.ApiResponse; import com.pinHouse.server.core.response.response.ErrorCode; -import com.pinHouse.server.platform.adapter.in.web.swagger.DevAuthApiSpec; -import com.pinHouse.server.platform.application.out.user.UserPort; -import com.pinHouse.server.platform.domain.user.Provider; -import com.pinHouse.server.platform.domain.user.Role; -import com.pinHouse.server.platform.domain.user.User; +import com.pinHouse.server.platform.user.presentation.swagger.DevAuthApiSpec; +import com.pinHouse.server.platform.user.application.usecase.UserPort; +import com.pinHouse.server.platform.user.domain.Provider; +import com.pinHouse.server.platform.user.domain.Role; +import com.pinHouse.server.platform.user.domain.User; import com.pinHouse.server.security.jwt.service.JwtTokenUseCase; import com.pinHouse.server.security.oauth2.domain.PrincipalDetails; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/DevAuthApiSpec.java b/src/main/java/com/pinHouse/server/platform/user/presentation/swagger/DevAuthApiSpec.java similarity index 90% rename from src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/DevAuthApiSpec.java rename to src/main/java/com/pinHouse/server/platform/user/presentation/swagger/DevAuthApiSpec.java index c041dd1..30bb961 100644 --- a/src/main/java/com/pinHouse/server/platform/adapter/in/web/swagger/DevAuthApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/user/presentation/swagger/DevAuthApiSpec.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.adapter.in.web.swagger; +package com.pinHouse.server.platform.user.presentation.swagger; import com.pinHouse.server.core.response.response.ApiResponse; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/pinHouse/server/security/config/RequestMatcherHolder.java b/src/main/java/com/pinHouse/server/security/config/RequestMatcherHolder.java index ea3b124..fad8ac5 100644 --- a/src/main/java/com/pinHouse/server/security/config/RequestMatcherHolder.java +++ b/src/main/java/com/pinHouse/server/security/config/RequestMatcherHolder.java @@ -1,6 +1,6 @@ package com.pinHouse.server.security.config; -import com.pinHouse.server.platform.domain.user.Role; +import com.pinHouse.server.platform.user.domain.Role; import io.micrometer.common.lang.Nullable; import org.springframework.http.HttpMethod; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; diff --git a/src/main/java/com/pinHouse/server/security/config/SecurityConfig.java b/src/main/java/com/pinHouse/server/security/config/SecurityConfig.java index f9a2a6d..76b6cb1 100644 --- a/src/main/java/com/pinHouse/server/security/config/SecurityConfig.java +++ b/src/main/java/com/pinHouse/server/security/config/SecurityConfig.java @@ -15,8 +15,8 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.cors.CorsConfigurationSource; -import static com.pinHouse.server.platform.domain.user.Role.ADMIN; -import static com.pinHouse.server.platform.domain.user.Role.USER; +import static com.pinHouse.server.platform.user.domain.Role.ADMIN; +import static com.pinHouse.server.platform.user.domain.Role.USER; /** * Spring Security 설정 클래스 diff --git a/src/main/java/com/pinHouse/server/security/jwt/util/JwtTokenExtractor.java b/src/main/java/com/pinHouse/server/security/jwt/util/JwtTokenExtractor.java index c910d8c..03702d4 100644 --- a/src/main/java/com/pinHouse/server/security/jwt/util/JwtTokenExtractor.java +++ b/src/main/java/com/pinHouse/server/security/jwt/util/JwtTokenExtractor.java @@ -1,8 +1,8 @@ package com.pinHouse.server.security.jwt.util; import com.pinHouse.server.core.response.response.ErrorCode; -import com.pinHouse.server.platform.application.out.user.UserPort; -import com.pinHouse.server.platform.domain.user.User; +import com.pinHouse.server.platform.user.application.usecase.UserPort; +import com.pinHouse.server.platform.user.domain.User; import com.pinHouse.server.security.jwt.exception.JwtAuthenticationException; import com.pinHouse.server.security.oauth2.domain.PrincipalDetails; import io.jsonwebtoken.*; diff --git a/src/main/java/com/pinHouse/server/security/oauth2/domain/PrincipalDetails.java b/src/main/java/com/pinHouse/server/security/oauth2/domain/PrincipalDetails.java index 66e8f54..86cdb7e 100644 --- a/src/main/java/com/pinHouse/server/security/oauth2/domain/PrincipalDetails.java +++ b/src/main/java/com/pinHouse/server/security/oauth2/domain/PrincipalDetails.java @@ -1,6 +1,6 @@ package com.pinHouse.server.security.oauth2.domain; -import com.pinHouse.server.platform.domain.user.User; +import com.pinHouse.server.platform.user.domain.User; import lombok.Builder; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/pinHouse/server/security/oauth2/service/OAuth2UserService.java b/src/main/java/com/pinHouse/server/security/oauth2/service/OAuth2UserService.java index 12ca9e7..b613906 100644 --- a/src/main/java/com/pinHouse/server/security/oauth2/service/OAuth2UserService.java +++ b/src/main/java/com/pinHouse/server/security/oauth2/service/OAuth2UserService.java @@ -1,9 +1,9 @@ package com.pinHouse.server.security.oauth2.service; -import com.pinHouse.server.platform.application.out.user.UserPort; -import com.pinHouse.server.platform.domain.user.Gender; -import com.pinHouse.server.platform.domain.user.Provider; -import com.pinHouse.server.platform.domain.user.User; +import com.pinHouse.server.platform.user.application.usecase.UserPort; +import com.pinHouse.server.platform.user.domain.Gender; +import com.pinHouse.server.platform.user.domain.Provider; +import com.pinHouse.server.platform.user.domain.User; import com.pinHouse.server.security.oauth2.domain.OAuth2UserInfo; import com.pinHouse.server.security.oauth2.domain.PrincipalDetails; import com.pinHouse.server.security.oauth2.domain.kakao.KakaoUserInfo; From e9da2595c81cd5c275c514476a63568b963c7698 Mon Sep 17 00:00:00 2001 From: eedo_y Date: Thu, 4 Sep 2025 14:23:08 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=93=82=20file=20:=20=ED=8F=B4?= =?UTF-8?q?=EB=8D=94=20=EA=B5=AC=EC=A1=B0=EB=A5=BC=20=EC=9C=84=ED=95=9C=20?= =?UTF-8?q?.gitkeep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/platform/notification/application/dto/request/.gitkeep | 0 .../platform/notification/application/dto/response/.gitkeep | 0 .../server/platform/notification/application/service/.gitkeep | 0 .../server/platform/notification/application/usecase/.gitkeep | 0 .../pinHouse/server/platform/notification/domain/entity/.gitkeep | 0 .../server/platform/notification/domain/repository/.gitkeep | 0 .../server/platform/notification/presentation/swagger/.gitkeep | 0 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/java/com/pinHouse/server/platform/notification/application/dto/request/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/notification/application/dto/response/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/notification/application/service/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/notification/application/usecase/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/notification/domain/entity/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/notification/domain/repository/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/notification/presentation/swagger/.gitkeep diff --git a/src/main/java/com/pinHouse/server/platform/notification/application/dto/request/.gitkeep b/src/main/java/com/pinHouse/server/platform/notification/application/dto/request/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/notification/application/dto/response/.gitkeep b/src/main/java/com/pinHouse/server/platform/notification/application/dto/response/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/notification/application/service/.gitkeep b/src/main/java/com/pinHouse/server/platform/notification/application/service/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/notification/application/usecase/.gitkeep b/src/main/java/com/pinHouse/server/platform/notification/application/usecase/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/notification/domain/entity/.gitkeep b/src/main/java/com/pinHouse/server/platform/notification/domain/entity/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/notification/domain/repository/.gitkeep b/src/main/java/com/pinHouse/server/platform/notification/domain/repository/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/notification/presentation/swagger/.gitkeep b/src/main/java/com/pinHouse/server/platform/notification/presentation/swagger/.gitkeep new file mode 100644 index 0000000..e69de29 From 2834ff56f0494262db34722364516b80421f2024 Mon Sep 17 00:00:00 2001 From: eedo_y Date: Thu, 4 Sep 2025 14:26:06 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=F0=9F=93=82=20file=20:=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=EB=93=9C=202=EC=B0=A8=20=EC=9E=AC=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pinHouse/server/platform/BaseDomain.java | 19 ---- .../service}/OdsayAdapter.java | 4 +- .../application/usecase/DistancePort.java | 2 +- .../application/usecase/DistanceUseCase.java | 7 ++ .../presentation/DistanceApi.java | 6 +- .../swaager}/DistanceApiSpec.java | 2 +- .../service/FacilityMongoAdapter.java | 11 ++- .../service/NoticeInfraService.java | 11 ++- .../application/usecase/FacilityPort.java | 2 +- .../usecase/NoticeInfraUseCase.java | 6 +- .../platform/facility/domain/Animal.java | 54 ------------ .../platform/facility/domain/Library.java | 25 ------ .../server/platform/facility/domain/Park.java | 32 ------- .../platform/facility/domain/Sport.java | 43 --------- .../platform/facility/domain/Walking.java | 61 ------------- .../{AnimalDocument.java => Animal.java} | 41 +-------- .../domain/{ => entity}/Facility.java | 4 +- .../{LibraryDocument.java => Library.java} | 38 ++------ .../domain/entity}/Location.java | 2 +- .../domain/entity}/NoticeInfra.java | 4 +- .../entity/{ParkDocument.java => Park.java} | 23 +---- .../entity/{SportDocument.java => Sport.java} | 16 ++-- .../{WalkingDocument.java => Walking.java} | 31 +------ .../repository/AnimalDocumentRepository.java | 6 +- .../repository/LibraryDocumentRepository.java | 6 +- .../repository/ParkDocumentRepository.java | 6 +- .../repository/SportDocumentRepository.java | 6 +- .../repository/WalkingDocumentRepository.java | 6 +- .../presentation/FacilityApi.java} | 12 +-- .../swagger/FacilityApiSpec.java} | 4 +- .../application/dto/response/InfraDTO.java | 4 +- .../application/dto/response/NoticeDTO.java | 2 +- .../service/NoticeMongoAdapter.java | 9 +- .../application/service/NoticeService.java | 2 +- .../application/usecase/NoticePort.java | 2 +- .../application/usecase/NoticeUseCase.java | 2 +- .../server/platform/notice/domain/Notice.java | 41 --------- .../notice/domain/NoticeSupplyInfo.java | 36 -------- .../{DepositDocument.java => Deposit.java} | 11 +-- .../{NoticeDocument.java => Notice.java} | 38 +------- .../domain/{ => entity}/NoticeCount.java | 2 +- .../notice/domain/entity/NoticeSupply.java | 29 +++++++ .../entity/NoticeSupplyInfoDocument.java | 40 --------- ...entCountDocument.java => Recruitment.java} | 11 +-- .../repository/NoticeDocumentRepository.java | 6 +- .../notification/domain/Notification.java | 6 -- .../{UserJpaAdapter.java => UserService.java} | 24 ++--- .../{UserPort.java => UserUseCase.java} | 6 +- .../server/platform/user/domain/Provider.java | 5 -- .../user/domain/UserJpaRepository.java | 19 ---- .../user/domain/{ => entity}/Gender.java | 2 +- .../platform/user/domain/entity/Provider.java | 5 ++ .../user/domain/{ => entity}/Role.java | 2 +- .../user/domain/{ => entity}/User.java | 46 +++++++--- .../user/domain/entity/UserJpaEntity.java | 87 ------------------- .../domain/repository/UserJpaRepository.java | 20 +++++ .../user/presentation/DevAuthApi.java | 16 ++-- .../security/config/RequestMatcherHolder.java | 2 +- .../security/config/SecurityConfig.java | 4 +- .../security/jwt/util/JwtTokenExtractor.java | 8 +- .../oauth2/domain/PrincipalDetails.java | 2 +- .../oauth2/service/OAuth2UserService.java | 14 +-- 62 files changed, 218 insertions(+), 775 deletions(-) delete mode 100644 src/main/java/com/pinHouse/server/platform/BaseDomain.java rename src/main/java/com/pinHouse/server/platform/distance/{presentation => application/service}/OdsayAdapter.java (91%) rename src/main/java/com/pinHouse/server/platform/{notice => distance}/application/usecase/DistancePort.java (83%) create mode 100644 src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistanceUseCase.java rename src/main/java/com/pinHouse/server/platform/{notice => distance}/presentation/DistanceApi.java (75%) rename src/main/java/com/pinHouse/server/platform/{notice/presentation/swagger => distance/presentation/swaager}/DistanceApiSpec.java (95%) rename src/main/java/com/pinHouse/server/platform/{notice => facility}/application/service/NoticeInfraService.java (91%) rename src/main/java/com/pinHouse/server/platform/{notice => facility}/application/usecase/NoticeInfraUseCase.java (70%) delete mode 100644 src/main/java/com/pinHouse/server/platform/facility/domain/Animal.java delete mode 100644 src/main/java/com/pinHouse/server/platform/facility/domain/Library.java delete mode 100644 src/main/java/com/pinHouse/server/platform/facility/domain/Park.java delete mode 100644 src/main/java/com/pinHouse/server/platform/facility/domain/Sport.java delete mode 100644 src/main/java/com/pinHouse/server/platform/facility/domain/Walking.java rename src/main/java/com/pinHouse/server/platform/facility/domain/entity/{AnimalDocument.java => Animal.java} (56%) rename src/main/java/com/pinHouse/server/platform/facility/domain/{ => entity}/Facility.java (58%) rename src/main/java/com/pinHouse/server/platform/facility/domain/entity/{LibraryDocument.java => Library.java} (58%) rename src/main/java/com/pinHouse/server/platform/{location/domain => facility/domain/entity}/Location.java (89%) rename src/main/java/com/pinHouse/server/platform/{notice/domain => facility/domain/entity}/NoticeInfra.java (93%) rename src/main/java/com/pinHouse/server/platform/facility/domain/entity/{ParkDocument.java => Park.java} (60%) rename src/main/java/com/pinHouse/server/platform/facility/domain/entity/{SportDocument.java => Sport.java} (84%) rename src/main/java/com/pinHouse/server/platform/facility/domain/entity/{WalkingDocument.java => Walking.java} (62%) rename src/main/java/com/pinHouse/server/platform/{notice/presentation/NoticeInfraApi.java => facility/presentation/FacilityApi.java} (79%) rename src/main/java/com/pinHouse/server/platform/{notice/presentation/swagger/NoticeInfraApiSpec.java => facility/presentation/swagger/FacilityApiSpec.java} (93%) delete mode 100644 src/main/java/com/pinHouse/server/platform/notice/domain/Notice.java delete mode 100644 src/main/java/com/pinHouse/server/platform/notice/domain/NoticeSupplyInfo.java rename src/main/java/com/pinHouse/server/platform/notice/domain/entity/{DepositDocument.java => Deposit.java} (65%) rename src/main/java/com/pinHouse/server/platform/notice/domain/entity/{NoticeDocument.java => Notice.java} (57%) rename src/main/java/com/pinHouse/server/platform/notice/domain/{ => entity}/NoticeCount.java (93%) create mode 100644 src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupply.java delete mode 100644 src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupplyInfoDocument.java rename src/main/java/com/pinHouse/server/platform/notice/domain/entity/{RecruitmentCountDocument.java => Recruitment.java} (55%) delete mode 100644 src/main/java/com/pinHouse/server/platform/notification/domain/Notification.java rename src/main/java/com/pinHouse/server/platform/user/application/service/{UserJpaAdapter.java => UserService.java} (58%) rename src/main/java/com/pinHouse/server/platform/user/application/usecase/{UserPort.java => UserUseCase.java} (69%) delete mode 100644 src/main/java/com/pinHouse/server/platform/user/domain/Provider.java delete mode 100644 src/main/java/com/pinHouse/server/platform/user/domain/UserJpaRepository.java rename src/main/java/com/pinHouse/server/platform/user/domain/{ => entity}/Gender.java (92%) create mode 100644 src/main/java/com/pinHouse/server/platform/user/domain/entity/Provider.java rename src/main/java/com/pinHouse/server/platform/user/domain/{ => entity}/Role.java (77%) rename src/main/java/com/pinHouse/server/platform/user/domain/{ => entity}/User.java (73%) delete mode 100644 src/main/java/com/pinHouse/server/platform/user/domain/entity/UserJpaEntity.java create mode 100644 src/main/java/com/pinHouse/server/platform/user/domain/repository/UserJpaRepository.java diff --git a/src/main/java/com/pinHouse/server/platform/BaseDomain.java b/src/main/java/com/pinHouse/server/platform/BaseDomain.java deleted file mode 100644 index 98ba487..0000000 --- a/src/main/java/com/pinHouse/server/platform/BaseDomain.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.pinHouse.server.platform; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.time.LocalDateTime; - -@Getter -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public abstract class BaseDomain { - - private LocalDateTime createdAt; - private LocalDateTime updatedAt; - -} diff --git a/src/main/java/com/pinHouse/server/platform/distance/presentation/OdsayAdapter.java b/src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayAdapter.java similarity index 91% rename from src/main/java/com/pinHouse/server/platform/distance/presentation/OdsayAdapter.java rename to src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayAdapter.java index a36b6a2..c53e2e3 100644 --- a/src/main/java/com/pinHouse/server/platform/distance/presentation/OdsayAdapter.java +++ b/src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayAdapter.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.distance.presentation; +package com.pinHouse.server.platform.distance.application.service; -import com.pinHouse.server.platform.notice.application.usecase.DistancePort; +import com.pinHouse.server.platform.distance.application.usecase.DistancePort; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/DistancePort.java b/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistancePort.java similarity index 83% rename from src/main/java/com/pinHouse/server/platform/notice/application/usecase/DistancePort.java rename to src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistancePort.java index cf6a767..d5f4ef0 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/DistancePort.java +++ b/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistancePort.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.notice.application.usecase; +package com.pinHouse.server.platform.distance.application.usecase; import java.io.UnsupportedEncodingException; diff --git a/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistanceUseCase.java b/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistanceUseCase.java new file mode 100644 index 0000000..177006f --- /dev/null +++ b/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistanceUseCase.java @@ -0,0 +1,7 @@ +package com.pinHouse.server.platform.distance.application.usecase; + +public interface DistanceUseCase { + + + +} diff --git a/src/main/java/com/pinHouse/server/platform/notice/presentation/DistanceApi.java b/src/main/java/com/pinHouse/server/platform/distance/presentation/DistanceApi.java similarity index 75% rename from src/main/java/com/pinHouse/server/platform/notice/presentation/DistanceApi.java rename to src/main/java/com/pinHouse/server/platform/distance/presentation/DistanceApi.java index ea09002..d434a6a 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/presentation/DistanceApi.java +++ b/src/main/java/com/pinHouse/server/platform/distance/presentation/DistanceApi.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.notice.presentation; +package com.pinHouse.server.platform.distance.presentation; -import com.pinHouse.server.platform.notice.presentation.swagger.DistanceApiSpec; -import com.pinHouse.server.platform.notice.application.usecase.DistancePort; +import com.pinHouse.server.platform.distance.presentation.swaager.DistanceApiSpec; +import com.pinHouse.server.platform.distance.application.usecase.DistancePort; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DistanceApiSpec.java b/src/main/java/com/pinHouse/server/platform/distance/presentation/swaager/DistanceApiSpec.java similarity index 95% rename from src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DistanceApiSpec.java rename to src/main/java/com/pinHouse/server/platform/distance/presentation/swaager/DistanceApiSpec.java index 8489f8b..1e8b8f7 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DistanceApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/distance/presentation/swaager/DistanceApiSpec.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.notice.presentation.swagger; +package com.pinHouse.server.platform.distance.presentation.swaager; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityMongoAdapter.java b/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityMongoAdapter.java index cedff8b..39a04a0 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityMongoAdapter.java +++ b/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityMongoAdapter.java @@ -1,7 +1,6 @@ package com.pinHouse.server.platform.facility.application.service; import com.pinHouse.server.platform.facility.application.usecase.FacilityPort; -import com.pinHouse.server.platform.facility.domain.*; import com.pinHouse.server.platform.facility.domain.entity.*; import com.pinHouse.server.platform.facility.domain.repository.*; import lombok.RequiredArgsConstructor; @@ -23,35 +22,35 @@ public class FacilityMongoAdapter implements FacilityPort { @Override public List loadLibrariesNearBy(double longitude, double latitude, double radiusInKm) { return libraryRepository.findByLocation(longitude, latitude,radiusInKm).stream() - .map(LibraryDocument::toDomain) + .map(Library::toDomain) .toList(); } @Override public List loadParksNearBy(double longitude, double latitude, double radiusInKm) { return parkRepository.findByLocation(longitude, latitude,radiusInKm).stream() - .map(ParkDocument::toDomain) + .map(Park::toDomain) .toList(); } @Override public List loadSportsNearBy(double longitude, double latitude, double radiusInKm) { return sportRepository.findByLocation(longitude, latitude,radiusInKm).stream() - .map(SportDocument::toDomain) + .map(Sport::toDomain) .toList(); } @Override public List loadWalkingsNearBy(double longitude, double latitude, double radiusInKm) { return walkingRepository.findByLocation(longitude, latitude,radiusInKm).stream() - .map(WalkingDocument::toDomain) + .map(Walking::toDomain) .toList(); } @Override public List loadAnimalsNearBy(double longitude, double latitude, double radiusInKm) { return animalRepository.findByLocation(longitude, latitude,radiusInKm).stream() - .map(AnimalDocument::toDomain) + .map(Animal::toDomain) .toList(); } } diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeInfraService.java b/src/main/java/com/pinHouse/server/platform/facility/application/service/NoticeInfraService.java similarity index 91% rename from src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeInfraService.java rename to src/main/java/com/pinHouse/server/platform/facility/application/service/NoticeInfraService.java index 35799d4..b69357f 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeInfraService.java +++ b/src/main/java/com/pinHouse/server/platform/facility/application/service/NoticeInfraService.java @@ -1,13 +1,12 @@ -package com.pinHouse.server.platform.notice.application.service; +package com.pinHouse.server.platform.facility.application.service; import com.pinHouse.server.core.response.response.ErrorCode; -import com.pinHouse.server.platform.facility.domain.entity.FacilityType; -import com.pinHouse.server.platform.facility.domain.*; -import com.pinHouse.server.platform.notice.application.usecase.NoticeInfraUseCase; +import com.pinHouse.server.platform.facility.domain.entity.*; +import com.pinHouse.server.platform.facility.application.usecase.NoticeInfraUseCase; import com.pinHouse.server.platform.facility.application.usecase.FacilityPort; import com.pinHouse.server.platform.notice.application.usecase.NoticePort; -import com.pinHouse.server.platform.notice.domain.Notice; -import com.pinHouse.server.platform.notice.domain.NoticeInfra; +import com.pinHouse.server.platform.notice.domain.entity.Notice; +import com.pinHouse.server.platform.facility.domain.entity.NoticeInfra; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityPort.java b/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityPort.java index a01ba78..39cf1c5 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityPort.java +++ b/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityPort.java @@ -1,6 +1,6 @@ package com.pinHouse.server.platform.facility.application.usecase; -import com.pinHouse.server.platform.facility.domain.*; +import com.pinHouse.server.platform.facility.domain.entity.*; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeInfraUseCase.java b/src/main/java/com/pinHouse/server/platform/facility/application/usecase/NoticeInfraUseCase.java similarity index 70% rename from src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeInfraUseCase.java rename to src/main/java/com/pinHouse/server/platform/facility/application/usecase/NoticeInfraUseCase.java index ee9b37d..dae5ee5 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeInfraUseCase.java +++ b/src/main/java/com/pinHouse/server/platform/facility/application/usecase/NoticeInfraUseCase.java @@ -1,8 +1,8 @@ -package com.pinHouse.server.platform.notice.application.usecase; +package com.pinHouse.server.platform.facility.application.usecase; import com.pinHouse.server.platform.facility.domain.entity.FacilityType; -import com.pinHouse.server.platform.notice.domain.Notice; -import com.pinHouse.server.platform.notice.domain.NoticeInfra; +import com.pinHouse.server.platform.notice.domain.entity.Notice; +import com.pinHouse.server.platform.facility.domain.entity.NoticeInfra; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/Animal.java b/src/main/java/com/pinHouse/server/platform/facility/domain/Animal.java deleted file mode 100644 index baa8679..0000000 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/Animal.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.pinHouse.server.platform.facility.domain; - -import com.pinHouse.server.platform.location.domain.Location; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class Animal implements Facility{ - - /// 아이디 - private String id; - - /// 시설명 - private String name; - - /// 종류 - private String category; - - /// 좌표 - private Location location; - - /// 주소 - private String address; - - /// 휴무,운영 - private String restGuide; - - /// 운영시간 - private String operateTime; - - /// 가능여부 - private String petPossibleAt; - - /// 반려동물 크기 - private String enterPossiblePetSizeValue; - - /// 반려동물 제한사항 - private String petLimitMatterContent; - - /// 실내 입장 가능 여부 - private String inPlaceAcceptPossibleAt; - - /// 실외 입장 가능 여부 - private String outPlaceAcceptPossibleAt; - - /// 시설 안내 - private String facilityInfoDescription; - -} diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/Library.java b/src/main/java/com/pinHouse/server/platform/facility/domain/Library.java deleted file mode 100644 index ec0836b..0000000 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/Library.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.pinHouse.server.platform.facility.domain; - -import com.pinHouse.server.platform.location.domain.Location; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class Library implements Facility{ - - private String id; - private Integer code; - private String name; - private String address; - private Location location; - private String area; - private String city; - private Integer number; - private String openTime; - private String closedDay; -} diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/Park.java b/src/main/java/com/pinHouse/server/platform/facility/domain/Park.java deleted file mode 100644 index 8437e39..0000000 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/Park.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.pinHouse.server.platform.facility.domain; - -import com.pinHouse.server.platform.location.domain.Location; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; - -@Getter -@AllArgsConstructor -@Builder -public class Park implements Facility{ - - /// 아이디 - private String id; - - /// 공원 시스템 ID - private String parkId; - - /// 명칭 - private String name; - - /// 공원 분류 명칭 - private String category; - - /// PNU (법정동+지번코드) - private String pnu; - - /// 좌표 - private Location location; - - -} diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/Sport.java b/src/main/java/com/pinHouse/server/platform/facility/domain/Sport.java deleted file mode 100644 index 9918965..0000000 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/Sport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.pinHouse.server.platform.facility.domain; - -import com.pinHouse.server.platform.location.domain.Location; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class Sport implements Facility{ - - private String id; - - /** 시설 명칭 */ - private String name; - - /** 업종 명칭 */ - private String industryName; - - /** 시설 유형 명칭 */ - private String facilityTypeName; - - /** 시설 상태값 (예: 정상운영 등) */ - private String facilityStateValue; - - /** 도로명주소-1 */ - private String address; - - /// 좌표 - private Location location; - - /** 시설 운영 형태 값 */ - private String facilityOperStyleValue; - - /** 시설 기준일자(생성 기준일) */ - private String facilityCreationStandardDate; - - /** 국가 공공 시설 여부 */ - private String nationPublicFacilityAt; -} diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/Walking.java b/src/main/java/com/pinHouse/server/platform/facility/domain/Walking.java deleted file mode 100644 index acfa7ad..0000000 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/Walking.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.pinHouse.server.platform.facility.domain; - -import com.pinHouse.server.platform.location.domain.Location; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class Walking implements Facility{ - - private String id; - - /// 코스 고유 식별자 - private String esntlId; - - ///걷기 코스 플래그명 (코스 대표 명칭) - private String walkingCourseFlagName; - - /// 걷기 코스명 - private String walkingCourseName; - - /// 코스 상세설명 */ - private String courseDescription; - - /// 행정구역명(시/군/구) */ - private String districtName; - - /// 코스 난이도 */ - private String courseLevelName; - - /// 코스 거리 구간명 (예: 10~15㎞미만) */ - private String courseLengthDescription; - - /// 상세 거리 (단위: km, 실수 값) */ - private Double courseDetailLengthKm; - - /** 추가 설명 (코스 특성, 지역 건강증진 등) */ - private String additionalDescription; - - /** 예상 소요 시간 (예: 4시간) */ - private String courseTime; - - /** 편의시설 및 옵션 안내 */ - private String optionDescription; - - /** 화장실 안내 */ - private String toiletDescription; - - /** 주변 편의점/휴게시설 안내 */ - private String convenienceName; - - /** 코스 시작/대표 주소 */ - private String address; - - /// 좌표 - private Location location; -} diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/AnimalDocument.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Animal.java similarity index 56% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/AnimalDocument.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/Animal.java index 69c4d27..861c97f 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/AnimalDocument.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Animal.java @@ -1,7 +1,5 @@ package com.pinHouse.server.platform.facility.domain.entity; -import com.pinHouse.server.platform.facility.domain.Animal; -import com.pinHouse.server.platform.location.domain.Location; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; @@ -17,7 +15,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class AnimalDocument { +public class Animal implements Facility{ /** MongoDB ObjectId */ @Id @@ -26,22 +24,17 @@ public class AnimalDocument { /** 시설명 */ @Field("FCLTY_NM") - private String facilityName; + private String name; /** 3차 카테고리명 (ex. 펜션) */ @Field("CTGRY_THREE_NM") - private String categoryThreeName; + private String category; @GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE) private Location location; - - /** 우편번호 */ - @Field("ZIP_NO") - private Integer zipNo; - /** 도로명주소 */ @Field("RDNMADR_NM") - private String roadAddressName; + private String address; /** 휴무/운영 안내 */ @Field("RSTDE_GUID_CN") @@ -74,30 +67,4 @@ public class AnimalDocument { /** 시설 안내/특징 */ @Field("FCLTY_INFO_DC") private String facilityInfoDescription; - - /** 반려동물 추가 요금 안내 */ - @Field("PET_ACP_ADIT_CHRGE_VALUE") - private String petAcceptAdditionalChargeValue; - - /// 도메인 변환 - public Animal toDomain(){ - return Animal.builder() - .name(facilityName) - .category(categoryThreeName) - .location(Location.builder() - .type(location.getType()) - .coordinates(location.getCoordinates()) - .build()) - .address(roadAddressName) - .restGuide(restGuide) - .operateTime(operateTime) - .petPossibleAt(petPossibleAt) - .enterPossiblePetSizeValue(enterPossiblePetSizeValue) - .petLimitMatterContent(petLimitMatterContent) - .inPlaceAcceptPossibleAt(inPlaceAcceptPossibleAt) - .outPlaceAcceptPossibleAt(outPlaceAcceptPossibleAt) - .facilityInfoDescription(facilityInfoDescription) - .build(); - } - } diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/Facility.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Facility.java similarity index 58% rename from src/main/java/com/pinHouse/server/platform/facility/domain/Facility.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/Facility.java index fb4f057..c3a190e 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/Facility.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Facility.java @@ -1,6 +1,4 @@ -package com.pinHouse.server.platform.facility.domain; - -import com.pinHouse.server.platform.location.domain.Location; +package com.pinHouse.server.platform.facility.domain.entity; public interface Facility { diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/LibraryDocument.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Library.java similarity index 58% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/LibraryDocument.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/Library.java index 198699f..bc24154 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/LibraryDocument.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Library.java @@ -1,7 +1,5 @@ package com.pinHouse.server.platform.facility.domain.entity; -import com.pinHouse.server.platform.facility.domain.Library; -import com.pinHouse.server.platform.location.domain.Location; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; @@ -20,7 +18,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class LibraryDocument { +public class Library implements Facility{ /** * MongoDB unique identifier (_id) @@ -33,19 +31,19 @@ public class LibraryDocument { * Library code (도서관코드) */ @Field("LBRRY_CD") - private Integer libraryCode; + private Integer code; /** * Library name (도서관명) */ @Field("LBRRY_NM") - private String libraryName; + private String name; /** * Library address (도서관주소) */ @Field("LBRRY_ADDR") - private String libraryAddress; + private String address; @GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE) private Location location; @@ -54,19 +52,19 @@ public class LibraryDocument { * Province/State name (광역지역명) */ @Field("ONE_AREA_NM") - private String regionName; + private String area; /** * City/District name (시군구명) */ @Field("TWO_AREA_NM") - private String cityName; + private String city; /** * Library number (도서관번호) */ @Field("LBRRY_NO") - private Integer libraryNumber; + private Integer number; /** * Opening hours (운영시간) @@ -79,26 +77,4 @@ public class LibraryDocument { */ @Field("CLOSEDON_DC") private String closedDays; - - /** - * Converts this document to the domain model. - * @return Library domain object - */ - public Library toDomain() { - return Library.builder() - .id(id) - .code(libraryCode) - .name(libraryName) - .address(libraryAddress) - .location(Location.builder() - .type(location.getType()) - .coordinates(location.getCoordinates()) - .build()) - .area(regionName) - .city(cityName) - .number(libraryNumber) - .openTime(openingTime) - .closedDay(closedDays) - .build(); - } } diff --git a/src/main/java/com/pinHouse/server/platform/location/domain/Location.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Location.java similarity index 89% rename from src/main/java/com/pinHouse/server/platform/location/domain/Location.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/Location.java index 810dc48..fed1bda 100644 --- a/src/main/java/com/pinHouse/server/platform/location/domain/Location.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Location.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.location.domain; +package com.pinHouse.server.platform.facility.domain.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeInfra.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/NoticeInfra.java similarity index 93% rename from src/main/java/com/pinHouse/server/platform/notice/domain/NoticeInfra.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/NoticeInfra.java index d54bed8..d298e6c 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeInfra.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/NoticeInfra.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.notice.domain; +package com.pinHouse.server.platform.facility.domain.entity; -import com.pinHouse.server.platform.facility.domain.*; +import com.pinHouse.server.platform.notice.domain.entity.Notice; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/ParkDocument.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Park.java similarity index 60% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/ParkDocument.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/Park.java index c31b576..ef08b4c 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/ParkDocument.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Park.java @@ -1,7 +1,5 @@ package com.pinHouse.server.platform.facility.domain.entity; -import com.pinHouse.server.platform.facility.domain.Park; -import com.pinHouse.server.platform.location.domain.Location; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.GeoSpatialIndexType; import org.springframework.data.mongodb.core.index.GeoSpatialIndexed; @@ -21,7 +19,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class ParkDocument { +public class Park implements Facility{ @Id @Field("_id") @@ -33,11 +31,11 @@ public class ParkDocument { /** POI 명칭 */ @Field("POI_NM") - private String poiName; + private String name; /** 공원 분류 명칭 */ @Field("CL_NM") - private String categoryName; + private String category; /** PNU (법정동+지번코드) */ @Field("PNU") @@ -46,19 +44,4 @@ public class ParkDocument { @GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE) private Location location; - /// 도메인 변환 - public Park toDomain() { - return Park.builder() - .id(id) - .parkId(parkId) - .name(poiName) - .category(categoryName) - .pnu(pnu) - .location(Location.builder() - .type(location.getType()) - .coordinates(location.getCoordinates()) - .build()) - .build(); - } - } diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/SportDocument.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Sport.java similarity index 84% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/SportDocument.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/Sport.java index 84da865..ade0a1c 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/SportDocument.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Sport.java @@ -1,7 +1,5 @@ package com.pinHouse.server.platform.facility.domain.entity; -import com.pinHouse.server.platform.facility.domain.Sport; -import com.pinHouse.server.platform.location.domain.Location; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; @@ -17,7 +15,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class SportDocument { +public class Sport implements Facility{ /** MongoDB ObjectId */ @Id @@ -26,7 +24,7 @@ public class SportDocument { /** 시설 명칭 */ @Field("FCLTY_NM") - private String facilityName; + private String name; /** 업종 명칭 */ @Field("INDUTY_NM") @@ -42,11 +40,7 @@ public class SportDocument { /** 도로명주소-1 */ @Field("RDNMADR_ONE_NM") - private String roadAddressOneName; - - /** 도로명주소-2 */ - @Field("RDNMADR_TWO_NM") - private String roadAddressTwoName; + private String address; @GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE) private Location location; @@ -68,11 +62,11 @@ public class SportDocument { public Sport toDomain() { return Sport.builder() .id(id) - .name(facilityName) + .name(name) .industryName(industryName) .facilityTypeName(facilityTypeName) .facilityStateValue(facilityStateValue) - .address(roadAddressOneName) + .address(address) .location(Location.builder() .type(location.getType()) .coordinates(location.getCoordinates()) diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/WalkingDocument.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Walking.java similarity index 62% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/WalkingDocument.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/Walking.java index 31fb2d7..bec4db7 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/WalkingDocument.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Walking.java @@ -1,7 +1,5 @@ package com.pinHouse.server.platform.facility.domain.entity; -import com.pinHouse.server.platform.facility.domain.Walking; -import com.pinHouse.server.platform.location.domain.Location; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.GeoSpatialIndexType; import org.springframework.data.mongodb.core.index.GeoSpatialIndexed; @@ -18,7 +16,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class WalkingDocument { +public class Walking implements Facility{ /** MongoDB ObjectId */ @Id @@ -84,31 +82,4 @@ public class WalkingDocument { @GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE) private Location location; - /// toDomain - public Walking toDomain() { - return Walking.builder() - .id(id) - .esntlId(esntlId) - .walkingCourseFlagName(walkingCourseFlagName) - .walkingCourseName(walkingCourseName) - .courseDescription(courseDescription) - .districtName(districtName) - .courseLevelName(courseLevelName) - .courseLengthDescription(courseLengthDescription) - .courseDetailLengthKm(courseDetailLengthKm) - .courseLevelName(courseLevelName) - .courseLengthDescription(courseLengthDescription) - .courseDetailLengthKm(courseDetailLengthKm) - .courseTime(courseTime) - .optionDescription(optionDescription) - .toiletDescription(toiletDescription) - .convenienceName(convenienceName) - .address(address) - .location(Location.builder() - .type(location.getType()) - .coordinates(location.getCoordinates()) - .build()) - .build(); - } - } diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/AnimalDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/AnimalDocumentRepository.java index 11e582c..b1c296e 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/AnimalDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/AnimalDocumentRepository.java @@ -1,15 +1,15 @@ package com.pinHouse.server.platform.facility.domain.repository; -import com.pinHouse.server.platform.facility.domain.entity.AnimalDocument; +import com.pinHouse.server.platform.facility.domain.entity.Animal; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; import java.util.List; -public interface AnimalDocumentRepository extends MongoRepository { +public interface AnimalDocumentRepository extends MongoRepository { // 좌표 주변의 특정 반경이상 주소 검색 @Query(value = "{ 'location': { $geoWithin: { $centerSphere: [ [ ?0, ?1 ], ?2 ] } } }") - List findByLocation(double longitude, double latitude, double radiusInRadians); + List findByLocation(double longitude, double latitude, double radiusInRadians); } diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/LibraryDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/LibraryDocumentRepository.java index 222ba49..ebe2a6e 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/LibraryDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/LibraryDocumentRepository.java @@ -1,15 +1,15 @@ package com.pinHouse.server.platform.facility.domain.repository; -import com.pinHouse.server.platform.facility.domain.entity.LibraryDocument; +import com.pinHouse.server.platform.facility.domain.entity.Library; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; import java.util.List; -public interface LibraryDocumentRepository extends MongoRepository { +public interface LibraryDocumentRepository extends MongoRepository { // 좌표 주변의 특정 반경이상 주소 검색 @Query(value = "{ 'location': { $geoWithin: { $centerSphere: [ [ ?0, ?1 ], ?2 ] } } }") - List findByLocation(double longitude, double latitude, double radiusInRadians); + List findByLocation(double longitude, double latitude, double radiusInRadians); } diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/ParkDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/ParkDocumentRepository.java index f1f6b6a..e30a8a3 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/ParkDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/ParkDocumentRepository.java @@ -1,15 +1,15 @@ package com.pinHouse.server.platform.facility.domain.repository; -import com.pinHouse.server.platform.facility.domain.entity.ParkDocument; +import com.pinHouse.server.platform.facility.domain.entity.Park; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; import java.util.List; -public interface ParkDocumentRepository extends MongoRepository { +public interface ParkDocumentRepository extends MongoRepository { // 좌표 주변의 특정 반경이상 주소 검색 @Query(value = "{ 'location': { $geoWithin: { $centerSphere: [ [ ?0, ?1 ], ?2 ] } } }") - List findByLocation(double longitude, double latitude, double radiusInRadians); + List findByLocation(double longitude, double latitude, double radiusInRadians); } diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/SportDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/SportDocumentRepository.java index d835fc5..e1831f5 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/SportDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/SportDocumentRepository.java @@ -1,15 +1,15 @@ package com.pinHouse.server.platform.facility.domain.repository; -import com.pinHouse.server.platform.facility.domain.entity.SportDocument; +import com.pinHouse.server.platform.facility.domain.entity.Sport; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; import java.util.List; -public interface SportDocumentRepository extends MongoRepository { +public interface SportDocumentRepository extends MongoRepository { // 좌표 주변의 특정 반경이상 주소 검색 @Query(value = "{ 'location': { $geoWithin: { $centerSphere: [ [ ?0, ?1 ], ?2 ] } } }") - List findByLocation(double longitude, double latitude, double radiusInRadians); + List findByLocation(double longitude, double latitude, double radiusInRadians); } diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/WalkingDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/WalkingDocumentRepository.java index 7626e58..3e9b9b7 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/WalkingDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/repository/WalkingDocumentRepository.java @@ -1,14 +1,14 @@ package com.pinHouse.server.platform.facility.domain.repository; -import com.pinHouse.server.platform.facility.domain.entity.WalkingDocument; +import com.pinHouse.server.platform.facility.domain.entity.Walking; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; import java.util.List; -public interface WalkingDocumentRepository extends MongoRepository { +public interface WalkingDocumentRepository extends MongoRepository { // 좌표 주변의 특정 반경이상 주소 검색 @Query(value = "{ 'location': { $geoWithin: { $centerSphere: [ [ ?0, ?1 ], ?2 ] } } }") - List findByLocation(double longitude, double latitude, double radiusInRadians); + List findByLocation(double longitude, double latitude, double radiusInRadians); } diff --git a/src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeInfraApi.java b/src/main/java/com/pinHouse/server/platform/facility/presentation/FacilityApi.java similarity index 79% rename from src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeInfraApi.java rename to src/main/java/com/pinHouse/server/platform/facility/presentation/FacilityApi.java index 3bd8a2d..f0c24d5 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeInfraApi.java +++ b/src/main/java/com/pinHouse/server/platform/facility/presentation/FacilityApi.java @@ -1,13 +1,13 @@ -package com.pinHouse.server.platform.notice.presentation; +package com.pinHouse.server.platform.facility.presentation; import com.pinHouse.server.core.response.response.ApiResponse; import com.pinHouse.server.platform.facility.domain.entity.FacilityType; import com.pinHouse.server.platform.notice.application.dto.response.InfraDTO; import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; -import com.pinHouse.server.platform.notice.presentation.swagger.NoticeInfraApiSpec; -import com.pinHouse.server.platform.notice.application.usecase.NoticeInfraUseCase; -import com.pinHouse.server.platform.notice.domain.Notice; -import com.pinHouse.server.platform.notice.domain.NoticeInfra; +import com.pinHouse.server.platform.facility.presentation.swagger.FacilityApiSpec; +import com.pinHouse.server.platform.facility.application.usecase.NoticeInfraUseCase; +import com.pinHouse.server.platform.notice.domain.entity.Notice; +import com.pinHouse.server.platform.facility.domain.entity.NoticeInfra; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -15,7 +15,7 @@ @RestController @RequestMapping("/api/v1/notices/infra") @RequiredArgsConstructor -public class NoticeInfraApi implements NoticeInfraApiSpec { +public class FacilityApi implements FacilityApiSpec { /// 서비스 의존성 private final NoticeInfraUseCase service; diff --git a/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeInfraApiSpec.java b/src/main/java/com/pinHouse/server/platform/facility/presentation/swagger/FacilityApiSpec.java similarity index 93% rename from src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeInfraApiSpec.java rename to src/main/java/com/pinHouse/server/platform/facility/presentation/swagger/FacilityApiSpec.java index 24e0d6d..4d96e4c 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeInfraApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/facility/presentation/swagger/FacilityApiSpec.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.notice.presentation.swagger; +package com.pinHouse.server.platform.facility.presentation.swagger; import com.pinHouse.server.core.response.response.ApiResponse; import com.pinHouse.server.platform.facility.domain.entity.FacilityType; @@ -14,7 +14,7 @@ import java.util.List; @Tag(name = "공고 주변 인프라 API", description = "인프라를 바탕으로 조회하는 API 입니다.") -public interface NoticeInfraApiSpec { +public interface FacilityApiSpec { @Operation( summary = "공고 주변 인프라 조회 API", diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/InfraDTO.java b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/InfraDTO.java index 01c9414..761fb39 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/InfraDTO.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/InfraDTO.java @@ -1,7 +1,7 @@ package com.pinHouse.server.platform.notice.application.dto.response; -import com.pinHouse.server.platform.facility.domain.*; -import com.pinHouse.server.platform.notice.domain.NoticeInfra; +import com.pinHouse.server.platform.facility.domain.entity.*; +import com.pinHouse.server.platform.facility.domain.entity.NoticeInfra; import io.micrometer.common.lang.Nullable; import lombok.Builder; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeDTO.java b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeDTO.java index fbd70e9..69a9f4e 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeDTO.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeDTO.java @@ -1,6 +1,6 @@ package com.pinHouse.server.platform.notice.application.dto.response; -import com.pinHouse.server.platform.notice.domain.Notice; +import com.pinHouse.server.platform.notice.domain.entity.Notice; import lombok.Builder; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeMongoAdapter.java b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeMongoAdapter.java index 04341a7..fad7387 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeMongoAdapter.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeMongoAdapter.java @@ -1,9 +1,8 @@ package com.pinHouse.server.platform.notice.application.service; -import com.pinHouse.server.platform.notice.domain.entity.NoticeDocument; +import com.pinHouse.server.platform.notice.domain.entity.Notice; import com.pinHouse.server.platform.notice.domain.repository.NoticeDocumentRepository; import com.pinHouse.server.platform.notice.application.usecase.NoticePort; -import com.pinHouse.server.platform.notice.domain.Notice; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -28,19 +27,19 @@ public class NoticeMongoAdapter implements NoticePort { @Override public Page loadNotices(Pageable pageable) { return repository.findAll(pageable) - .map(NoticeDocument::toDomain); + .map(Notice::toDomain); } @Override public Optional loadById(String noticeId) { return repository.findByNoticeId(noticeId) - .map(NoticeDocument::toDomain); + .map(Notice::toDomain); } @Override public List loadAllNotices() { return repository.findAll().stream() - .map(NoticeDocument::toDomain) + .map(Notice::toDomain) .toList(); } diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java index c2be832..84ba83a 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java @@ -6,7 +6,7 @@ import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; import com.pinHouse.server.platform.notice.application.usecase.NoticeUseCase; import com.pinHouse.server.platform.notice.application.usecase.NoticePort; -import com.pinHouse.server.platform.notice.domain.Notice; +import com.pinHouse.server.platform.notice.domain.entity.Notice; import com.pinHouse.server.platform.notice.domain.NoticeSupplyInfo; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticePort.java b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticePort.java index 865f0b0..b17c469 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticePort.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticePort.java @@ -1,6 +1,6 @@ package com.pinHouse.server.platform.notice.application.usecase; -import com.pinHouse.server.platform.notice.domain.Notice; +import com.pinHouse.server.platform.notice.domain.entity.Notice; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java index 804f8f0..a06a1ce 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java @@ -3,7 +3,7 @@ import com.pinHouse.server.core.response.response.pageable.PageRequest; import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; -import com.pinHouse.server.platform.notice.domain.Notice; +import com.pinHouse.server.platform.notice.domain.entity.Notice; import org.springframework.data.domain.Page; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/Notice.java b/src/main/java/com/pinHouse/server/platform/notice/domain/Notice.java deleted file mode 100644 index c9acc49..0000000 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/Notice.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.pinHouse.server.platform.notice.domain; - -import com.pinHouse.server.platform.location.domain.Location; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; - -import java.util.List; - -@Getter -@AllArgsConstructor -@Builder -public class Notice { - - private String id; - private String noticeId; - private String complexName; - private String status; - private String startDate; - private String supplier; - private String type; - private String title; - private String views; - private String endDate; - private String address; - private String region; - private Location location; - - private List supplyInfo; - - private String noticeUrl; - private String myHomePcUrl; - private String myHomeMobileUrl; - private String contact; - - private String winnerAnnouncementDate; - private String heatingMethod; - private String totalHouseholds; -} - - diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeSupplyInfo.java b/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeSupplyInfo.java deleted file mode 100644 index db44e92..0000000 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeSupplyInfo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.pinHouse.server.platform.notice.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; - -@Getter -@AllArgsConstructor -@Builder -public class NoticeSupplyInfo { - - private String housingType; // 공급유형 - private String area; // 전용면적 - private Integer monthlyRent; // 월임대료 - private Deposit deposit; // 임대보증금 세부 - private RecruitmentCount recruitmentCount; // 모집호수 - - @Getter - @AllArgsConstructor - @Builder - public static class Deposit { - private Integer total; - private Integer contract; - private Integer middle; - private Integer balance; - } - - @Getter - @AllArgsConstructor - @Builder - public static class RecruitmentCount { - private Integer total; - private Integer priority; - private Integer general; - } -} diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/DepositDocument.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Deposit.java similarity index 65% rename from src/main/java/com/pinHouse/server/platform/notice/domain/entity/DepositDocument.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/entity/Deposit.java index 3a91c3d..377de7f 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/DepositDocument.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Deposit.java @@ -11,7 +11,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class DepositDocument { +public class Deposit { @Field("계") private Integer total; @@ -24,13 +24,4 @@ public class DepositDocument { @Field("잔금") private Integer balance; - - public NoticeSupplyInfo.Deposit toDomain() { - return NoticeSupplyInfo.Deposit.builder() - .total(total) - .contract(contract) - .middle(middle) - .balance(balance) - .build(); - } } diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeDocument.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Notice.java similarity index 57% rename from src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeDocument.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/entity/Notice.java index 73c78ec..f9f4960 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeDocument.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Notice.java @@ -1,7 +1,6 @@ package com.pinHouse.server.platform.notice.domain.entity; -import com.pinHouse.server.platform.location.domain.Location; -import com.pinHouse.server.platform.notice.domain.Notice; +import com.pinHouse.server.platform.facility.domain.entity.Location; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; @@ -18,7 +17,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class NoticeDocument { +public class Notice { @Id private String id; @@ -60,7 +59,7 @@ public class NoticeDocument { private Location location; @Field("공급정보목록") - private List supplyInfo; + private List supplyInfo; @Field("모집공고URL") private String noticeUrl; @@ -82,36 +81,5 @@ public class NoticeDocument { @Field("총세대수") private String totalHouseholds; - - public Notice toDomain() { - return Notice.builder() - .id(noticeId) - .noticeId(noticeId) - .complexName(complexName) - .status(status) - .startDate(startDate) - .supplier(supplier) - .type(type) - .title(title) - .views(views) - .endDate(endDate) - .address(address) - .region(region) - .location(Location.builder() - .type(location.getType()) - .coordinates(location.getCoordinates()) - .build()) - .supplyInfo(supplyInfo.stream() - .map(NoticeSupplyInfoDocument::toDomain) - .toList()) - .noticeUrl(noticeUrl) - .myHomePcUrl(myHomePcUrl) - .myHomeMobileUrl(myHomeMobileUrl) - .contact(contact) - .winnerAnnouncementDate(winnerAnnouncementDate) - .heatingMethod(heatingMethod) - .totalHouseholds(totalHouseholds) - .build(); - } } diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeCount.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeCount.java similarity index 93% rename from src/main/java/com/pinHouse/server/platform/notice/domain/NoticeCount.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeCount.java index fa5f71d..1e94bb0 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/NoticeCount.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeCount.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.notice.domain; +package com.pinHouse.server.platform.notice.domain.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupply.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupply.java new file mode 100644 index 0000000..1a392d0 --- /dev/null +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupply.java @@ -0,0 +1,29 @@ +package com.pinHouse.server.platform.notice.domain.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.data.mongodb.core.mapping.Field; + +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class NoticeSupply { + + @Field("공급유형") + private String housingType; + + @Field("전용면적") + private String area; + + @Field("월임대료(원)") + private Integer monthlyRent; + + @Field("임대보증금(원)") + private Deposit deposit; + + @Field("모집호수") + private Recruitment recruitmentCount; +} diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupplyInfoDocument.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupplyInfoDocument.java deleted file mode 100644 index 07d106e..0000000 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupplyInfoDocument.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.pinHouse.server.platform.notice.domain.entity; - -import com.pinHouse.server.platform.notice.domain.NoticeSupplyInfo; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import org.springframework.data.mongodb.core.mapping.Field; - -@Getter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class NoticeSupplyInfoDocument { - - @Field("공급유형") - private String housingType; - - @Field("전용면적") - private String area; - - @Field("월임대료(원)") - private Integer monthlyRent; - - @Field("임대보증금(원)") - private DepositDocument deposit; - - @Field("모집호수") - private RecruitmentCountDocument recruitmentCount; - - public NoticeSupplyInfo toDomain() { - return NoticeSupplyInfo.builder() - .housingType(housingType) - .area(area) - .monthlyRent(monthlyRent) - .deposit(deposit.toDomain()) - .recruitmentCount(recruitmentCount.toDomain()) - .build(); - } -} diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/RecruitmentCountDocument.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Recruitment.java similarity index 55% rename from src/main/java/com/pinHouse/server/platform/notice/domain/entity/RecruitmentCountDocument.java rename to src/main/java/com/pinHouse/server/platform/notice/domain/entity/Recruitment.java index 0f11407..d84723f 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/RecruitmentCountDocument.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Recruitment.java @@ -1,6 +1,5 @@ package com.pinHouse.server.platform.notice.domain.entity; -import com.pinHouse.server.platform.notice.domain.NoticeSupplyInfo; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -11,7 +10,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class RecruitmentCountDocument { +public class Recruitment { @Field("계") private Integer total; @@ -21,13 +20,5 @@ public class RecruitmentCountDocument { @Field("일반공급") private Integer general; - - public NoticeSupplyInfo.RecruitmentCount toDomain() { - return NoticeSupplyInfo.RecruitmentCount.builder() - .total(total) - .priority(priority) - .general(general) - .build(); - } } diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/repository/NoticeDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/notice/domain/repository/NoticeDocumentRepository.java index 324c1fd..b0c9ab5 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/repository/NoticeDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/repository/NoticeDocumentRepository.java @@ -1,12 +1,12 @@ package com.pinHouse.server.platform.notice.domain.repository; -import com.pinHouse.server.platform.notice.domain.entity.NoticeDocument; +import com.pinHouse.server.platform.notice.domain.entity.Notice; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; -public interface NoticeDocumentRepository extends MongoRepository { +public interface NoticeDocumentRepository extends MongoRepository { - Optional findByNoticeId(String noticeId); + Optional findByNoticeId(String noticeId); } diff --git a/src/main/java/com/pinHouse/server/platform/notification/domain/Notification.java b/src/main/java/com/pinHouse/server/platform/notification/domain/Notification.java deleted file mode 100644 index 13fc80e..0000000 --- a/src/main/java/com/pinHouse/server/platform/notification/domain/Notification.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.pinHouse.server.platform.notification.domain; - -import com.pinHouse.server.platform.BaseDomain; - -public class Notification extends BaseDomain { -} diff --git a/src/main/java/com/pinHouse/server/platform/user/application/service/UserJpaAdapter.java b/src/main/java/com/pinHouse/server/platform/user/application/service/UserService.java similarity index 58% rename from src/main/java/com/pinHouse/server/platform/user/application/service/UserJpaAdapter.java rename to src/main/java/com/pinHouse/server/platform/user/application/service/UserService.java index 799c58d..6e70ea2 100644 --- a/src/main/java/com/pinHouse/server/platform/user/application/service/UserJpaAdapter.java +++ b/src/main/java/com/pinHouse/server/platform/user/application/service/UserService.java @@ -1,10 +1,9 @@ package com.pinHouse.server.platform.user.application.service; -import com.pinHouse.server.platform.user.domain.entity.UserJpaEntity; -import com.pinHouse.server.platform.user.domain.UserJpaRepository; -import com.pinHouse.server.platform.user.application.usecase.UserPort; -import com.pinHouse.server.platform.user.domain.Provider; -import com.pinHouse.server.platform.user.domain.User; +import com.pinHouse.server.platform.user.domain.entity.User; +import com.pinHouse.server.platform.user.domain.repository.UserJpaRepository; +import com.pinHouse.server.platform.user.application.usecase.UserUseCase; +import com.pinHouse.server.platform.user.domain.entity.Provider; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -13,16 +12,13 @@ @Component @RequiredArgsConstructor -public class UserJpaAdapter implements UserPort { +public class UserService implements UserUseCase { private final UserJpaRepository repository; @Override public User saveUser(User user) { - var entity = UserJpaEntity.from(user); - - return repository.save(entity) - .toDomain(); + return repository.save(user); } @Override @@ -32,19 +28,17 @@ public boolean checkExistingById(UUID userId) { @Override public Optional loadUserById(UUID userId) { - return repository.findById(userId) - .map(UserJpaEntity::toDomain); + return repository.findById(userId); } @Override public boolean existsByEmail(String email) { - Optional userJpaEntity = repository.findByEmail(email); + Optional userJpaEntity = repository.findByEmail(email); return userJpaEntity.isPresent(); } @Override public Optional loadUserBySocialAndSocialId(Provider social, String socialId) { - return repository.findByProviderAndSocialId(social, socialId) - .map(UserJpaEntity::toDomain); + return repository.findByProviderAndSocialId(social, socialId); } } diff --git a/src/main/java/com/pinHouse/server/platform/user/application/usecase/UserPort.java b/src/main/java/com/pinHouse/server/platform/user/application/usecase/UserUseCase.java similarity index 69% rename from src/main/java/com/pinHouse/server/platform/user/application/usecase/UserPort.java rename to src/main/java/com/pinHouse/server/platform/user/application/usecase/UserUseCase.java index e580ab1..cbd36fb 100644 --- a/src/main/java/com/pinHouse/server/platform/user/application/usecase/UserPort.java +++ b/src/main/java/com/pinHouse/server/platform/user/application/usecase/UserUseCase.java @@ -1,12 +1,12 @@ package com.pinHouse.server.platform.user.application.usecase; -import com.pinHouse.server.platform.user.domain.Provider; -import com.pinHouse.server.platform.user.domain.User; +import com.pinHouse.server.platform.user.domain.entity.Provider; +import com.pinHouse.server.platform.user.domain.entity.User; import java.util.Optional; import java.util.UUID; -public interface UserPort { +public interface UserUseCase { Optional loadUserById(UUID Id); diff --git a/src/main/java/com/pinHouse/server/platform/user/domain/Provider.java b/src/main/java/com/pinHouse/server/platform/user/domain/Provider.java deleted file mode 100644 index 6f041e1..0000000 --- a/src/main/java/com/pinHouse/server/platform/user/domain/Provider.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.pinHouse.server.platform.user.domain; - -public enum Provider { - KAKAO, NAVER -} diff --git a/src/main/java/com/pinHouse/server/platform/user/domain/UserJpaRepository.java b/src/main/java/com/pinHouse/server/platform/user/domain/UserJpaRepository.java deleted file mode 100644 index c78700a..0000000 --- a/src/main/java/com/pinHouse/server/platform/user/domain/UserJpaRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.pinHouse.server.platform.user.domain; - -import com.pinHouse.server.platform.user.domain.entity.UserJpaEntity; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; -import java.util.UUID; - -@Repository -public interface UserJpaRepository extends JpaRepository { - Optional findByEmail(String email); - - Optional findById(UUID id); - - - Optional findByProviderAndSocialId(Provider social, String socialId); - -} diff --git a/src/main/java/com/pinHouse/server/platform/user/domain/Gender.java b/src/main/java/com/pinHouse/server/platform/user/domain/entity/Gender.java similarity index 92% rename from src/main/java/com/pinHouse/server/platform/user/domain/Gender.java rename to src/main/java/com/pinHouse/server/platform/user/domain/entity/Gender.java index 8988f3e..32d9c86 100644 --- a/src/main/java/com/pinHouse/server/platform/user/domain/Gender.java +++ b/src/main/java/com/pinHouse/server/platform/user/domain/entity/Gender.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.user.domain; +package com.pinHouse.server.platform.user.domain.entity; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/pinHouse/server/platform/user/domain/entity/Provider.java b/src/main/java/com/pinHouse/server/platform/user/domain/entity/Provider.java new file mode 100644 index 0000000..9dc3afa --- /dev/null +++ b/src/main/java/com/pinHouse/server/platform/user/domain/entity/Provider.java @@ -0,0 +1,5 @@ +package com.pinHouse.server.platform.user.domain.entity; + +public enum Provider { + KAKAO, NAVER +} diff --git a/src/main/java/com/pinHouse/server/platform/user/domain/Role.java b/src/main/java/com/pinHouse/server/platform/user/domain/entity/Role.java similarity index 77% rename from src/main/java/com/pinHouse/server/platform/user/domain/Role.java rename to src/main/java/com/pinHouse/server/platform/user/domain/entity/Role.java index 014fc7a..14e0853 100644 --- a/src/main/java/com/pinHouse/server/platform/user/domain/Role.java +++ b/src/main/java/com/pinHouse/server/platform/user/domain/entity/Role.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.user.domain; +package com.pinHouse.server.platform.user.domain.entity; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/pinHouse/server/platform/user/domain/User.java b/src/main/java/com/pinHouse/server/platform/user/domain/entity/User.java similarity index 73% rename from src/main/java/com/pinHouse/server/platform/user/domain/User.java rename to src/main/java/com/pinHouse/server/platform/user/domain/entity/User.java index 99bd71e..234de44 100644 --- a/src/main/java/com/pinHouse/server/platform/user/domain/User.java +++ b/src/main/java/com/pinHouse/server/platform/user/domain/entity/User.java @@ -1,36 +1,57 @@ -package com.pinHouse.server.platform.user.domain; +package com.pinHouse.server.platform.user.domain.entity; import com.pinHouse.server.core.util.BirthDayUtil; +import com.pinHouse.server.platform.BaseTimeEntity; import com.pinHouse.server.security.oauth2.domain.OAuth2UserInfo; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; +import jakarta.persistence.*; +import lombok.*; import java.time.LocalDate; import java.util.UUID; -/** - * 사용할 유저 도메인 입니다. - */ +@Entity @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "users") @AllArgsConstructor -@SuperBuilder -public class User { +@Builder +public class User extends BaseTimeEntity { + @Id + @Column(name = "id", nullable = false, columnDefinition = "BINARY(16)") private UUID id; + + @Enumerated(EnumType.STRING) private Provider provider; + private String socialId; + + @Column(nullable = false) private String name; + + @Column(nullable = false, unique = true) private String email; + + @Column(name = "phone_number") private String phoneNumber; + + @Enumerated(EnumType.STRING) private Role role; - private String profileImage; + + @Enumerated(EnumType.STRING) private Gender gender; + + private String profileImage; + private LocalDate birthday; + @PrePersist + public void generateUUID() { + if (this.id == null) { + this.id = UUID.randomUUID(); + } + } + /// 정적 팩토리 메서드 public static User of(OAuth2UserInfo userInfo) { return User.builder() @@ -66,5 +87,4 @@ public static User of( .build(); } - } diff --git a/src/main/java/com/pinHouse/server/platform/user/domain/entity/UserJpaEntity.java b/src/main/java/com/pinHouse/server/platform/user/domain/entity/UserJpaEntity.java deleted file mode 100644 index b61b1b5..0000000 --- a/src/main/java/com/pinHouse/server/platform/user/domain/entity/UserJpaEntity.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.pinHouse.server.platform.user.domain.entity; - -import com.pinHouse.server.platform.BaseTimeEntity; -import com.pinHouse.server.platform.user.domain.Gender; -import com.pinHouse.server.platform.user.domain.Provider; -import com.pinHouse.server.platform.user.domain.Role; -import com.pinHouse.server.platform.user.domain.User; -import jakarta.persistence.*; -import lombok.*; - -import java.time.LocalDate; -import java.util.UUID; - -@Entity -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@Table(name = "users") -@AllArgsConstructor -@Builder -public class UserJpaEntity extends BaseTimeEntity { - - @Id - @Column(name = "id", nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - - @Enumerated(EnumType.STRING) - private Provider provider; - - private String socialId; - - @Column(nullable = false) - private String name; - - @Column(nullable = false, unique = true) - private String email; - - @Column(name = "phone_number") - private String phoneNumber; - - @Enumerated(EnumType.STRING) - private Role role; - - @Enumerated(EnumType.STRING) - private Gender gender; - - private String profileImage; - - private LocalDate birthday; - - @PrePersist - public void generateUUID() { - if (this.id == null) { - this.id = UUID.randomUUID(); - } - } - - public static UserJpaEntity from(User user) { - return UserJpaEntity.builder() - .id(user.getId()) - .name(user.getName()) - .provider(user.getProvider()) - .socialId(user.getSocialId()) - .email(user.getEmail()) - .phoneNumber(user.getPhoneNumber()) - .role(user.getRole()) - .gender(user.getGender()) - .profileImage(user.getProfileImage()) - .birthday(user.getBirthday()) - .build(); - } - - public User toDomain() { - return User.builder() - .id(id) - .provider(provider) - .socialId(socialId) - .name(name) - .email(email) - .phoneNumber(phoneNumber) - .role(role) - .gender(gender) - .profileImage(profileImage) - .birthday(birthday) - .build(); - } - -} diff --git a/src/main/java/com/pinHouse/server/platform/user/domain/repository/UserJpaRepository.java b/src/main/java/com/pinHouse/server/platform/user/domain/repository/UserJpaRepository.java new file mode 100644 index 0000000..ef4999f --- /dev/null +++ b/src/main/java/com/pinHouse/server/platform/user/domain/repository/UserJpaRepository.java @@ -0,0 +1,20 @@ +package com.pinHouse.server.platform.user.domain.repository; + +import com.pinHouse.server.platform.user.domain.entity.Provider; +import com.pinHouse.server.platform.user.domain.entity.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; +import java.util.UUID; + +@Repository +public interface UserJpaRepository extends JpaRepository { + Optional findByEmail(String email); + + Optional findById(UUID id); + + + Optional findByProviderAndSocialId(Provider social, String socialId); + +} diff --git a/src/main/java/com/pinHouse/server/platform/user/presentation/DevAuthApi.java b/src/main/java/com/pinHouse/server/platform/user/presentation/DevAuthApi.java index efdc40c..5427f9e 100644 --- a/src/main/java/com/pinHouse/server/platform/user/presentation/DevAuthApi.java +++ b/src/main/java/com/pinHouse/server/platform/user/presentation/DevAuthApi.java @@ -2,11 +2,11 @@ import com.pinHouse.server.core.response.response.ApiResponse; import com.pinHouse.server.core.response.response.ErrorCode; +import com.pinHouse.server.platform.user.domain.entity.User; import com.pinHouse.server.platform.user.presentation.swagger.DevAuthApiSpec; -import com.pinHouse.server.platform.user.application.usecase.UserPort; -import com.pinHouse.server.platform.user.domain.Provider; -import com.pinHouse.server.platform.user.domain.Role; -import com.pinHouse.server.platform.user.domain.User; +import com.pinHouse.server.platform.user.application.usecase.UserUseCase; +import com.pinHouse.server.platform.user.domain.entity.Provider; +import com.pinHouse.server.platform.user.domain.entity.Role; import com.pinHouse.server.security.jwt.service.JwtTokenUseCase; import com.pinHouse.server.security.oauth2.domain.PrincipalDetails; import jakarta.servlet.http.HttpServletResponse; @@ -27,7 +27,7 @@ @RequiredArgsConstructor public class DevAuthApi implements DevAuthApiSpec { - private final UserPort userPort; + private final UserUseCase userUseCase; private final JwtTokenUseCase tokenService; // 테스트용으로 만든 UUID @@ -41,13 +41,13 @@ public ApiResponse devLogin(HttpServletResponse httpServletResponse) { /// 테스트용 유저 정보 수정 User user; - if (userPort.checkExistingById(id)) { - user = userPort.loadUserById(id) + if (userUseCase.checkExistingById(id)) { + user = userUseCase.loadUserById(id) .orElseThrow(() -> new NoSuchElementException(ErrorCode.USER_NOT_FOUND.getMessage())); } else { User dev = createDev(); - user = userPort.saveUser(dev); + user = userUseCase.saveUser(dev); } /// PrincipalDetails 생성 (시스템에 따라 다름) diff --git a/src/main/java/com/pinHouse/server/security/config/RequestMatcherHolder.java b/src/main/java/com/pinHouse/server/security/config/RequestMatcherHolder.java index fad8ac5..c1806a3 100644 --- a/src/main/java/com/pinHouse/server/security/config/RequestMatcherHolder.java +++ b/src/main/java/com/pinHouse/server/security/config/RequestMatcherHolder.java @@ -1,6 +1,6 @@ package com.pinHouse.server.security.config; -import com.pinHouse.server.platform.user.domain.Role; +import com.pinHouse.server.platform.user.domain.entity.Role; import io.micrometer.common.lang.Nullable; import org.springframework.http.HttpMethod; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; diff --git a/src/main/java/com/pinHouse/server/security/config/SecurityConfig.java b/src/main/java/com/pinHouse/server/security/config/SecurityConfig.java index 76b6cb1..aafb215 100644 --- a/src/main/java/com/pinHouse/server/security/config/SecurityConfig.java +++ b/src/main/java/com/pinHouse/server/security/config/SecurityConfig.java @@ -15,8 +15,8 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.cors.CorsConfigurationSource; -import static com.pinHouse.server.platform.user.domain.Role.ADMIN; -import static com.pinHouse.server.platform.user.domain.Role.USER; +import static com.pinHouse.server.platform.user.domain.entity.Role.ADMIN; +import static com.pinHouse.server.platform.user.domain.entity.Role.USER; /** * Spring Security 설정 클래스 diff --git a/src/main/java/com/pinHouse/server/security/jwt/util/JwtTokenExtractor.java b/src/main/java/com/pinHouse/server/security/jwt/util/JwtTokenExtractor.java index 03702d4..2551334 100644 --- a/src/main/java/com/pinHouse/server/security/jwt/util/JwtTokenExtractor.java +++ b/src/main/java/com/pinHouse/server/security/jwt/util/JwtTokenExtractor.java @@ -1,8 +1,8 @@ package com.pinHouse.server.security.jwt.util; import com.pinHouse.server.core.response.response.ErrorCode; -import com.pinHouse.server.platform.user.application.usecase.UserPort; -import com.pinHouse.server.platform.user.domain.User; +import com.pinHouse.server.platform.user.application.usecase.UserUseCase; +import com.pinHouse.server.platform.user.domain.entity.User; import com.pinHouse.server.security.jwt.exception.JwtAuthenticationException; import com.pinHouse.server.security.oauth2.domain.PrincipalDetails; import io.jsonwebtoken.*; @@ -35,7 +35,7 @@ public class JwtTokenExtractor { private SecretKey secretKey; /// 의존성 - private final UserPort userPort; + private final UserUseCase userUseCase; private final CookieUtil cookieUtil; @@ -108,7 +108,7 @@ public Authentication getAuthentication(String token) { UUID userId = UUID.fromString(claimUserId); // 해당 userId로 Member를 조회 - User user = userPort.loadUserById(userId) + User user = userUseCase.loadUserById(userId) .orElseThrow(() -> new JwtAuthenticationException(ErrorCode.USER_NOT_FOUND_IN_COOKIE.getMessage())); PrincipalDetails details = PrincipalDetails.of(user); diff --git a/src/main/java/com/pinHouse/server/security/oauth2/domain/PrincipalDetails.java b/src/main/java/com/pinHouse/server/security/oauth2/domain/PrincipalDetails.java index 86cdb7e..be023dc 100644 --- a/src/main/java/com/pinHouse/server/security/oauth2/domain/PrincipalDetails.java +++ b/src/main/java/com/pinHouse/server/security/oauth2/domain/PrincipalDetails.java @@ -1,6 +1,6 @@ package com.pinHouse.server.security.oauth2.domain; -import com.pinHouse.server.platform.user.domain.User; +import com.pinHouse.server.platform.user.domain.entity.User; import lombok.Builder; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/pinHouse/server/security/oauth2/service/OAuth2UserService.java b/src/main/java/com/pinHouse/server/security/oauth2/service/OAuth2UserService.java index b613906..b6a2c04 100644 --- a/src/main/java/com/pinHouse/server/security/oauth2/service/OAuth2UserService.java +++ b/src/main/java/com/pinHouse/server/security/oauth2/service/OAuth2UserService.java @@ -1,9 +1,9 @@ package com.pinHouse.server.security.oauth2.service; -import com.pinHouse.server.platform.user.application.usecase.UserPort; -import com.pinHouse.server.platform.user.domain.Gender; -import com.pinHouse.server.platform.user.domain.Provider; -import com.pinHouse.server.platform.user.domain.User; +import com.pinHouse.server.platform.user.application.usecase.UserUseCase; +import com.pinHouse.server.platform.user.domain.entity.Gender; +import com.pinHouse.server.platform.user.domain.entity.Provider; +import com.pinHouse.server.platform.user.domain.entity.User; import com.pinHouse.server.security.oauth2.domain.OAuth2UserInfo; import com.pinHouse.server.security.oauth2.domain.PrincipalDetails; import com.pinHouse.server.security.oauth2.domain.kakao.KakaoUserInfo; @@ -28,7 +28,7 @@ @RequiredArgsConstructor public class OAuth2UserService extends DefaultOAuth2UserService { - private final UserPort userPort; + private final UserUseCase userUseCase; /** * 소셜 로그인 유저 가져오기 @@ -57,7 +57,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic userInfo = createOAuth2User(registrationId, oAuth2UserAttributes); Provider social = Provider.valueOf(userInfo.getProvider()); - Optional existUser = userPort.loadUserBySocialAndSocialId(social, userInfo.getProviderId()); + Optional existUser = userUseCase.loadUserBySocialAndSocialId(social, userInfo.getProviderId()); /// 존재한다면 로그인 if (existUser.isPresent()) { @@ -82,7 +82,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic Gender.getGender(userInfo.getGender()) ); - User savedNewUser = userPort.saveUser(user); + User savedNewUser = userUseCase.saveUser(user); return PrincipalDetails.of(savedNewUser, oAuth2UserAttributes); } From eaa7c1e6ad9fae1d675d678e1a7dd03c295185ab Mon Sep 17 00:00:00 2001 From: eedo_y Date: Thu, 4 Sep 2025 14:45:49 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=F0=9F=93=82=20file=20:=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=EB=93=9C=203=EC=B0=A8=20=EC=9E=AC=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity}/BaseTimeEntity.java | 2 +- .../domain => core}/entity/Location.java | 2 +- .../{OdsayAdapter.java => OdsayService.java} | 4 +- .../application/usecase/DistancePort.java | 14 --- .../application/usecase/DistanceUseCase.java | 9 +- .../distance/presentation/DistanceApi.java | 6 +- .../dto/request}/FacilityType.java | 2 +- .../dto/response/FacilityResponse.java} | 9 +- .../application/dto/response/InfraDTO.java | 15 ++- .../service/FacilityMongoAdapter.java | 56 --------- ...InfraService.java => FacilityService.java} | 48 +++---- .../application/usecase/FacilityPort.java | 18 --- ...InfraUseCase.java => FacilityUseCase.java} | 8 +- .../facility/domain/entity/Animal.java | 4 +- .../facility/domain/entity/Library.java | 4 +- .../platform/facility/domain/entity/Park.java | 4 +- .../facility/domain/entity/Sport.java | 4 +- .../facility/domain/entity/Walking.java | 4 +- .../domain/entity/{ => infra}/Facility.java | 4 +- .../facility/presentation/FacilityApi.java | 14 +-- .../presentation/swagger/FacilityApiSpec.java | 4 +- .../dto/response/NoticeSupplyDTO.java | 4 +- .../application/service/DepositService.java | 118 ++++++++++++++++++ .../service/NoticeMongoAdapter.java | 46 ------- .../application/service/NoticeService.java | 108 +++------------- .../application/usecase/DepositUseCase.java | 11 ++ .../application/usecase/NoticePort.java | 25 ---- .../application/usecase/NoticeUseCase.java | 11 +- .../notice/domain/entity/Deposit.java | 1 - .../platform/notice/domain/entity/Notice.java | 2 +- .../platform/user/domain/entity/User.java | 2 +- 31 files changed, 241 insertions(+), 322 deletions(-) rename src/main/java/com/pinHouse/server/{platform => core/entity}/BaseTimeEntity.java (91%) rename src/main/java/com/pinHouse/server/{platform/facility/domain => core}/entity/Location.java (89%) rename src/main/java/com/pinHouse/server/platform/distance/application/service/{OdsayAdapter.java => OdsayService.java} (95%) delete mode 100644 src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistancePort.java rename src/main/java/com/pinHouse/server/platform/facility/{domain/entity => application/dto/request}/FacilityType.java (72%) rename src/main/java/com/pinHouse/server/platform/facility/{domain/entity/NoticeInfra.java => application/dto/response/FacilityResponse.java} (87%) rename src/main/java/com/pinHouse/server/platform/{notice => facility}/application/dto/response/InfraDTO.java (89%) delete mode 100644 src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityMongoAdapter.java rename src/main/java/com/pinHouse/server/platform/facility/application/service/{NoticeInfraService.java => FacilityService.java} (63%) delete mode 100644 src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityPort.java rename src/main/java/com/pinHouse/server/platform/facility/application/usecase/{NoticeInfraUseCase.java => FacilityUseCase.java} (63%) rename src/main/java/com/pinHouse/server/platform/facility/domain/entity/{ => infra}/Facility.java (58%) create mode 100644 src/main/java/com/pinHouse/server/platform/notice/application/service/DepositService.java delete mode 100644 src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeMongoAdapter.java create mode 100644 src/main/java/com/pinHouse/server/platform/notice/application/usecase/DepositUseCase.java delete mode 100644 src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticePort.java diff --git a/src/main/java/com/pinHouse/server/platform/BaseTimeEntity.java b/src/main/java/com/pinHouse/server/core/entity/BaseTimeEntity.java similarity index 91% rename from src/main/java/com/pinHouse/server/platform/BaseTimeEntity.java rename to src/main/java/com/pinHouse/server/core/entity/BaseTimeEntity.java index 3ecdc61..d3e279e 100644 --- a/src/main/java/com/pinHouse/server/platform/BaseTimeEntity.java +++ b/src/main/java/com/pinHouse/server/core/entity/BaseTimeEntity.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform; +package com.pinHouse.server.core.entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Location.java b/src/main/java/com/pinHouse/server/core/entity/Location.java similarity index 89% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/Location.java rename to src/main/java/com/pinHouse/server/core/entity/Location.java index fed1bda..c458ea0 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Location.java +++ b/src/main/java/com/pinHouse/server/core/entity/Location.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.facility.domain.entity; +package com.pinHouse.server.core.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayAdapter.java b/src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayService.java similarity index 95% rename from src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayAdapter.java rename to src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayService.java index c53e2e3..546c87c 100644 --- a/src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayAdapter.java +++ b/src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayService.java @@ -1,6 +1,6 @@ package com.pinHouse.server.platform.distance.application.service; -import com.pinHouse.server.platform.distance.application.usecase.DistancePort; +import com.pinHouse.server.platform.distance.application.usecase.DistanceUseCase; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -12,7 +12,7 @@ @Component @RequiredArgsConstructor -public class OdsayAdapter implements DistancePort { +public class OdsayService implements DistanceUseCase { @Value("${odsay.apiKey}") private String apiKey; diff --git a/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistancePort.java b/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistancePort.java deleted file mode 100644 index d5f4ef0..0000000 --- a/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistancePort.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.pinHouse.server.platform.distance.application.usecase; - -import java.io.UnsupportedEncodingException; - -/** - * [외부 거리계산]을 위한 인터페이스입니다. - * - */ -public interface DistancePort { - - // 출발지의 위도와 도착지의 위도를 바탕으로 계산 - String findPath(double startY, double startX, double endY, double endX) throws UnsupportedEncodingException; - -} diff --git a/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistanceUseCase.java b/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistanceUseCase.java index 177006f..cc6ea38 100644 --- a/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistanceUseCase.java +++ b/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistanceUseCase.java @@ -1,7 +1,14 @@ package com.pinHouse.server.platform.distance.application.usecase; -public interface DistanceUseCase { +import java.io.UnsupportedEncodingException; +/** + * [외부 거리계산]을 위한 인터페이스입니다. + * + */ +public interface DistanceUseCase { + // 출발지의 위도와 도착지의 위도를 바탕으로 계산 + String findPath(double startY, double startX, double endY, double endX) throws UnsupportedEncodingException; } diff --git a/src/main/java/com/pinHouse/server/platform/distance/presentation/DistanceApi.java b/src/main/java/com/pinHouse/server/platform/distance/presentation/DistanceApi.java index d434a6a..bdeb32d 100644 --- a/src/main/java/com/pinHouse/server/platform/distance/presentation/DistanceApi.java +++ b/src/main/java/com/pinHouse/server/platform/distance/presentation/DistanceApi.java @@ -1,7 +1,7 @@ package com.pinHouse.server.platform.distance.presentation; import com.pinHouse.server.platform.distance.presentation.swaager.DistanceApiSpec; -import com.pinHouse.server.platform.distance.application.usecase.DistancePort; +import com.pinHouse.server.platform.distance.application.usecase.DistanceUseCase; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -12,7 +12,7 @@ @RequiredArgsConstructor public class DistanceApi implements DistanceApiSpec { - private final DistancePort distancePort; + private final DistanceUseCase distanceUseCase; @GetMapping() public String getDistance( @@ -22,7 +22,7 @@ public String getDistance( @RequestParam double endX ) throws UnsupportedEncodingException { - String path = distancePort.findPath(startY, startX, endY, endX); + String path = distanceUseCase.findPath(startY, startX, endY, endX); return path; } diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/FacilityType.java b/src/main/java/com/pinHouse/server/platform/facility/application/dto/request/FacilityType.java similarity index 72% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/FacilityType.java rename to src/main/java/com/pinHouse/server/platform/facility/application/dto/request/FacilityType.java index a2e0c53..460f393 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/FacilityType.java +++ b/src/main/java/com/pinHouse/server/platform/facility/application/dto/request/FacilityType.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.facility.domain.entity; +package com.pinHouse.server.platform.facility.application.dto.request; public enum FacilityType { diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/NoticeInfra.java b/src/main/java/com/pinHouse/server/platform/facility/application/dto/response/FacilityResponse.java similarity index 87% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/NoticeInfra.java rename to src/main/java/com/pinHouse/server/platform/facility/application/dto/response/FacilityResponse.java index d298e6c..84eb666 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/NoticeInfra.java +++ b/src/main/java/com/pinHouse/server/platform/facility/application/dto/response/FacilityResponse.java @@ -1,5 +1,6 @@ -package com.pinHouse.server.platform.facility.domain.entity; +package com.pinHouse.server.platform.facility.application.dto.response; +import com.pinHouse.server.platform.facility.domain.entity.*; import com.pinHouse.server.platform.notice.domain.entity.Notice; import lombok.Builder; import lombok.Getter; @@ -16,7 +17,7 @@ */ @Builder @Getter -public class NoticeInfra { +public class FacilityResponse { /** 공지사항 엔티티 */ private Notice notice; @@ -47,7 +48,7 @@ public class NoticeInfra { * @param parks 주변 공원 리스트 * @return NoticeInfra 도메인 객체 */ - public static NoticeInfra of( + public static FacilityResponse of( Notice notice, List libraries, List animals, @@ -55,7 +56,7 @@ public static NoticeInfra of( List walkings, List parks ) { - return NoticeInfra.builder() + return FacilityResponse.builder() .notice(notice) .libraries(libraries) .animals(animals) diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/InfraDTO.java b/src/main/java/com/pinHouse/server/platform/facility/application/dto/response/InfraDTO.java similarity index 89% rename from src/main/java/com/pinHouse/server/platform/notice/application/dto/response/InfraDTO.java rename to src/main/java/com/pinHouse/server/platform/facility/application/dto/response/InfraDTO.java index 761fb39..eda4a00 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/InfraDTO.java +++ b/src/main/java/com/pinHouse/server/platform/facility/application/dto/response/InfraDTO.java @@ -1,7 +1,6 @@ -package com.pinHouse.server.platform.notice.application.dto.response; +package com.pinHouse.server.platform.facility.application.dto.response; import com.pinHouse.server.platform.facility.domain.entity.*; -import com.pinHouse.server.platform.facility.domain.entity.NoticeInfra; import io.micrometer.common.lang.Nullable; import lombok.Builder; import java.util.List; @@ -172,13 +171,13 @@ public record NoticeInfraResponse( @Nullable List walkings ) { /** NoticeInfra → 응답 DTO로 일괄 변환 */ - public static NoticeInfraResponse from(NoticeInfra noticeInfra) { + public static NoticeInfraResponse from(FacilityResponse facilityResponse) { return NoticeInfraResponse.builder() - .libraries(LibraryResponse.from(noticeInfra.getLibraries())) - .animals(AnimalResponse.from(noticeInfra.getAnimals())) - .sports(SportResponse.from(noticeInfra.getSports())) - .parks(ParkResponse.from(noticeInfra.getParks())) - .walkings(WalkingResponse.from(noticeInfra.getWalkings())) + .libraries(LibraryResponse.from(facilityResponse.getLibraries())) + .animals(AnimalResponse.from(facilityResponse.getAnimals())) + .sports(SportResponse.from(facilityResponse.getSports())) + .parks(ParkResponse.from(facilityResponse.getParks())) + .walkings(WalkingResponse.from(facilityResponse.getWalkings())) .build(); } } diff --git a/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityMongoAdapter.java b/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityMongoAdapter.java deleted file mode 100644 index 39a04a0..0000000 --- a/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityMongoAdapter.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.pinHouse.server.platform.facility.application.service; - -import com.pinHouse.server.platform.facility.application.usecase.FacilityPort; -import com.pinHouse.server.platform.facility.domain.entity.*; -import com.pinHouse.server.platform.facility.domain.repository.*; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -@RequiredArgsConstructor -public class FacilityMongoAdapter implements FacilityPort { - - /// 외부 의존성 - private final LibraryDocumentRepository libraryRepository; - private final ParkDocumentRepository parkRepository; - private final SportDocumentRepository sportRepository; - private final WalkingDocumentRepository walkingRepository; - private final AnimalDocumentRepository animalRepository; - - @Override - public List loadLibrariesNearBy(double longitude, double latitude, double radiusInKm) { - return libraryRepository.findByLocation(longitude, latitude,radiusInKm).stream() - .map(Library::toDomain) - .toList(); - } - - @Override - public List loadParksNearBy(double longitude, double latitude, double radiusInKm) { - return parkRepository.findByLocation(longitude, latitude,radiusInKm).stream() - .map(Park::toDomain) - .toList(); - } - - @Override - public List loadSportsNearBy(double longitude, double latitude, double radiusInKm) { - return sportRepository.findByLocation(longitude, latitude,radiusInKm).stream() - .map(Sport::toDomain) - .toList(); - } - - @Override - public List loadWalkingsNearBy(double longitude, double latitude, double radiusInKm) { - return walkingRepository.findByLocation(longitude, latitude,radiusInKm).stream() - .map(Walking::toDomain) - .toList(); - } - - @Override - public List loadAnimalsNearBy(double longitude, double latitude, double radiusInKm) { - return animalRepository.findByLocation(longitude, latitude,radiusInKm).stream() - .map(Animal::toDomain) - .toList(); - } -} diff --git a/src/main/java/com/pinHouse/server/platform/facility/application/service/NoticeInfraService.java b/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityService.java similarity index 63% rename from src/main/java/com/pinHouse/server/platform/facility/application/service/NoticeInfraService.java rename to src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityService.java index b69357f..8f7c1db 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/application/service/NoticeInfraService.java +++ b/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityService.java @@ -1,12 +1,14 @@ package com.pinHouse.server.platform.facility.application.service; import com.pinHouse.server.core.response.response.ErrorCode; +import com.pinHouse.server.platform.facility.application.dto.request.FacilityType; import com.pinHouse.server.platform.facility.domain.entity.*; -import com.pinHouse.server.platform.facility.application.usecase.NoticeInfraUseCase; -import com.pinHouse.server.platform.facility.application.usecase.FacilityPort; -import com.pinHouse.server.platform.notice.application.usecase.NoticePort; +import com.pinHouse.server.platform.facility.application.usecase.FacilityUseCase; +import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; +import com.pinHouse.server.platform.facility.domain.repository.*; +import com.pinHouse.server.platform.notice.application.usecase.NoticeUseCase; import com.pinHouse.server.platform.notice.domain.entity.Notice; -import com.pinHouse.server.platform.facility.domain.entity.NoticeInfra; +import com.pinHouse.server.platform.facility.application.dto.response.FacilityResponse; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -17,13 +19,17 @@ @Service @Transactional @RequiredArgsConstructor -public class NoticeInfraService implements NoticeInfraUseCase { +public class FacilityService implements FacilityUseCase { /// 공고 의존성 - private final NoticePort noticePort; + private final NoticeUseCase noticeService; /// 인프라 의존성 - private final FacilityPort facilityPort; + private final LibraryDocumentRepository libraryRepository; + private final AnimalDocumentRepository animalRepository; + private final ParkDocumentRepository parkRepository; + private final WalkingDocumentRepository walkingRepository; + private final SportDocumentRepository sportRepository; /// 상수 private final double radiusKm = 1.5; @@ -35,47 +41,47 @@ public class NoticeInfraService implements NoticeInfraUseCase { /// 주변의 인프라 개수 조회 @Override - public NoticeInfra getNoticeInfraById(String noticeId) { + public FacilityResponse getNoticeInfraById(String noticeId) { /// 예외 처리 Notice notice = getNotice(noticeId); /// 주변에 존재하는 도서관 가져오기 - List libraries = facilityPort.loadLibrariesNearBy( + List libraries = libraryRepository.findByLocation( notice.getLocation().getLongitude(), notice.getLocation().getLatitude(), radiusInRadians); /// 주변에 존재하는 동물 관련 시설 가져오기 - List animals = facilityPort.loadAnimalsNearBy( + List animals = animalRepository.findByLocation( notice.getLocation().getLongitude(), notice.getLocation().getLatitude(), radiusInRadians); /// 주변에 존재하는 공원 정보 시설 가져오기 - List parks = facilityPort.loadParksNearBy( + List parks = parkRepository.findByLocation( notice.getLocation().getLongitude(), notice.getLocation().getLatitude(), radiusInRadians); /// 주변에 존재하는 산책로 관련 시설 가져오기 - List walkings = facilityPort.loadWalkingsNearBy( + List walkings = walkingRepository.findByLocation( notice.getLocation().getLongitude(), notice.getLocation().getLatitude(), radiusInRadians); /// 주변에 존재하는 스포츠 정보 시설 가져오기 - List sports = facilityPort.loadSportsNearBy( + List sports = sportRepository.findByLocation( notice.getLocation().getLongitude(), notice.getLocation().getLatitude(), radiusInRadians); /// 객체 생성 - return NoticeInfra.of(notice, libraries, animals, sports, walkings, parks); + return FacilityResponse.of(notice, libraries, animals, sports, walkings, parks); } // ================= @@ -83,7 +89,7 @@ public NoticeInfra getNoticeInfraById(String noticeId) { // ================= @Override public List getNoticesByInfraTypesWithAllMinCount(List facilityTypes) { - List allNotices = noticePort.loadAllNotices(); + List allNotices = noticeService.loadAllNotices(); return allNotices.stream() .filter(notice -> { @@ -93,11 +99,11 @@ public List getNoticesByInfraTypesWithAllMinCount(List fac // 모든 종류가 2개 이상이어야만 true 반환 return facilityTypes.stream().allMatch(facilityType -> { List facilityList = switch (facilityType) { - case LIBRARY -> facilityPort.loadLibrariesNearBy(lng, lat, radiusInRadians); - case PARK -> facilityPort.loadParksNearBy(lng, lat, radiusInRadians); - case ANIMAL -> facilityPort.loadAnimalsNearBy(lng, lat, radiusInRadians); - case WALKING -> facilityPort.loadWalkingsNearBy(lng, lat, radiusInRadians); - case SPORT -> facilityPort.loadSportsNearBy(lng, lat, radiusInRadians); + case LIBRARY -> libraryRepository.findByLocation(lng, lat, radiusInRadians); + case PARK -> parkRepository.findByLocation(lng, lat, radiusInRadians); + case ANIMAL -> animalRepository.findByLocation(lng, lat, radiusInRadians); + case WALKING -> walkingRepository.findByLocation(lng, lat, radiusInRadians); + case SPORT -> sportRepository.findByLocation(lng, lat, radiusInRadians); }; return facilityList.size() >= 2; }); @@ -111,7 +117,7 @@ public List getNoticesByInfraTypesWithAllMinCount(List fac // ================= private Notice getNotice(String noticeId) { - return noticePort.loadById(noticeId) + return noticeService.loadById(noticeId) .orElseThrow(() -> new NoSuchElementException(ErrorCode.NOT_NOTICE.getMessage())); } diff --git a/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityPort.java b/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityPort.java deleted file mode 100644 index 39cf1c5..0000000 --- a/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityPort.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.pinHouse.server.platform.facility.application.usecase; - -import com.pinHouse.server.platform.facility.domain.entity.*; - -import java.util.List; - -public interface FacilityPort { - - List loadLibrariesNearBy(double longitude, double latitude, double radiusInKm); - - List loadParksNearBy(double longitude, double latitude, double radiusInKm); - - List loadSportsNearBy(double longitude, double latitude, double radiusInKm); - - List loadWalkingsNearBy(double longitude, double latitude, double radiusInKm); - - List loadAnimalsNearBy(double longitude, double latitude, double radiusInKm); -} diff --git a/src/main/java/com/pinHouse/server/platform/facility/application/usecase/NoticeInfraUseCase.java b/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityUseCase.java similarity index 63% rename from src/main/java/com/pinHouse/server/platform/facility/application/usecase/NoticeInfraUseCase.java rename to src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityUseCase.java index dae5ee5..a79e4de 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/application/usecase/NoticeInfraUseCase.java +++ b/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityUseCase.java @@ -1,19 +1,19 @@ package com.pinHouse.server.platform.facility.application.usecase; -import com.pinHouse.server.platform.facility.domain.entity.FacilityType; +import com.pinHouse.server.platform.facility.application.dto.request.FacilityType; import com.pinHouse.server.platform.notice.domain.entity.Notice; -import com.pinHouse.server.platform.facility.domain.entity.NoticeInfra; +import com.pinHouse.server.platform.facility.application.dto.response.FacilityResponse; import java.util.List; /** * - 공고 주변의 인프라 목록 조회할 인터페이스 */ -public interface NoticeInfraUseCase { +public interface FacilityUseCase { /// 조회 // 주변의 인프라 개수 조회 - NoticeInfra getNoticeInfraById(String noticeId); + FacilityResponse getNoticeInfraById(String noticeId); // 원하는 인프라 바탕으로 많이 존재하는 공고 조회 List getNoticesByInfraTypesWithAllMinCount(List facilityTypes); diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Animal.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Animal.java index 861c97f..55db4c6 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Animal.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Animal.java @@ -1,5 +1,7 @@ package com.pinHouse.server.platform.facility.domain.entity; +import com.pinHouse.server.core.entity.Location; +import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; @@ -15,7 +17,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class Animal implements Facility{ +public class Animal implements Facility { /** MongoDB ObjectId */ @Id diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Library.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Library.java index bc24154..3297699 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Library.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Library.java @@ -1,5 +1,7 @@ package com.pinHouse.server.platform.facility.domain.entity; +import com.pinHouse.server.core.entity.Location; +import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; @@ -18,7 +20,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class Library implements Facility{ +public class Library implements Facility { /** * MongoDB unique identifier (_id) diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Park.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Park.java index ef08b4c..6cef0fc 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Park.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Park.java @@ -1,5 +1,7 @@ package com.pinHouse.server.platform.facility.domain.entity; +import com.pinHouse.server.core.entity.Location; +import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.GeoSpatialIndexType; import org.springframework.data.mongodb.core.index.GeoSpatialIndexed; @@ -19,7 +21,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class Park implements Facility{ +public class Park implements Facility { @Id @Field("_id") diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Sport.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Sport.java index ade0a1c..3f4c52f 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Sport.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Sport.java @@ -1,5 +1,7 @@ package com.pinHouse.server.platform.facility.domain.entity; +import com.pinHouse.server.core.entity.Location; +import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; @@ -15,7 +17,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class Sport implements Facility{ +public class Sport implements Facility { /** MongoDB ObjectId */ @Id diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Walking.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Walking.java index bec4db7..134321d 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Walking.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Walking.java @@ -1,5 +1,7 @@ package com.pinHouse.server.platform.facility.domain.entity; +import com.pinHouse.server.core.entity.Location; +import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.GeoSpatialIndexType; import org.springframework.data.mongodb.core.index.GeoSpatialIndexed; @@ -16,7 +18,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class Walking implements Facility{ +public class Walking implements Facility { /** MongoDB ObjectId */ @Id diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Facility.java b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/infra/Facility.java similarity index 58% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/Facility.java rename to src/main/java/com/pinHouse/server/platform/facility/domain/entity/infra/Facility.java index c3a190e..4a45e80 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Facility.java +++ b/src/main/java/com/pinHouse/server/platform/facility/domain/entity/infra/Facility.java @@ -1,4 +1,6 @@ -package com.pinHouse.server.platform.facility.domain.entity; +package com.pinHouse.server.platform.facility.domain.entity.infra; + +import com.pinHouse.server.core.entity.Location; public interface Facility { diff --git a/src/main/java/com/pinHouse/server/platform/facility/presentation/FacilityApi.java b/src/main/java/com/pinHouse/server/platform/facility/presentation/FacilityApi.java index f0c24d5..1226550 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/presentation/FacilityApi.java +++ b/src/main/java/com/pinHouse/server/platform/facility/presentation/FacilityApi.java @@ -1,13 +1,13 @@ package com.pinHouse.server.platform.facility.presentation; import com.pinHouse.server.core.response.response.ApiResponse; -import com.pinHouse.server.platform.facility.domain.entity.FacilityType; -import com.pinHouse.server.platform.notice.application.dto.response.InfraDTO; +import com.pinHouse.server.platform.facility.application.dto.request.FacilityType; +import com.pinHouse.server.platform.facility.application.dto.response.InfraDTO; import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; import com.pinHouse.server.platform.facility.presentation.swagger.FacilityApiSpec; -import com.pinHouse.server.platform.facility.application.usecase.NoticeInfraUseCase; +import com.pinHouse.server.platform.facility.application.usecase.FacilityUseCase; import com.pinHouse.server.platform.notice.domain.entity.Notice; -import com.pinHouse.server.platform.facility.domain.entity.NoticeInfra; +import com.pinHouse.server.platform.facility.application.dto.response.FacilityResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -18,7 +18,7 @@ public class FacilityApi implements FacilityApiSpec { /// 서비스 의존성 - private final NoticeInfraUseCase service; + private final FacilityUseCase service; /// 주변 인프라 조회 @GetMapping("/{noticeId}") @@ -26,10 +26,10 @@ public ApiResponse showNotice( @PathVariable String noticeId) { /// 서비스 계층 - NoticeInfra noticeInfra = service.getNoticeInfraById(noticeId); + FacilityResponse facilityResponse = service.getNoticeInfraById(noticeId); /// DTO 수정 - InfraDTO.NoticeInfraResponse response = InfraDTO.NoticeInfraResponse.from(noticeInfra); + InfraDTO.NoticeInfraResponse response = InfraDTO.NoticeInfraResponse.from(facilityResponse); /// 응답 return ApiResponse.ok(response); diff --git a/src/main/java/com/pinHouse/server/platform/facility/presentation/swagger/FacilityApiSpec.java b/src/main/java/com/pinHouse/server/platform/facility/presentation/swagger/FacilityApiSpec.java index 4d96e4c..b1e3e85 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/presentation/swagger/FacilityApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/facility/presentation/swagger/FacilityApiSpec.java @@ -1,8 +1,8 @@ package com.pinHouse.server.platform.facility.presentation.swagger; import com.pinHouse.server.core.response.response.ApiResponse; -import com.pinHouse.server.platform.facility.domain.entity.FacilityType; -import com.pinHouse.server.platform.notice.application.dto.response.InfraDTO; +import com.pinHouse.server.platform.facility.application.dto.request.FacilityType; +import com.pinHouse.server.platform.facility.application.dto.response.InfraDTO; import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeSupplyDTO.java b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeSupplyDTO.java index 6835cac..2cdd853 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeSupplyDTO.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeSupplyDTO.java @@ -1,6 +1,6 @@ package com.pinHouse.server.platform.notice.application.dto.response; -import com.pinHouse.server.platform.notice.domain.NoticeSupplyInfo; +import com.pinHouse.server.platform.notice.domain.entity.NoticeSupply; import lombok.Builder; public record NoticeSupplyDTO() { @@ -14,7 +14,7 @@ public record NoticeSupplyResponse( Integer recruitment ) { /// 정적 팩토리 메서드 - public static NoticeSupplyResponse from(NoticeSupplyInfo notice) { + public static NoticeSupplyResponse from(NoticeSupply notice) { return NoticeSupplyResponse.builder() .housingType(notice.getHousingType()) .area(notice.getArea()) diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/service/DepositService.java b/src/main/java/com/pinHouse/server/platform/notice/application/service/DepositService.java new file mode 100644 index 0000000..6a3dbeb --- /dev/null +++ b/src/main/java/com/pinHouse/server/platform/notice/application/service/DepositService.java @@ -0,0 +1,118 @@ +package com.pinHouse.server.platform.notice.application.service; + +import com.pinHouse.server.core.response.response.ErrorCode; +import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; +import com.pinHouse.server.platform.notice.application.usecase.DepositUseCase; +import com.pinHouse.server.platform.notice.domain.entity.Notice; +import com.pinHouse.server.platform.notice.domain.entity.NoticeSupply; +import com.pinHouse.server.platform.notice.domain.repository.NoticeDocumentRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.NoSuchElementException; + +@Service +@Transactional +@RequiredArgsConstructor +public class DepositService implements DepositUseCase { + + private final NoticeDocumentRepository repository; + + /** + * 임대보증금과 월임대료 전환 옵션 계산 메서드 + * + * @param noticeId 공고 ID + * @param type 공급 유형(예: '전세', '월세') + * @param percentage 전환 비율(0.0~1.0, 예: 0.5는 50% 전환) + * + * <전환 규칙> + * - 임대보증금 100만원 단위로만 전환 가능 + * - 임대보증금 → 월임대료: 연 3.5% 적용 (월이율 = 3.5%/12) + * - 월임대료 → 임대보증금: 연 7% 적용 (월이율 = 7%/12) + * - 전환 이율 변동 시, 변경된 이율로 재산정 + */ + @Override + public NoticeSupplyDTO.NoticeLeaseOptionResponse getLeaseByPercent(String noticeId, String type, double percentage) { + + // 1. 공고 예외처리 + Notice notice = getNotice(noticeId); + + // 2. 공급 정보 필터링 + NoticeSupply matchedSupplyInfo = notice.getSupplyInfo().stream() + .filter(info -> info.getHousingType().equalsIgnoreCase(type)) + .findFirst() + .orElseThrow(() -> new IllegalArgumentException("해당 유형(" + type + ")의 공급 정보가 없습니다.")); + + // 3. 원본 보증금, 월세 + long originalDeposit = matchedSupplyInfo.getDeposit().getTotal(); + long originalRent = matchedSupplyInfo.getMonthlyRent(); + + // 4. 최대 전환 가능한 보증금 (예: 10,000,000원으로 조정 가능) + long maxConvertibleDeposit = 10_000_000L; // 필요에 따라 조정 가능 + + // 5. 동적 최대 전환 비율 계산 + double maxDepositRate = (double) maxConvertibleDeposit / originalDeposit; + + // 6. 월세 전환율은 보증금 전환율 대비 비율 유지 (3.5% / 7%) + double baseDepositRate = 0.07; // 7% + double baseRentRate = 0.035; // 3.5% + double maxRentRate = maxDepositRate * (baseRentRate / baseDepositRate); + + // 7. 월 이율 계산 (고정) + double monthlyDepositToRentRate = baseRentRate / 12; // 보증금 → 월세 월 이율 + double monthlyRentToDepositRate = baseDepositRate / 12; // 월세 → 보증금 월 이율 + + // 8. 사용자 입력 비율 클램핑 (-1.0 ~ 1.0) + double clampedPercentage = Math.max(-1.0, Math.min(1.0, percentage)); + + long adjustedDeposit = originalDeposit; + long adjustedRent = originalRent; + + if (clampedPercentage > 0) { + // 보증금 → 월세 전환 + long convertibleDeposit = Math.round(originalDeposit * maxDepositRate * clampedPercentage); + // 10만원 단위 반올림 + convertibleDeposit = Math.round(convertibleDeposit / 100_000.0) * 100_000; + + long additionalRent = Math.round(convertibleDeposit * monthlyDepositToRentRate); + + adjustedDeposit = originalDeposit - convertibleDeposit; + adjustedRent = originalRent + additionalRent; + + } else if (clampedPercentage < 0) { + // 월세 → 보증금 전환 + long convertibleRent = Math.round(originalRent * maxRentRate * (-clampedPercentage)); + + long increasedDeposit = Math.round(convertibleRent / monthlyRentToDepositRate); + // 10만원 단위 반올림 + increasedDeposit = Math.round(increasedDeposit / 100_000.0) * 100_000; + + adjustedDeposit = originalDeposit + increasedDeposit; + adjustedRent = originalRent - convertibleRent; + } + // clampedPercentage == 0 이면 원본 값 그대로 유지 + + return NoticeSupplyDTO.NoticeLeaseOptionResponse + .from(notice.getNoticeId(), type, adjustedDeposit, adjustedRent); + } + + /** + * 연 3.5% 이자율 기준 월 전환 + */ + private double percentageRateFactor() { + return 0.035 / 12; + } + + + /** + * - ID를 바탕으로 공고를 조회하는 함수입니다. + * @param noticeId 공고 ID + * @return Notice 객체 + */ + private Notice getNotice(String noticeId) { + return repository.findByNoticeId(noticeId) + .orElseThrow(() -> new NoSuchElementException(ErrorCode.NOT_NOTICE.getMessage())); + } + +} diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeMongoAdapter.java b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeMongoAdapter.java deleted file mode 100644 index fad7387..0000000 --- a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeMongoAdapter.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.pinHouse.server.platform.notice.application.service; - -import com.pinHouse.server.platform.notice.domain.entity.Notice; -import com.pinHouse.server.platform.notice.domain.repository.NoticeDocumentRepository; -import com.pinHouse.server.platform.notice.application.usecase.NoticePort; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Optional; - -/** - * NoticePort의 구현체입니다. - * Repository를 주입받아 역할을 수행합니다. - */ - -@Slf4j -@Component -@RequiredArgsConstructor -public class NoticeMongoAdapter implements NoticePort { - - private final NoticeDocumentRepository repository; - - @Override - public Page loadNotices(Pageable pageable) { - return repository.findAll(pageable) - .map(Notice::toDomain); - } - - @Override - public Optional loadById(String noticeId) { - return repository.findByNoticeId(noticeId) - .map(Notice::toDomain); - } - - @Override - public List loadAllNotices() { - return repository.findAll().stream() - .map(Notice::toDomain) - .toList(); - } - -} diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java index 84ba83a..21dc600 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java @@ -3,11 +3,9 @@ import com.pinHouse.server.core.response.response.ErrorCode; import com.pinHouse.server.core.response.response.pageable.PageRequest; import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; import com.pinHouse.server.platform.notice.application.usecase.NoticeUseCase; -import com.pinHouse.server.platform.notice.application.usecase.NoticePort; import com.pinHouse.server.platform.notice.domain.entity.Notice; -import com.pinHouse.server.platform.notice.domain.NoticeSupplyInfo; +import com.pinHouse.server.platform.notice.domain.repository.NoticeDocumentRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -18,13 +16,14 @@ import java.util.List; import java.util.NoSuchElementException; +import java.util.Optional; @Service @Transactional @RequiredArgsConstructor public class NoticeService implements NoticeUseCase { - private final NoticePort port; + private final NoticeDocumentRepository repository; /** * 최신 공고 목록 조회를 위한 함수 입니다. @@ -37,7 +36,7 @@ public Page getNotices(PageRequest pageRequest) { Pageable pageable = getPageable(pageRequest); /// port 조회 - Page notices = port.loadNotices(pageable); + Page notices = repository.findAll(pageable); /// DTO 변환 List contents = notices.getContent(); @@ -74,89 +73,6 @@ public NoticeDTO.NoticeDetailResponse getNoticeById(String noticeId) { return NoticeDTO.NoticeDetailResponse.from(notice); } - - /** - * 임대보증금과 월임대료 전환 옵션 계산 메서드 - * - * @param noticeId 공고 ID - * @param type 공급 유형(예: '전세', '월세') - * @param percentage 전환 비율(0.0~1.0, 예: 0.5는 50% 전환) - * - * <전환 규칙> - * - 임대보증금 100만원 단위로만 전환 가능 - * - 임대보증금 → 월임대료: 연 3.5% 적용 (월이율 = 3.5%/12) - * - 월임대료 → 임대보증금: 연 7% 적용 (월이율 = 7%/12) - * - 전환 이율 변동 시, 변경된 이율로 재산정 - */ - @Override - public NoticeSupplyDTO.NoticeLeaseOptionResponse getLeaseByPercent(String noticeId, String type, double percentage) { - - // 1. 공고 예외처리 - Notice notice = getNotice(noticeId); - - // 2. 공급 정보 필터링 - NoticeSupplyInfo matchedSupplyInfo = notice.getSupplyInfo().stream() - .filter(info -> info.getHousingType().equalsIgnoreCase(type)) - .findFirst() - .orElseThrow(() -> new IllegalArgumentException("해당 유형(" + type + ")의 공급 정보가 없습니다.")); - - // 3. 원본 보증금, 월세 - long originalDeposit = matchedSupplyInfo.getDeposit().getTotal(); - long originalRent = matchedSupplyInfo.getMonthlyRent(); - - // 4. 최대 전환 가능한 보증금 (예: 10,000,000원으로 조정 가능) - long maxConvertibleDeposit = 10_000_000L; // 필요에 따라 조정 가능 - - // 5. 동적 최대 전환 비율 계산 - double maxDepositRate = (double) maxConvertibleDeposit / originalDeposit; - - // 6. 월세 전환율은 보증금 전환율 대비 비율 유지 (3.5% / 7%) - double baseDepositRate = 0.07; // 7% - double baseRentRate = 0.035; // 3.5% - double maxRentRate = maxDepositRate * (baseRentRate / baseDepositRate); - - // 7. 월 이율 계산 (고정) - double monthlyDepositToRentRate = baseRentRate / 12; // 보증금 → 월세 월 이율 - double monthlyRentToDepositRate = baseDepositRate / 12; // 월세 → 보증금 월 이율 - - // 8. 사용자 입력 비율 클램핑 (-1.0 ~ 1.0) - double clampedPercentage = Math.max(-1.0, Math.min(1.0, percentage)); - - long adjustedDeposit = originalDeposit; - long adjustedRent = originalRent; - - if (clampedPercentage > 0) { - // 보증금 → 월세 전환 - long convertibleDeposit = Math.round(originalDeposit * maxDepositRate * clampedPercentage); - // 10만원 단위 반올림 - convertibleDeposit = Math.round(convertibleDeposit / 100_000.0) * 100_000; - - long additionalRent = Math.round(convertibleDeposit * monthlyDepositToRentRate); - - adjustedDeposit = originalDeposit - convertibleDeposit; - adjustedRent = originalRent + additionalRent; - - } else if (clampedPercentage < 0) { - // 월세 → 보증금 전환 - long convertibleRent = Math.round(originalRent * maxRentRate * (-clampedPercentage)); - - long increasedDeposit = Math.round(convertibleRent / monthlyRentToDepositRate); - // 10만원 단위 반올림 - increasedDeposit = Math.round(increasedDeposit / 100_000.0) * 100_000; - - adjustedDeposit = originalDeposit + increasedDeposit; - adjustedRent = originalRent - convertibleRent; - } - // clampedPercentage == 0 이면 원본 값 그대로 유지 - - return NoticeSupplyDTO.NoticeLeaseOptionResponse - .from(notice.getNoticeId(), type, adjustedDeposit, adjustedRent); - } - - - - - /** * 사용자가 원하는 공고 목록을 비교할 함수 입니다. * @param noticeId1 비교할 첫번째 공고 ID @@ -167,8 +83,6 @@ public List compareNotices(String noticeId1, String noticeId2) { return List.of(); } - - /// 공통 함수 모음 /** @@ -177,7 +91,7 @@ public List compareNotices(String noticeId1, String noticeId2) { * @return Notice 객체 */ private Notice getNotice(String noticeId) { - return port.loadById(noticeId) + return repository.findByNoticeId(noticeId) .orElseThrow(() -> new NoSuchElementException(ErrorCode.NOT_NOTICE.getMessage())); } @@ -192,10 +106,16 @@ private Pageable getPageable(PageRequest pageRequest) { } /** - * 연 3.5% 이자율 기준 월 전환 + * 외부 사용 함수 */ - private double percentageRateFactor() { - return 0.035 / 12; + @Override + public Optional loadById(String id) { + return repository.findById(id); + } + + @Override + public List loadAllNotices() { + return repository.findAll(); } } diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/DepositUseCase.java b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/DepositUseCase.java new file mode 100644 index 0000000..fe0d3f1 --- /dev/null +++ b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/DepositUseCase.java @@ -0,0 +1,11 @@ +package com.pinHouse.server.platform.notice.application.usecase; + +import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; + +public interface DepositUseCase { + + /// 시뮬레이터 + NoticeSupplyDTO.NoticeLeaseOptionResponse getLeaseByPercent(String noticeId, String type, double percentage); + + +} diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticePort.java b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticePort.java deleted file mode 100644 index b17c469..0000000 --- a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticePort.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.pinHouse.server.platform.notice.application.usecase; - -import com.pinHouse.server.platform.notice.domain.entity.Notice; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - -import java.util.*; - -/** - * DB에 넣는 포트를 정의한 인터페이스입니다. - * CRUD의 기능을 수행합니다. - */ - -public interface NoticePort { - - /// 가져오기 - Page loadNotices(Pageable pageable); - - /// 상세 조회 - Optional loadById(String id); - - /// 모든 공고 가져오기 - List loadAllNotices(); - -} diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java index a06a1ce..2850542 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java +++ b/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java @@ -7,6 +7,8 @@ import org.springframework.data.domain.Page; import java.util.List; +import java.util.Optional; + /** * [공고 기반 조회] 인터페이스 * - 최신 기반, 공고의 목록 조회 @@ -28,12 +30,15 @@ public interface NoticeUseCase { // 상세 조회 NoticeDTO.NoticeDetailResponse getNoticeById(String noticeId); - /// 시뮬레이터 - NoticeSupplyDTO.NoticeLeaseOptionResponse getLeaseByPercent(String noticeId, String type, double percentage); - /// 비교 List compareNotices(String noticeId1, String noticeId2); + /// 외부 사용 + /// 상세 조회 + Optional loadById(String id); + + /// 모든 공고 가져오기 + List loadAllNotices(); } diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Deposit.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Deposit.java index 377de7f..11e700a 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Deposit.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Deposit.java @@ -1,6 +1,5 @@ package com.pinHouse.server.platform.notice.domain.entity; -import com.pinHouse.server.platform.notice.domain.NoticeSupplyInfo; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Notice.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Notice.java index f9f4960..a61047a 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Notice.java +++ b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Notice.java @@ -1,6 +1,6 @@ package com.pinHouse.server.platform.notice.domain.entity; -import com.pinHouse.server.platform.facility.domain.entity.Location; +import com.pinHouse.server.core.entity.Location; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/user/domain/entity/User.java b/src/main/java/com/pinHouse/server/platform/user/domain/entity/User.java index 234de44..7998b75 100644 --- a/src/main/java/com/pinHouse/server/platform/user/domain/entity/User.java +++ b/src/main/java/com/pinHouse/server/platform/user/domain/entity/User.java @@ -1,7 +1,7 @@ package com.pinHouse.server.platform.user.domain.entity; import com.pinHouse.server.core.util.BirthDayUtil; -import com.pinHouse.server.platform.BaseTimeEntity; +import com.pinHouse.server.core.entity.BaseTimeEntity; import com.pinHouse.server.security.oauth2.domain.OAuth2UserInfo; import jakarta.persistence.*; import lombok.*; From 9a2f68f7ffef4d681a414898325cc61ddd7f14c8 Mon Sep 17 00:00:00 2001 From: eedo_y Date: Thu, 4 Sep 2025 14:56:30 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=F0=9F=93=82=20file=20:=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=EB=93=9C=204=EC=B0=A8=20=EC=9E=AC=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/platform/notice/presentation/DepositApi.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/pinHouse/server/platform/notice/presentation/DepositApi.java b/src/main/java/com/pinHouse/server/platform/notice/presentation/DepositApi.java index 9fbe5d6..d496b8d 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/presentation/DepositApi.java +++ b/src/main/java/com/pinHouse/server/platform/notice/presentation/DepositApi.java @@ -2,6 +2,7 @@ import com.pinHouse.server.core.response.response.ApiResponse; import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; +import com.pinHouse.server.platform.notice.application.usecase.DepositUseCase; import com.pinHouse.server.platform.notice.presentation.swagger.DepositApiSpec; import com.pinHouse.server.platform.notice.application.usecase.NoticeUseCase; import lombok.RequiredArgsConstructor; @@ -15,7 +16,7 @@ @RequiredArgsConstructor public class DepositApi implements DepositApiSpec { - private final NoticeUseCase noticeService; + private final DepositUseCase service; @PutMapping("/{noticeId}") public ApiResponse update( @@ -24,7 +25,7 @@ public ApiResponse update( @RequestParam double percentage) { /// 서비스 호출 - NoticeSupplyDTO.NoticeLeaseOptionResponse lease = noticeService.getLeaseByPercent(noticeId, housingType, percentage); + NoticeSupplyDTO.NoticeLeaseOptionResponse lease = service.getLeaseByPercent(noticeId, housingType, percentage); return ApiResponse.ok(lease); From 797dd2bb345bc8ca690868f0b0b55c4fe2e3c149 Mon Sep 17 00:00:00 2001 From: eedo_y Date: Thu, 4 Sep 2025 15:05:44 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=F0=9F=93=82=20file=20:=20=EC=B2=AD?= =?UTF-8?q?=EC=95=BD=20=EC=A7=84=EB=8B=A8=EC=9D=84=20=EC=9C=84=ED=95=9C=20?= =?UTF-8?q?=ED=8F=B4=EB=8D=94=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/diagnosis/rule/application/dto/request/.gitkeep | 0 .../platform/diagnosis/rule/application/dto/response/.gitkeep | 0 .../server/platform/diagnosis/rule/application/service/.gitkeep | 0 .../server/platform/diagnosis/rule/application/usecase/.gitkeep | 0 .../server/platform/diagnosis/rule/domain/entity/.gitkeep | 0 .../server/platform/diagnosis/rule/domain/repository/.gitkeep | 0 .../pinHouse/server/platform/diagnosis/rule/presentation/.gitkeep | 0 .../server/platform/diagnosis/rule/presentation/swagger/.gitkeep | 0 .../platform/diagnosis/school/application/dto/request/.gitkeep | 0 .../platform/diagnosis/school/application/dto/response/.gitkeep | 0 .../server/platform/diagnosis/school/application/service/.gitkeep | 0 .../server/platform/diagnosis/school/application/usecase/.gitkeep | 0 .../server/platform/diagnosis/school/domain/entity/.gitkeep | 0 .../server/platform/diagnosis/school/domain/repository/.gitkeep | 0 .../server/platform/diagnosis/school/presentation/.gitkeep | 0 .../platform/diagnosis/school/presentation/swagger/.gitkeep | 0 16 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/dto/request/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/dto/response/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/service/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/usecase/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/rule/domain/entity/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/rule/domain/repository/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/rule/presentation/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/rule/presentation/swagger/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/school/application/dto/request/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/school/application/dto/response/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/school/application/service/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/school/application/usecase/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/school/domain/entity/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/school/domain/repository/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/school/presentation/.gitkeep create mode 100644 src/main/java/com/pinHouse/server/platform/diagnosis/school/presentation/swagger/.gitkeep diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/dto/request/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/dto/request/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/dto/response/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/dto/response/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/service/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/service/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/usecase/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/rule/application/usecase/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/rule/domain/entity/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/rule/domain/entity/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/rule/domain/repository/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/rule/domain/repository/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/rule/presentation/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/rule/presentation/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/rule/presentation/swagger/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/rule/presentation/swagger/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/school/application/dto/request/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/school/application/dto/request/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/school/application/dto/response/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/school/application/dto/response/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/school/application/service/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/school/application/service/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/school/application/usecase/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/school/application/usecase/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/school/domain/entity/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/school/domain/entity/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/school/domain/repository/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/school/domain/repository/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/school/presentation/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/school/presentation/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/pinHouse/server/platform/diagnosis/school/presentation/swagger/.gitkeep b/src/main/java/com/pinHouse/server/platform/diagnosis/school/presentation/swagger/.gitkeep new file mode 100644 index 0000000..e69de29 From 570ffb712d25cc6bdbff87802837fac2dc22e2a0 Mon Sep 17 00:00:00 2001 From: eedo_y Date: Thu, 4 Sep 2025 15:05:57 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=F0=9F=93=82=20file=20:=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=EB=93=9C=205=EC=B0=A8=20=EC=9E=AC=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/NoticeSupplyDTO.java | 4 +-- .../application/service/DepositService.java | 12 +++---- .../application/usecase/DepositUseCase.java | 4 +-- .../deposit}/domain/entity/Deposit.java | 2 +- .../deposit}/domain/entity/NoticeSupply.java | 2 +- .../deposit}/domain/entity/Recruitment.java | 2 +- .../deposit}/presentation/DepositApi.java | 9 +++-- .../presentation/swagger/DepositApiSpec.java | 4 +-- .../dto/response/OdsayResponse.java | 2 +- .../application/service/OdsayService.java | 4 +-- .../application/usecase/DistanceUseCase.java | 2 +- .../distance/presentation/DistanceApi.java | 6 ++-- .../presentation/swaager/DistanceApiSpec.java | 2 +- .../application/dto/request/FacilityType.java | 2 +- .../dto/response/FacilityResponse.java | 5 +-- .../application/dto/response/InfraDTO.java | 3 +- .../application/service/FacilityService.java | 16 +++++---- .../application/usecase/FacilityUseCase.java | 8 ++--- .../facility/domain/entity/Animal.java | 4 +-- .../facility/domain/entity/Library.java | 4 +-- .../facility/domain/entity/Park.java | 4 +-- .../facility/domain/entity/Sport.java | 4 +-- .../facility/domain/entity/Walking.java | 4 +-- .../domain/entity/infra/Facility.java | 2 +- .../repository/AnimalDocumentRepository.java | 4 +-- .../repository/LibraryDocumentRepository.java | 4 +-- .../repository/ParkDocumentRepository.java | 4 +-- .../repository/SportDocumentRepository.java | 4 +-- .../repository/WalkingDocumentRepository.java | 4 +-- .../facility/presentation/FacilityApi.java | 16 ++++----- .../presentation/swagger/FacilityApiSpec.java | 8 ++--- .../application/dto/response/NoticeDTO.java | 5 +-- .../application/service/NoticeService.java | 10 +++--- .../application/usecase/NoticeUseCase.java | 7 ++-- .../notice/domain/entity/Notice.java | 3 +- .../repository/NoticeDocumentRepository.java | 4 +-- .../notice/presentation/NoticeApi.java | 8 ++--- .../presentation/swagger/NoticeApiSpec.java | 4 +-- .../notice/domain/entity/NoticeCount.java | 36 ------------------- 39 files changed, 100 insertions(+), 132 deletions(-) rename src/main/java/com/pinHouse/server/platform/{notice => housing/deposit}/application/dto/response/NoticeSupplyDTO.java (91%) rename src/main/java/com/pinHouse/server/platform/{notice => housing/deposit}/application/service/DepositService.java (90%) rename src/main/java/com/pinHouse/server/platform/{notice => housing/deposit}/application/usecase/DepositUseCase.java (51%) rename src/main/java/com/pinHouse/server/platform/{notice => housing/deposit}/domain/entity/Deposit.java (87%) rename src/main/java/com/pinHouse/server/platform/{notice => housing/deposit}/domain/entity/NoticeSupply.java (89%) rename src/main/java/com/pinHouse/server/platform/{notice => housing/deposit}/domain/entity/Recruitment.java (86%) rename src/main/java/com/pinHouse/server/platform/{notice => housing/deposit}/presentation/DepositApi.java (68%) rename src/main/java/com/pinHouse/server/platform/{notice => housing/deposit}/presentation/swagger/DepositApiSpec.java (84%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/distance/application/dto/response/OdsayResponse.java (96%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/distance/application/service/OdsayService.java (90%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/distance/application/usecase/DistanceUseCase.java (82%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/distance/presentation/DistanceApi.java (73%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/distance/presentation/swaager/DistanceApiSpec.java (94%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/application/dto/request/FacilityType.java (70%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/application/dto/response/FacilityResponse.java (89%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/application/dto/response/InfraDTO.java (97%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/application/service/FacilityService.java (85%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/application/usecase/FacilityUseCase.java (55%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/domain/entity/Animal.java (92%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/domain/entity/Library.java (91%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/domain/entity/Park.java (87%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/domain/entity/Sport.java (93%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/domain/entity/Walking.java (93%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/domain/entity/infra/Facility.java (74%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/domain/repository/AnimalDocumentRepository.java (76%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/domain/repository/LibraryDocumentRepository.java (76%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/domain/repository/ParkDocumentRepository.java (76%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/domain/repository/SportDocumentRepository.java (76%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/domain/repository/WalkingDocumentRepository.java (76%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/presentation/FacilityApi.java (68%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/facility/presentation/swagger/FacilityApiSpec.java (78%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/notice/application/dto/response/NoticeDTO.java (93%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/notice/application/service/NoticeService.java (89%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/notice/application/usecase/NoticeUseCase.java (79%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/notice/domain/entity/Notice.java (92%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/notice/domain/repository/NoticeDocumentRepository.java (62%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/notice/presentation/NoticeApi.java (82%) rename src/main/java/com/pinHouse/server/platform/{ => housing}/notice/presentation/swagger/NoticeApiSpec.java (87%) delete mode 100644 src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeCount.java diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeSupplyDTO.java b/src/main/java/com/pinHouse/server/platform/housing/deposit/application/dto/response/NoticeSupplyDTO.java similarity index 91% rename from src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeSupplyDTO.java rename to src/main/java/com/pinHouse/server/platform/housing/deposit/application/dto/response/NoticeSupplyDTO.java index 2cdd853..6218dc2 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeSupplyDTO.java +++ b/src/main/java/com/pinHouse/server/platform/housing/deposit/application/dto/response/NoticeSupplyDTO.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.notice.application.dto.response; +package com.pinHouse.server.platform.housing.deposit.application.dto.response; -import com.pinHouse.server.platform.notice.domain.entity.NoticeSupply; +import com.pinHouse.server.platform.housing.deposit.domain.entity.NoticeSupply; import lombok.Builder; public record NoticeSupplyDTO() { diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/service/DepositService.java b/src/main/java/com/pinHouse/server/platform/housing/deposit/application/service/DepositService.java similarity index 90% rename from src/main/java/com/pinHouse/server/platform/notice/application/service/DepositService.java rename to src/main/java/com/pinHouse/server/platform/housing/deposit/application/service/DepositService.java index 6a3dbeb..9bb7869 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/service/DepositService.java +++ b/src/main/java/com/pinHouse/server/platform/housing/deposit/application/service/DepositService.java @@ -1,11 +1,11 @@ -package com.pinHouse.server.platform.notice.application.service; +package com.pinHouse.server.platform.housing.deposit.application.service; import com.pinHouse.server.core.response.response.ErrorCode; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; -import com.pinHouse.server.platform.notice.application.usecase.DepositUseCase; -import com.pinHouse.server.platform.notice.domain.entity.Notice; -import com.pinHouse.server.platform.notice.domain.entity.NoticeSupply; -import com.pinHouse.server.platform.notice.domain.repository.NoticeDocumentRepository; +import com.pinHouse.server.platform.housing.deposit.application.dto.response.NoticeSupplyDTO; +import com.pinHouse.server.platform.housing.deposit.application.usecase.DepositUseCase; +import com.pinHouse.server.platform.housing.notice.domain.entity.Notice; +import com.pinHouse.server.platform.housing.deposit.domain.entity.NoticeSupply; +import com.pinHouse.server.platform.housing.notice.domain.repository.NoticeDocumentRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/DepositUseCase.java b/src/main/java/com/pinHouse/server/platform/housing/deposit/application/usecase/DepositUseCase.java similarity index 51% rename from src/main/java/com/pinHouse/server/platform/notice/application/usecase/DepositUseCase.java rename to src/main/java/com/pinHouse/server/platform/housing/deposit/application/usecase/DepositUseCase.java index fe0d3f1..904f1da 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/DepositUseCase.java +++ b/src/main/java/com/pinHouse/server/platform/housing/deposit/application/usecase/DepositUseCase.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.notice.application.usecase; +package com.pinHouse.server.platform.housing.deposit.application.usecase; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; +import com.pinHouse.server.platform.housing.deposit.application.dto.response.NoticeSupplyDTO; public interface DepositUseCase { diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Deposit.java b/src/main/java/com/pinHouse/server/platform/housing/deposit/domain/entity/Deposit.java similarity index 87% rename from src/main/java/com/pinHouse/server/platform/notice/domain/entity/Deposit.java rename to src/main/java/com/pinHouse/server/platform/housing/deposit/domain/entity/Deposit.java index 11e700a..2dd842f 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Deposit.java +++ b/src/main/java/com/pinHouse/server/platform/housing/deposit/domain/entity/Deposit.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.notice.domain.entity; +package com.pinHouse.server.platform.housing.deposit.domain.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupply.java b/src/main/java/com/pinHouse/server/platform/housing/deposit/domain/entity/NoticeSupply.java similarity index 89% rename from src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupply.java rename to src/main/java/com/pinHouse/server/platform/housing/deposit/domain/entity/NoticeSupply.java index 1a392d0..6828c04 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeSupply.java +++ b/src/main/java/com/pinHouse/server/platform/housing/deposit/domain/entity/NoticeSupply.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.notice.domain.entity; +package com.pinHouse.server.platform.housing.deposit.domain.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Recruitment.java b/src/main/java/com/pinHouse/server/platform/housing/deposit/domain/entity/Recruitment.java similarity index 86% rename from src/main/java/com/pinHouse/server/platform/notice/domain/entity/Recruitment.java rename to src/main/java/com/pinHouse/server/platform/housing/deposit/domain/entity/Recruitment.java index d84723f..6d6e6c6 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Recruitment.java +++ b/src/main/java/com/pinHouse/server/platform/housing/deposit/domain/entity/Recruitment.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.notice.domain.entity; +package com.pinHouse.server.platform.housing.deposit.domain.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/notice/presentation/DepositApi.java b/src/main/java/com/pinHouse/server/platform/housing/deposit/presentation/DepositApi.java similarity index 68% rename from src/main/java/com/pinHouse/server/platform/notice/presentation/DepositApi.java rename to src/main/java/com/pinHouse/server/platform/housing/deposit/presentation/DepositApi.java index d496b8d..7f43c0b 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/presentation/DepositApi.java +++ b/src/main/java/com/pinHouse/server/platform/housing/deposit/presentation/DepositApi.java @@ -1,10 +1,9 @@ -package com.pinHouse.server.platform.notice.presentation; +package com.pinHouse.server.platform.housing.deposit.presentation; import com.pinHouse.server.core.response.response.ApiResponse; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; -import com.pinHouse.server.platform.notice.application.usecase.DepositUseCase; -import com.pinHouse.server.platform.notice.presentation.swagger.DepositApiSpec; -import com.pinHouse.server.platform.notice.application.usecase.NoticeUseCase; +import com.pinHouse.server.platform.housing.deposit.application.dto.response.NoticeSupplyDTO; +import com.pinHouse.server.platform.housing.deposit.application.usecase.DepositUseCase; +import com.pinHouse.server.platform.housing.deposit.presentation.swagger.DepositApiSpec; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DepositApiSpec.java b/src/main/java/com/pinHouse/server/platform/housing/deposit/presentation/swagger/DepositApiSpec.java similarity index 84% rename from src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DepositApiSpec.java rename to src/main/java/com/pinHouse/server/platform/housing/deposit/presentation/swagger/DepositApiSpec.java index dc9d472..1dabb9f 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/DepositApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/housing/deposit/presentation/swagger/DepositApiSpec.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.notice.presentation.swagger; +package com.pinHouse.server.platform.housing.deposit.presentation.swagger; import com.pinHouse.server.core.response.response.ApiResponse; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; +import com.pinHouse.server.platform.housing.deposit.application.dto.response.NoticeSupplyDTO; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/java/com/pinHouse/server/platform/distance/application/dto/response/OdsayResponse.java b/src/main/java/com/pinHouse/server/platform/housing/distance/application/dto/response/OdsayResponse.java similarity index 96% rename from src/main/java/com/pinHouse/server/platform/distance/application/dto/response/OdsayResponse.java rename to src/main/java/com/pinHouse/server/platform/housing/distance/application/dto/response/OdsayResponse.java index 0c986fe..43f5640 100644 --- a/src/main/java/com/pinHouse/server/platform/distance/application/dto/response/OdsayResponse.java +++ b/src/main/java/com/pinHouse/server/platform/housing/distance/application/dto/response/OdsayResponse.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.distance.application.dto.response; +package com.pinHouse.server.platform.housing.distance.application.dto.response; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayService.java b/src/main/java/com/pinHouse/server/platform/housing/distance/application/service/OdsayService.java similarity index 90% rename from src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayService.java rename to src/main/java/com/pinHouse/server/platform/housing/distance/application/service/OdsayService.java index 546c87c..9651a0d 100644 --- a/src/main/java/com/pinHouse/server/platform/distance/application/service/OdsayService.java +++ b/src/main/java/com/pinHouse/server/platform/housing/distance/application/service/OdsayService.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.distance.application.service; +package com.pinHouse.server.platform.housing.distance.application.service; -import com.pinHouse.server.platform.distance.application.usecase.DistanceUseCase; +import com.pinHouse.server.platform.housing.distance.application.usecase.DistanceUseCase; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistanceUseCase.java b/src/main/java/com/pinHouse/server/platform/housing/distance/application/usecase/DistanceUseCase.java similarity index 82% rename from src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistanceUseCase.java rename to src/main/java/com/pinHouse/server/platform/housing/distance/application/usecase/DistanceUseCase.java index cc6ea38..048bcee 100644 --- a/src/main/java/com/pinHouse/server/platform/distance/application/usecase/DistanceUseCase.java +++ b/src/main/java/com/pinHouse/server/platform/housing/distance/application/usecase/DistanceUseCase.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.distance.application.usecase; +package com.pinHouse.server.platform.housing.distance.application.usecase; import java.io.UnsupportedEncodingException; diff --git a/src/main/java/com/pinHouse/server/platform/distance/presentation/DistanceApi.java b/src/main/java/com/pinHouse/server/platform/housing/distance/presentation/DistanceApi.java similarity index 73% rename from src/main/java/com/pinHouse/server/platform/distance/presentation/DistanceApi.java rename to src/main/java/com/pinHouse/server/platform/housing/distance/presentation/DistanceApi.java index bdeb32d..4282c47 100644 --- a/src/main/java/com/pinHouse/server/platform/distance/presentation/DistanceApi.java +++ b/src/main/java/com/pinHouse/server/platform/housing/distance/presentation/DistanceApi.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.distance.presentation; +package com.pinHouse.server.platform.housing.distance.presentation; -import com.pinHouse.server.platform.distance.presentation.swaager.DistanceApiSpec; -import com.pinHouse.server.platform.distance.application.usecase.DistanceUseCase; +import com.pinHouse.server.platform.housing.distance.presentation.swaager.DistanceApiSpec; +import com.pinHouse.server.platform.housing.distance.application.usecase.DistanceUseCase; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/pinHouse/server/platform/distance/presentation/swaager/DistanceApiSpec.java b/src/main/java/com/pinHouse/server/platform/housing/distance/presentation/swaager/DistanceApiSpec.java similarity index 94% rename from src/main/java/com/pinHouse/server/platform/distance/presentation/swaager/DistanceApiSpec.java rename to src/main/java/com/pinHouse/server/platform/housing/distance/presentation/swaager/DistanceApiSpec.java index 1e8b8f7..6d462cc 100644 --- a/src/main/java/com/pinHouse/server/platform/distance/presentation/swaager/DistanceApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/housing/distance/presentation/swaager/DistanceApiSpec.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.distance.presentation.swaager; +package com.pinHouse.server.platform.housing.distance.presentation.swaager; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/pinHouse/server/platform/facility/application/dto/request/FacilityType.java b/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/request/FacilityType.java similarity index 70% rename from src/main/java/com/pinHouse/server/platform/facility/application/dto/request/FacilityType.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/request/FacilityType.java index 460f393..5550716 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/application/dto/request/FacilityType.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/request/FacilityType.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.facility.application.dto.request; +package com.pinHouse.server.platform.housing.facility.application.dto.request; public enum FacilityType { diff --git a/src/main/java/com/pinHouse/server/platform/facility/application/dto/response/FacilityResponse.java b/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/FacilityResponse.java similarity index 89% rename from src/main/java/com/pinHouse/server/platform/facility/application/dto/response/FacilityResponse.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/FacilityResponse.java index 84eb666..fc08cfd 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/application/dto/response/FacilityResponse.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/FacilityResponse.java @@ -1,7 +1,8 @@ -package com.pinHouse.server.platform.facility.application.dto.response; +package com.pinHouse.server.platform.housing.facility.application.dto.response; import com.pinHouse.server.platform.facility.domain.entity.*; -import com.pinHouse.server.platform.notice.domain.entity.Notice; +import com.pinHouse.server.platform.housing.facility.domain.entity.*; +import com.pinHouse.server.platform.housing.notice.domain.entity.Notice; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/pinHouse/server/platform/facility/application/dto/response/InfraDTO.java b/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/InfraDTO.java similarity index 97% rename from src/main/java/com/pinHouse/server/platform/facility/application/dto/response/InfraDTO.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/InfraDTO.java index eda4a00..435dc85 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/application/dto/response/InfraDTO.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/InfraDTO.java @@ -1,6 +1,7 @@ -package com.pinHouse.server.platform.facility.application.dto.response; +package com.pinHouse.server.platform.housing.facility.application.dto.response; import com.pinHouse.server.platform.facility.domain.entity.*; +import com.pinHouse.server.platform.housing.facility.domain.entity.*; import io.micrometer.common.lang.Nullable; import lombok.Builder; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityService.java b/src/main/java/com/pinHouse/server/platform/housing/facility/application/service/FacilityService.java similarity index 85% rename from src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityService.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/application/service/FacilityService.java index 8f7c1db..858e829 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/application/service/FacilityService.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/application/service/FacilityService.java @@ -1,14 +1,16 @@ -package com.pinHouse.server.platform.facility.application.service; +package com.pinHouse.server.platform.housing.facility.application.service; import com.pinHouse.server.core.response.response.ErrorCode; -import com.pinHouse.server.platform.facility.application.dto.request.FacilityType; +import com.pinHouse.server.platform.housing.facility.application.dto.request.FacilityType; import com.pinHouse.server.platform.facility.domain.entity.*; -import com.pinHouse.server.platform.facility.application.usecase.FacilityUseCase; -import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; +import com.pinHouse.server.platform.housing.facility.application.usecase.FacilityUseCase; +import com.pinHouse.server.platform.housing.facility.domain.entity.*; +import com.pinHouse.server.platform.housing.facility.domain.entity.infra.Facility; import com.pinHouse.server.platform.facility.domain.repository.*; -import com.pinHouse.server.platform.notice.application.usecase.NoticeUseCase; -import com.pinHouse.server.platform.notice.domain.entity.Notice; -import com.pinHouse.server.platform.facility.application.dto.response.FacilityResponse; +import com.pinHouse.server.platform.housing.facility.domain.repository.*; +import com.pinHouse.server.platform.housing.notice.application.usecase.NoticeUseCase; +import com.pinHouse.server.platform.housing.notice.domain.entity.Notice; +import com.pinHouse.server.platform.housing.facility.application.dto.response.FacilityResponse; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityUseCase.java b/src/main/java/com/pinHouse/server/platform/housing/facility/application/usecase/FacilityUseCase.java similarity index 55% rename from src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityUseCase.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/application/usecase/FacilityUseCase.java index a79e4de..bbc26d8 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/application/usecase/FacilityUseCase.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/application/usecase/FacilityUseCase.java @@ -1,8 +1,8 @@ -package com.pinHouse.server.platform.facility.application.usecase; +package com.pinHouse.server.platform.housing.facility.application.usecase; -import com.pinHouse.server.platform.facility.application.dto.request.FacilityType; -import com.pinHouse.server.platform.notice.domain.entity.Notice; -import com.pinHouse.server.platform.facility.application.dto.response.FacilityResponse; +import com.pinHouse.server.platform.housing.facility.application.dto.request.FacilityType; +import com.pinHouse.server.platform.housing.notice.domain.entity.Notice; +import com.pinHouse.server.platform.housing.facility.application.dto.response.FacilityResponse; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Animal.java b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Animal.java similarity index 92% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/Animal.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Animal.java index 55db4c6..d9f67fd 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Animal.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Animal.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.facility.domain.entity; +package com.pinHouse.server.platform.housing.facility.domain.entity; import com.pinHouse.server.core.entity.Location; -import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; +import com.pinHouse.server.platform.housing.facility.domain.entity.infra.Facility; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Library.java b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Library.java similarity index 91% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/Library.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Library.java index 3297699..8f0fee1 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Library.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Library.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.facility.domain.entity; +package com.pinHouse.server.platform.housing.facility.domain.entity; import com.pinHouse.server.core.entity.Location; -import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; +import com.pinHouse.server.platform.housing.facility.domain.entity.infra.Facility; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Park.java b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Park.java similarity index 87% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/Park.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Park.java index 6cef0fc..912c445 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Park.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Park.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.facility.domain.entity; +package com.pinHouse.server.platform.housing.facility.domain.entity; import com.pinHouse.server.core.entity.Location; -import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; +import com.pinHouse.server.platform.housing.facility.domain.entity.infra.Facility; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.GeoSpatialIndexType; import org.springframework.data.mongodb.core.index.GeoSpatialIndexed; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Sport.java b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Sport.java similarity index 93% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/Sport.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Sport.java index 3f4c52f..b79b0f5 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Sport.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Sport.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.facility.domain.entity; +package com.pinHouse.server.platform.housing.facility.domain.entity; import com.pinHouse.server.core.entity.Location; -import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; +import com.pinHouse.server.platform.housing.facility.domain.entity.infra.Facility; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Walking.java b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Walking.java similarity index 93% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/Walking.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Walking.java index 134321d..fc8d494 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/Walking.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/Walking.java @@ -1,7 +1,7 @@ -package com.pinHouse.server.platform.facility.domain.entity; +package com.pinHouse.server.platform.housing.facility.domain.entity; import com.pinHouse.server.core.entity.Location; -import com.pinHouse.server.platform.facility.domain.entity.infra.Facility; +import com.pinHouse.server.platform.housing.facility.domain.entity.infra.Facility; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.GeoSpatialIndexType; import org.springframework.data.mongodb.core.index.GeoSpatialIndexed; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/infra/Facility.java b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/infra/Facility.java similarity index 74% rename from src/main/java/com/pinHouse/server/platform/facility/domain/entity/infra/Facility.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/infra/Facility.java index 4a45e80..984c5dd 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/entity/infra/Facility.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/entity/infra/Facility.java @@ -1,4 +1,4 @@ -package com.pinHouse.server.platform.facility.domain.entity.infra; +package com.pinHouse.server.platform.housing.facility.domain.entity.infra; import com.pinHouse.server.core.entity.Location; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/AnimalDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/AnimalDocumentRepository.java similarity index 76% rename from src/main/java/com/pinHouse/server/platform/facility/domain/repository/AnimalDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/AnimalDocumentRepository.java index b1c296e..56b4309 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/AnimalDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/AnimalDocumentRepository.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.facility.domain.repository; +package com.pinHouse.server.platform.housing.facility.domain.repository; -import com.pinHouse.server.platform.facility.domain.entity.Animal; +import com.pinHouse.server.platform.housing.facility.domain.entity.Animal; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/LibraryDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/LibraryDocumentRepository.java similarity index 76% rename from src/main/java/com/pinHouse/server/platform/facility/domain/repository/LibraryDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/LibraryDocumentRepository.java index ebe2a6e..65321c9 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/LibraryDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/LibraryDocumentRepository.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.facility.domain.repository; +package com.pinHouse.server.platform.housing.facility.domain.repository; -import com.pinHouse.server.platform.facility.domain.entity.Library; +import com.pinHouse.server.platform.housing.facility.domain.entity.Library; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/ParkDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/ParkDocumentRepository.java similarity index 76% rename from src/main/java/com/pinHouse/server/platform/facility/domain/repository/ParkDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/ParkDocumentRepository.java index e30a8a3..7d05ab1 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/ParkDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/ParkDocumentRepository.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.facility.domain.repository; +package com.pinHouse.server.platform.housing.facility.domain.repository; -import com.pinHouse.server.platform.facility.domain.entity.Park; +import com.pinHouse.server.platform.housing.facility.domain.entity.Park; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/SportDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/SportDocumentRepository.java similarity index 76% rename from src/main/java/com/pinHouse/server/platform/facility/domain/repository/SportDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/SportDocumentRepository.java index e1831f5..b7671f5 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/SportDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/SportDocumentRepository.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.facility.domain.repository; +package com.pinHouse.server.platform.housing.facility.domain.repository; -import com.pinHouse.server.platform.facility.domain.entity.Sport; +import com.pinHouse.server.platform.housing.facility.domain.entity.Sport; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; diff --git a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/WalkingDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/WalkingDocumentRepository.java similarity index 76% rename from src/main/java/com/pinHouse/server/platform/facility/domain/repository/WalkingDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/WalkingDocumentRepository.java index 3e9b9b7..a9dfb4b 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/domain/repository/WalkingDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/domain/repository/WalkingDocumentRepository.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.facility.domain.repository; +package com.pinHouse.server.platform.housing.facility.domain.repository; -import com.pinHouse.server.platform.facility.domain.entity.Walking; +import com.pinHouse.server.platform.housing.facility.domain.entity.Walking; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; diff --git a/src/main/java/com/pinHouse/server/platform/facility/presentation/FacilityApi.java b/src/main/java/com/pinHouse/server/platform/housing/facility/presentation/FacilityApi.java similarity index 68% rename from src/main/java/com/pinHouse/server/platform/facility/presentation/FacilityApi.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/presentation/FacilityApi.java index 1226550..c23a992 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/presentation/FacilityApi.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/presentation/FacilityApi.java @@ -1,13 +1,13 @@ -package com.pinHouse.server.platform.facility.presentation; +package com.pinHouse.server.platform.housing.facility.presentation; import com.pinHouse.server.core.response.response.ApiResponse; -import com.pinHouse.server.platform.facility.application.dto.request.FacilityType; -import com.pinHouse.server.platform.facility.application.dto.response.InfraDTO; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; -import com.pinHouse.server.platform.facility.presentation.swagger.FacilityApiSpec; -import com.pinHouse.server.platform.facility.application.usecase.FacilityUseCase; -import com.pinHouse.server.platform.notice.domain.entity.Notice; -import com.pinHouse.server.platform.facility.application.dto.response.FacilityResponse; +import com.pinHouse.server.platform.housing.facility.application.dto.request.FacilityType; +import com.pinHouse.server.platform.housing.facility.application.dto.response.InfraDTO; +import com.pinHouse.server.platform.housing.notice.application.dto.response.NoticeDTO; +import com.pinHouse.server.platform.housing.facility.presentation.swagger.FacilityApiSpec; +import com.pinHouse.server.platform.housing.facility.application.usecase.FacilityUseCase; +import com.pinHouse.server.platform.housing.notice.domain.entity.Notice; +import com.pinHouse.server.platform.housing.facility.application.dto.response.FacilityResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/facility/presentation/swagger/FacilityApiSpec.java b/src/main/java/com/pinHouse/server/platform/housing/facility/presentation/swagger/FacilityApiSpec.java similarity index 78% rename from src/main/java/com/pinHouse/server/platform/facility/presentation/swagger/FacilityApiSpec.java rename to src/main/java/com/pinHouse/server/platform/housing/facility/presentation/swagger/FacilityApiSpec.java index b1e3e85..41a4b96 100644 --- a/src/main/java/com/pinHouse/server/platform/facility/presentation/swagger/FacilityApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/presentation/swagger/FacilityApiSpec.java @@ -1,9 +1,9 @@ -package com.pinHouse.server.platform.facility.presentation.swagger; +package com.pinHouse.server.platform.housing.facility.presentation.swagger; import com.pinHouse.server.core.response.response.ApiResponse; -import com.pinHouse.server.platform.facility.application.dto.request.FacilityType; -import com.pinHouse.server.platform.facility.application.dto.response.InfraDTO; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; +import com.pinHouse.server.platform.housing.facility.application.dto.request.FacilityType; +import com.pinHouse.server.platform.housing.facility.application.dto.response.InfraDTO; +import com.pinHouse.server.platform.housing.notice.application.dto.response.NoticeDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeDTO.java b/src/main/java/com/pinHouse/server/platform/housing/notice/application/dto/response/NoticeDTO.java similarity index 93% rename from src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeDTO.java rename to src/main/java/com/pinHouse/server/platform/housing/notice/application/dto/response/NoticeDTO.java index 69a9f4e..60999d0 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/dto/response/NoticeDTO.java +++ b/src/main/java/com/pinHouse/server/platform/housing/notice/application/dto/response/NoticeDTO.java @@ -1,6 +1,7 @@ -package com.pinHouse.server.platform.notice.application.dto.response; +package com.pinHouse.server.platform.housing.notice.application.dto.response; -import com.pinHouse.server.platform.notice.domain.entity.Notice; +import com.pinHouse.server.platform.housing.deposit.application.dto.response.NoticeSupplyDTO; +import com.pinHouse.server.platform.housing.notice.domain.entity.Notice; import lombok.Builder; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java b/src/main/java/com/pinHouse/server/platform/housing/notice/application/service/NoticeService.java similarity index 89% rename from src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java rename to src/main/java/com/pinHouse/server/platform/housing/notice/application/service/NoticeService.java index 21dc600..a6df6ec 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/service/NoticeService.java +++ b/src/main/java/com/pinHouse/server/platform/housing/notice/application/service/NoticeService.java @@ -1,11 +1,11 @@ -package com.pinHouse.server.platform.notice.application.service; +package com.pinHouse.server.platform.housing.notice.application.service; import com.pinHouse.server.core.response.response.ErrorCode; import com.pinHouse.server.core.response.response.pageable.PageRequest; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; -import com.pinHouse.server.platform.notice.application.usecase.NoticeUseCase; -import com.pinHouse.server.platform.notice.domain.entity.Notice; -import com.pinHouse.server.platform.notice.domain.repository.NoticeDocumentRepository; +import com.pinHouse.server.platform.housing.notice.application.dto.response.NoticeDTO; +import com.pinHouse.server.platform.housing.notice.application.usecase.NoticeUseCase; +import com.pinHouse.server.platform.housing.notice.domain.entity.Notice; +import com.pinHouse.server.platform.housing.notice.domain.repository.NoticeDocumentRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; diff --git a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java b/src/main/java/com/pinHouse/server/platform/housing/notice/application/usecase/NoticeUseCase.java similarity index 79% rename from src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java rename to src/main/java/com/pinHouse/server/platform/housing/notice/application/usecase/NoticeUseCase.java index 2850542..4133cfb 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/application/usecase/NoticeUseCase.java +++ b/src/main/java/com/pinHouse/server/platform/housing/notice/application/usecase/NoticeUseCase.java @@ -1,9 +1,8 @@ -package com.pinHouse.server.platform.notice.application.usecase; +package com.pinHouse.server.platform.housing.notice.application.usecase; import com.pinHouse.server.core.response.response.pageable.PageRequest; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeSupplyDTO; -import com.pinHouse.server.platform.notice.domain.entity.Notice; +import com.pinHouse.server.platform.housing.notice.application.dto.response.NoticeDTO; +import com.pinHouse.server.platform.housing.notice.domain.entity.Notice; import org.springframework.data.domain.Page; import java.util.List; diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Notice.java b/src/main/java/com/pinHouse/server/platform/housing/notice/domain/entity/Notice.java similarity index 92% rename from src/main/java/com/pinHouse/server/platform/notice/domain/entity/Notice.java rename to src/main/java/com/pinHouse/server/platform/housing/notice/domain/entity/Notice.java index a61047a..7f0a337 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/Notice.java +++ b/src/main/java/com/pinHouse/server/platform/housing/notice/domain/entity/Notice.java @@ -1,6 +1,7 @@ -package com.pinHouse.server.platform.notice.domain.entity; +package com.pinHouse.server.platform.housing.notice.domain.entity; import com.pinHouse.server.core.entity.Location; +import com.pinHouse.server.platform.housing.deposit.domain.entity.NoticeSupply; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/repository/NoticeDocumentRepository.java b/src/main/java/com/pinHouse/server/platform/housing/notice/domain/repository/NoticeDocumentRepository.java similarity index 62% rename from src/main/java/com/pinHouse/server/platform/notice/domain/repository/NoticeDocumentRepository.java rename to src/main/java/com/pinHouse/server/platform/housing/notice/domain/repository/NoticeDocumentRepository.java index b0c9ab5..bde80e2 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/repository/NoticeDocumentRepository.java +++ b/src/main/java/com/pinHouse/server/platform/housing/notice/domain/repository/NoticeDocumentRepository.java @@ -1,6 +1,6 @@ -package com.pinHouse.server.platform.notice.domain.repository; +package com.pinHouse.server.platform.housing.notice.domain.repository; -import com.pinHouse.server.platform.notice.domain.entity.Notice; +import com.pinHouse.server.platform.housing.notice.domain.entity.Notice; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeApi.java b/src/main/java/com/pinHouse/server/platform/housing/notice/presentation/NoticeApi.java similarity index 82% rename from src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeApi.java rename to src/main/java/com/pinHouse/server/platform/housing/notice/presentation/NoticeApi.java index 63b8135..d77e617 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/presentation/NoticeApi.java +++ b/src/main/java/com/pinHouse/server/platform/housing/notice/presentation/NoticeApi.java @@ -1,11 +1,11 @@ -package com.pinHouse.server.platform.notice.presentation; +package com.pinHouse.server.platform.housing.notice.presentation; import com.pinHouse.server.core.response.response.ApiResponse; import com.pinHouse.server.core.response.response.pageable.PageRequest; import com.pinHouse.server.core.response.response.pageable.PageResponse; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; -import com.pinHouse.server.platform.notice.presentation.swagger.NoticeApiSpec; -import com.pinHouse.server.platform.notice.application.usecase.NoticeUseCase; +import com.pinHouse.server.platform.housing.notice.application.dto.response.NoticeDTO; +import com.pinHouse.server.platform.housing.notice.presentation.swagger.NoticeApiSpec; +import com.pinHouse.server.platform.housing.notice.application.usecase.NoticeUseCase; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeApiSpec.java b/src/main/java/com/pinHouse/server/platform/housing/notice/presentation/swagger/NoticeApiSpec.java similarity index 87% rename from src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeApiSpec.java rename to src/main/java/com/pinHouse/server/platform/housing/notice/presentation/swagger/NoticeApiSpec.java index b1c4d69..69220d9 100644 --- a/src/main/java/com/pinHouse/server/platform/notice/presentation/swagger/NoticeApiSpec.java +++ b/src/main/java/com/pinHouse/server/platform/housing/notice/presentation/swagger/NoticeApiSpec.java @@ -1,9 +1,9 @@ -package com.pinHouse.server.platform.notice.presentation.swagger; +package com.pinHouse.server.platform.housing.notice.presentation.swagger; import com.pinHouse.server.core.response.response.ApiResponse; import com.pinHouse.server.core.response.response.pageable.PageRequest; import com.pinHouse.server.core.response.response.pageable.PageResponse; -import com.pinHouse.server.platform.notice.application.dto.response.NoticeDTO; +import com.pinHouse.server.platform.housing.notice.application.dto.response.NoticeDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeCount.java b/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeCount.java deleted file mode 100644 index 1e94bb0..0000000 --- a/src/main/java/com/pinHouse/server/platform/notice/domain/entity/NoticeCount.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.pinHouse.server.platform.notice.domain.entity; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class NoticeCount { - - private String noticeId; - - private int libraryCount; - - private int animalCount; - - private int parkCount; - - private int sportCount; - - private int walkCount; - - /// 정적 팩토리 메서드 - public NoticeCount of(String noticeId, int libraryCount, int animalCount, int parkCount, int sportCount) { - return NoticeCount.builder() - .noticeId(noticeId) - .libraryCount(libraryCount) - .animalCount(animalCount) - .parkCount(parkCount) - .sportCount(sportCount) - .build(); - } -} From 6104472b3ff8a320d0cab82d3d8212a89d504734 Mon Sep 17 00:00:00 2001 From: eedo_y Date: Thu, 4 Sep 2025 15:06:41 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=F0=9F=93=82=20file=20:=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=EB=93=9C=206=EC=B0=A8=20=EC=9E=AC=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../facility/application/dto/response/FacilityResponse.java | 1 - .../housing/facility/application/dto/response/InfraDTO.java | 1 - .../housing/facility/application/service/FacilityService.java | 2 -- 3 files changed, 4 deletions(-) diff --git a/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/FacilityResponse.java b/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/FacilityResponse.java index fc08cfd..d903091 100644 --- a/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/FacilityResponse.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/FacilityResponse.java @@ -1,6 +1,5 @@ package com.pinHouse.server.platform.housing.facility.application.dto.response; -import com.pinHouse.server.platform.facility.domain.entity.*; import com.pinHouse.server.platform.housing.facility.domain.entity.*; import com.pinHouse.server.platform.housing.notice.domain.entity.Notice; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/InfraDTO.java b/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/InfraDTO.java index 435dc85..7d13c93 100644 --- a/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/InfraDTO.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/application/dto/response/InfraDTO.java @@ -1,6 +1,5 @@ package com.pinHouse.server.platform.housing.facility.application.dto.response; -import com.pinHouse.server.platform.facility.domain.entity.*; import com.pinHouse.server.platform.housing.facility.domain.entity.*; import io.micrometer.common.lang.Nullable; import lombok.Builder; diff --git a/src/main/java/com/pinHouse/server/platform/housing/facility/application/service/FacilityService.java b/src/main/java/com/pinHouse/server/platform/housing/facility/application/service/FacilityService.java index 858e829..3915bf2 100644 --- a/src/main/java/com/pinHouse/server/platform/housing/facility/application/service/FacilityService.java +++ b/src/main/java/com/pinHouse/server/platform/housing/facility/application/service/FacilityService.java @@ -2,11 +2,9 @@ import com.pinHouse.server.core.response.response.ErrorCode; import com.pinHouse.server.platform.housing.facility.application.dto.request.FacilityType; -import com.pinHouse.server.platform.facility.domain.entity.*; import com.pinHouse.server.platform.housing.facility.application.usecase.FacilityUseCase; import com.pinHouse.server.platform.housing.facility.domain.entity.*; import com.pinHouse.server.platform.housing.facility.domain.entity.infra.Facility; -import com.pinHouse.server.platform.facility.domain.repository.*; import com.pinHouse.server.platform.housing.facility.domain.repository.*; import com.pinHouse.server.platform.housing.notice.application.usecase.NoticeUseCase; import com.pinHouse.server.platform.housing.notice.domain.entity.Notice;