From fe3f81ce5a74beef341080547066257d332cd9cb Mon Sep 17 00:00:00 2001 From: RosieOh Date: Mon, 5 Oct 2026 02:22:01 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20careFacility=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=EB=A5=BC=20facility=20=EB=A1=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 도메인 패키지 중 하나만 낙타등이었다. 한 군데만 다른 규칙이면 새로 들어온 사람이 둘 다 흉내 내서 규칙이 둘로 갈린다. 클래스 이름(CareFacility 등)은 그대로 둔다. 엔티티 이름을 바꾸면 JPQL 문자열까지 전부 손봐야 하고, '돌봄시설' 이라는 뜻은 CareFacility 가 더 정확하다. 바꾼 것은 패키지 자리뿐이다. 구조 규칙 위반: 489 → 391 (네이밍 98건 해소). 파일 이동이라 baseline 을 한 번 다시 떴고, 다른 규칙 숫자가 늘지 않았음을 확인했다. --- .../05a5820d-39ea-4db6-b8e7-f737ac6a90df | 10 +- .../05a7a88e-9a95-451a-b96f-4a8eb9be6c1e | 98 ------------- .../a6b21c55-f3df-4514-8faa-c32628f81448 | 134 +++++++++--------- .../architecture/carecode-architecture.drawio | 2 +- docs/architecture/system-overview.md | 2 +- docs/quality/architecture-rules.md | 9 +- .../batch/BookingReminderScheduler.java | 4 +- .../batch/ForecastBacktestScheduler.java | 2 +- .../batch/PublicDataSyncScheduler.java | 2 +- .../carecode/devtools/SampleDataCleaner.java | 8 +- .../devtools/SampleFacilitySeeder.java | 10 +- .../controller/AdminPublicDataController.java | 2 +- .../controller/AdminSyncStatusController.java | 2 +- .../admin/dto/AdminBookingStatsResponse.java | 8 +- .../CareFacilityBookingAdminService.java | 12 +- .../chatbot/rag/CareKnowledgeRetriever.java | 4 +- .../chatbot/service/ChatbotService.java | 2 +- .../app/CareFacilityFacade.java | 44 +++--- .../controller/CareFacilityApiController.java | 14 +- .../controller/CareFacilityController.java | 32 ++--- .../FacilityWaitlistController.java | 10 +- .../controller/PublicDataController.java | 2 +- ...CareFacilityAdminBookingSearchRequest.java | 2 +- .../CareFacilityAdminStatusUpdateRequest.java | 2 +- .../CareFacilityAdvancedSearchRequest.java | 4 +- .../CareFacilityListBookingsRequest.java | 2 +- .../request/CareFacilitySearchRequest.java | 2 +- .../dto/request/CreateBookingRequest.java | 2 +- .../dto/request/ReviewRequest.java | 2 +- .../dto/request/UpdateBookingRequest.java | 2 +- .../dto/request/WaitlistRequest.java | 2 +- .../response/AdmissionForecastResponse.java | 2 +- .../dto/response/BookingListResponse.java | 2 +- .../dto/response/BookingResponse.java | 2 +- .../dto/response/BookingStats.java | 2 +- .../response/CareFacilityBookingResponse.java | 2 +- .../dto/response/CareFacilityInfo.java | 2 +- .../response/CareFacilityListResponse.java | 2 +- .../response/CareFacilityStatsResponse.java | 2 +- .../dto/response/DailyBookingCount.java | 2 +- .../dto/response/FacilityDistribution.java | 2 +- .../response/FacilityPopularityResponse.java | 2 +- .../response/ForecastAccuracyResponse.java | 2 +- .../dto/response/ReviewResponse.java | 2 +- .../dto/response/StatusDistribution.java | 2 +- .../dto/response/TypeDistribution.java | 2 +- .../dto/response/TypeStats.java | 4 +- .../dto/response/WaitlistStatsResponse.java | 2 +- .../entity/CareFacility.java | 2 +- .../entity/CareFacilityBooking.java | 2 +- .../entity/FacilityCapacitySnapshot.java | 2 +- .../entity/FacilityType.java | 2 +- .../entity/FacilityWaitlist.java | 2 +- .../entity/ForecastAccuracy.java | 2 +- .../entity/Review.java | 2 +- .../mapper/BookingMapper.java | 8 +- .../mapper/CareFacilityMapper.java | 6 +- .../CareFacilityBookingRepository.java | 8 +- .../repository/CareFacilityRepository.java | 10 +- .../FacilityCapacitySnapshotRepository.java | 4 +- .../FacilityWaitlistRepository.java | 12 +- .../ForecastAccuracyRepository.java | 4 +- .../repository/ReviewRepository.java | 6 +- .../service/AdmissionForecastCalculator.java | 4 +- .../service/AdmissionForecastService.java | 12 +- .../service/CareFacilityBookingService.java | 16 +-- .../service/CareFacilityService.java | 30 ++-- .../service/FacilityPopularityService.java | 12 +- .../service/FacilityVacancyNotifier.java | 14 +- .../service/FacilityWaitlistService.java | 14 +- .../service/ForecastAccuracyService.java | 8 +- .../service/ForecastBacktestService.java | 10 +- .../domain/health/service/HealthService.java | 4 +- .../service/SiblingOverviewService.java | 2 +- .../com/carecode/domain/user/entity/User.java | 2 +- .../geocoding/FacilityGeocodingService.java | 4 +- .../sync/CapacitySnapshotRecorder.java | 6 +- .../sync/CareFacilityUpsertService.java | 6 +- .../sync/KindergartenUpsertService.java | 6 +- .../service/AdmissionForecastServiceTest.java | 12 +- .../CareFacilityBookingServiceTest.java | 12 +- .../FacilityPopularityServiceTest.java | 12 +- .../service/FacilityVacancyNotifierTest.java | 14 +- .../service/ForecastAccuracyServiceTest.java | 8 +- .../service/ForecastBacktestServiceTest.java | 10 +- .../FacilityGeocodingServiceTest.java | 4 +- .../sync/KindergartenUpsertServiceTest.java | 6 +- .../FacilityBookingContractTest.java | 6 +- .../ForecastAccuracyContractTest.java | 10 +- .../integration/LivePublicDataSyncTest.java | 6 +- .../integration/PublicStatsContractTest.java | 6 +- .../integration/SampleDataScenarioTest.java | 12 +- 92 files changed, 357 insertions(+), 452 deletions(-) rename src/main/java/com/carecode/domain/{careFacility => facility}/app/CareFacilityFacade.java (82%) rename src/main/java/com/carecode/domain/{careFacility => facility}/controller/CareFacilityApiController.java (97%) rename src/main/java/com/carecode/domain/{careFacility => facility}/controller/CareFacilityController.java (94%) rename src/main/java/com/carecode/domain/{careFacility => facility}/controller/FacilityWaitlistController.java (91%) rename src/main/java/com/carecode/domain/{careFacility => facility}/controller/PublicDataController.java (99%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/request/CareFacilityAdminBookingSearchRequest.java (91%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/request/CareFacilityAdminStatusUpdateRequest.java (91%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/request/CareFacilityAdvancedSearchRequest.java (84%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/request/CareFacilityListBookingsRequest.java (91%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/request/CareFacilitySearchRequest.java (91%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/request/CreateBookingRequest.java (91%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/request/ReviewRequest.java (75%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/request/UpdateBookingRequest.java (91%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/request/WaitlistRequest.java (93%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/AdmissionForecastResponse.java (96%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/BookingListResponse.java (90%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/BookingResponse.java (93%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/BookingStats.java (87%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/CareFacilityBookingResponse.java (93%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/CareFacilityInfo.java (94%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/CareFacilityListResponse.java (90%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/CareFacilityStatsResponse.java (94%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/DailyBookingCount.java (83%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/FacilityDistribution.java (86%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/FacilityPopularityResponse.java (95%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/ForecastAccuracyResponse.java (97%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/ReviewResponse.java (86%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/StatusDistribution.java (86%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/TypeDistribution.java (86%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/TypeStats.java (84%) rename src/main/java/com/carecode/domain/{careFacility => facility}/dto/response/WaitlistStatsResponse.java (94%) rename src/main/java/com/carecode/domain/{careFacility => facility}/entity/CareFacility.java (98%) rename src/main/java/com/carecode/domain/{careFacility => facility}/entity/CareFacilityBooking.java (99%) rename src/main/java/com/carecode/domain/{careFacility => facility}/entity/FacilityCapacitySnapshot.java (97%) rename src/main/java/com/carecode/domain/{careFacility => facility}/entity/FacilityType.java (93%) rename src/main/java/com/carecode/domain/{careFacility => facility}/entity/FacilityWaitlist.java (98%) rename src/main/java/com/carecode/domain/{careFacility => facility}/entity/ForecastAccuracy.java (97%) rename src/main/java/com/carecode/domain/{careFacility => facility}/entity/Review.java (98%) rename src/main/java/com/carecode/domain/{careFacility => facility}/mapper/BookingMapper.java (87%) rename src/main/java/com/carecode/domain/{careFacility => facility}/mapper/CareFacilityMapper.java (88%) rename src/main/java/com/carecode/domain/{careFacility => facility}/repository/CareFacilityBookingRepository.java (95%) rename src/main/java/com/carecode/domain/{careFacility => facility}/repository/CareFacilityRepository.java (96%) rename src/main/java/com/carecode/domain/{careFacility => facility}/repository/FacilityCapacitySnapshotRepository.java (92%) rename src/main/java/com/carecode/domain/{careFacility => facility}/repository/FacilityWaitlistRepository.java (74%) rename src/main/java/com/carecode/domain/{careFacility => facility}/repository/ForecastAccuracyRepository.java (79%) rename src/main/java/com/carecode/domain/{careFacility => facility}/repository/ReviewRepository.java (71%) rename src/main/java/com/carecode/domain/{careFacility => facility}/service/AdmissionForecastCalculator.java (98%) rename src/main/java/com/carecode/domain/{careFacility => facility}/service/AdmissionForecastService.java (89%) rename src/main/java/com/carecode/domain/{careFacility => facility}/service/CareFacilityBookingService.java (95%) rename src/main/java/com/carecode/domain/{careFacility => facility}/service/CareFacilityService.java (96%) rename src/main/java/com/carecode/domain/{careFacility => facility}/service/FacilityPopularityService.java (94%) rename src/main/java/com/carecode/domain/{careFacility => facility}/service/FacilityVacancyNotifier.java (93%) rename src/main/java/com/carecode/domain/{careFacility => facility}/service/FacilityWaitlistService.java (93%) rename src/main/java/com/carecode/domain/{careFacility => facility}/service/ForecastAccuracyService.java (93%) rename src/main/java/com/carecode/domain/{careFacility => facility}/service/ForecastBacktestService.java (96%) rename src/test/java/com/carecode/domain/{careFacility => facility}/service/AdmissionForecastServiceTest.java (94%) rename src/test/java/com/carecode/domain/{careFacility => facility}/service/CareFacilityBookingServiceTest.java (93%) rename src/test/java/com/carecode/domain/{careFacility => facility}/service/FacilityPopularityServiceTest.java (94%) rename src/test/java/com/carecode/domain/{careFacility => facility}/service/FacilityVacancyNotifierTest.java (93%) rename src/test/java/com/carecode/domain/{careFacility => facility}/service/ForecastAccuracyServiceTest.java (94%) rename src/test/java/com/carecode/domain/{careFacility => facility}/service/ForecastBacktestServiceTest.java (95%) diff --git a/archunit-baseline/05a5820d-39ea-4db6-b8e7-f737ac6a90df b/archunit-baseline/05a5820d-39ea-4db6-b8e7-f737ac6a90df index 3d7c1957..e6bff583 100644 --- a/archunit-baseline/05a5820d-39ea-4db6-b8e7-f737ac6a90df +++ b/archunit-baseline/05a5820d-39ea-4db6-b8e7-f737ac6a90df @@ -9,7 +9,7 @@ Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.admin.service.PolicyAdminService)> has parameter of type in (AdminPolicyController.java:0) Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.core.security.CurrentUserFacade)> has parameter of type in (AdminPolicyVerificationController.java:0) Constructor (com.carecode.domain.user.repository.UserRepository, com.carecode.domain.user.service.UserService)> has parameter of type in (AdminUserController.java:0) -Constructor (com.carecode.external.publicdata.CareFacilityApiService, com.carecode.domain.careFacility.service.CareFacilityService, com.carecode.domain.careFacility.repository.CareFacilityRepository)> has parameter of type in (CareFacilityApiController.java:0) +Constructor (com.carecode.external.publicdata.CareFacilityApiService, com.carecode.domain.facility.service.CareFacilityService, com.carecode.domain.facility.repository.CareFacilityRepository)> has parameter of type in (CareFacilityApiController.java:0) Constructor (com.carecode.domain.notification.repository.NotificationRepository, com.carecode.core.analytics.EventLogger, com.carecode.core.security.CurrentUserFacade)> has parameter of type in (NotificationLinkController.java:0) Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.core.analytics.EventLogger, com.carecode.core.security.CurrentUserFacade)> has parameter of type in (BenefitLinkController.java:0) Field has type in (AdminCommunityController.java:0) @@ -23,7 +23,7 @@ Field has type in (AdminPolicyController.java:0) Field has type in (AdminPolicyVerificationController.java:0) Field has type in (AdminUserController.java:0) -Field has type in (CareFacilityApiController.java:0) +Field has type in (CareFacilityApiController.java:0) Field has type in (NotificationLinkController.java:0) Field has type in (BenefitLinkController.java:0) Method calls method in (AdminCommunityController.java:46) @@ -58,9 +58,9 @@ Method calls method in (AdminUserController.java:177) Method calls method in (AdminUserController.java:56) Method calls method in (AdminUserController.java:134) -Method calls method in (CareFacilityApiController.java:86) -Method calls method in (CareFacilityApiController.java:96) -Method calls method in (CareFacilityApiController.java:266) +Method calls method in (CareFacilityApiController.java:86) +Method calls method in (CareFacilityApiController.java:96) +Method calls method in (CareFacilityApiController.java:266) Method calls method in (NotificationLinkController.java:56) Method calls method in (NotificationLinkController.java:64) Method calls method in (BenefitLinkController.java:43) diff --git a/archunit-baseline/05a7a88e-9a95-451a-b96f-4a8eb9be6c1e b/archunit-baseline/05a7a88e-9a95-451a-b96f-4a8eb9be6c1e index 44b855fd..e69de29b 100644 --- a/archunit-baseline/05a7a88e-9a95-451a-b96f-4a8eb9be6c1e +++ b/archunit-baseline/05a7a88e-9a95-451a-b96f-4a8eb9be6c1e @@ -1,98 +0,0 @@ -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.app.CareFacilityFacade) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.controller.CareFacilityApiController) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.controller.CareFacilityController) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.controller.FacilityWaitlistController) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.controller.PublicDataController) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CareFacilityAdminBookingSearchRequest$CareFacilityAdminBookingSearchRequestBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CareFacilityAdminBookingSearchRequest) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CareFacilityAdminStatusUpdateRequest$CareFacilityAdminStatusUpdateRequestBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CareFacilityAdminStatusUpdateRequest) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CareFacilityAdvancedSearchRequest$CareFacilityAdvancedSearchRequestBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CareFacilityAdvancedSearchRequest) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CareFacilityListBookingsRequest$CareFacilityListBookingsRequestBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CareFacilityListBookingsRequest) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CareFacilitySearchRequest$CareFacilitySearchRequestBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CareFacilitySearchRequest) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CreateBookingRequest$CreateBookingRequestBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.CreateBookingRequest) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.ReviewRequest$ReviewRequestBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.ReviewRequest) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.UpdateBookingRequest$UpdateBookingRequestBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.UpdateBookingRequest) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.request.WaitlistRequest) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.AdmissionForecastResponse$AdmissionForecastResponseBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.AdmissionForecastResponse) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.BookingListResponse$BookingListResponseBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.BookingListResponse) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.BookingResponse$BookingResponseBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.BookingResponse) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.BookingStats$BookingStatsBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.BookingStats) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.CareFacilityBookingResponse$CareFacilityBookingResponseBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.CareFacilityBookingResponse) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.CareFacilityInfo$CareFacilityInfoBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.CareFacilityInfo) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.CareFacilityListResponse$CareFacilityListResponseBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.CareFacilityListResponse) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.CareFacilityStatsResponse$CareFacilityStatsResponseBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.CareFacilityStatsResponse) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.DailyBookingCount$DailyBookingCountBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.DailyBookingCount) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.FacilityDistribution$FacilityDistributionBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.FacilityDistribution) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.FacilityPopularityResponse$FacilityPopularityResponseBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.FacilityPopularityResponse) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.ForecastAccuracyResponse$Bucket$BucketBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.ForecastAccuracyResponse$Bucket) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.ForecastAccuracyResponse$ForecastAccuracyResponseBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.ForecastAccuracyResponse) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.ReviewResponse$ReviewResponseBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.ReviewResponse) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.StatusDistribution$StatusDistributionBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.StatusDistribution) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.TypeDistribution$TypeDistributionBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.TypeDistribution) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.TypeStats$TypeStatsBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.TypeStats) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.WaitlistStatsResponse$WaitlistStatsResponseBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.dto.response.WaitlistStatsResponse) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.CareFacility$CareFacilityBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.CareFacility) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.CareFacilityBooking$BookingStatus) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.CareFacilityBooking$BookingType) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.CareFacilityBooking) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot$FacilityCapacitySnapshotBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.FacilityType) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.FacilityWaitlist$FacilityWaitlistBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.FacilityWaitlist$WaitStatus) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.FacilityWaitlist) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.ForecastAccuracy$ForecastAccuracyBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.ForecastAccuracy) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.Review$ReviewBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.entity.Review) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.mapper.BookingMapper) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.mapper.CareFacilityMapper) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.repository.CareFacilityBookingRepository) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.repository.CareFacilityRepository) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.repository.FacilityWaitlistRepository) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.repository.ForecastAccuracyRepository) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.repository.ReviewRepository) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.AdmissionForecastCalculator$Forecast$ForecastBuilder) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.AdmissionForecastCalculator$Forecast) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.AdmissionForecastCalculator) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.AdmissionForecastService) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.CareFacilityBookingService$1) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.CareFacilityBookingService) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.CareFacilityService) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.FacilityPopularityService$Rate) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.FacilityPopularityService) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.FacilityVacancyNotifier$VacancyNotifyResult) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.FacilityVacancyNotifier) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.FacilityWaitlistService) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.ForecastAccuracyService$1) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.ForecastAccuracyService) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.ForecastBacktestService$Bucket) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.ForecastBacktestService$Sample) -도메인 패키지 이름이 소문자가 아니다: careFacility (com.carecode.domain.careFacility.service.ForecastBacktestService) diff --git a/archunit-baseline/a6b21c55-f3df-4514-8faa-c32628f81448 b/archunit-baseline/a6b21c55-f3df-4514-8faa-c32628f81448 index 48dd389b..bfa746fb 100644 --- a/archunit-baseline/a6b21c55-f3df-4514-8faa-c32628f81448 +++ b/archunit-baseline/a6b21c55-f3df-4514-8faa-c32628f81448 @@ -1,38 +1,38 @@ -admin → careFacility 리포지토리: Constructor (com.carecode.domain.careFacility.repository.CareFacilityBookingRepository, com.carecode.domain.user.repository.UserRepository)> has parameter of type in (CareFacilityBookingAdminService.java:0) -admin → careFacility 리포지토리: Field has type in (CareFacilityBookingAdminService.java:0) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:173) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:170) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:54) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:131) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:180) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:181) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:182) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:183) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:184) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:189) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:188) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:187) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:267) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:253) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:252) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:226) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:230) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:231) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:232) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:233) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:234) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:240) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:244) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:245) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:246) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:102) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:142) -admin → careFacility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:162) admin → community 리포지토리: Constructor (com.carecode.domain.community.repository.PostRepository, com.carecode.domain.community.mapper.CommunityMapper)> has parameter of type in (AdminCommunityController.java:0) admin → community 리포지토리: Field has type in (AdminCommunityController.java:0) admin → community 리포지토리: Method calls method in (AdminCommunityController.java:46) admin → community 리포지토리: Method calls method in (AdminCommunityController.java:51) admin → community 리포지토리: Method calls method in (AdminCommunityController.java:33) +admin → facility 리포지토리: Constructor (com.carecode.domain.facility.repository.CareFacilityBookingRepository, com.carecode.domain.user.repository.UserRepository)> has parameter of type in (CareFacilityBookingAdminService.java:0) +admin → facility 리포지토리: Field has type in (CareFacilityBookingAdminService.java:0) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:173) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:170) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:54) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:131) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:180) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:181) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:182) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:183) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:184) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:189) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:188) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:187) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:267) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:253) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:252) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:226) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:230) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:231) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:232) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:233) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:234) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:240) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:244) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:245) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:246) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:102) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:142) +admin → facility 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:162) admin → health 리포지토리: Constructor (com.carecode.domain.user.repository.UserRepository, com.carecode.domain.health.repository.HospitalRepository, com.carecode.domain.policy.repository.PolicyRepository)> has parameter of type in (AdminDashboardController.java:0) admin → health 리포지토리: Constructor (com.carecode.domain.health.repository.HealthRecordRepository, com.carecode.domain.health.mapper.HealthRecordMapper)> has parameter of type in (AdminHealthController.java:0) admin → health 리포지토리: Constructor (com.carecode.domain.health.repository.HospitalRepository, com.carecode.domain.health.mapper.HospitalMapper)> has parameter of type in (AdminHospitalController.java:0) @@ -84,7 +84,7 @@ admin → policy 리포지토리: Method (com.carecode.domain.user.repository.UserRepository, com.carecode.domain.health.repository.HospitalRepository, com.carecode.domain.policy.repository.PolicyRepository)> has parameter of type in (AdminDashboardController.java:0) admin → user 리포지토리: Constructor (com.carecode.domain.notification.repository.NotificationRepository, com.carecode.domain.user.repository.UserRepository)> has parameter of type in (AdminNotificationController.java:0) admin → user 리포지토리: Constructor (com.carecode.domain.user.repository.UserRepository, com.carecode.domain.user.service.UserService)> has parameter of type in (AdminUserController.java:0) -admin → user 리포지토리: Constructor (com.carecode.domain.careFacility.repository.CareFacilityBookingRepository, com.carecode.domain.user.repository.UserRepository)> has parameter of type in (CareFacilityBookingAdminService.java:0) +admin → user 리포지토리: Constructor (com.carecode.domain.facility.repository.CareFacilityBookingRepository, com.carecode.domain.user.repository.UserRepository)> has parameter of type in (CareFacilityBookingAdminService.java:0) admin → user 리포지토리: Field has type in (AdminDashboardController.java:0) admin → user 리포지토리: Field has type in (AdminNotificationController.java:0) admin → user 리포지토리: Field has type in (AdminUserController.java:0) @@ -97,36 +97,21 @@ admin → user 리포지토리: Method calls method in (AdminUserController.java:177) admin → user 리포지토리: Method calls method in (AdminUserController.java:56) admin → user 리포지토리: Method calls method in (AdminUserController.java:134) -admin → user 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:317) +admin → user 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:317) admin → user 리포지토리: Method calls method in (CareFacilityBookingAdminService.java:351) -careFacility → notification 리포지토리: Constructor (com.carecode.domain.careFacility.repository.FacilityWaitlistRepository, com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository, com.carecode.domain.notification.repository.NotificationRepository, com.carecode.domain.notification.sender.NotificationDispatcher, com.carecode.core.analytics.EventLogger)> has parameter of type in (FacilityVacancyNotifier.java:0) -careFacility → notification 리포지토리: Field has type in (FacilityVacancyNotifier.java:0) -careFacility → notification 리포지토리: Method calls method in (FacilityVacancyNotifier.java:130) -careFacility → user 리포지토리: Constructor (com.carecode.domain.careFacility.repository.CareFacilityBookingRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository, com.carecode.domain.user.repository.UserRepository)> has parameter of type in (CareFacilityBookingService.java:0) -careFacility → user 리포지토리: Constructor (com.carecode.domain.careFacility.repository.CareFacilityRepository, com.carecode.domain.careFacility.repository.CareFacilityBookingRepository, com.carecode.core.ops.sync.SyncFreshnessService, com.carecode.domain.careFacility.repository.ReviewRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.careFacility.mapper.CareFacilityMapper, com.carecode.core.search.FullTextSearchSupport)> has parameter of type in (CareFacilityService.java:0) -careFacility → user 리포지토리: Constructor (com.carecode.domain.careFacility.repository.FacilityWaitlistRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.core.security.CurrentUserFacade, com.carecode.core.analytics.EventLogger)> has parameter of type in (FacilityWaitlistService.java:0) -careFacility → user 리포지토리: Field has type in (CareFacilityBookingService.java:0) -careFacility → user 리포지토리: Field has type in (CareFacilityService.java:0) -careFacility → user 리포지토리: Field has type in (FacilityWaitlistService.java:0) -careFacility → user 리포지토리: Method calls method in (CareFacilityBookingService.java:52) -careFacility → user 리포지토리: Method calls method in (CareFacilityBookingService.java:100) -careFacility → user 리포지토리: Method calls method in (CareFacilityService.java:524) -careFacility → user 리포지토리: Method calls method in (CareFacilityService.java:559) -careFacility → user 리포지토리: Method calls method in (CareFacilityService.java:549) -careFacility → user 리포지토리: Method calls method in (FacilityWaitlistService.java:140) -chatbot → careFacility 리포지토리: Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository)> has parameter of type in (CareKnowledgeRetriever.java:0) -chatbot → careFacility 리포지토리: Constructor (com.carecode.domain.chatbot.repository.ChatMessageRepository, com.carecode.domain.chatbot.repository.ChatSessionRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository, com.carecode.domain.chatbot.rag.CareKnowledgeRetriever, com.carecode.domain.chatbot.llm.ChatCompletionClient)> has parameter of type in (ChatbotService.java:0) -chatbot → careFacility 리포지토리: Field has type in (CareKnowledgeRetriever.java:0) -chatbot → careFacility 리포지토리: Field has type in (ChatbotService.java:0) -chatbot → careFacility 리포지토리: Method calls method in (CareKnowledgeRetriever.java:82) -chatbot → careFacility 리포지토리: Method calls method in (ChatbotService.java:520) -chatbot → policy 리포지토리: Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository)> has parameter of type in (CareKnowledgeRetriever.java:0) -chatbot → policy 리포지토리: Constructor (com.carecode.domain.chatbot.repository.ChatMessageRepository, com.carecode.domain.chatbot.repository.ChatSessionRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository, com.carecode.domain.chatbot.rag.CareKnowledgeRetriever, com.carecode.domain.chatbot.llm.ChatCompletionClient)> has parameter of type in (ChatbotService.java:0) +chatbot → facility 리포지토리: Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.facility.repository.CareFacilityRepository)> has parameter of type in (CareKnowledgeRetriever.java:0) +chatbot → facility 리포지토리: Constructor (com.carecode.domain.chatbot.repository.ChatMessageRepository, com.carecode.domain.chatbot.repository.ChatSessionRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.facility.repository.CareFacilityRepository, com.carecode.domain.chatbot.rag.CareKnowledgeRetriever, com.carecode.domain.chatbot.llm.ChatCompletionClient)> has parameter of type in (ChatbotService.java:0) +chatbot → facility 리포지토리: Field has type in (CareKnowledgeRetriever.java:0) +chatbot → facility 리포지토리: Field has type in (ChatbotService.java:0) +chatbot → facility 리포지토리: Method calls method in (CareKnowledgeRetriever.java:82) +chatbot → facility 리포지토리: Method calls method in (ChatbotService.java:520) +chatbot → policy 리포지토리: Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.facility.repository.CareFacilityRepository)> has parameter of type in (CareKnowledgeRetriever.java:0) +chatbot → policy 리포지토리: Constructor (com.carecode.domain.chatbot.repository.ChatMessageRepository, com.carecode.domain.chatbot.repository.ChatSessionRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.facility.repository.CareFacilityRepository, com.carecode.domain.chatbot.rag.CareKnowledgeRetriever, com.carecode.domain.chatbot.llm.ChatCompletionClient)> has parameter of type in (ChatbotService.java:0) chatbot → policy 리포지토리: Field has type in (CareKnowledgeRetriever.java:0) chatbot → policy 리포지토리: Field has type in (ChatbotService.java:0) chatbot → policy 리포지토리: Method calls method in (CareKnowledgeRetriever.java:68) chatbot → policy 리포지토리: Method calls method in (ChatbotService.java:505) -chatbot → user 리포지토리: Constructor (com.carecode.domain.chatbot.repository.ChatMessageRepository, com.carecode.domain.chatbot.repository.ChatSessionRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository, com.carecode.domain.chatbot.rag.CareKnowledgeRetriever, com.carecode.domain.chatbot.llm.ChatCompletionClient)> has parameter of type in (ChatbotService.java:0) +chatbot → user 리포지토리: Constructor (com.carecode.domain.chatbot.repository.ChatMessageRepository, com.carecode.domain.chatbot.repository.ChatSessionRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.facility.repository.CareFacilityRepository, com.carecode.domain.chatbot.rag.CareKnowledgeRetriever, com.carecode.domain.chatbot.llm.ChatCompletionClient)> has parameter of type in (ChatbotService.java:0) chatbot → user 리포지토리: Field has type in (ChatbotService.java:0) chatbot → user 리포지토리: Method calls method in (ChatbotService.java:381) chatbot → user 리포지토리: Method calls method in (ChatbotService.java:380) @@ -144,14 +129,29 @@ community → user 리포지토리: Method calls method in (CommunityService.java:544) community → user 리포지토리: Method calls method in (CommunityService.java:514) community → user 리포지토리: Method calls method in (ModerationService.java:115) -health → careFacility 리포지토리: Constructor (com.carecode.domain.health.repository.HealthRecordRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.user.service.ConsentGuard, com.carecode.domain.health.repository.HealthRecordAttachmentRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository, com.carecode.domain.health.mapper.HealthRecordMapper, com.carecode.domain.health.mapper.ChildMapper)> has parameter of type in (HealthService.java:0) -health → careFacility 리포지토리: Constructor (com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.careFacility.repository.FacilityWaitlistRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.core.security.CurrentUserFacade)> has parameter of type in (SiblingOverviewService.java:0) -health → careFacility 리포지토리: Field has type in (HealthService.java:0) -health → careFacility 리포지토리: Field has type in (SiblingOverviewService.java:0) -health → careFacility 리포지토리: Method calls method in (HealthService.java:524) -health → careFacility 리포지토리: Method calls method in (SiblingOverviewService.java:91) -health → policy 리포지토리: Constructor (com.carecode.domain.health.repository.HealthRecordRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.user.service.ConsentGuard, com.carecode.domain.health.repository.HealthRecordAttachmentRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository, com.carecode.domain.health.mapper.HealthRecordMapper, com.carecode.domain.health.mapper.ChildMapper)> has parameter of type in (HealthService.java:0) -health → policy 리포지토리: Constructor (com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.careFacility.repository.FacilityWaitlistRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.core.security.CurrentUserFacade)> has parameter of type in (SiblingOverviewService.java:0) +facility → notification 리포지토리: Constructor (com.carecode.domain.facility.repository.FacilityWaitlistRepository, com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository, com.carecode.domain.facility.repository.CareFacilityRepository, com.carecode.domain.notification.repository.NotificationRepository, com.carecode.domain.notification.sender.NotificationDispatcher, com.carecode.core.analytics.EventLogger)> has parameter of type in (FacilityVacancyNotifier.java:0) +facility → notification 리포지토리: Field has type in (FacilityVacancyNotifier.java:0) +facility → notification 리포지토리: Method calls method in (FacilityVacancyNotifier.java:130) +facility → user 리포지토리: Constructor (com.carecode.domain.facility.repository.CareFacilityBookingRepository, com.carecode.domain.facility.repository.CareFacilityRepository, com.carecode.domain.user.repository.UserRepository)> has parameter of type in (CareFacilityBookingService.java:0) +facility → user 리포지토리: Constructor (com.carecode.domain.facility.repository.CareFacilityRepository, com.carecode.domain.facility.repository.CareFacilityBookingRepository, com.carecode.core.ops.sync.SyncFreshnessService, com.carecode.domain.facility.repository.ReviewRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.facility.mapper.CareFacilityMapper, com.carecode.core.search.FullTextSearchSupport)> has parameter of type in (CareFacilityService.java:0) +facility → user 리포지토리: Constructor (com.carecode.domain.facility.repository.FacilityWaitlistRepository, com.carecode.domain.facility.repository.CareFacilityRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.core.security.CurrentUserFacade, com.carecode.core.analytics.EventLogger)> has parameter of type in (FacilityWaitlistService.java:0) +facility → user 리포지토리: Field has type in (CareFacilityBookingService.java:0) +facility → user 리포지토리: Field has type in (CareFacilityService.java:0) +facility → user 리포지토리: Field has type in (FacilityWaitlistService.java:0) +facility → user 리포지토리: Method calls method in (CareFacilityBookingService.java:52) +facility → user 리포지토리: Method calls method in (CareFacilityBookingService.java:100) +facility → user 리포지토리: Method calls method in (CareFacilityService.java:524) +facility → user 리포지토리: Method calls method in (CareFacilityService.java:559) +facility → user 리포지토리: Method calls method in (CareFacilityService.java:549) +facility → user 리포지토리: Method calls method in (FacilityWaitlistService.java:140) +health → facility 리포지토리: Constructor (com.carecode.domain.health.repository.HealthRecordRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.user.service.ConsentGuard, com.carecode.domain.health.repository.HealthRecordAttachmentRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.facility.repository.CareFacilityRepository, com.carecode.domain.health.mapper.HealthRecordMapper, com.carecode.domain.health.mapper.ChildMapper)> has parameter of type in (HealthService.java:0) +health → facility 리포지토리: Constructor (com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.facility.repository.FacilityWaitlistRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.core.security.CurrentUserFacade)> has parameter of type in (SiblingOverviewService.java:0) +health → facility 리포지토리: Field has type in (HealthService.java:0) +health → facility 리포지토리: Field has type in (SiblingOverviewService.java:0) +health → facility 리포지토리: Method calls method in (HealthService.java:524) +health → facility 리포지토리: Method calls method in (SiblingOverviewService.java:91) +health → policy 리포지토리: Constructor (com.carecode.domain.health.repository.HealthRecordRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.user.service.ConsentGuard, com.carecode.domain.health.repository.HealthRecordAttachmentRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.facility.repository.CareFacilityRepository, com.carecode.domain.health.mapper.HealthRecordMapper, com.carecode.domain.health.mapper.ChildMapper)> has parameter of type in (HealthService.java:0) +health → policy 리포지토리: Constructor (com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.facility.repository.FacilityWaitlistRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.core.security.CurrentUserFacade)> has parameter of type in (SiblingOverviewService.java:0) health → policy 리포지토리: Constructor (com.carecode.domain.health.service.ChildService, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.health.repository.HealthRecordRepository, com.carecode.domain.policy.repository.PolicyRepository)> has parameter of type in (ChildTimelineService.java:0) health → policy 리포지토리: Field has type in (HealthService.java:0) health → policy 리포지토리: Field has type in (SiblingOverviewService.java:0) @@ -162,9 +162,9 @@ health → policy 리포지토리: Method (com.carecode.domain.health.service.HealthService, com.carecode.domain.health.repository.HospitalRepository, com.carecode.core.ops.sync.SyncFreshnessService, com.carecode.domain.health.repository.HospitalLikeRepository, com.carecode.domain.health.repository.HospitalReviewRepository, com.carecode.domain.health.mapper.HospitalMapper, com.carecode.domain.health.mapper.HospitalReviewMapper, com.carecode.domain.user.repository.UserRepository)> has parameter of type in (HealthFacade.java:0) health → user 리포지토리: Constructor (com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.health.mapper.ChildMapper, com.carecode.core.security.CurrentUserFacade, com.carecode.domain.health.service.VaccinationScheduleService, com.carecode.core.analytics.EventLogger)> has parameter of type in (ChildService.java:0) health → user 리포지토리: Constructor (com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.health.repository.HealthRecordRepository, com.carecode.core.security.CurrentUserFacade)> has parameter of type in (GrowthChartService.java:0) -health → user 리포지토리: Constructor (com.carecode.domain.health.repository.HealthRecordRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.user.service.ConsentGuard, com.carecode.domain.health.repository.HealthRecordAttachmentRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository, com.carecode.domain.health.mapper.HealthRecordMapper, com.carecode.domain.health.mapper.ChildMapper)> has parameter of type in (HealthService.java:0) -health → user 리포지토리: Constructor (com.carecode.domain.health.repository.HealthRecordRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.user.service.ConsentGuard, com.carecode.domain.health.repository.HealthRecordAttachmentRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.careFacility.repository.CareFacilityRepository, com.carecode.domain.health.mapper.HealthRecordMapper, com.carecode.domain.health.mapper.ChildMapper)> has parameter of type in (HealthService.java:0) -health → user 리포지토리: Constructor (com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.careFacility.repository.FacilityWaitlistRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.core.security.CurrentUserFacade)> has parameter of type in (SiblingOverviewService.java:0) +health → user 리포지토리: Constructor (com.carecode.domain.health.repository.HealthRecordRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.user.service.ConsentGuard, com.carecode.domain.health.repository.HealthRecordAttachmentRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.facility.repository.CareFacilityRepository, com.carecode.domain.health.mapper.HealthRecordMapper, com.carecode.domain.health.mapper.ChildMapper)> has parameter of type in (HealthService.java:0) +health → user 리포지토리: Constructor (com.carecode.domain.health.repository.HealthRecordRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.user.service.ConsentGuard, com.carecode.domain.health.repository.HealthRecordAttachmentRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.facility.repository.CareFacilityRepository, com.carecode.domain.health.mapper.HealthRecordMapper, com.carecode.domain.health.mapper.ChildMapper)> has parameter of type in (HealthService.java:0) +health → user 리포지토리: Constructor (com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.facility.repository.FacilityWaitlistRepository, com.carecode.domain.policy.repository.PolicyRepository, com.carecode.core.security.CurrentUserFacade)> has parameter of type in (SiblingOverviewService.java:0) health → user 리포지토리: Constructor (com.carecode.domain.health.repository.VaccinationScheduleRepository, com.carecode.domain.user.repository.ChildRepository)> has parameter of type in (VaccinationScheduleService.java:0) health → user 리포지토리: Field has type in (HealthFacade.java:0) health → user 리포지토리: Field has type in (ChildService.java:0) diff --git a/docs/architecture/carecode-architecture.drawio b/docs/architecture/carecode-architecture.drawio index 76436c8f..13f5c503 100644 --- a/docs/architecture/carecode-architecture.drawio +++ b/docs/architecture/carecode-architecture.drawio @@ -48,7 +48,7 @@ - + diff --git a/docs/architecture/system-overview.md b/docs/architecture/system-overview.md index f768b610..3b86ea78 100644 --- a/docs/architecture/system-overview.md +++ b/docs/architecture/system-overview.md @@ -22,7 +22,7 @@ graph TB subgraph domains["도메인"] POLICY["policy
지원금"] - FACILITY["careFacility
어린이집·유치원"] + FACILITY["facility
어린이집·유치원"] HEALTHD["health
건강기록·병원"] USERD["user
계정·자녀·동의"] NOTI["notification"] diff --git a/docs/quality/architecture-rules.md b/docs/quality/architecture-rules.md index 5bbc188e..a6887c7b 100644 --- a/docs/quality/architecture-rules.md +++ b/docs/quality/architecture-rules.md @@ -29,12 +29,15 @@ ArchUnit 의 `FreezingArchRule` 을 씁니다. ./gradlew test --tests '*ArchitectureRulesTest' ``` -## 규칙과 현재 위반 (2026-10-05 기준) +## 규칙과 현재 위반 + +진척: **489건(0단계) → 391건(1b 단계)**. 남은 것은 도메인 경계(271)와 컨트롤러의 리포지토리 +직접 사용(66), core 기반의 도메인 참조(50)입니다. | 규칙 | 위반 | 뜻 | |------|------|-----| | 다른 도메인의 리포지토리를 직접 쓰지 않는다 | 271 | 남의 테이블을 직접 읽으면 그 도메인의 규칙(소유권 검증 등)을 건너뛴다 | -| 도메인 패키지 이름은 소문자다 | 96 | `careFacility` 하나만 낙타등. 한 군데만 다르면 새로 온 사람이 둘 다 흉내 낸다 | +| 도메인 패키지 이름은 소문자다 | **0** | `careFacility`→`facility` 로 해소 (1b 단계) | | 컨트롤러는 리포지토리를 직접 쓰지 않는다 | 66 | 검증·트랜잭션 경계가 컨트롤러로 샌다 | | core 기반 패키지는 domain 을 의존하지 않는다 | 50 | 기반 코드가 도메인을 알면 공통이 아니다 | | 매퍼는 리포지토리를 쓰지 않는다 | 3 | 변환 한 번에 숨은 쿼리가 생기면 N+1 을 추적할 수 없다 | @@ -92,7 +95,7 @@ ArchUnit 의 `FreezingArchRule` 을 씁니다. | 단계 | 내용 | 효과 | |------|------|------| | ~~1a. core 정리~~ | ~~조합 계층 분리, core 의 도메인 코드 이동~~ | **완료** — core 에 컨트롤러 0 | -| 1b. 이름 통일 | `careFacility`→`facility`, 문서의 `facade`↔코드 `app` | 위반 98 감소 | +| ~~1b. 이름 통일~~ | ~~`careFacility`→`facility`, 문서의 `facade`↔코드 `app`~~ | **완료** — 489 → 391 | | 2. 예외 한 체계 | `catch(Exception)` 덮어쓰기 제거, ErrorCode 기반 통합 | 상태 코드 정확해짐 | | 3. `Map` 응답 → DTO | 24곳. 스펙에 타입이 생겨 프런트 계약 대조가 이 경로까지 본다 | 계약 품질 | | 4. Child 를 제 자리로 | 엔티티는 `user`, 서비스는 `health` 에 쪼개져 있다 | 결합 1위 해소 | diff --git a/src/main/java/com/carecode/batch/BookingReminderScheduler.java b/src/main/java/com/carecode/batch/BookingReminderScheduler.java index 9b29a1d5..da6badcf 100644 --- a/src/main/java/com/carecode/batch/BookingReminderScheduler.java +++ b/src/main/java/com/carecode/batch/BookingReminderScheduler.java @@ -1,7 +1,7 @@ package com.carecode.batch; -import com.carecode.domain.careFacility.entity.CareFacilityBooking; -import com.carecode.domain.careFacility.repository.CareFacilityBookingRepository; +import com.carecode.domain.facility.entity.CareFacilityBooking; +import com.carecode.domain.facility.repository.CareFacilityBookingRepository; import com.carecode.domain.notification.entity.Notification; import com.carecode.domain.notification.service.NotificationCreationService; import com.carecode.domain.user.entity.User; diff --git a/src/main/java/com/carecode/batch/ForecastBacktestScheduler.java b/src/main/java/com/carecode/batch/ForecastBacktestScheduler.java index 2cdd9314..4d630de7 100644 --- a/src/main/java/com/carecode/batch/ForecastBacktestScheduler.java +++ b/src/main/java/com/carecode/batch/ForecastBacktestScheduler.java @@ -2,7 +2,7 @@ import com.carecode.core.ops.sync.SyncJob; import com.carecode.core.ops.sync.SyncRunTracker; -import com.carecode.domain.careFacility.service.ForecastBacktestService; +import com.carecode.domain.facility.service.ForecastBacktestService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/carecode/batch/PublicDataSyncScheduler.java b/src/main/java/com/carecode/batch/PublicDataSyncScheduler.java index a6bd5a23..826b78a5 100644 --- a/src/main/java/com/carecode/batch/PublicDataSyncScheduler.java +++ b/src/main/java/com/carecode/batch/PublicDataSyncScheduler.java @@ -5,7 +5,7 @@ import com.carecode.external.publicdata.sync.NationwideChildcareFacilitySyncService; import com.carecode.external.publicdata.sync.PediatricHospitalSyncService; import com.carecode.external.geocoding.FacilityGeocodingService; -import com.carecode.domain.careFacility.service.FacilityVacancyNotifier; +import com.carecode.domain.facility.service.FacilityVacancyNotifier; import com.carecode.domain.policy.service.BenefitReportSolicitor; import com.carecode.domain.policy.service.PolicyChangeNotifier; import com.carecode.domain.policy.service.PolicyDeadlineNotifier; diff --git a/src/main/java/com/carecode/devtools/SampleDataCleaner.java b/src/main/java/com/carecode/devtools/SampleDataCleaner.java index e716d31e..c8481025 100644 --- a/src/main/java/com/carecode/devtools/SampleDataCleaner.java +++ b/src/main/java/com/carecode/devtools/SampleDataCleaner.java @@ -1,9 +1,9 @@ package com.carecode.devtools; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; import com.carecode.domain.policy.entity.Policy; import com.carecode.domain.policy.repository.PolicyRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/carecode/devtools/SampleFacilitySeeder.java b/src/main/java/com/carecode/devtools/SampleFacilitySeeder.java index 03ad9dac..7df8cfdb 100644 --- a/src/main/java/com/carecode/devtools/SampleFacilitySeeder.java +++ b/src/main/java/com/carecode/devtools/SampleFacilitySeeder.java @@ -1,10 +1,10 @@ package com.carecode.devtools; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.entity.FacilityType; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.entity.FacilityType; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/carecode/domain/admin/controller/AdminPublicDataController.java b/src/main/java/com/carecode/domain/admin/controller/AdminPublicDataController.java index 9eb13a8a..2c0bfe30 100644 --- a/src/main/java/com/carecode/domain/admin/controller/AdminPublicDataController.java +++ b/src/main/java/com/carecode/domain/admin/controller/AdminPublicDataController.java @@ -8,7 +8,7 @@ import com.carecode.external.geocoding.FacilityGeocodingService; import com.carecode.core.ops.sync.SyncJob; import com.carecode.core.ops.sync.SyncRunTracker; -import com.carecode.domain.careFacility.service.FacilityVacancyNotifier; +import com.carecode.domain.facility.service.FacilityVacancyNotifier; import com.carecode.domain.policy.service.PolicyDeadlineNotifier; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/carecode/domain/admin/controller/AdminSyncStatusController.java b/src/main/java/com/carecode/domain/admin/controller/AdminSyncStatusController.java index 07d8c1ab..25e72d79 100644 --- a/src/main/java/com/carecode/domain/admin/controller/AdminSyncStatusController.java +++ b/src/main/java/com/carecode/domain/admin/controller/AdminSyncStatusController.java @@ -1,7 +1,7 @@ package com.carecode.domain.admin.controller; import com.carecode.core.ops.sync.SyncFreshnessService; -import com.carecode.domain.careFacility.service.ForecastBacktestService; +import com.carecode.domain.facility.service.ForecastBacktestService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/carecode/domain/admin/dto/AdminBookingStatsResponse.java b/src/main/java/com/carecode/domain/admin/dto/AdminBookingStatsResponse.java index aa47494d..264bc3fa 100644 --- a/src/main/java/com/carecode/domain/admin/dto/AdminBookingStatsResponse.java +++ b/src/main/java/com/carecode/domain/admin/dto/AdminBookingStatsResponse.java @@ -1,9 +1,9 @@ package com.carecode.domain.admin.dto; -import com.carecode.domain.careFacility.dto.response.StatusDistribution; -import com.carecode.domain.careFacility.dto.response.TypeDistribution; -import com.carecode.domain.careFacility.dto.response.FacilityDistribution; -import com.carecode.domain.careFacility.dto.response.DailyBookingCount; +import com.carecode.domain.facility.dto.response.StatusDistribution; +import com.carecode.domain.facility.dto.response.TypeDistribution; +import com.carecode.domain.facility.dto.response.FacilityDistribution; +import com.carecode.domain.facility.dto.response.DailyBookingCount; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/carecode/domain/admin/service/CareFacilityBookingAdminService.java b/src/main/java/com/carecode/domain/admin/service/CareFacilityBookingAdminService.java index 8326f073..074a1f26 100644 --- a/src/main/java/com/carecode/domain/admin/service/CareFacilityBookingAdminService.java +++ b/src/main/java/com/carecode/domain/admin/service/CareFacilityBookingAdminService.java @@ -4,16 +4,16 @@ import com.carecode.core.exception.CareServiceException; import com.carecode.domain.admin.dto.AdminBookingDetailResponse; import com.carecode.domain.admin.dto.AdminBookingListResponse; -import com.carecode.domain.careFacility.dto.response.StatusDistribution; -import com.carecode.domain.careFacility.dto.response.TypeDistribution; -import com.carecode.domain.careFacility.dto.response.FacilityDistribution; -import com.carecode.domain.careFacility.dto.response.DailyBookingCount; +import com.carecode.domain.facility.dto.response.StatusDistribution; +import com.carecode.domain.facility.dto.response.TypeDistribution; +import com.carecode.domain.facility.dto.response.FacilityDistribution; +import com.carecode.domain.facility.dto.response.DailyBookingCount; import com.carecode.domain.admin.dto.AdminBookingSearchRequest; import com.carecode.domain.admin.dto.AdminBookingSearchResponse; import com.carecode.domain.admin.dto.AdminStatusUpdateRequest; import com.carecode.domain.admin.dto.AdminBookingStatsResponse; -import com.carecode.domain.careFacility.entity.CareFacilityBooking; -import com.carecode.domain.careFacility.repository.CareFacilityBookingRepository; +import com.carecode.domain.facility.entity.CareFacilityBooking; +import com.carecode.domain.facility.repository.CareFacilityBookingRepository; import com.carecode.domain.user.entity.User; import com.carecode.domain.user.repository.UserRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/carecode/domain/chatbot/rag/CareKnowledgeRetriever.java b/src/main/java/com/carecode/domain/chatbot/rag/CareKnowledgeRetriever.java index 5d5327a0..0b8127ce 100644 --- a/src/main/java/com/carecode/domain/chatbot/rag/CareKnowledgeRetriever.java +++ b/src/main/java/com/carecode/domain/chatbot/rag/CareKnowledgeRetriever.java @@ -1,7 +1,7 @@ package com.carecode.domain.chatbot.rag; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.repository.CareFacilityRepository; import com.carecode.domain.policy.entity.Policy; import com.carecode.domain.policy.repository.PolicyRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/carecode/domain/chatbot/service/ChatbotService.java b/src/main/java/com/carecode/domain/chatbot/service/ChatbotService.java index de366515..d0c84cea 100644 --- a/src/main/java/com/carecode/domain/chatbot/service/ChatbotService.java +++ b/src/main/java/com/carecode/domain/chatbot/service/ChatbotService.java @@ -13,7 +13,7 @@ import com.carecode.domain.chatbot.llm.ChatCompletionClient; import com.carecode.domain.chatbot.rag.CareKnowledgeRetriever; import com.carecode.domain.chatbot.rag.RetrievedContext; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.CareFacilityRepository; import com.carecode.domain.policy.repository.PolicyRepository; import com.carecode.domain.user.entity.User; import com.carecode.domain.user.repository.UserRepository; diff --git a/src/main/java/com/carecode/domain/careFacility/app/CareFacilityFacade.java b/src/main/java/com/carecode/domain/facility/app/CareFacilityFacade.java similarity index 82% rename from src/main/java/com/carecode/domain/careFacility/app/CareFacilityFacade.java rename to src/main/java/com/carecode/domain/facility/app/CareFacilityFacade.java index bced54d4..407d459f 100644 --- a/src/main/java/com/carecode/domain/careFacility/app/CareFacilityFacade.java +++ b/src/main/java/com/carecode/domain/facility/app/CareFacilityFacade.java @@ -1,21 +1,21 @@ -package com.carecode.domain.careFacility.app; - -import com.carecode.domain.careFacility.dto.response.AdmissionForecastResponse; -import com.carecode.domain.careFacility.dto.response.BookingResponse; -import com.carecode.domain.careFacility.dto.response.FacilityPopularityResponse; -import com.carecode.domain.careFacility.dto.request.ReviewRequest; -import com.carecode.domain.careFacility.dto.request.CreateBookingRequest; -import com.carecode.domain.careFacility.dto.request.UpdateBookingRequest; -import com.carecode.domain.careFacility.dto.request.CareFacilitySearchRequest; -import com.carecode.domain.careFacility.dto.response.CareFacilityInfo; -import com.carecode.domain.careFacility.dto.response.CareFacilityListResponse; -import com.carecode.domain.careFacility.dto.response.CareFacilityStatsResponse; -import com.carecode.domain.careFacility.dto.response.ReviewResponse; -import com.carecode.domain.careFacility.entity.FacilityType; -import com.carecode.domain.careFacility.service.AdmissionForecastService; -import com.carecode.domain.careFacility.service.CareFacilityBookingService; -import com.carecode.domain.careFacility.service.FacilityPopularityService; -import com.carecode.domain.careFacility.service.CareFacilityService; +package com.carecode.domain.facility.app; + +import com.carecode.domain.facility.dto.response.AdmissionForecastResponse; +import com.carecode.domain.facility.dto.response.BookingResponse; +import com.carecode.domain.facility.dto.response.FacilityPopularityResponse; +import com.carecode.domain.facility.dto.request.ReviewRequest; +import com.carecode.domain.facility.dto.request.CreateBookingRequest; +import com.carecode.domain.facility.dto.request.UpdateBookingRequest; +import com.carecode.domain.facility.dto.request.CareFacilitySearchRequest; +import com.carecode.domain.facility.dto.response.CareFacilityInfo; +import com.carecode.domain.facility.dto.response.CareFacilityListResponse; +import com.carecode.domain.facility.dto.response.CareFacilityStatsResponse; +import com.carecode.domain.facility.dto.response.ReviewResponse; +import com.carecode.domain.facility.entity.FacilityType; +import com.carecode.domain.facility.service.AdmissionForecastService; +import com.carecode.domain.facility.service.CareFacilityBookingService; +import com.carecode.domain.facility.service.FacilityPopularityService; +import com.carecode.domain.facility.service.CareFacilityService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,7 +30,7 @@ public class CareFacilityFacade { private final CareFacilityBookingService bookingService; private final AdmissionForecastService admissionForecastService; private final FacilityPopularityService facilityPopularityService; - private final com.carecode.domain.careFacility.service.ForecastAccuracyService forecastAccuracyService; + private final com.carecode.domain.facility.service.ForecastAccuracyService forecastAccuracyService; @Transactional(readOnly = true) public List getAllCareFacilities(int page, int size) { @@ -94,8 +94,8 @@ public void updateRating(Long id, Double rating) { /** 입소 예측 정확도(측정된 기간별 최신 결과). 공개 API. */ @Transactional(readOnly = true) - public java.util.List getForecastAccuracy() { - return forecastAccuracyService.latestByHorizon(com.carecode.domain.careFacility.service.ForecastBacktestService.MEASURED_HORIZONS); + public java.util.List getForecastAccuracy() { + return forecastAccuracyService.latestByHorizon(com.carecode.domain.facility.service.ForecastBacktestService.MEASURED_HORIZONS); } @Transactional(readOnly = true) @@ -177,7 +177,7 @@ public List searchFacilitiesByKeyword(String keyword) { @Transactional(readOnly = true) public List searchFacilitiesAdvanced( - com.carecode.domain.careFacility.entity.FacilityType facilityType, + com.carecode.domain.facility.entity.FacilityType facilityType, Boolean isPublic, Boolean subsidyAvailable, Double minRating, diff --git a/src/main/java/com/carecode/domain/careFacility/controller/CareFacilityApiController.java b/src/main/java/com/carecode/domain/facility/controller/CareFacilityApiController.java similarity index 97% rename from src/main/java/com/carecode/domain/careFacility/controller/CareFacilityApiController.java rename to src/main/java/com/carecode/domain/facility/controller/CareFacilityApiController.java index 66aba899..11e52e9c 100644 --- a/src/main/java/com/carecode/domain/careFacility/controller/CareFacilityApiController.java +++ b/src/main/java/com/carecode/domain/facility/controller/CareFacilityApiController.java @@ -1,13 +1,13 @@ -package com.carecode.domain.careFacility.controller; +package com.carecode.domain.facility.controller; import com.carecode.external.publicdata.CareFacilityApiService; -import com.carecode.domain.careFacility.dto.response.CareFacilityInfo; -import com.carecode.domain.careFacility.dto.response.CareFacilityStatsResponse; -import com.carecode.domain.careFacility.entity.FacilityType; -import com.carecode.domain.careFacility.service.CareFacilityService; +import com.carecode.domain.facility.dto.response.CareFacilityInfo; +import com.carecode.domain.facility.dto.response.CareFacilityStatsResponse; +import com.carecode.domain.facility.entity.FacilityType; +import com.carecode.domain.facility.service.CareFacilityService; import com.carecode.core.util.PageRequestUtil; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.repository.CareFacilityRepository; 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/carecode/domain/careFacility/controller/CareFacilityController.java b/src/main/java/com/carecode/domain/facility/controller/CareFacilityController.java similarity index 94% rename from src/main/java/com/carecode/domain/careFacility/controller/CareFacilityController.java rename to src/main/java/com/carecode/domain/facility/controller/CareFacilityController.java index f642bd21..8e69e12f 100644 --- a/src/main/java/com/carecode/domain/careFacility/controller/CareFacilityController.java +++ b/src/main/java/com/carecode/domain/facility/controller/CareFacilityController.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.controller; +package com.carecode.domain.facility.controller; import com.carecode.core.annotation.LogExecutionTime; import com.carecode.core.annotation.ValidateLocation; @@ -6,20 +6,20 @@ import com.carecode.core.web.BaseController; import com.carecode.core.security.CurrentUserFacade; import com.carecode.core.util.PageRequestUtil; -import com.carecode.domain.careFacility.dto.request.CareFacilitySearchRequest; -import com.carecode.domain.careFacility.dto.request.CareFacilityAdvancedSearchRequest; -import com.carecode.domain.careFacility.dto.request.ReviewRequest; -import com.carecode.domain.careFacility.dto.response.CareFacilityInfo; -import com.carecode.domain.careFacility.dto.response.CareFacilityListResponse; -import com.carecode.domain.careFacility.dto.response.CareFacilityStatsResponse; -import com.carecode.domain.careFacility.dto.response.AdmissionForecastResponse; -import com.carecode.domain.careFacility.dto.response.BookingResponse; -import com.carecode.domain.careFacility.dto.response.FacilityPopularityResponse; -import com.carecode.domain.careFacility.dto.response.ReviewResponse; -import com.carecode.domain.careFacility.dto.request.CreateBookingRequest; -import com.carecode.domain.careFacility.dto.request.UpdateBookingRequest; -import com.carecode.domain.careFacility.entity.FacilityType; -import com.carecode.domain.careFacility.app.CareFacilityFacade; +import com.carecode.domain.facility.dto.request.CareFacilitySearchRequest; +import com.carecode.domain.facility.dto.request.CareFacilityAdvancedSearchRequest; +import com.carecode.domain.facility.dto.request.ReviewRequest; +import com.carecode.domain.facility.dto.response.CareFacilityInfo; +import com.carecode.domain.facility.dto.response.CareFacilityListResponse; +import com.carecode.domain.facility.dto.response.CareFacilityStatsResponse; +import com.carecode.domain.facility.dto.response.AdmissionForecastResponse; +import com.carecode.domain.facility.dto.response.BookingResponse; +import com.carecode.domain.facility.dto.response.FacilityPopularityResponse; +import com.carecode.domain.facility.dto.response.ReviewResponse; +import com.carecode.domain.facility.dto.request.CreateBookingRequest; +import com.carecode.domain.facility.dto.request.UpdateBookingRequest; +import com.carecode.domain.facility.entity.FacilityType; +import com.carecode.domain.facility.app.CareFacilityFacade; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -436,7 +436,7 @@ public ResponseEntity forecastAdmission( description = "과거 관측으로 같은 예측을 다시 계산해 실제 결과와 비교한 측정값. " + "확률대별 실제 적중률과, 항상 평균으로 답했을 때(기준선)와의 비교를 함께 준다. " + "표본이 부족한 기간은 목록에 없다.") - public ResponseEntity> getForecastAccuracy() { + public ResponseEntity> getForecastAccuracy() { return ResponseEntity.ok(careFacilityFacade.getForecastAccuracy()); } diff --git a/src/main/java/com/carecode/domain/careFacility/controller/FacilityWaitlistController.java b/src/main/java/com/carecode/domain/facility/controller/FacilityWaitlistController.java similarity index 91% rename from src/main/java/com/carecode/domain/careFacility/controller/FacilityWaitlistController.java rename to src/main/java/com/carecode/domain/facility/controller/FacilityWaitlistController.java index a826e025..1630a169 100644 --- a/src/main/java/com/carecode/domain/careFacility/controller/FacilityWaitlistController.java +++ b/src/main/java/com/carecode/domain/facility/controller/FacilityWaitlistController.java @@ -1,10 +1,10 @@ -package com.carecode.domain.careFacility.controller; +package com.carecode.domain.facility.controller; import com.carecode.core.annotation.LogExecutionTime; -import com.carecode.domain.careFacility.dto.request.WaitlistRequest; -import com.carecode.domain.careFacility.dto.response.WaitlistStatsResponse; -import com.carecode.domain.careFacility.entity.FacilityWaitlist; -import com.carecode.domain.careFacility.service.FacilityWaitlistService; +import com.carecode.domain.facility.dto.request.WaitlistRequest; +import com.carecode.domain.facility.dto.response.WaitlistStatsResponse; +import com.carecode.domain.facility.entity.FacilityWaitlist; +import com.carecode.domain.facility.service.FacilityWaitlistService; 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/carecode/domain/careFacility/controller/PublicDataController.java b/src/main/java/com/carecode/domain/facility/controller/PublicDataController.java similarity index 99% rename from src/main/java/com/carecode/domain/careFacility/controller/PublicDataController.java rename to src/main/java/com/carecode/domain/facility/controller/PublicDataController.java index 454d41b9..f22b3bbe 100644 --- a/src/main/java/com/carecode/domain/careFacility/controller/PublicDataController.java +++ b/src/main/java/com/carecode/domain/facility/controller/PublicDataController.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.controller; +package com.carecode.domain.facility.controller; import com.carecode.external.publicdata.PublicDataApiService; import com.carecode.external.publicdata.dto.PublicDataResponse; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityAdminBookingSearchRequest.java b/src/main/java/com/carecode/domain/facility/dto/request/CareFacilityAdminBookingSearchRequest.java similarity index 91% rename from src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityAdminBookingSearchRequest.java rename to src/main/java/com/carecode/domain/facility/dto/request/CareFacilityAdminBookingSearchRequest.java index 1daead21..147d822b 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityAdminBookingSearchRequest.java +++ b/src/main/java/com/carecode/domain/facility/dto/request/CareFacilityAdminBookingSearchRequest.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.request; +package com.carecode.domain.facility.dto.request; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityAdminStatusUpdateRequest.java b/src/main/java/com/carecode/domain/facility/dto/request/CareFacilityAdminStatusUpdateRequest.java similarity index 91% rename from src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityAdminStatusUpdateRequest.java rename to src/main/java/com/carecode/domain/facility/dto/request/CareFacilityAdminStatusUpdateRequest.java index 78929122..69482831 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityAdminStatusUpdateRequest.java +++ b/src/main/java/com/carecode/domain/facility/dto/request/CareFacilityAdminStatusUpdateRequest.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.request; +package com.carecode.domain.facility.dto.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityAdvancedSearchRequest.java b/src/main/java/com/carecode/domain/facility/dto/request/CareFacilityAdvancedSearchRequest.java similarity index 84% rename from src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityAdvancedSearchRequest.java rename to src/main/java/com/carecode/domain/facility/dto/request/CareFacilityAdvancedSearchRequest.java index 27bfa1d8..78699a76 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityAdvancedSearchRequest.java +++ b/src/main/java/com/carecode/domain/facility/dto/request/CareFacilityAdvancedSearchRequest.java @@ -1,6 +1,6 @@ -package com.carecode.domain.careFacility.dto.request; +package com.carecode.domain.facility.dto.request; -import com.carecode.domain.careFacility.entity.FacilityType; +import com.carecode.domain.facility.entity.FacilityType; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityListBookingsRequest.java b/src/main/java/com/carecode/domain/facility/dto/request/CareFacilityListBookingsRequest.java similarity index 91% rename from src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityListBookingsRequest.java rename to src/main/java/com/carecode/domain/facility/dto/request/CareFacilityListBookingsRequest.java index 03bb6ae1..c3f344a6 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilityListBookingsRequest.java +++ b/src/main/java/com/carecode/domain/facility/dto/request/CareFacilityListBookingsRequest.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.request; +package com.carecode.domain.facility.dto.request; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilitySearchRequest.java b/src/main/java/com/carecode/domain/facility/dto/request/CareFacilitySearchRequest.java similarity index 91% rename from src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilitySearchRequest.java rename to src/main/java/com/carecode/domain/facility/dto/request/CareFacilitySearchRequest.java index eaa38a6a..68238beb 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/request/CareFacilitySearchRequest.java +++ b/src/main/java/com/carecode/domain/facility/dto/request/CareFacilitySearchRequest.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.request; +package com.carecode.domain.facility.dto.request; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/request/CreateBookingRequest.java b/src/main/java/com/carecode/domain/facility/dto/request/CreateBookingRequest.java similarity index 91% rename from src/main/java/com/carecode/domain/careFacility/dto/request/CreateBookingRequest.java rename to src/main/java/com/carecode/domain/facility/dto/request/CreateBookingRequest.java index b4106168..42c93f50 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/request/CreateBookingRequest.java +++ b/src/main/java/com/carecode/domain/facility/dto/request/CreateBookingRequest.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.request; +package com.carecode.domain.facility.dto.request; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/request/ReviewRequest.java b/src/main/java/com/carecode/domain/facility/dto/request/ReviewRequest.java similarity index 75% rename from src/main/java/com/carecode/domain/careFacility/dto/request/ReviewRequest.java rename to src/main/java/com/carecode/domain/facility/dto/request/ReviewRequest.java index f7de1759..6e45b8a5 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/request/ReviewRequest.java +++ b/src/main/java/com/carecode/domain/facility/dto/request/ReviewRequest.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.request; +package com.carecode.domain.facility.dto.request; import lombok.*; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/request/UpdateBookingRequest.java b/src/main/java/com/carecode/domain/facility/dto/request/UpdateBookingRequest.java similarity index 91% rename from src/main/java/com/carecode/domain/careFacility/dto/request/UpdateBookingRequest.java rename to src/main/java/com/carecode/domain/facility/dto/request/UpdateBookingRequest.java index a7e1c24a..aee87672 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/request/UpdateBookingRequest.java +++ b/src/main/java/com/carecode/domain/facility/dto/request/UpdateBookingRequest.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.request; +package com.carecode.domain.facility.dto.request; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/request/WaitlistRequest.java b/src/main/java/com/carecode/domain/facility/dto/request/WaitlistRequest.java similarity index 93% rename from src/main/java/com/carecode/domain/careFacility/dto/request/WaitlistRequest.java rename to src/main/java/com/carecode/domain/facility/dto/request/WaitlistRequest.java index a76de8e2..710d5bef 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/request/WaitlistRequest.java +++ b/src/main/java/com/carecode/domain/facility/dto/request/WaitlistRequest.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.request; +package com.carecode.domain.facility.dto.request; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/AdmissionForecastResponse.java b/src/main/java/com/carecode/domain/facility/dto/response/AdmissionForecastResponse.java similarity index 96% rename from src/main/java/com/carecode/domain/careFacility/dto/response/AdmissionForecastResponse.java rename to src/main/java/com/carecode/domain/facility/dto/response/AdmissionForecastResponse.java index 69aaf243..e6e89a89 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/AdmissionForecastResponse.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/AdmissionForecastResponse.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/BookingListResponse.java b/src/main/java/com/carecode/domain/facility/dto/response/BookingListResponse.java similarity index 90% rename from src/main/java/com/carecode/domain/careFacility/dto/response/BookingListResponse.java rename to src/main/java/com/carecode/domain/facility/dto/response/BookingListResponse.java index a7f1fa43..f145ca57 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/BookingListResponse.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/BookingListResponse.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/BookingResponse.java b/src/main/java/com/carecode/domain/facility/dto/response/BookingResponse.java similarity index 93% rename from src/main/java/com/carecode/domain/careFacility/dto/response/BookingResponse.java rename to src/main/java/com/carecode/domain/facility/dto/response/BookingResponse.java index 866cd764..f253253f 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/BookingResponse.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/BookingResponse.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/BookingStats.java b/src/main/java/com/carecode/domain/facility/dto/response/BookingStats.java similarity index 87% rename from src/main/java/com/carecode/domain/careFacility/dto/response/BookingStats.java rename to src/main/java/com/carecode/domain/facility/dto/response/BookingStats.java index 0e4684f3..5256397b 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/BookingStats.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/BookingStats.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityBookingResponse.java b/src/main/java/com/carecode/domain/facility/dto/response/CareFacilityBookingResponse.java similarity index 93% rename from src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityBookingResponse.java rename to src/main/java/com/carecode/domain/facility/dto/response/CareFacilityBookingResponse.java index 71d98977..bac5a0b8 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityBookingResponse.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/CareFacilityBookingResponse.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityInfo.java b/src/main/java/com/carecode/domain/facility/dto/response/CareFacilityInfo.java similarity index 94% rename from src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityInfo.java rename to src/main/java/com/carecode/domain/facility/dto/response/CareFacilityInfo.java index eea9ba69..c360c27c 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityInfo.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/CareFacilityInfo.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityListResponse.java b/src/main/java/com/carecode/domain/facility/dto/response/CareFacilityListResponse.java similarity index 90% rename from src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityListResponse.java rename to src/main/java/com/carecode/domain/facility/dto/response/CareFacilityListResponse.java index b2836d10..161f051d 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityListResponse.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/CareFacilityListResponse.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityStatsResponse.java b/src/main/java/com/carecode/domain/facility/dto/response/CareFacilityStatsResponse.java similarity index 94% rename from src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityStatsResponse.java rename to src/main/java/com/carecode/domain/facility/dto/response/CareFacilityStatsResponse.java index c4475448..be1e7fe8 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/CareFacilityStatsResponse.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/CareFacilityStatsResponse.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/DailyBookingCount.java b/src/main/java/com/carecode/domain/facility/dto/response/DailyBookingCount.java similarity index 83% rename from src/main/java/com/carecode/domain/careFacility/dto/response/DailyBookingCount.java rename to src/main/java/com/carecode/domain/facility/dto/response/DailyBookingCount.java index 4e00d8dd..c8797806 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/DailyBookingCount.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/DailyBookingCount.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/FacilityDistribution.java b/src/main/java/com/carecode/domain/facility/dto/response/FacilityDistribution.java similarity index 86% rename from src/main/java/com/carecode/domain/careFacility/dto/response/FacilityDistribution.java rename to src/main/java/com/carecode/domain/facility/dto/response/FacilityDistribution.java index 9d44ecd0..c5da8393 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/FacilityDistribution.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/FacilityDistribution.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/FacilityPopularityResponse.java b/src/main/java/com/carecode/domain/facility/dto/response/FacilityPopularityResponse.java similarity index 95% rename from src/main/java/com/carecode/domain/careFacility/dto/response/FacilityPopularityResponse.java rename to src/main/java/com/carecode/domain/facility/dto/response/FacilityPopularityResponse.java index b4e839a9..e450109b 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/FacilityPopularityResponse.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/FacilityPopularityResponse.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/ForecastAccuracyResponse.java b/src/main/java/com/carecode/domain/facility/dto/response/ForecastAccuracyResponse.java similarity index 97% rename from src/main/java/com/carecode/domain/careFacility/dto/response/ForecastAccuracyResponse.java rename to src/main/java/com/carecode/domain/facility/dto/response/ForecastAccuracyResponse.java index 13b53d76..fd8b47b4 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/ForecastAccuracyResponse.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/ForecastAccuracyResponse.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/ReviewResponse.java b/src/main/java/com/carecode/domain/facility/dto/response/ReviewResponse.java similarity index 86% rename from src/main/java/com/carecode/domain/careFacility/dto/response/ReviewResponse.java rename to src/main/java/com/carecode/domain/facility/dto/response/ReviewResponse.java index 5bf74d0b..936dcd89 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/ReviewResponse.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/ReviewResponse.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.*; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/StatusDistribution.java b/src/main/java/com/carecode/domain/facility/dto/response/StatusDistribution.java similarity index 86% rename from src/main/java/com/carecode/domain/careFacility/dto/response/StatusDistribution.java rename to src/main/java/com/carecode/domain/facility/dto/response/StatusDistribution.java index bbf4bff7..c9cb37f7 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/StatusDistribution.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/StatusDistribution.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/TypeDistribution.java b/src/main/java/com/carecode/domain/facility/dto/response/TypeDistribution.java similarity index 86% rename from src/main/java/com/carecode/domain/careFacility/dto/response/TypeDistribution.java rename to src/main/java/com/carecode/domain/facility/dto/response/TypeDistribution.java index e5258a00..a61247fd 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/TypeDistribution.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/TypeDistribution.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/TypeStats.java b/src/main/java/com/carecode/domain/facility/dto/response/TypeStats.java similarity index 84% rename from src/main/java/com/carecode/domain/careFacility/dto/response/TypeStats.java rename to src/main/java/com/carecode/domain/facility/dto/response/TypeStats.java index c3ba8cf6..44db0e47 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/TypeStats.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/TypeStats.java @@ -1,10 +1,10 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.Getter; import lombok.Setter; import lombok.NoArgsConstructor; import lombok.Builder; -import com.carecode.domain.careFacility.entity.FacilityType; +import com.carecode.domain.facility.entity.FacilityType; /** 시설 유형별 통계 DTO */ @Getter diff --git a/src/main/java/com/carecode/domain/careFacility/dto/response/WaitlistStatsResponse.java b/src/main/java/com/carecode/domain/facility/dto/response/WaitlistStatsResponse.java similarity index 94% rename from src/main/java/com/carecode/domain/careFacility/dto/response/WaitlistStatsResponse.java rename to src/main/java/com/carecode/domain/facility/dto/response/WaitlistStatsResponse.java index 5417cf0c..fbc0d7fc 100644 --- a/src/main/java/com/carecode/domain/careFacility/dto/response/WaitlistStatsResponse.java +++ b/src/main/java/com/carecode/domain/facility/dto/response/WaitlistStatsResponse.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.dto.response; +package com.carecode.domain.facility.dto.response; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/carecode/domain/careFacility/entity/CareFacility.java b/src/main/java/com/carecode/domain/facility/entity/CareFacility.java similarity index 98% rename from src/main/java/com/carecode/domain/careFacility/entity/CareFacility.java rename to src/main/java/com/carecode/domain/facility/entity/CareFacility.java index 536c6eda..483447f3 100644 --- a/src/main/java/com/carecode/domain/careFacility/entity/CareFacility.java +++ b/src/main/java/com/carecode/domain/facility/entity/CareFacility.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.entity; +package com.carecode.domain.facility.entity; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/carecode/domain/careFacility/entity/CareFacilityBooking.java b/src/main/java/com/carecode/domain/facility/entity/CareFacilityBooking.java similarity index 99% rename from src/main/java/com/carecode/domain/careFacility/entity/CareFacilityBooking.java rename to src/main/java/com/carecode/domain/facility/entity/CareFacilityBooking.java index 035b36e5..3decda42 100644 --- a/src/main/java/com/carecode/domain/careFacility/entity/CareFacilityBooking.java +++ b/src/main/java/com/carecode/domain/facility/entity/CareFacilityBooking.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.entity; +package com.carecode.domain.facility.entity; import jakarta.persistence.*; import org.springframework.data.annotation.CreatedDate; diff --git a/src/main/java/com/carecode/domain/careFacility/entity/FacilityCapacitySnapshot.java b/src/main/java/com/carecode/domain/facility/entity/FacilityCapacitySnapshot.java similarity index 97% rename from src/main/java/com/carecode/domain/careFacility/entity/FacilityCapacitySnapshot.java rename to src/main/java/com/carecode/domain/facility/entity/FacilityCapacitySnapshot.java index 7afe6d94..7e517b3c 100644 --- a/src/main/java/com/carecode/domain/careFacility/entity/FacilityCapacitySnapshot.java +++ b/src/main/java/com/carecode/domain/facility/entity/FacilityCapacitySnapshot.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.entity; +package com.carecode.domain.facility.entity; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/com/carecode/domain/careFacility/entity/FacilityType.java b/src/main/java/com/carecode/domain/facility/entity/FacilityType.java similarity index 93% rename from src/main/java/com/carecode/domain/careFacility/entity/FacilityType.java rename to src/main/java/com/carecode/domain/facility/entity/FacilityType.java index 71d8554b..e45319af 100644 --- a/src/main/java/com/carecode/domain/careFacility/entity/FacilityType.java +++ b/src/main/java/com/carecode/domain/facility/entity/FacilityType.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.entity; +package com.carecode.domain.facility.entity; /** 육아 시설 유형 열거형 */ public enum FacilityType { diff --git a/src/main/java/com/carecode/domain/careFacility/entity/FacilityWaitlist.java b/src/main/java/com/carecode/domain/facility/entity/FacilityWaitlist.java similarity index 98% rename from src/main/java/com/carecode/domain/careFacility/entity/FacilityWaitlist.java rename to src/main/java/com/carecode/domain/facility/entity/FacilityWaitlist.java index 302b5cfd..38149c8e 100644 --- a/src/main/java/com/carecode/domain/careFacility/entity/FacilityWaitlist.java +++ b/src/main/java/com/carecode/domain/facility/entity/FacilityWaitlist.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.entity; +package com.carecode.domain.facility.entity; import com.carecode.domain.user.entity.Child; import com.carecode.domain.user.entity.User; diff --git a/src/main/java/com/carecode/domain/careFacility/entity/ForecastAccuracy.java b/src/main/java/com/carecode/domain/facility/entity/ForecastAccuracy.java similarity index 97% rename from src/main/java/com/carecode/domain/careFacility/entity/ForecastAccuracy.java rename to src/main/java/com/carecode/domain/facility/entity/ForecastAccuracy.java index f9553660..6113108f 100644 --- a/src/main/java/com/carecode/domain/careFacility/entity/ForecastAccuracy.java +++ b/src/main/java/com/carecode/domain/facility/entity/ForecastAccuracy.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.entity; +package com.carecode.domain.facility.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/carecode/domain/careFacility/entity/Review.java b/src/main/java/com/carecode/domain/facility/entity/Review.java similarity index 98% rename from src/main/java/com/carecode/domain/careFacility/entity/Review.java rename to src/main/java/com/carecode/domain/facility/entity/Review.java index c9558658..8481f2f6 100644 --- a/src/main/java/com/carecode/domain/careFacility/entity/Review.java +++ b/src/main/java/com/carecode/domain/facility/entity/Review.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.entity; +package com.carecode.domain.facility.entity; import com.carecode.domain.user.entity.User; import jakarta.persistence.*; diff --git a/src/main/java/com/carecode/domain/careFacility/mapper/BookingMapper.java b/src/main/java/com/carecode/domain/facility/mapper/BookingMapper.java similarity index 87% rename from src/main/java/com/carecode/domain/careFacility/mapper/BookingMapper.java rename to src/main/java/com/carecode/domain/facility/mapper/BookingMapper.java index 90b4316c..18e6cb04 100644 --- a/src/main/java/com/carecode/domain/careFacility/mapper/BookingMapper.java +++ b/src/main/java/com/carecode/domain/facility/mapper/BookingMapper.java @@ -1,8 +1,8 @@ -package com.carecode.domain.careFacility.mapper; +package com.carecode.domain.facility.mapper; -import com.carecode.domain.careFacility.dto.response.BookingListResponse; -import com.carecode.domain.careFacility.dto.response.BookingResponse; -import com.carecode.domain.careFacility.entity.CareFacilityBooking; +import com.carecode.domain.facility.dto.response.BookingListResponse; +import com.carecode.domain.facility.dto.response.BookingResponse; +import com.carecode.domain.facility.entity.CareFacilityBooking; /** 예약 Entity와 DTO 간 변환을 담당하는 Mapper 클래스 */ public class BookingMapper { diff --git a/src/main/java/com/carecode/domain/careFacility/mapper/CareFacilityMapper.java b/src/main/java/com/carecode/domain/facility/mapper/CareFacilityMapper.java similarity index 88% rename from src/main/java/com/carecode/domain/careFacility/mapper/CareFacilityMapper.java rename to src/main/java/com/carecode/domain/facility/mapper/CareFacilityMapper.java index 318e66ce..6e637c61 100644 --- a/src/main/java/com/carecode/domain/careFacility/mapper/CareFacilityMapper.java +++ b/src/main/java/com/carecode/domain/facility/mapper/CareFacilityMapper.java @@ -1,8 +1,8 @@ -package com.carecode.domain.careFacility.mapper; +package com.carecode.domain.facility.mapper; import com.carecode.core.util.ResponseMapper; -import com.carecode.domain.careFacility.dto.response.CareFacilityInfo; -import com.carecode.domain.careFacility.entity.CareFacility; +import com.carecode.domain.facility.dto.response.CareFacilityInfo; +import com.carecode.domain.facility.entity.CareFacility; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/carecode/domain/careFacility/repository/CareFacilityBookingRepository.java b/src/main/java/com/carecode/domain/facility/repository/CareFacilityBookingRepository.java similarity index 95% rename from src/main/java/com/carecode/domain/careFacility/repository/CareFacilityBookingRepository.java rename to src/main/java/com/carecode/domain/facility/repository/CareFacilityBookingRepository.java index ee714810..30caa188 100644 --- a/src/main/java/com/carecode/domain/careFacility/repository/CareFacilityBookingRepository.java +++ b/src/main/java/com/carecode/domain/facility/repository/CareFacilityBookingRepository.java @@ -1,6 +1,6 @@ -package com.carecode.domain.careFacility.repository; +package com.carecode.domain.facility.repository; -import com.carecode.domain.careFacility.entity.CareFacilityBooking; +import com.carecode.domain.facility.entity.CareFacilityBooking; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import jakarta.persistence.LockModeType; @@ -35,8 +35,8 @@ List findByFacilityIdAndStartTimeBetween(@Param("facilityId @Lock(LockModeType.PESSIMISTIC_WRITE) @Query("SELECT COUNT(cb) FROM CareFacilityBooking cb " + "WHERE cb.facility.id = :facilityId " + - "AND cb.status NOT IN (com.carecode.domain.careFacility.entity.CareFacilityBooking.BookingStatus.CANCELLED, " + - " com.carecode.domain.careFacility.entity.CareFacilityBooking.BookingStatus.REJECTED) " + + "AND cb.status NOT IN (com.carecode.domain.facility.entity.CareFacilityBooking.BookingStatus.CANCELLED, " + + " com.carecode.domain.facility.entity.CareFacilityBooking.BookingStatus.REJECTED) " + "AND (:excludeBookingId IS NULL OR cb.id <> :excludeBookingId) " + "AND cb.startTime < :newEnd AND cb.endTime > :newStart") long countOverlappingBookings(@Param("facilityId") Long facilityId, diff --git a/src/main/java/com/carecode/domain/careFacility/repository/CareFacilityRepository.java b/src/main/java/com/carecode/domain/facility/repository/CareFacilityRepository.java similarity index 96% rename from src/main/java/com/carecode/domain/careFacility/repository/CareFacilityRepository.java rename to src/main/java/com/carecode/domain/facility/repository/CareFacilityRepository.java index 08be12c7..e27ebb0a 100644 --- a/src/main/java/com/carecode/domain/careFacility/repository/CareFacilityRepository.java +++ b/src/main/java/com/carecode/domain/facility/repository/CareFacilityRepository.java @@ -1,8 +1,8 @@ -package com.carecode.domain.careFacility.repository; +package com.carecode.domain.facility.repository; -import com.carecode.domain.careFacility.dto.response.TypeStats; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityType; +import com.carecode.domain.facility.dto.response.TypeStats; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityType; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -92,7 +92,7 @@ List searchFacilities(@Param("facilityType") FacilityType facility long getTotalViewCount(); // 시설 유형별 통계 조회 - @Query("SELECT new com.carecode.domain.careFacility.dto.response.TypeStats(" + + @Query("SELECT new com.carecode.domain.facility.dto.response.TypeStats(" + "cf.facilityType, COUNT(cf), COALESCE(AVG(cf.rating), 0.0), COALESCE(SUM(cf.viewCount), 0)) " + "FROM CareFacility cf WHERE cf.isActive = true " + "GROUP BY cf.facilityType") diff --git a/src/main/java/com/carecode/domain/careFacility/repository/FacilityCapacitySnapshotRepository.java b/src/main/java/com/carecode/domain/facility/repository/FacilityCapacitySnapshotRepository.java similarity index 92% rename from src/main/java/com/carecode/domain/careFacility/repository/FacilityCapacitySnapshotRepository.java rename to src/main/java/com/carecode/domain/facility/repository/FacilityCapacitySnapshotRepository.java index dad05260..24b93fad 100644 --- a/src/main/java/com/carecode/domain/careFacility/repository/FacilityCapacitySnapshotRepository.java +++ b/src/main/java/com/carecode/domain/facility/repository/FacilityCapacitySnapshotRepository.java @@ -1,6 +1,6 @@ -package com.carecode.domain.careFacility.repository; +package com.carecode.domain.facility.repository; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/com/carecode/domain/careFacility/repository/FacilityWaitlistRepository.java b/src/main/java/com/carecode/domain/facility/repository/FacilityWaitlistRepository.java similarity index 74% rename from src/main/java/com/carecode/domain/careFacility/repository/FacilityWaitlistRepository.java rename to src/main/java/com/carecode/domain/facility/repository/FacilityWaitlistRepository.java index 33164e8c..68cc8ef7 100644 --- a/src/main/java/com/carecode/domain/careFacility/repository/FacilityWaitlistRepository.java +++ b/src/main/java/com/carecode/domain/facility/repository/FacilityWaitlistRepository.java @@ -1,6 +1,6 @@ -package com.carecode.domain.careFacility.repository; +package com.carecode.domain.facility.repository; -import com.carecode.domain.careFacility.entity.FacilityWaitlist; +import com.carecode.domain.facility.entity.FacilityWaitlist; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -19,12 +19,12 @@ public interface FacilityWaitlistRepository extends JpaRepository findAdmitted(@Param("facilityId") Long facilityId); @Query("SELECT COUNT(w) FROM FacilityWaitlist w WHERE w.facilityId = :facilityId " - + "AND w.status = com.carecode.domain.careFacility.entity.FacilityWaitlist.WaitStatus.WAITING") + + "AND w.status = com.carecode.domain.facility.entity.FacilityWaitlist.WaitStatus.WAITING") long countWaiting(@Param("facilityId") Long facilityId); /** @@ -34,13 +34,13 @@ public interface FacilityWaitlistRepository extends JpaRepository findFacilityIdsWithWaiting(); /** 해당 시설에서 아직 기다리는 사람들. 알림 대상이다. */ @Query("SELECT w FROM FacilityWaitlist w " + "WHERE w.facilityId = :facilityId " - + "AND w.status = com.carecode.domain.careFacility.entity.FacilityWaitlist.WaitStatus.WAITING " + + "AND w.status = com.carecode.domain.facility.entity.FacilityWaitlist.WaitStatus.WAITING " + "ORDER BY w.appliedAt ASC") List findWaiting(@Param("facilityId") Long facilityId); } diff --git a/src/main/java/com/carecode/domain/careFacility/repository/ForecastAccuracyRepository.java b/src/main/java/com/carecode/domain/facility/repository/ForecastAccuracyRepository.java similarity index 79% rename from src/main/java/com/carecode/domain/careFacility/repository/ForecastAccuracyRepository.java rename to src/main/java/com/carecode/domain/facility/repository/ForecastAccuracyRepository.java index cc67cf71..dc36e817 100644 --- a/src/main/java/com/carecode/domain/careFacility/repository/ForecastAccuracyRepository.java +++ b/src/main/java/com/carecode/domain/facility/repository/ForecastAccuracyRepository.java @@ -1,6 +1,6 @@ -package com.carecode.domain.careFacility.repository; +package com.carecode.domain.facility.repository; -import com.carecode.domain.careFacility.entity.ForecastAccuracy; +import com.carecode.domain.facility.entity.ForecastAccuracy; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/carecode/domain/careFacility/repository/ReviewRepository.java b/src/main/java/com/carecode/domain/facility/repository/ReviewRepository.java similarity index 71% rename from src/main/java/com/carecode/domain/careFacility/repository/ReviewRepository.java rename to src/main/java/com/carecode/domain/facility/repository/ReviewRepository.java index 463ab364..370cd5a4 100644 --- a/src/main/java/com/carecode/domain/careFacility/repository/ReviewRepository.java +++ b/src/main/java/com/carecode/domain/facility/repository/ReviewRepository.java @@ -1,7 +1,7 @@ -package com.carecode.domain.careFacility.repository; +package com.carecode.domain.facility.repository; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.Review; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.Review; import com.carecode.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/carecode/domain/careFacility/service/AdmissionForecastCalculator.java b/src/main/java/com/carecode/domain/facility/service/AdmissionForecastCalculator.java similarity index 98% rename from src/main/java/com/carecode/domain/careFacility/service/AdmissionForecastCalculator.java rename to src/main/java/com/carecode/domain/facility/service/AdmissionForecastCalculator.java index 734d90b1..66385f1f 100644 --- a/src/main/java/com/carecode/domain/careFacility/service/AdmissionForecastCalculator.java +++ b/src/main/java/com/carecode/domain/facility/service/AdmissionForecastCalculator.java @@ -1,6 +1,6 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; import lombok.Builder; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/carecode/domain/careFacility/service/AdmissionForecastService.java b/src/main/java/com/carecode/domain/facility/service/AdmissionForecastService.java similarity index 89% rename from src/main/java/com/carecode/domain/careFacility/service/AdmissionForecastService.java rename to src/main/java/com/carecode/domain/facility/service/AdmissionForecastService.java index 372f34e9..590cdc98 100644 --- a/src/main/java/com/carecode/domain/careFacility/service/AdmissionForecastService.java +++ b/src/main/java/com/carecode/domain/facility/service/AdmissionForecastService.java @@ -1,13 +1,13 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; import com.carecode.core.analytics.EventLogger; import com.carecode.core.analytics.EventType; import com.carecode.core.exception.CareServiceException; -import com.carecode.domain.careFacility.dto.response.AdmissionForecastResponse; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.dto.response.AdmissionForecastResponse; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/carecode/domain/careFacility/service/CareFacilityBookingService.java b/src/main/java/com/carecode/domain/facility/service/CareFacilityBookingService.java similarity index 95% rename from src/main/java/com/carecode/domain/careFacility/service/CareFacilityBookingService.java rename to src/main/java/com/carecode/domain/facility/service/CareFacilityBookingService.java index 55df12fa..72b82c98 100644 --- a/src/main/java/com/carecode/domain/careFacility/service/CareFacilityBookingService.java +++ b/src/main/java/com/carecode/domain/facility/service/CareFacilityBookingService.java @@ -1,17 +1,17 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; import com.carecode.core.annotation.LogExecutionTime; import com.carecode.core.exception.BusinessException; import com.carecode.core.exception.CareServiceException; import com.carecode.core.exception.ErrorCode; import com.carecode.core.exception.ResourceNotFoundException; -import com.carecode.domain.careFacility.dto.response.BookingResponse; -import com.carecode.domain.careFacility.dto.request.CreateBookingRequest; -import com.carecode.domain.careFacility.dto.request.UpdateBookingRequest; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.CareFacilityBooking; -import com.carecode.domain.careFacility.repository.CareFacilityBookingRepository; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.dto.response.BookingResponse; +import com.carecode.domain.facility.dto.request.CreateBookingRequest; +import com.carecode.domain.facility.dto.request.UpdateBookingRequest; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.CareFacilityBooking; +import com.carecode.domain.facility.repository.CareFacilityBookingRepository; +import com.carecode.domain.facility.repository.CareFacilityRepository; import com.carecode.domain.user.entity.User; import com.carecode.domain.user.repository.UserRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/carecode/domain/careFacility/service/CareFacilityService.java b/src/main/java/com/carecode/domain/facility/service/CareFacilityService.java similarity index 96% rename from src/main/java/com/carecode/domain/careFacility/service/CareFacilityService.java rename to src/main/java/com/carecode/domain/facility/service/CareFacilityService.java index 43766a47..3a94b2e7 100644 --- a/src/main/java/com/carecode/domain/careFacility/service/CareFacilityService.java +++ b/src/main/java/com/carecode/domain/facility/service/CareFacilityService.java @@ -1,4 +1,4 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; import org.springframework.cache.annotation.Cacheable; import com.carecode.core.annotation.LogExecutionTime; @@ -6,19 +6,19 @@ import com.carecode.core.search.FullTextSearchSupport; import com.carecode.core.annotation.ValidateLocation; import com.carecode.core.exception.CareFacilityNotFoundException; -import com.carecode.domain.careFacility.dto.request.CareFacilitySearchRequest; -import com.carecode.domain.careFacility.dto.request.ReviewRequest; -import com.carecode.domain.careFacility.dto.response.CareFacilityInfo; -import com.carecode.domain.careFacility.dto.response.CareFacilityListResponse; -import com.carecode.domain.careFacility.dto.response.ReviewResponse; -import com.carecode.domain.careFacility.dto.response.CareFacilityStatsResponse; -import com.carecode.domain.careFacility.dto.response.TypeStats; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityType; -import com.carecode.domain.careFacility.entity.Review; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.ReviewRepository; -import com.carecode.domain.careFacility.mapper.CareFacilityMapper; +import com.carecode.domain.facility.dto.request.CareFacilitySearchRequest; +import com.carecode.domain.facility.dto.request.ReviewRequest; +import com.carecode.domain.facility.dto.response.CareFacilityInfo; +import com.carecode.domain.facility.dto.response.CareFacilityListResponse; +import com.carecode.domain.facility.dto.response.ReviewResponse; +import com.carecode.domain.facility.dto.response.CareFacilityStatsResponse; +import com.carecode.domain.facility.dto.response.TypeStats; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityType; +import com.carecode.domain.facility.entity.Review; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.ReviewRepository; +import com.carecode.domain.facility.mapper.CareFacilityMapper; import com.carecode.core.util.CommonUtil; import com.carecode.domain.user.entity.User; import com.carecode.domain.user.repository.UserRepository; @@ -45,7 +45,7 @@ public class CareFacilityService { private final CareFacilityRepository careFacilityRepository; - private final com.carecode.domain.careFacility.repository.CareFacilityBookingRepository bookingRepository; + private final com.carecode.domain.facility.repository.CareFacilityBookingRepository bookingRepository; private final com.carecode.core.ops.sync.SyncFreshnessService syncFreshnessService; private final ReviewRepository reviewRepository; private final UserRepository userRepository; diff --git a/src/main/java/com/carecode/domain/careFacility/service/FacilityPopularityService.java b/src/main/java/com/carecode/domain/facility/service/FacilityPopularityService.java similarity index 94% rename from src/main/java/com/carecode/domain/careFacility/service/FacilityPopularityService.java rename to src/main/java/com/carecode/domain/facility/service/FacilityPopularityService.java index ea1d3556..cb5350c9 100644 --- a/src/main/java/com/carecode/domain/careFacility/service/FacilityPopularityService.java +++ b/src/main/java/com/carecode/domain/facility/service/FacilityPopularityService.java @@ -1,13 +1,13 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; import com.carecode.core.analytics.EventLogger; import com.carecode.core.analytics.EventType; import com.carecode.core.exception.CareServiceException; -import com.carecode.domain.careFacility.dto.response.FacilityPopularityResponse; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.dto.response.FacilityPopularityResponse; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/carecode/domain/careFacility/service/FacilityVacancyNotifier.java b/src/main/java/com/carecode/domain/facility/service/FacilityVacancyNotifier.java similarity index 93% rename from src/main/java/com/carecode/domain/careFacility/service/FacilityVacancyNotifier.java rename to src/main/java/com/carecode/domain/facility/service/FacilityVacancyNotifier.java index 1ec26d7a..e25fa35f 100644 --- a/src/main/java/com/carecode/domain/careFacility/service/FacilityVacancyNotifier.java +++ b/src/main/java/com/carecode/domain/facility/service/FacilityVacancyNotifier.java @@ -1,13 +1,13 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; import com.carecode.core.analytics.EventLogger; import com.carecode.core.analytics.EventType; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.entity.FacilityWaitlist; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; -import com.carecode.domain.careFacility.repository.FacilityWaitlistRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.entity.FacilityWaitlist; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.repository.FacilityWaitlistRepository; import com.carecode.domain.notification.entity.Notification; import com.carecode.domain.notification.repository.NotificationRepository; import com.carecode.domain.notification.sender.NotificationDispatcher; diff --git a/src/main/java/com/carecode/domain/careFacility/service/FacilityWaitlistService.java b/src/main/java/com/carecode/domain/facility/service/FacilityWaitlistService.java similarity index 93% rename from src/main/java/com/carecode/domain/careFacility/service/FacilityWaitlistService.java rename to src/main/java/com/carecode/domain/facility/service/FacilityWaitlistService.java index d8e51ab1..0b79a51b 100644 --- a/src/main/java/com/carecode/domain/careFacility/service/FacilityWaitlistService.java +++ b/src/main/java/com/carecode/domain/facility/service/FacilityWaitlistService.java @@ -1,15 +1,15 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; import com.carecode.core.analytics.EventLogger; import com.carecode.core.analytics.EventType; import com.carecode.core.exception.CareServiceException; import com.carecode.core.security.CurrentUserFacade; -import com.carecode.domain.careFacility.dto.request.WaitlistRequest; -import com.carecode.domain.careFacility.dto.response.WaitlistStatsResponse; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityWaitlist; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.FacilityWaitlistRepository; +import com.carecode.domain.facility.dto.request.WaitlistRequest; +import com.carecode.domain.facility.dto.response.WaitlistStatsResponse; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityWaitlist; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.FacilityWaitlistRepository; import com.carecode.domain.user.entity.Child; import com.carecode.domain.user.entity.User; import com.carecode.domain.user.repository.ChildRepository; diff --git a/src/main/java/com/carecode/domain/careFacility/service/ForecastAccuracyService.java b/src/main/java/com/carecode/domain/facility/service/ForecastAccuracyService.java similarity index 93% rename from src/main/java/com/carecode/domain/careFacility/service/ForecastAccuracyService.java rename to src/main/java/com/carecode/domain/facility/service/ForecastAccuracyService.java index 5b160bae..88a88cbc 100644 --- a/src/main/java/com/carecode/domain/careFacility/service/ForecastAccuracyService.java +++ b/src/main/java/com/carecode/domain/facility/service/ForecastAccuracyService.java @@ -1,8 +1,8 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; -import com.carecode.domain.careFacility.dto.response.ForecastAccuracyResponse; -import com.carecode.domain.careFacility.entity.ForecastAccuracy; -import com.carecode.domain.careFacility.repository.ForecastAccuracyRepository; +import com.carecode.domain.facility.dto.response.ForecastAccuracyResponse; +import com.carecode.domain.facility.entity.ForecastAccuracy; +import com.carecode.domain.facility.repository.ForecastAccuracyRepository; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/carecode/domain/careFacility/service/ForecastBacktestService.java b/src/main/java/com/carecode/domain/facility/service/ForecastBacktestService.java similarity index 96% rename from src/main/java/com/carecode/domain/careFacility/service/ForecastBacktestService.java rename to src/main/java/com/carecode/domain/facility/service/ForecastBacktestService.java index eced0e16..85dceb6a 100644 --- a/src/main/java/com/carecode/domain/careFacility/service/ForecastBacktestService.java +++ b/src/main/java/com/carecode/domain/facility/service/ForecastBacktestService.java @@ -1,9 +1,9 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.entity.ForecastAccuracy; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; -import com.carecode.domain.careFacility.repository.ForecastAccuracyRepository; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.entity.ForecastAccuracy; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.repository.ForecastAccuracyRepository; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/carecode/domain/health/service/HealthService.java b/src/main/java/com/carecode/domain/health/service/HealthService.java index e750f455..d57ef1b7 100644 --- a/src/main/java/com/carecode/domain/health/service/HealthService.java +++ b/src/main/java/com/carecode/domain/health/service/HealthService.java @@ -23,12 +23,12 @@ import com.carecode.domain.health.entity.HealthRecord; import com.carecode.domain.health.entity.HealthRecordAttachment; import com.carecode.domain.policy.entity.Policy; -import com.carecode.domain.careFacility.entity.CareFacility; +import com.carecode.domain.facility.entity.CareFacility; import com.carecode.domain.health.repository.HealthRecordAttachmentRepository; import com.carecode.domain.health.repository.HealthRecordRepository; import com.carecode.domain.health.repository.VaccinationScheduleRepository; import com.carecode.domain.policy.repository.PolicyRepository; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.CareFacilityRepository; import com.carecode.domain.user.entity.Child; import com.carecode.domain.user.entity.User; import com.carecode.domain.user.repository.ChildRepository; diff --git a/src/main/java/com/carecode/domain/health/service/SiblingOverviewService.java b/src/main/java/com/carecode/domain/health/service/SiblingOverviewService.java index ae3374eb..f9f33c36 100644 --- a/src/main/java/com/carecode/domain/health/service/SiblingOverviewService.java +++ b/src/main/java/com/carecode/domain/health/service/SiblingOverviewService.java @@ -1,7 +1,7 @@ package com.carecode.domain.health.service; import com.carecode.core.security.CurrentUserFacade; -import com.carecode.domain.careFacility.repository.FacilityWaitlistRepository; +import com.carecode.domain.facility.repository.FacilityWaitlistRepository; import com.carecode.domain.health.dto.response.SiblingOverviewResponse; import com.carecode.domain.health.entity.VaccinationSchedule; import com.carecode.domain.health.repository.VaccinationScheduleRepository; diff --git a/src/main/java/com/carecode/domain/user/entity/User.java b/src/main/java/com/carecode/domain/user/entity/User.java index b8f44808..141c3f55 100644 --- a/src/main/java/com/carecode/domain/user/entity/User.java +++ b/src/main/java/com/carecode/domain/user/entity/User.java @@ -1,6 +1,6 @@ package com.carecode.domain.user.entity; -import com.carecode.domain.careFacility.entity.Review; +import com.carecode.domain.facility.entity.Review; import com.carecode.domain.community.entity.Post; import com.carecode.domain.health.entity.HealthRecord; import com.carecode.domain.notification.entity.Notification; diff --git a/src/main/java/com/carecode/external/geocoding/FacilityGeocodingService.java b/src/main/java/com/carecode/external/geocoding/FacilityGeocodingService.java index 31cf902a..135105fb 100644 --- a/src/main/java/com/carecode/external/geocoding/FacilityGeocodingService.java +++ b/src/main/java/com/carecode/external/geocoding/FacilityGeocodingService.java @@ -1,7 +1,7 @@ package com.carecode.external.geocoding; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.repository.CareFacilityRepository; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/carecode/external/publicdata/sync/CapacitySnapshotRecorder.java b/src/main/java/com/carecode/external/publicdata/sync/CapacitySnapshotRecorder.java index ade3ecc9..9f5ff3ad 100644 --- a/src/main/java/com/carecode/external/publicdata/sync/CapacitySnapshotRecorder.java +++ b/src/main/java/com/carecode/external/publicdata/sync/CapacitySnapshotRecorder.java @@ -1,8 +1,8 @@ package com.carecode.external.publicdata.sync; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/carecode/external/publicdata/sync/CareFacilityUpsertService.java b/src/main/java/com/carecode/external/publicdata/sync/CareFacilityUpsertService.java index 71372f56..fe65af6d 100644 --- a/src/main/java/com/carecode/external/publicdata/sync/CareFacilityUpsertService.java +++ b/src/main/java/com/carecode/external/publicdata/sync/CareFacilityUpsertService.java @@ -1,8 +1,8 @@ package com.carecode.external.publicdata.sync; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityType; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityType; +import com.carecode.domain.facility.repository.CareFacilityRepository; import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/carecode/external/publicdata/sync/KindergartenUpsertService.java b/src/main/java/com/carecode/external/publicdata/sync/KindergartenUpsertService.java index 894a19a7..5368b7b0 100644 --- a/src/main/java/com/carecode/external/publicdata/sync/KindergartenUpsertService.java +++ b/src/main/java/com/carecode/external/publicdata/sync/KindergartenUpsertService.java @@ -1,8 +1,8 @@ package com.carecode.external.publicdata.sync; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityType; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityType; +import com.carecode.domain.facility.repository.CareFacilityRepository; import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/test/java/com/carecode/domain/careFacility/service/AdmissionForecastServiceTest.java b/src/test/java/com/carecode/domain/facility/service/AdmissionForecastServiceTest.java similarity index 94% rename from src/test/java/com/carecode/domain/careFacility/service/AdmissionForecastServiceTest.java rename to src/test/java/com/carecode/domain/facility/service/AdmissionForecastServiceTest.java index d035c142..e5a6d103 100644 --- a/src/test/java/com/carecode/domain/careFacility/service/AdmissionForecastServiceTest.java +++ b/src/test/java/com/carecode/domain/facility/service/AdmissionForecastServiceTest.java @@ -1,10 +1,10 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; -import com.carecode.domain.careFacility.dto.response.AdmissionForecastResponse; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.dto.response.AdmissionForecastResponse; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; import com.carecode.core.analytics.EventLogger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/carecode/domain/careFacility/service/CareFacilityBookingServiceTest.java b/src/test/java/com/carecode/domain/facility/service/CareFacilityBookingServiceTest.java similarity index 93% rename from src/test/java/com/carecode/domain/careFacility/service/CareFacilityBookingServiceTest.java rename to src/test/java/com/carecode/domain/facility/service/CareFacilityBookingServiceTest.java index 57965a6b..5b19406d 100644 --- a/src/test/java/com/carecode/domain/careFacility/service/CareFacilityBookingServiceTest.java +++ b/src/test/java/com/carecode/domain/facility/service/CareFacilityBookingServiceTest.java @@ -1,11 +1,11 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; import com.carecode.core.exception.CareServiceException; -import com.carecode.domain.careFacility.dto.request.CreateBookingRequest; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.CareFacilityBooking; -import com.carecode.domain.careFacility.repository.CareFacilityBookingRepository; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.dto.request.CreateBookingRequest; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.CareFacilityBooking; +import com.carecode.domain.facility.repository.CareFacilityBookingRepository; +import com.carecode.domain.facility.repository.CareFacilityRepository; import com.carecode.domain.user.entity.User; import com.carecode.domain.user.entity.UserRole; import com.carecode.domain.user.repository.UserRepository; diff --git a/src/test/java/com/carecode/domain/careFacility/service/FacilityPopularityServiceTest.java b/src/test/java/com/carecode/domain/facility/service/FacilityPopularityServiceTest.java similarity index 94% rename from src/test/java/com/carecode/domain/careFacility/service/FacilityPopularityServiceTest.java rename to src/test/java/com/carecode/domain/facility/service/FacilityPopularityServiceTest.java index cb71fc54..b80b8071 100644 --- a/src/test/java/com/carecode/domain/careFacility/service/FacilityPopularityServiceTest.java +++ b/src/test/java/com/carecode/domain/facility/service/FacilityPopularityServiceTest.java @@ -1,10 +1,10 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; -import com.carecode.domain.careFacility.dto.response.FacilityPopularityResponse; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.dto.response.FacilityPopularityResponse; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; import com.carecode.core.analytics.EventLogger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/carecode/domain/careFacility/service/FacilityVacancyNotifierTest.java b/src/test/java/com/carecode/domain/facility/service/FacilityVacancyNotifierTest.java similarity index 93% rename from src/test/java/com/carecode/domain/careFacility/service/FacilityVacancyNotifierTest.java rename to src/test/java/com/carecode/domain/facility/service/FacilityVacancyNotifierTest.java index 2863df2d..c636d78a 100644 --- a/src/test/java/com/carecode/domain/careFacility/service/FacilityVacancyNotifierTest.java +++ b/src/test/java/com/carecode/domain/facility/service/FacilityVacancyNotifierTest.java @@ -1,12 +1,12 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; import com.carecode.core.analytics.EventLogger; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.entity.FacilityWaitlist; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; -import com.carecode.domain.careFacility.repository.FacilityWaitlistRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.entity.FacilityWaitlist; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.repository.FacilityWaitlistRepository; import com.carecode.domain.notification.entity.Notification; import com.carecode.domain.notification.repository.NotificationRepository; import com.carecode.domain.notification.sender.NotificationDispatcher; diff --git a/src/test/java/com/carecode/domain/careFacility/service/ForecastAccuracyServiceTest.java b/src/test/java/com/carecode/domain/facility/service/ForecastAccuracyServiceTest.java similarity index 94% rename from src/test/java/com/carecode/domain/careFacility/service/ForecastAccuracyServiceTest.java rename to src/test/java/com/carecode/domain/facility/service/ForecastAccuracyServiceTest.java index 8aa41c12..1d26a271 100644 --- a/src/test/java/com/carecode/domain/careFacility/service/ForecastAccuracyServiceTest.java +++ b/src/test/java/com/carecode/domain/facility/service/ForecastAccuracyServiceTest.java @@ -1,8 +1,8 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; -import com.carecode.domain.careFacility.dto.response.ForecastAccuracyResponse; -import com.carecode.domain.careFacility.entity.ForecastAccuracy; -import com.carecode.domain.careFacility.repository.ForecastAccuracyRepository; +import com.carecode.domain.facility.dto.response.ForecastAccuracyResponse; +import com.carecode.domain.facility.entity.ForecastAccuracy; +import com.carecode.domain.facility.repository.ForecastAccuracyRepository; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/carecode/domain/careFacility/service/ForecastBacktestServiceTest.java b/src/test/java/com/carecode/domain/facility/service/ForecastBacktestServiceTest.java similarity index 95% rename from src/test/java/com/carecode/domain/careFacility/service/ForecastBacktestServiceTest.java rename to src/test/java/com/carecode/domain/facility/service/ForecastBacktestServiceTest.java index d9cb0ad1..fe8c7eca 100644 --- a/src/test/java/com/carecode/domain/careFacility/service/ForecastBacktestServiceTest.java +++ b/src/test/java/com/carecode/domain/facility/service/ForecastBacktestServiceTest.java @@ -1,9 +1,9 @@ -package com.carecode.domain.careFacility.service; +package com.carecode.domain.facility.service; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.entity.ForecastAccuracy; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; -import com.carecode.domain.careFacility.repository.ForecastAccuracyRepository; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.entity.ForecastAccuracy; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.repository.ForecastAccuracyRepository; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/carecode/external/geocoding/FacilityGeocodingServiceTest.java b/src/test/java/com/carecode/external/geocoding/FacilityGeocodingServiceTest.java index 14130ebe..85905802 100644 --- a/src/test/java/com/carecode/external/geocoding/FacilityGeocodingServiceTest.java +++ b/src/test/java/com/carecode/external/geocoding/FacilityGeocodingServiceTest.java @@ -1,7 +1,7 @@ package com.carecode.external.geocoding; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.repository.CareFacilityRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/carecode/external/publicdata/sync/KindergartenUpsertServiceTest.java b/src/test/java/com/carecode/external/publicdata/sync/KindergartenUpsertServiceTest.java index 3e4136d7..dcc115d7 100644 --- a/src/test/java/com/carecode/external/publicdata/sync/KindergartenUpsertServiceTest.java +++ b/src/test/java/com/carecode/external/publicdata/sync/KindergartenUpsertServiceTest.java @@ -1,8 +1,8 @@ package com.carecode.external.publicdata.sync; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityType; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityType; +import com.carecode.domain.facility.repository.CareFacilityRepository; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/carecode/integration/FacilityBookingContractTest.java b/src/test/java/com/carecode/integration/FacilityBookingContractTest.java index 451d1fe6..206af087 100644 --- a/src/test/java/com/carecode/integration/FacilityBookingContractTest.java +++ b/src/test/java/com/carecode/integration/FacilityBookingContractTest.java @@ -1,9 +1,9 @@ package com.carecode.integration; import com.carecode.CareCodeApplication; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityType; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityType; +import com.carecode.domain.facility.repository.CareFacilityRepository; import com.carecode.domain.user.entity.User; import com.carecode.domain.user.entity.UserRole; import com.carecode.domain.user.repository.UserRepository; diff --git a/src/test/java/com/carecode/integration/ForecastAccuracyContractTest.java b/src/test/java/com/carecode/integration/ForecastAccuracyContractTest.java index b9ab594e..086e77bd 100644 --- a/src/test/java/com/carecode/integration/ForecastAccuracyContractTest.java +++ b/src/test/java/com/carecode/integration/ForecastAccuracyContractTest.java @@ -1,11 +1,11 @@ package com.carecode.integration; import com.carecode.CareCodeApplication; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; -import com.carecode.domain.careFacility.entity.FacilityType; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityCapacitySnapshot; +import com.carecode.domain.facility.entity.FacilityType; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; import com.carecode.domain.user.entity.User; import com.carecode.domain.user.entity.UserRole; import com.carecode.domain.user.repository.UserRepository; diff --git a/src/test/java/com/carecode/integration/LivePublicDataSyncTest.java b/src/test/java/com/carecode/integration/LivePublicDataSyncTest.java index f8073693..933c793f 100644 --- a/src/test/java/com/carecode/integration/LivePublicDataSyncTest.java +++ b/src/test/java/com/carecode/integration/LivePublicDataSyncTest.java @@ -6,9 +6,9 @@ import com.carecode.external.publicdata.sync.KindergartenSyncService; import com.carecode.external.publicdata.sync.PediatricHospitalSyncService; import com.carecode.external.publicdata.sync.SyncResult; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.repository.FacilityCapacitySnapshotRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.repository.FacilityCapacitySnapshotRepository; import com.carecode.domain.health.repository.HospitalRepository; import com.carecode.domain.policy.repository.PolicyRepository; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/carecode/integration/PublicStatsContractTest.java b/src/test/java/com/carecode/integration/PublicStatsContractTest.java index 89285057..24ae033c 100644 --- a/src/test/java/com/carecode/integration/PublicStatsContractTest.java +++ b/src/test/java/com/carecode/integration/PublicStatsContractTest.java @@ -1,9 +1,9 @@ package com.carecode.integration; import com.carecode.CareCodeApplication; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.entity.FacilityType; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.entity.FacilityType; +import com.carecode.domain.facility.repository.CareFacilityRepository; import com.carecode.domain.health.entity.Hospital; import com.carecode.core.ops.sync.SyncJob; import com.carecode.core.ops.sync.SyncRunTracker; diff --git a/src/test/java/com/carecode/integration/SampleDataScenarioTest.java b/src/test/java/com/carecode/integration/SampleDataScenarioTest.java index bc31534a..ee7e926c 100644 --- a/src/test/java/com/carecode/integration/SampleDataScenarioTest.java +++ b/src/test/java/com/carecode/integration/SampleDataScenarioTest.java @@ -4,12 +4,12 @@ import com.carecode.devtools.SampleFacilitySeeder; import com.carecode.devtools.SamplePolicySeeder; import com.carecode.core.security.CurrentUserFacade; -import com.carecode.domain.careFacility.dto.response.AdmissionForecastResponse; -import com.carecode.domain.careFacility.dto.response.FacilityPopularityResponse; -import com.carecode.domain.careFacility.entity.CareFacility; -import com.carecode.domain.careFacility.repository.CareFacilityRepository; -import com.carecode.domain.careFacility.service.AdmissionForecastService; -import com.carecode.domain.careFacility.service.FacilityPopularityService; +import com.carecode.domain.facility.dto.response.AdmissionForecastResponse; +import com.carecode.domain.facility.dto.response.FacilityPopularityResponse; +import com.carecode.domain.facility.entity.CareFacility; +import com.carecode.domain.facility.repository.CareFacilityRepository; +import com.carecode.domain.facility.service.AdmissionForecastService; +import com.carecode.domain.facility.service.FacilityPopularityService; import com.carecode.domain.policy.dto.response.MissedBenefitSummaryResponse; import com.carecode.domain.policy.dto.response.RegionalBenefitComparisonResponse; import com.carecode.domain.policy.service.MissedBenefitService;