From b43c987bedac17aba3cd41e690446de9a5d016b7 Mon Sep 17 00:00:00 2001 From: RosieOh Date: Mon, 5 Oct 2026 02:06:47 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20core=20=EC=97=90=20=EC=84=9E?= =?UTF-8?q?=EC=97=AC=20=EC=9E=88=EB=8D=98=20=EC=A1=B0=ED=95=A9=C2=B7?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=BD=94=EB=93=9C=EB=A5=BC=20?= =?UTF-8?q?=EC=A0=9C=20=EC=9E=90=EB=A6=AC=EB=A1=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit core 는 '공통 기반' 이라는 이름인데, 안에 성격이 다른 셋이 섞여 있었다. 기반 보안·웹·설정·저장소·유틸·예외 — 도메인을 몰라야 한다 조합 공공데이터 연동·배치·지오코딩 — 도메인을 아는 게 본질이다 (도메인 참조 47건) 도메인 시설 공개 API 컨트롤러 2개(373줄 포함), 지원금 계산기 이름이 뜻을 말하도록 쪼갠다. core/client → external/publicdata 외부 공공데이터 연동·동기화 core/geocoding → external/geocoding 외부 좌표 변환 core/scheduler → batch 주기 작업 core/devtools → devtools 개발용 샘플 데이터 core/benefit → domain/policy/benefit policy 만 쓰는 도메인 로직이었다 core/controller/CareFacilityApiController → domain/careFacility/controller core/client/controller/PublicDataController → domain/careFacility/controller core/controller/BaseController → core/web (core/controller 패키지 해체) integration 이라는 이름은 쓰지 않았다. 테스트 쪽에 이미 '통합 테스트' 뜻으로 쓰고 있어 같은 이름이 두 뜻으로 읽힌다. --- .../05a5820d-39ea-4db6-b8e7-f737ac6a90df | 10 ++-- .../05a7a88e-9a95-451a-b96f-4a8eb9be6c1e | 2 + .../a6b21c55-f3df-4514-8faa-c32628f81448 | 2 +- .../ab7a1eba-4dd5-499e-95ed-0c71f0b6f61f | 2 - docs/architecture/system-overview.md | 2 +- docs/quality/architecture-rules.md | 48 ++++++++++++++++--- .../BookingReminderScheduler.java | 2 +- .../DataCleanupScheduler.java | 2 +- .../ForecastBacktestScheduler.java | 2 +- .../PublicDataSyncScheduler.java | 12 ++--- .../VaccinationReminderScheduler.java | 2 +- .../core/ops/sync/SyncRunTracker.java | 2 +- .../{controller => web}/BaseController.java | 2 +- .../devtools/SampleDataCleaner.java | 2 +- .../devtools/SampleDataProperties.java | 2 +- .../{core => }/devtools/SampleDataRunner.java | 2 +- .../devtools/SampleFacilitySeeder.java | 2 +- .../devtools/SamplePolicySeeder.java | 2 +- .../AdminCareFacilityBookingController.java | 2 +- .../controller/AdminPublicDataController.java | 12 ++--- .../controller/AdminSampleDataController.java | 6 +-- .../controller/CareFacilityApiController.java | 4 +- .../controller/CareFacilityController.java | 2 +- .../controller/PublicDataController.java | 6 +-- .../chatbot/controller/ChatbotController.java | 2 +- .../controller/CommunityController.java | 2 +- .../health/controller/HealthController.java | 2 +- .../controller/NotificationController.java | 2 +- .../policy}/benefit/BenefitPaymentType.java | 2 +- .../benefit/BenefitProjectionCalculator.java | 2 +- .../policy/controller/PolicyController.java | 2 +- .../RegionalBenefitComparisonService.java | 4 +- .../user/controller/AuthController.java | 2 +- .../user/controller/KakaoAuthController.java | 2 +- .../user/controller/UserController.java | 2 +- .../geocoding/FacilityGeocodingService.java | 2 +- .../geocoding/Geocoder.java | 2 +- .../geocoding/KakaoGeocoder.java | 2 +- .../publicdata}/CareFacilityApiService.java | 2 +- .../publicdata}/PublicDataApiClient.java | 2 +- .../publicdata}/PublicDataApiService.java | 4 +- .../publicdata}/XmlResponseParser.java | 2 +- .../constants/PublicDataApiConstants.java | 2 +- .../publicdata}/dto/PublicDataResponse.java | 2 +- .../exception/PublicDataApiException.java | 2 +- .../provider/ChildcarePortalProvider.java | 4 +- .../provider/DataGoKrProvider.java | 4 +- .../provider/KindergartenInfoProvider.java | 4 +- .../publicdata}/provider/OdcloudProvider.java | 4 +- .../provider/PublicDataProvider.java | 2 +- .../provider/SeoulOpenDataProvider.java | 4 +- .../sync/CapacitySnapshotRecorder.java | 2 +- .../sync/CareFacilityUpsertService.java | 2 +- .../publicdata}/sync/ChildcareApiStatus.java | 2 +- .../sync/GovernmentBenefitSyncService.java | 4 +- .../sync/HospitalUpsertService.java | 2 +- .../sync/KindergartenSyncService.java | 4 +- .../sync/KindergartenUpsertService.java | 2 +- ...ationwideChildcareFacilitySyncService.java | 6 +-- .../publicdata}/sync/PagedSyncTemplate.java | 4 +- .../sync/PediatricHospitalSyncService.java | 4 +- .../publicdata}/sync/PolicyUpsertService.java | 2 +- .../publicdata}/sync/RegionCodeCatalog.java | 2 +- .../publicdata}/sync/SyncResult.java | 2 +- .../publicdata}/sync/SyncSpec.java | 4 +- .../core/ops/sync/SyncRunTrackerTest.java | 2 +- .../BenefitProjectionCalculatorTest.java | 2 +- .../RegionalBenefitComparisonServiceTest.java | 2 +- .../FacilityGeocodingServiceTest.java | 2 +- .../geocoding/KakaoGeocoderTest.java | 2 +- .../publicdata}/XmlResponseParserTest.java | 2 +- .../constants/PublicDataApiConstantsTest.java | 2 +- .../provider/ChildcarePortalProviderTest.java | 4 +- .../provider/DataGoKrProviderTest.java | 4 +- .../sync/ChildcareApiStatusTest.java | 2 +- .../sync/KindergartenUpsertServiceTest.java | 2 +- .../sync/PagedSyncTemplateTest.java | 6 +-- .../integration/LivePublicDataSyncTest.java | 10 ++-- .../integration/SampleDataScenarioTest.java | 4 +- 79 files changed, 161 insertions(+), 127 deletions(-) rename src/main/java/com/carecode/{core/scheduler => batch}/BookingReminderScheduler.java (98%) rename src/main/java/com/carecode/{core/scheduler => batch}/DataCleanupScheduler.java (98%) rename src/main/java/com/carecode/{core/scheduler => batch}/ForecastBacktestScheduler.java (96%) rename src/main/java/com/carecode/{core/scheduler => batch}/PublicDataSyncScheduler.java (91%) rename src/main/java/com/carecode/{core/scheduler => batch}/VaccinationReminderScheduler.java (98%) rename src/main/java/com/carecode/core/{controller => web}/BaseController.java (97%) rename src/main/java/com/carecode/{core => }/devtools/SampleDataCleaner.java (98%) rename src/main/java/com/carecode/{core => }/devtools/SampleDataProperties.java (92%) rename src/main/java/com/carecode/{core => }/devtools/SampleDataRunner.java (97%) rename src/main/java/com/carecode/{core => }/devtools/SampleFacilitySeeder.java (99%) rename src/main/java/com/carecode/{core => }/devtools/SamplePolicySeeder.java (99%) rename src/main/java/com/carecode/{core => domain/careFacility}/controller/CareFacilityApiController.java (99%) rename src/main/java/com/carecode/{core/client => domain/careFacility}/controller/PublicDataController.java (97%) rename src/main/java/com/carecode/{core => domain/policy}/benefit/BenefitPaymentType.java (98%) rename src/main/java/com/carecode/{core => domain/policy}/benefit/BenefitProjectionCalculator.java (98%) rename src/main/java/com/carecode/{core => external}/geocoding/FacilityGeocodingService.java (98%) rename src/main/java/com/carecode/{core => external}/geocoding/Geocoder.java (95%) rename src/main/java/com/carecode/{core => external}/geocoding/KakaoGeocoder.java (98%) rename src/main/java/com/carecode/{core/client => external/publicdata}/CareFacilityApiService.java (99%) rename src/main/java/com/carecode/{core/client => external/publicdata}/PublicDataApiClient.java (99%) rename src/main/java/com/carecode/{core/client => external/publicdata}/PublicDataApiService.java (97%) rename src/main/java/com/carecode/{core/client => external/publicdata}/XmlResponseParser.java (98%) rename src/main/java/com/carecode/{core/client => external/publicdata}/constants/PublicDataApiConstants.java (97%) rename src/main/java/com/carecode/{core/client => external/publicdata}/dto/PublicDataResponse.java (97%) rename src/main/java/com/carecode/{core/client => external/publicdata}/exception/PublicDataApiException.java (89%) rename src/main/java/com/carecode/{core/client => external/publicdata}/provider/ChildcarePortalProvider.java (96%) rename src/main/java/com/carecode/{core/client => external/publicdata}/provider/DataGoKrProvider.java (96%) rename src/main/java/com/carecode/{core/client => external/publicdata}/provider/KindergartenInfoProvider.java (95%) rename src/main/java/com/carecode/{core/client => external/publicdata}/provider/OdcloudProvider.java (96%) rename src/main/java/com/carecode/{core/client => external/publicdata}/provider/PublicDataProvider.java (90%) rename src/main/java/com/carecode/{core/client => external/publicdata}/provider/SeoulOpenDataProvider.java (95%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/CapacitySnapshotRecorder.java (97%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/CareFacilityUpsertService.java (99%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/ChildcareApiStatus.java (97%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/GovernmentBenefitSyncService.java (95%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/HospitalUpsertService.java (98%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/KindergartenSyncService.java (96%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/KindergartenUpsertService.java (99%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/NationwideChildcareFacilitySyncService.java (95%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/PagedSyncTemplate.java (98%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/PediatricHospitalSyncService.java (93%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/PolicyUpsertService.java (99%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/RegionCodeCatalog.java (98%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/SyncResult.java (96%) rename src/main/java/com/carecode/{core/client => external/publicdata}/sync/SyncSpec.java (89%) rename src/test/java/com/carecode/{core => domain/policy}/benefit/BenefitProjectionCalculatorTest.java (99%) rename src/test/java/com/carecode/{core => external}/geocoding/FacilityGeocodingServiceTest.java (99%) rename src/test/java/com/carecode/{core => external}/geocoding/KakaoGeocoderTest.java (99%) rename src/test/java/com/carecode/{core/client => external/publicdata}/XmlResponseParserTest.java (98%) rename src/test/java/com/carecode/{core/client => external/publicdata}/constants/PublicDataApiConstantsTest.java (96%) rename src/test/java/com/carecode/{core/client => external/publicdata}/provider/ChildcarePortalProviderTest.java (97%) rename src/test/java/com/carecode/{core/client => external/publicdata}/provider/DataGoKrProviderTest.java (97%) rename src/test/java/com/carecode/{core/client => external/publicdata}/sync/ChildcareApiStatusTest.java (98%) rename src/test/java/com/carecode/{core/client => external/publicdata}/sync/KindergartenUpsertServiceTest.java (99%) rename src/test/java/com/carecode/{core/client => external/publicdata}/sync/PagedSyncTemplateTest.java (98%) diff --git a/archunit-baseline/05a5820d-39ea-4db6-b8e7-f737ac6a90df b/archunit-baseline/05a5820d-39ea-4db6-b8e7-f737ac6a90df index 2cc1df70..3d7c1957 100644 --- a/archunit-baseline/05a5820d-39ea-4db6-b8e7-f737ac6a90df +++ b/archunit-baseline/05a5820d-39ea-4db6-b8e7-f737ac6a90df @@ -1,4 +1,3 @@ -Constructor (com.carecode.core.client.CareFacilityApiService, com.carecode.domain.careFacility.service.CareFacilityService, com.carecode.domain.careFacility.repository.CareFacilityRepository)> has parameter of type in (CareFacilityApiController.java:0) Constructor (com.carecode.domain.community.repository.PostRepository, com.carecode.domain.community.mapper.CommunityMapper)> has parameter of type in (AdminCommunityController.java:0) 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) 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) @@ -10,9 +9,9 @@ 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.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 (CareFacilityApiController.java:0) Field has type in (AdminCommunityController.java:0) Field has type in (AdminDashboardController.java:0) Field has type in (AdminDashboardController.java:0) @@ -24,11 +23,9 @@ 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 (NotificationLinkController.java:0) Field has type in (BenefitLinkController.java:0) -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 (AdminCommunityController.java:46) Method calls method in (AdminCommunityController.java:51) Method calls method in (AdminCommunityController.java:33) @@ -61,6 +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 (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 71262174..44b855fd 100644 --- a/archunit-baseline/05a7a88e-9a95-451a-b96f-4a8eb9be6c1e +++ b/archunit-baseline/05a7a88e-9a95-451a-b96f-4a8eb9be6c1e @@ -1,6 +1,8 @@ 도메인 패키지 이름이 소문자가 아니다: 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) diff --git a/archunit-baseline/a6b21c55-f3df-4514-8faa-c32628f81448 b/archunit-baseline/a6b21c55-f3df-4514-8faa-c32628f81448 index 2dfb0313..48dd389b 100644 --- a/archunit-baseline/a6b21c55-f3df-4514-8faa-c32628f81448 +++ b/archunit-baseline/a6b21c55-f3df-4514-8faa-c32628f81448 @@ -243,7 +243,7 @@ policy → user 리포지토리: Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.policy.repository.PolicyDeadlineNoticeRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.notification.repository.NotificationRepository, com.carecode.domain.notification.sender.NotificationDispatcher, com.carecode.core.analytics.EventLogger)> has parameter of type in (PolicyDeadlineNotifier.java:0) policy → user 리포지토리: Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.domain.policy.mapper.PolicyMapper, com.carecode.core.security.CurrentUserFacade, com.carecode.core.analytics.EventLogger)> has parameter of type in (PolicyRecommendationService.java:0) policy → user 리포지토리: Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.policy.repository.PolicyBookmarkRepository, com.carecode.domain.user.repository.UserRepository, com.carecode.domain.policy.mapper.PolicyMapper)> has parameter of type in (PolicyService.java:0) -policy → user 리포지토리: Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.core.security.CurrentUserFacade, com.carecode.core.analytics.EventLogger, com.carecode.core.benefit.BenefitProjectionCalculator)> has parameter of type in (RegionalBenefitComparisonService.java:0) +policy → user 리포지토리: Constructor (com.carecode.domain.policy.repository.PolicyRepository, com.carecode.domain.user.repository.ChildRepository, com.carecode.core.security.CurrentUserFacade, com.carecode.core.analytics.EventLogger, com.carecode.domain.policy.benefit.BenefitProjectionCalculator)> has parameter of type in (RegionalBenefitComparisonService.java:0) policy → user 리포지토리: Field has type in (BenefitReportSolicitor.java:0) policy → user 리포지토리: Field has type in (BenefitReportSolicitor.java:0) policy → user 리포지토리: Field has type in (MissedBenefitService.java:0) diff --git a/archunit-baseline/ab7a1eba-4dd5-499e-95ed-0c71f0b6f61f b/archunit-baseline/ab7a1eba-4dd5-499e-95ed-0c71f0b6f61f index fb2d5789..e69de29b 100644 --- a/archunit-baseline/ab7a1eba-4dd5-499e-95ed-0c71f0b6f61f +++ b/archunit-baseline/ab7a1eba-4dd5-499e-95ed-0c71f0b6f61f @@ -1,2 +0,0 @@ -Class is annotated with @RestController in (PublicDataController.java:0) -Class is annotated with @RestController in (CareFacilityApiController.java:0) diff --git a/docs/architecture/system-overview.md b/docs/architecture/system-overview.md index 3496dcbd..f768b610 100644 --- a/docs/architecture/system-overview.md +++ b/docs/architecture/system-overview.md @@ -81,7 +81,7 @@ graph TB |------|--------|------| | 진입 | `core.security`, `core.RateLimitInterceptor`, `core.handler` | 인증·인가, 호출 제한, 예외의 상태코드 변환 | | 표현 | `domain.*.controller` | HTTP 계약. 비즈니스 판단은 하지 않음 | -| 조합 | `domain.*.facade` | 여러 서비스를 묶어 화면 단위 응답을 만듦 | +| 조합 | `domain.*.app` | 여러 서비스를 묶어 화면 단위 응답을 만듦 (클래스 이름은 `*Facade`) | | 도메인 | `domain.*.service` | 판단과 계산. 대부분의 설계 결정이 여기 있음 | | 수집 | `core.client` | 공공데이터 공급자 추상화와 동기화 | | 지표 | `core.analytics` | 행동 이벤트 적재와 퍼널·리텐션 집계 | diff --git a/docs/quality/architecture-rules.md b/docs/quality/architecture-rules.md index c19454a1..5bbc188e 100644 --- a/docs/quality/architecture-rules.md +++ b/docs/quality/architecture-rules.md @@ -45,20 +45,54 @@ ArchUnit 의 `FreezingArchRule` 을 씁니다. 마지막 두 줄이 0 인 것이 중요합니다 — **층 구조 자체는 맞습니다.** 문제는 같은 층 안에서 경계를 지키지 않는 쪽입니다. -## 규칙 대상이 아닌 것 +## core 를 이름이 뜻을 말하는 자리로 쪼갰다 (1단계) -`core/scheduler` · `core/client` · `core/devtools` · `core/geocoding` · `core/benefit` 은 -공공데이터 동기화와 배치처럼 **여러 도메인을 조합하는 코드** 입니다. 도메인을 아는 게 본질이라 -"기반은 도메인을 모른다" 규칙의 대상이 아닙니다. +`core` 라는 한 패키지에 성격이 다른 셋이 섞여 있었습니다. -다만 그 코드가 "공통 기반" 자리에 있는 것이 혼란의 원인입니다. 조합 계층으로 따로 옮기는 것은 -다음 단계에서 다룹니다. +| 성격 | 내용 | 도메인을 아는가 | +|------|------|-----------------| +| 기반 | 보안·웹·설정·저장소·유틸·예외·모니터링 | 몰라야 한다 | +| 조합 | 공공데이터 연동·배치·지오코딩 | **아는 게 본질이다** (도메인 참조 47건) | +| 도메인 | 시설 공개 API 컨트롤러 2개, 지원금 계산기 | 도메인이다 | + +조합 코드가 "공통 기반" 자리에 있으면, 규칙을 세울 수도 없고(도메인 참조가 정상이므로) +새로 온 사람은 "core 는 뭐든 넣는 곳" 으로 읽습니다. 그래서 이름이 뜻을 말하도록 옮겼습니다. + +| 전 | 후 | 무엇인가 | +|----|----|----------| +| `core/client` | `external/publicdata` | 외부 공공데이터 연동·동기화 | +| `core/geocoding` | `external/geocoding` | 외부 좌표 변환 | +| `core/scheduler` | `batch` | 주기 작업 | +| `core/devtools` | `devtools` | 개발용 샘플 데이터 | +| `core/benefit` | `domain/policy/benefit` | policy 만 쓰는 도메인 로직이었다 | +| `core/controller/CareFacilityApiController` | `domain/careFacility/controller` | 373줄짜리 시설 공개 API | +| `core/client/controller/PublicDataController` | `domain/careFacility/controller` | 같은 성격 | +| `core/controller/BaseController` | `core/web` | 패키지 해체 | + +`integration` 이라는 이름은 쓰지 않았습니다. 테스트 쪽에서 이미 "통합 테스트" 뜻으로 쓰고 있어 +같은 이름이 두 뜻으로 읽힙니다. + +### 총 위반은 줄지 않았다 (489 → 489) + +솔직하게 적어 둡니다. "core 에 컨트롤러" 2건이 **`careFacility` 네이밍 위반 2건으로 옮겨 간 것**입니다. +옮긴 코드가 이제 도메인 규칙의 대상이 되기 때문입니다. 숫자가 줄어드는 것은 다음 단계 +(`careFacility`→`facility`, 98건 일괄)에서 나옵니다. + +이 단계의 값은 숫자가 아니라 **규칙을 세울 수 있는 구조가 된 것** 입니다. 조합 코드가 기반에서 빠졌으니 +"기반은 도메인을 모른다" 를 예외 없이 적용할 수 있습니다. + +### 파일을 옮기면 baseline 을 다시 떠야 한다 + +위반 설명에 클래스 경로가 들어가므로, 같은 문제라도 파일을 옮기면 **새 위반으로 잡힙니다.** +이동 PR 에서는 `freeze.refreeze=true` 로 한 번 다시 뜨고, 규칙별 숫자가 늘지 않았는지 확인한 뒤 +다시 `false` 로 돌려놓습니다(그래야 CI 가 진짜 새 위반을 잡습니다). ## 다음 단계 | 단계 | 내용 | 효과 | |------|------|------| -| 1. 자리 정리 | `core` 의 도메인 컨트롤러 이동, 조합 계층 분리, `careFacility`→`facility`, 문서의 `facade`↔코드 `app` 통일 | 위반 96+50+2 감소 | +| ~~1a. core 정리~~ | ~~조합 계층 분리, core 의 도메인 코드 이동~~ | **완료** — core 에 컨트롤러 0 | +| 1b. 이름 통일 | `careFacility`→`facility`, 문서의 `facade`↔코드 `app` | 위반 98 감소 | | 2. 예외 한 체계 | `catch(Exception)` 덮어쓰기 제거, ErrorCode 기반 통합 | 상태 코드 정확해짐 | | 3. `Map` 응답 → DTO | 24곳. 스펙에 타입이 생겨 프런트 계약 대조가 이 경로까지 본다 | 계약 품질 | | 4. Child 를 제 자리로 | 엔티티는 `user`, 서비스는 `health` 에 쪼개져 있다 | 결합 1위 해소 | diff --git a/src/main/java/com/carecode/core/scheduler/BookingReminderScheduler.java b/src/main/java/com/carecode/batch/BookingReminderScheduler.java similarity index 98% rename from src/main/java/com/carecode/core/scheduler/BookingReminderScheduler.java rename to src/main/java/com/carecode/batch/BookingReminderScheduler.java index 34e26674..9b29a1d5 100644 --- a/src/main/java/com/carecode/core/scheduler/BookingReminderScheduler.java +++ b/src/main/java/com/carecode/batch/BookingReminderScheduler.java @@ -1,4 +1,4 @@ -package com.carecode.core.scheduler; +package com.carecode.batch; import com.carecode.domain.careFacility.entity.CareFacilityBooking; import com.carecode.domain.careFacility.repository.CareFacilityBookingRepository; diff --git a/src/main/java/com/carecode/core/scheduler/DataCleanupScheduler.java b/src/main/java/com/carecode/batch/DataCleanupScheduler.java similarity index 98% rename from src/main/java/com/carecode/core/scheduler/DataCleanupScheduler.java rename to src/main/java/com/carecode/batch/DataCleanupScheduler.java index 8e5f83ad..d3affc00 100644 --- a/src/main/java/com/carecode/core/scheduler/DataCleanupScheduler.java +++ b/src/main/java/com/carecode/batch/DataCleanupScheduler.java @@ -1,4 +1,4 @@ -package com.carecode.core.scheduler; +package com.carecode.batch; import com.carecode.core.ops.sync.SyncRunRepository; import com.carecode.domain.user.repository.EmailVerificationTokenRepository; diff --git a/src/main/java/com/carecode/core/scheduler/ForecastBacktestScheduler.java b/src/main/java/com/carecode/batch/ForecastBacktestScheduler.java similarity index 96% rename from src/main/java/com/carecode/core/scheduler/ForecastBacktestScheduler.java rename to src/main/java/com/carecode/batch/ForecastBacktestScheduler.java index ec300df7..2cdd9314 100644 --- a/src/main/java/com/carecode/core/scheduler/ForecastBacktestScheduler.java +++ b/src/main/java/com/carecode/batch/ForecastBacktestScheduler.java @@ -1,4 +1,4 @@ -package com.carecode.core.scheduler; +package com.carecode.batch; import com.carecode.core.ops.sync.SyncJob; import com.carecode.core.ops.sync.SyncRunTracker; diff --git a/src/main/java/com/carecode/core/scheduler/PublicDataSyncScheduler.java b/src/main/java/com/carecode/batch/PublicDataSyncScheduler.java similarity index 91% rename from src/main/java/com/carecode/core/scheduler/PublicDataSyncScheduler.java rename to src/main/java/com/carecode/batch/PublicDataSyncScheduler.java index 325b2d6d..a6bd5a23 100644 --- a/src/main/java/com/carecode/core/scheduler/PublicDataSyncScheduler.java +++ b/src/main/java/com/carecode/batch/PublicDataSyncScheduler.java @@ -1,10 +1,10 @@ -package com.carecode.core.scheduler; +package com.carecode.batch; -import com.carecode.core.client.sync.GovernmentBenefitSyncService; -import com.carecode.core.client.sync.KindergartenSyncService; -import com.carecode.core.client.sync.NationwideChildcareFacilitySyncService; -import com.carecode.core.client.sync.PediatricHospitalSyncService; -import com.carecode.core.geocoding.FacilityGeocodingService; +import com.carecode.external.publicdata.sync.GovernmentBenefitSyncService; +import com.carecode.external.publicdata.sync.KindergartenSyncService; +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.policy.service.BenefitReportSolicitor; import com.carecode.domain.policy.service.PolicyChangeNotifier; diff --git a/src/main/java/com/carecode/core/scheduler/VaccinationReminderScheduler.java b/src/main/java/com/carecode/batch/VaccinationReminderScheduler.java similarity index 98% rename from src/main/java/com/carecode/core/scheduler/VaccinationReminderScheduler.java rename to src/main/java/com/carecode/batch/VaccinationReminderScheduler.java index 6b7cb72f..8dfbec83 100644 --- a/src/main/java/com/carecode/core/scheduler/VaccinationReminderScheduler.java +++ b/src/main/java/com/carecode/batch/VaccinationReminderScheduler.java @@ -1,4 +1,4 @@ -package com.carecode.core.scheduler; +package com.carecode.batch; import com.carecode.domain.health.entity.VaccinationSchedule; import com.carecode.domain.health.repository.VaccinationScheduleRepository; diff --git a/src/main/java/com/carecode/core/ops/sync/SyncRunTracker.java b/src/main/java/com/carecode/core/ops/sync/SyncRunTracker.java index 3b6e04ce..2be27f20 100644 --- a/src/main/java/com/carecode/core/ops/sync/SyncRunTracker.java +++ b/src/main/java/com/carecode/core/ops/sync/SyncRunTracker.java @@ -1,6 +1,6 @@ package com.carecode.core.ops.sync; -import com.carecode.core.client.sync.SyncResult; +import com.carecode.external.publicdata.sync.SyncResult; import com.carecode.core.ops.OperationalAlerter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/carecode/core/controller/BaseController.java b/src/main/java/com/carecode/core/web/BaseController.java similarity index 97% rename from src/main/java/com/carecode/core/controller/BaseController.java rename to src/main/java/com/carecode/core/web/BaseController.java index 3aa2b620..0a49c436 100644 --- a/src/main/java/com/carecode/core/controller/BaseController.java +++ b/src/main/java/com/carecode/core/web/BaseController.java @@ -1,4 +1,4 @@ -package com.carecode.core.controller; +package com.carecode.core.web; /** * 컨트롤러 공통 상수. diff --git a/src/main/java/com/carecode/core/devtools/SampleDataCleaner.java b/src/main/java/com/carecode/devtools/SampleDataCleaner.java similarity index 98% rename from src/main/java/com/carecode/core/devtools/SampleDataCleaner.java rename to src/main/java/com/carecode/devtools/SampleDataCleaner.java index d10a0cc6..e716d31e 100644 --- a/src/main/java/com/carecode/core/devtools/SampleDataCleaner.java +++ b/src/main/java/com/carecode/devtools/SampleDataCleaner.java @@ -1,4 +1,4 @@ -package com.carecode.core.devtools; +package com.carecode.devtools; import com.carecode.domain.careFacility.entity.CareFacility; import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; diff --git a/src/main/java/com/carecode/core/devtools/SampleDataProperties.java b/src/main/java/com/carecode/devtools/SampleDataProperties.java similarity index 92% rename from src/main/java/com/carecode/core/devtools/SampleDataProperties.java rename to src/main/java/com/carecode/devtools/SampleDataProperties.java index e34e1700..9ff5fbc9 100644 --- a/src/main/java/com/carecode/core/devtools/SampleDataProperties.java +++ b/src/main/java/com/carecode/devtools/SampleDataProperties.java @@ -1,4 +1,4 @@ -package com.carecode.core.devtools; +package com.carecode.devtools; /** 샘플 데이터 식별자. 실데이터와 섞이지 않도록 접두어로 구분하고, 이 접두어로 일괄 삭제한다. */ public final class SampleDataProperties { diff --git a/src/main/java/com/carecode/core/devtools/SampleDataRunner.java b/src/main/java/com/carecode/devtools/SampleDataRunner.java similarity index 97% rename from src/main/java/com/carecode/core/devtools/SampleDataRunner.java rename to src/main/java/com/carecode/devtools/SampleDataRunner.java index f9121c96..bf1cb9c3 100644 --- a/src/main/java/com/carecode/core/devtools/SampleDataRunner.java +++ b/src/main/java/com/carecode/devtools/SampleDataRunner.java @@ -1,4 +1,4 @@ -package com.carecode.core.devtools; +package com.carecode.devtools; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/carecode/core/devtools/SampleFacilitySeeder.java b/src/main/java/com/carecode/devtools/SampleFacilitySeeder.java similarity index 99% rename from src/main/java/com/carecode/core/devtools/SampleFacilitySeeder.java rename to src/main/java/com/carecode/devtools/SampleFacilitySeeder.java index dba772ff..03ad9dac 100644 --- a/src/main/java/com/carecode/core/devtools/SampleFacilitySeeder.java +++ b/src/main/java/com/carecode/devtools/SampleFacilitySeeder.java @@ -1,4 +1,4 @@ -package com.carecode.core.devtools; +package com.carecode.devtools; import com.carecode.domain.careFacility.entity.CareFacility; import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; diff --git a/src/main/java/com/carecode/core/devtools/SamplePolicySeeder.java b/src/main/java/com/carecode/devtools/SamplePolicySeeder.java similarity index 99% rename from src/main/java/com/carecode/core/devtools/SamplePolicySeeder.java rename to src/main/java/com/carecode/devtools/SamplePolicySeeder.java index 0c030fa5..0ec098fe 100644 --- a/src/main/java/com/carecode/core/devtools/SamplePolicySeeder.java +++ b/src/main/java/com/carecode/devtools/SamplePolicySeeder.java @@ -1,4 +1,4 @@ -package com.carecode.core.devtools; +package com.carecode.devtools; import com.carecode.domain.policy.entity.Policy; import com.carecode.domain.policy.repository.PolicyRepository; diff --git a/src/main/java/com/carecode/domain/admin/controller/AdminCareFacilityBookingController.java b/src/main/java/com/carecode/domain/admin/controller/AdminCareFacilityBookingController.java index ee5f4dff..5450c0dd 100644 --- a/src/main/java/com/carecode/domain/admin/controller/AdminCareFacilityBookingController.java +++ b/src/main/java/com/carecode/domain/admin/controller/AdminCareFacilityBookingController.java @@ -1,7 +1,7 @@ package com.carecode.domain.admin.controller; import com.carecode.core.annotation.LogExecutionTime; -import com.carecode.core.controller.BaseController; +import com.carecode.core.web.BaseController; import com.carecode.domain.admin.dto.AdminBookingDetailResponse; import com.carecode.domain.admin.dto.AdminBookingSearchRequest; import com.carecode.domain.admin.dto.AdminBookingSearchResponse; 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 6f665067..9eb13a8a 100644 --- a/src/main/java/com/carecode/domain/admin/controller/AdminPublicDataController.java +++ b/src/main/java/com/carecode/domain/admin/controller/AdminPublicDataController.java @@ -1,11 +1,11 @@ package com.carecode.domain.admin.controller; -import com.carecode.core.client.sync.GovernmentBenefitSyncService; -import com.carecode.core.client.sync.KindergartenSyncService; -import com.carecode.core.client.sync.NationwideChildcareFacilitySyncService; -import com.carecode.core.client.sync.PediatricHospitalSyncService; -import com.carecode.core.client.sync.SyncResult; -import com.carecode.core.geocoding.FacilityGeocodingService; +import com.carecode.external.publicdata.sync.GovernmentBenefitSyncService; +import com.carecode.external.publicdata.sync.KindergartenSyncService; +import com.carecode.external.publicdata.sync.NationwideChildcareFacilitySyncService; +import com.carecode.external.publicdata.sync.PediatricHospitalSyncService; +import com.carecode.external.publicdata.sync.SyncResult; +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; diff --git a/src/main/java/com/carecode/domain/admin/controller/AdminSampleDataController.java b/src/main/java/com/carecode/domain/admin/controller/AdminSampleDataController.java index 95500489..467a1416 100644 --- a/src/main/java/com/carecode/domain/admin/controller/AdminSampleDataController.java +++ b/src/main/java/com/carecode/domain/admin/controller/AdminSampleDataController.java @@ -1,8 +1,8 @@ package com.carecode.domain.admin.controller; -import com.carecode.core.devtools.SampleDataCleaner; -import com.carecode.core.devtools.SampleFacilitySeeder; -import com.carecode.core.devtools.SamplePolicySeeder; +import com.carecode.devtools.SampleDataCleaner; +import com.carecode.devtools.SampleFacilitySeeder; +import com.carecode.devtools.SamplePolicySeeder; 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/core/controller/CareFacilityApiController.java b/src/main/java/com/carecode/domain/careFacility/controller/CareFacilityApiController.java similarity index 99% rename from src/main/java/com/carecode/core/controller/CareFacilityApiController.java rename to src/main/java/com/carecode/domain/careFacility/controller/CareFacilityApiController.java index 625b767f..66aba899 100644 --- a/src/main/java/com/carecode/core/controller/CareFacilityApiController.java +++ b/src/main/java/com/carecode/domain/careFacility/controller/CareFacilityApiController.java @@ -1,6 +1,6 @@ -package com.carecode.core.controller; +package com.carecode.domain.careFacility.controller; -import com.carecode.core.client.CareFacilityApiService; +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; diff --git a/src/main/java/com/carecode/domain/careFacility/controller/CareFacilityController.java b/src/main/java/com/carecode/domain/careFacility/controller/CareFacilityController.java index 195100b2..f642bd21 100644 --- a/src/main/java/com/carecode/domain/careFacility/controller/CareFacilityController.java +++ b/src/main/java/com/carecode/domain/careFacility/controller/CareFacilityController.java @@ -3,7 +3,7 @@ import com.carecode.core.annotation.LogExecutionTime; import com.carecode.core.annotation.ValidateLocation; import com.carecode.core.annotation.ValidateChildAge; -import com.carecode.core.controller.BaseController; +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; diff --git a/src/main/java/com/carecode/core/client/controller/PublicDataController.java b/src/main/java/com/carecode/domain/careFacility/controller/PublicDataController.java similarity index 97% rename from src/main/java/com/carecode/core/client/controller/PublicDataController.java rename to src/main/java/com/carecode/domain/careFacility/controller/PublicDataController.java index 83576eae..454d41b9 100644 --- a/src/main/java/com/carecode/core/client/controller/PublicDataController.java +++ b/src/main/java/com/carecode/domain/careFacility/controller/PublicDataController.java @@ -1,7 +1,7 @@ -package com.carecode.core.client.controller; +package com.carecode.domain.careFacility.controller; -import com.carecode.core.client.PublicDataApiService; -import com.carecode.core.client.dto.PublicDataResponse; +import com.carecode.external.publicdata.PublicDataApiService; +import com.carecode.external.publicdata.dto.PublicDataResponse; 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/chatbot/controller/ChatbotController.java b/src/main/java/com/carecode/domain/chatbot/controller/ChatbotController.java index 40e48a19..97399deb 100644 --- a/src/main/java/com/carecode/domain/chatbot/controller/ChatbotController.java +++ b/src/main/java/com/carecode/domain/chatbot/controller/ChatbotController.java @@ -2,7 +2,7 @@ import com.carecode.core.annotation.LogExecutionTime; import com.carecode.core.annotation.RateLimit; -import com.carecode.core.controller.BaseController; +import com.carecode.core.web.BaseController; import com.carecode.core.security.CurrentUserFacade; import com.carecode.core.exception.CareServiceException; import com.carecode.domain.chatbot.dto.request.ChatbotMessageRequest; diff --git a/src/main/java/com/carecode/domain/community/controller/CommunityController.java b/src/main/java/com/carecode/domain/community/controller/CommunityController.java index 21024e4f..c89b1e3f 100644 --- a/src/main/java/com/carecode/domain/community/controller/CommunityController.java +++ b/src/main/java/com/carecode/domain/community/controller/CommunityController.java @@ -1,7 +1,7 @@ package com.carecode.domain.community.controller; import com.carecode.core.annotation.LogExecutionTime; -import com.carecode.core.controller.BaseController; +import com.carecode.core.web.BaseController; import com.carecode.domain.community.dto.request.CommunityCreatePostRequest; import com.carecode.domain.community.dto.request.CommunityUpdatePostRequest; import com.carecode.domain.community.dto.request.CommunityCreateCommentRequest; diff --git a/src/main/java/com/carecode/domain/health/controller/HealthController.java b/src/main/java/com/carecode/domain/health/controller/HealthController.java index 2629f27d..bbae0bbb 100644 --- a/src/main/java/com/carecode/domain/health/controller/HealthController.java +++ b/src/main/java/com/carecode/domain/health/controller/HealthController.java @@ -1,7 +1,7 @@ package com.carecode.domain.health.controller; import com.carecode.core.annotation.LogExecutionTime; -import com.carecode.core.controller.BaseController; +import com.carecode.core.web.BaseController; import com.carecode.core.web.ConditionalResponse; import com.carecode.core.util.PageRequestUtil; import com.carecode.core.security.CurrentUserFacade; diff --git a/src/main/java/com/carecode/domain/notification/controller/NotificationController.java b/src/main/java/com/carecode/domain/notification/controller/NotificationController.java index 63d351aa..535ff996 100644 --- a/src/main/java/com/carecode/domain/notification/controller/NotificationController.java +++ b/src/main/java/com/carecode/domain/notification/controller/NotificationController.java @@ -1,7 +1,7 @@ package com.carecode.domain.notification.controller; import com.carecode.core.annotation.LogExecutionTime; -import com.carecode.core.controller.BaseController; +import com.carecode.core.web.BaseController; import com.carecode.core.exception.CareServiceException; import com.carecode.core.security.CurrentUserFacade; import com.carecode.domain.notification.dto.request.NotificationCreateRequest; diff --git a/src/main/java/com/carecode/core/benefit/BenefitPaymentType.java b/src/main/java/com/carecode/domain/policy/benefit/BenefitPaymentType.java similarity index 98% rename from src/main/java/com/carecode/core/benefit/BenefitPaymentType.java rename to src/main/java/com/carecode/domain/policy/benefit/BenefitPaymentType.java index 11b157d0..beb95db9 100644 --- a/src/main/java/com/carecode/core/benefit/BenefitPaymentType.java +++ b/src/main/java/com/carecode/domain/policy/benefit/BenefitPaymentType.java @@ -1,4 +1,4 @@ -package com.carecode.core.benefit; +package com.carecode.domain.policy.benefit; import java.util.List; diff --git a/src/main/java/com/carecode/core/benefit/BenefitProjectionCalculator.java b/src/main/java/com/carecode/domain/policy/benefit/BenefitProjectionCalculator.java similarity index 98% rename from src/main/java/com/carecode/core/benefit/BenefitProjectionCalculator.java rename to src/main/java/com/carecode/domain/policy/benefit/BenefitProjectionCalculator.java index e7baec79..920138da 100644 --- a/src/main/java/com/carecode/core/benefit/BenefitProjectionCalculator.java +++ b/src/main/java/com/carecode/domain/policy/benefit/BenefitProjectionCalculator.java @@ -1,4 +1,4 @@ -package com.carecode.core.benefit; +package com.carecode.domain.policy.benefit; import com.carecode.domain.policy.entity.Policy; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/carecode/domain/policy/controller/PolicyController.java b/src/main/java/com/carecode/domain/policy/controller/PolicyController.java index 4d7f198c..68284a19 100644 --- a/src/main/java/com/carecode/domain/policy/controller/PolicyController.java +++ b/src/main/java/com/carecode/domain/policy/controller/PolicyController.java @@ -2,7 +2,7 @@ import com.carecode.core.annotation.LogExecutionTime; import com.carecode.core.annotation.ValidateLocation; -import com.carecode.core.controller.BaseController; +import com.carecode.core.web.BaseController; import com.carecode.core.util.PageRequestUtil; import com.carecode.core.security.CurrentUserFacade; import com.carecode.core.exception.CareServiceException; diff --git a/src/main/java/com/carecode/domain/policy/service/RegionalBenefitComparisonService.java b/src/main/java/com/carecode/domain/policy/service/RegionalBenefitComparisonService.java index f35f3e1e..7b3c9d6f 100644 --- a/src/main/java/com/carecode/domain/policy/service/RegionalBenefitComparisonService.java +++ b/src/main/java/com/carecode/domain/policy/service/RegionalBenefitComparisonService.java @@ -1,7 +1,7 @@ package com.carecode.domain.policy.service; -import com.carecode.core.benefit.BenefitPaymentType; -import com.carecode.core.benefit.BenefitProjectionCalculator; +import com.carecode.domain.policy.benefit.BenefitPaymentType; +import com.carecode.domain.policy.benefit.BenefitProjectionCalculator; import com.carecode.core.exception.CareServiceException; import com.carecode.core.analytics.EventLogger; import com.carecode.core.analytics.EventType; diff --git a/src/main/java/com/carecode/domain/user/controller/AuthController.java b/src/main/java/com/carecode/domain/user/controller/AuthController.java index 01ca586d..aed08448 100644 --- a/src/main/java/com/carecode/domain/user/controller/AuthController.java +++ b/src/main/java/com/carecode/domain/user/controller/AuthController.java @@ -2,7 +2,7 @@ import com.carecode.core.annotation.LogExecutionTime; import com.carecode.core.annotation.RateLimit; -import com.carecode.core.controller.BaseController; +import com.carecode.core.web.BaseController; import com.carecode.core.security.CurrentUserFacade; import com.carecode.core.security.RefreshTokenCookieFactory; import com.carecode.core.exception.UserNotFoundException; diff --git a/src/main/java/com/carecode/domain/user/controller/KakaoAuthController.java b/src/main/java/com/carecode/domain/user/controller/KakaoAuthController.java index c655f47e..9e787492 100644 --- a/src/main/java/com/carecode/domain/user/controller/KakaoAuthController.java +++ b/src/main/java/com/carecode/domain/user/controller/KakaoAuthController.java @@ -1,7 +1,7 @@ package com.carecode.domain.user.controller; import com.carecode.core.annotation.LogExecutionTime; -import com.carecode.core.controller.BaseController; +import com.carecode.core.web.BaseController; import com.carecode.core.exception.UserNotFoundException; import com.carecode.core.security.CurrentUserFacade; import com.carecode.core.security.RefreshTokenCookieFactory; diff --git a/src/main/java/com/carecode/domain/user/controller/UserController.java b/src/main/java/com/carecode/domain/user/controller/UserController.java index 13743352..6e5def84 100644 --- a/src/main/java/com/carecode/domain/user/controller/UserController.java +++ b/src/main/java/com/carecode/domain/user/controller/UserController.java @@ -1,7 +1,7 @@ package com.carecode.domain.user.controller; import com.carecode.core.annotation.LogExecutionTime; -import com.carecode.core.controller.BaseController; +import com.carecode.core.web.BaseController; import com.carecode.core.handler.ApiSuccess; import com.carecode.core.security.CurrentUserFacade; import com.carecode.domain.user.app.UserFacade; diff --git a/src/main/java/com/carecode/core/geocoding/FacilityGeocodingService.java b/src/main/java/com/carecode/external/geocoding/FacilityGeocodingService.java similarity index 98% rename from src/main/java/com/carecode/core/geocoding/FacilityGeocodingService.java rename to src/main/java/com/carecode/external/geocoding/FacilityGeocodingService.java index 284cbeb2..31cf902a 100644 --- a/src/main/java/com/carecode/core/geocoding/FacilityGeocodingService.java +++ b/src/main/java/com/carecode/external/geocoding/FacilityGeocodingService.java @@ -1,4 +1,4 @@ -package com.carecode.core.geocoding; +package com.carecode.external.geocoding; import com.carecode.domain.careFacility.entity.CareFacility; import com.carecode.domain.careFacility.repository.CareFacilityRepository; diff --git a/src/main/java/com/carecode/core/geocoding/Geocoder.java b/src/main/java/com/carecode/external/geocoding/Geocoder.java similarity index 95% rename from src/main/java/com/carecode/core/geocoding/Geocoder.java rename to src/main/java/com/carecode/external/geocoding/Geocoder.java index 269385cf..0d34bdf3 100644 --- a/src/main/java/com/carecode/core/geocoding/Geocoder.java +++ b/src/main/java/com/carecode/external/geocoding/Geocoder.java @@ -1,4 +1,4 @@ -package com.carecode.core.geocoding; +package com.carecode.external.geocoding; import java.util.Optional; diff --git a/src/main/java/com/carecode/core/geocoding/KakaoGeocoder.java b/src/main/java/com/carecode/external/geocoding/KakaoGeocoder.java similarity index 98% rename from src/main/java/com/carecode/core/geocoding/KakaoGeocoder.java rename to src/main/java/com/carecode/external/geocoding/KakaoGeocoder.java index acbd4160..b966ed5a 100644 --- a/src/main/java/com/carecode/core/geocoding/KakaoGeocoder.java +++ b/src/main/java/com/carecode/external/geocoding/KakaoGeocoder.java @@ -1,4 +1,4 @@ -package com.carecode.core.geocoding; +package com.carecode.external.geocoding; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/carecode/core/client/CareFacilityApiService.java b/src/main/java/com/carecode/external/publicdata/CareFacilityApiService.java similarity index 99% rename from src/main/java/com/carecode/core/client/CareFacilityApiService.java rename to src/main/java/com/carecode/external/publicdata/CareFacilityApiService.java index de808548..1c687574 100644 --- a/src/main/java/com/carecode/core/client/CareFacilityApiService.java +++ b/src/main/java/com/carecode/external/publicdata/CareFacilityApiService.java @@ -1,4 +1,4 @@ -package com.carecode.core.client; +package com.carecode.external.publicdata; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/carecode/core/client/PublicDataApiClient.java b/src/main/java/com/carecode/external/publicdata/PublicDataApiClient.java similarity index 99% rename from src/main/java/com/carecode/core/client/PublicDataApiClient.java rename to src/main/java/com/carecode/external/publicdata/PublicDataApiClient.java index 3033532b..f4e7e786 100644 --- a/src/main/java/com/carecode/core/client/PublicDataApiClient.java +++ b/src/main/java/com/carecode/external/publicdata/PublicDataApiClient.java @@ -1,4 +1,4 @@ -package com.carecode.core.client; +package com.carecode.external.publicdata; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/carecode/core/client/PublicDataApiService.java b/src/main/java/com/carecode/external/publicdata/PublicDataApiService.java similarity index 97% rename from src/main/java/com/carecode/core/client/PublicDataApiService.java rename to src/main/java/com/carecode/external/publicdata/PublicDataApiService.java index cadc0da1..fb102fec 100644 --- a/src/main/java/com/carecode/core/client/PublicDataApiService.java +++ b/src/main/java/com/carecode/external/publicdata/PublicDataApiService.java @@ -1,6 +1,6 @@ -package com.carecode.core.client; +package com.carecode.external.publicdata; -import com.carecode.core.client.dto.PublicDataResponse; +import com.carecode.external.publicdata.dto.PublicDataResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/carecode/core/client/XmlResponseParser.java b/src/main/java/com/carecode/external/publicdata/XmlResponseParser.java similarity index 98% rename from src/main/java/com/carecode/core/client/XmlResponseParser.java rename to src/main/java/com/carecode/external/publicdata/XmlResponseParser.java index 639c1429..b38753e1 100644 --- a/src/main/java/com/carecode/core/client/XmlResponseParser.java +++ b/src/main/java/com/carecode/external/publicdata/XmlResponseParser.java @@ -1,4 +1,4 @@ -package com.carecode.core.client; +package com.carecode.external.publicdata; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/carecode/core/client/constants/PublicDataApiConstants.java b/src/main/java/com/carecode/external/publicdata/constants/PublicDataApiConstants.java similarity index 97% rename from src/main/java/com/carecode/core/client/constants/PublicDataApiConstants.java rename to src/main/java/com/carecode/external/publicdata/constants/PublicDataApiConstants.java index 56bc0129..ddd6b5c9 100644 --- a/src/main/java/com/carecode/core/client/constants/PublicDataApiConstants.java +++ b/src/main/java/com/carecode/external/publicdata/constants/PublicDataApiConstants.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.constants; +package com.carecode.external.publicdata.constants; import java.util.Map; diff --git a/src/main/java/com/carecode/core/client/dto/PublicDataResponse.java b/src/main/java/com/carecode/external/publicdata/dto/PublicDataResponse.java similarity index 97% rename from src/main/java/com/carecode/core/client/dto/PublicDataResponse.java rename to src/main/java/com/carecode/external/publicdata/dto/PublicDataResponse.java index 5daf3b78..c7b065e7 100644 --- a/src/main/java/com/carecode/core/client/dto/PublicDataResponse.java +++ b/src/main/java/com/carecode/external/publicdata/dto/PublicDataResponse.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.dto; +package com.carecode.external.publicdata.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/carecode/core/client/exception/PublicDataApiException.java b/src/main/java/com/carecode/external/publicdata/exception/PublicDataApiException.java similarity index 89% rename from src/main/java/com/carecode/core/client/exception/PublicDataApiException.java rename to src/main/java/com/carecode/external/publicdata/exception/PublicDataApiException.java index 6a719446..0a439213 100644 --- a/src/main/java/com/carecode/core/client/exception/PublicDataApiException.java +++ b/src/main/java/com/carecode/external/publicdata/exception/PublicDataApiException.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.exception; +package com.carecode.external.publicdata.exception; /** 공공데이터 API 관련 예외 API 호출 실패 시 발생하는 커스텀 예외 */ public class PublicDataApiException extends RuntimeException { diff --git a/src/main/java/com/carecode/core/client/provider/ChildcarePortalProvider.java b/src/main/java/com/carecode/external/publicdata/provider/ChildcarePortalProvider.java similarity index 96% rename from src/main/java/com/carecode/core/client/provider/ChildcarePortalProvider.java rename to src/main/java/com/carecode/external/publicdata/provider/ChildcarePortalProvider.java index 660ee8cf..03981ab7 100644 --- a/src/main/java/com/carecode/core/client/provider/ChildcarePortalProvider.java +++ b/src/main/java/com/carecode/external/publicdata/provider/ChildcarePortalProvider.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.provider; +package com.carecode.external.publicdata.provider; -import com.carecode.core.client.exception.PublicDataApiException; +import com.carecode.external.publicdata.exception.PublicDataApiException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/carecode/core/client/provider/DataGoKrProvider.java b/src/main/java/com/carecode/external/publicdata/provider/DataGoKrProvider.java similarity index 96% rename from src/main/java/com/carecode/core/client/provider/DataGoKrProvider.java rename to src/main/java/com/carecode/external/publicdata/provider/DataGoKrProvider.java index d4fe507e..99f5b755 100644 --- a/src/main/java/com/carecode/core/client/provider/DataGoKrProvider.java +++ b/src/main/java/com/carecode/external/publicdata/provider/DataGoKrProvider.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.provider; +package com.carecode.external.publicdata.provider; -import com.carecode.core.client.exception.PublicDataApiException; +import com.carecode.external.publicdata.exception.PublicDataApiException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/carecode/core/client/provider/KindergartenInfoProvider.java b/src/main/java/com/carecode/external/publicdata/provider/KindergartenInfoProvider.java similarity index 95% rename from src/main/java/com/carecode/core/client/provider/KindergartenInfoProvider.java rename to src/main/java/com/carecode/external/publicdata/provider/KindergartenInfoProvider.java index 28f970af..5630d5e4 100644 --- a/src/main/java/com/carecode/core/client/provider/KindergartenInfoProvider.java +++ b/src/main/java/com/carecode/external/publicdata/provider/KindergartenInfoProvider.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.provider; +package com.carecode.external.publicdata.provider; -import com.carecode.core.client.exception.PublicDataApiException; +import com.carecode.external.publicdata.exception.PublicDataApiException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/carecode/core/client/provider/OdcloudProvider.java b/src/main/java/com/carecode/external/publicdata/provider/OdcloudProvider.java similarity index 96% rename from src/main/java/com/carecode/core/client/provider/OdcloudProvider.java rename to src/main/java/com/carecode/external/publicdata/provider/OdcloudProvider.java index 1caf8243..bbe13da5 100644 --- a/src/main/java/com/carecode/core/client/provider/OdcloudProvider.java +++ b/src/main/java/com/carecode/external/publicdata/provider/OdcloudProvider.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.provider; +package com.carecode.external.publicdata.provider; -import com.carecode.core.client.exception.PublicDataApiException; +import com.carecode.external.publicdata.exception.PublicDataApiException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/carecode/core/client/provider/PublicDataProvider.java b/src/main/java/com/carecode/external/publicdata/provider/PublicDataProvider.java similarity index 90% rename from src/main/java/com/carecode/core/client/provider/PublicDataProvider.java rename to src/main/java/com/carecode/external/publicdata/provider/PublicDataProvider.java index 00c4b669..d214a086 100644 --- a/src/main/java/com/carecode/core/client/provider/PublicDataProvider.java +++ b/src/main/java/com/carecode/external/publicdata/provider/PublicDataProvider.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.provider; +package com.carecode.external.publicdata.provider; import java.util.Map; diff --git a/src/main/java/com/carecode/core/client/provider/SeoulOpenDataProvider.java b/src/main/java/com/carecode/external/publicdata/provider/SeoulOpenDataProvider.java similarity index 95% rename from src/main/java/com/carecode/core/client/provider/SeoulOpenDataProvider.java rename to src/main/java/com/carecode/external/publicdata/provider/SeoulOpenDataProvider.java index 57a038c2..14d899ba 100644 --- a/src/main/java/com/carecode/core/client/provider/SeoulOpenDataProvider.java +++ b/src/main/java/com/carecode/external/publicdata/provider/SeoulOpenDataProvider.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.provider; +package com.carecode.external.publicdata.provider; -import com.carecode.core.client.exception.PublicDataApiException; +import com.carecode.external.publicdata.exception.PublicDataApiException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/carecode/core/client/sync/CapacitySnapshotRecorder.java b/src/main/java/com/carecode/external/publicdata/sync/CapacitySnapshotRecorder.java similarity index 97% rename from src/main/java/com/carecode/core/client/sync/CapacitySnapshotRecorder.java rename to src/main/java/com/carecode/external/publicdata/sync/CapacitySnapshotRecorder.java index 2a6ba135..ade3ecc9 100644 --- a/src/main/java/com/carecode/core/client/sync/CapacitySnapshotRecorder.java +++ b/src/main/java/com/carecode/external/publicdata/sync/CapacitySnapshotRecorder.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; import com.carecode.domain.careFacility.entity.CareFacility; import com.carecode.domain.careFacility.entity.FacilityCapacitySnapshot; diff --git a/src/main/java/com/carecode/core/client/sync/CareFacilityUpsertService.java b/src/main/java/com/carecode/external/publicdata/sync/CareFacilityUpsertService.java similarity index 99% rename from src/main/java/com/carecode/core/client/sync/CareFacilityUpsertService.java rename to src/main/java/com/carecode/external/publicdata/sync/CareFacilityUpsertService.java index 43bdaaa1..71372f56 100644 --- a/src/main/java/com/carecode/core/client/sync/CareFacilityUpsertService.java +++ b/src/main/java/com/carecode/external/publicdata/sync/CareFacilityUpsertService.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; import com.carecode.domain.careFacility.entity.CareFacility; import com.carecode.domain.careFacility.entity.FacilityType; diff --git a/src/main/java/com/carecode/core/client/sync/ChildcareApiStatus.java b/src/main/java/com/carecode/external/publicdata/sync/ChildcareApiStatus.java similarity index 97% rename from src/main/java/com/carecode/core/client/sync/ChildcareApiStatus.java rename to src/main/java/com/carecode/external/publicdata/sync/ChildcareApiStatus.java index 6b041268..97c3fea4 100644 --- a/src/main/java/com/carecode/core/client/sync/ChildcareApiStatus.java +++ b/src/main/java/com/carecode/external/publicdata/sync/ChildcareApiStatus.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/com/carecode/core/client/sync/GovernmentBenefitSyncService.java b/src/main/java/com/carecode/external/publicdata/sync/GovernmentBenefitSyncService.java similarity index 95% rename from src/main/java/com/carecode/core/client/sync/GovernmentBenefitSyncService.java rename to src/main/java/com/carecode/external/publicdata/sync/GovernmentBenefitSyncService.java index 9029e88a..5690b9e2 100644 --- a/src/main/java/com/carecode/core/client/sync/GovernmentBenefitSyncService.java +++ b/src/main/java/com/carecode/external/publicdata/sync/GovernmentBenefitSyncService.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; -import com.carecode.core.client.provider.OdcloudProvider; +import com.carecode.external.publicdata.provider.OdcloudProvider; import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/carecode/core/client/sync/HospitalUpsertService.java b/src/main/java/com/carecode/external/publicdata/sync/HospitalUpsertService.java similarity index 98% rename from src/main/java/com/carecode/core/client/sync/HospitalUpsertService.java rename to src/main/java/com/carecode/external/publicdata/sync/HospitalUpsertService.java index 64d349d3..c294df03 100644 --- a/src/main/java/com/carecode/core/client/sync/HospitalUpsertService.java +++ b/src/main/java/com/carecode/external/publicdata/sync/HospitalUpsertService.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; import com.carecode.domain.health.entity.Hospital; import com.carecode.domain.health.repository.HospitalRepository; diff --git a/src/main/java/com/carecode/core/client/sync/KindergartenSyncService.java b/src/main/java/com/carecode/external/publicdata/sync/KindergartenSyncService.java similarity index 96% rename from src/main/java/com/carecode/core/client/sync/KindergartenSyncService.java rename to src/main/java/com/carecode/external/publicdata/sync/KindergartenSyncService.java index 0fd29833..ef779e75 100644 --- a/src/main/java/com/carecode/core/client/sync/KindergartenSyncService.java +++ b/src/main/java/com/carecode/external/publicdata/sync/KindergartenSyncService.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; -import com.carecode.core.client.provider.KindergartenInfoProvider; +import com.carecode.external.publicdata.provider.KindergartenInfoProvider; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/carecode/core/client/sync/KindergartenUpsertService.java b/src/main/java/com/carecode/external/publicdata/sync/KindergartenUpsertService.java similarity index 99% rename from src/main/java/com/carecode/core/client/sync/KindergartenUpsertService.java rename to src/main/java/com/carecode/external/publicdata/sync/KindergartenUpsertService.java index 635de8b5..894a19a7 100644 --- a/src/main/java/com/carecode/core/client/sync/KindergartenUpsertService.java +++ b/src/main/java/com/carecode/external/publicdata/sync/KindergartenUpsertService.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; import com.carecode.domain.careFacility.entity.CareFacility; import com.carecode.domain.careFacility.entity.FacilityType; diff --git a/src/main/java/com/carecode/core/client/sync/NationwideChildcareFacilitySyncService.java b/src/main/java/com/carecode/external/publicdata/sync/NationwideChildcareFacilitySyncService.java similarity index 95% rename from src/main/java/com/carecode/core/client/sync/NationwideChildcareFacilitySyncService.java rename to src/main/java/com/carecode/external/publicdata/sync/NationwideChildcareFacilitySyncService.java index ae74724b..b19bde4e 100644 --- a/src/main/java/com/carecode/core/client/sync/NationwideChildcareFacilitySyncService.java +++ b/src/main/java/com/carecode/external/publicdata/sync/NationwideChildcareFacilitySyncService.java @@ -1,7 +1,7 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; -import com.carecode.core.client.XmlResponseParser; -import com.carecode.core.client.provider.ChildcarePortalProvider; +import com.carecode.external.publicdata.XmlResponseParser; +import com.carecode.external.publicdata.provider.ChildcarePortalProvider; import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/carecode/core/client/sync/PagedSyncTemplate.java b/src/main/java/com/carecode/external/publicdata/sync/PagedSyncTemplate.java similarity index 98% rename from src/main/java/com/carecode/core/client/sync/PagedSyncTemplate.java rename to src/main/java/com/carecode/external/publicdata/sync/PagedSyncTemplate.java index 5df96fad..235df05d 100644 --- a/src/main/java/com/carecode/core/client/sync/PagedSyncTemplate.java +++ b/src/main/java/com/carecode/external/publicdata/sync/PagedSyncTemplate.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; -import com.carecode.core.client.XmlResponseParser; +import com.carecode.external.publicdata.XmlResponseParser; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/carecode/core/client/sync/PediatricHospitalSyncService.java b/src/main/java/com/carecode/external/publicdata/sync/PediatricHospitalSyncService.java similarity index 93% rename from src/main/java/com/carecode/core/client/sync/PediatricHospitalSyncService.java rename to src/main/java/com/carecode/external/publicdata/sync/PediatricHospitalSyncService.java index 851d2278..0562adbc 100644 --- a/src/main/java/com/carecode/core/client/sync/PediatricHospitalSyncService.java +++ b/src/main/java/com/carecode/external/publicdata/sync/PediatricHospitalSyncService.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; -import com.carecode.core.client.provider.DataGoKrProvider; +import com.carecode.external.publicdata.provider.DataGoKrProvider; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/carecode/core/client/sync/PolicyUpsertService.java b/src/main/java/com/carecode/external/publicdata/sync/PolicyUpsertService.java similarity index 99% rename from src/main/java/com/carecode/core/client/sync/PolicyUpsertService.java rename to src/main/java/com/carecode/external/publicdata/sync/PolicyUpsertService.java index f0ee945e..098d6788 100644 --- a/src/main/java/com/carecode/core/client/sync/PolicyUpsertService.java +++ b/src/main/java/com/carecode/external/publicdata/sync/PolicyUpsertService.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; import com.carecode.core.util.AgeRangeParser; import com.carecode.domain.policy.entity.Policy; diff --git a/src/main/java/com/carecode/core/client/sync/RegionCodeCatalog.java b/src/main/java/com/carecode/external/publicdata/sync/RegionCodeCatalog.java similarity index 98% rename from src/main/java/com/carecode/core/client/sync/RegionCodeCatalog.java rename to src/main/java/com/carecode/external/publicdata/sync/RegionCodeCatalog.java index 05627100..61b702b6 100644 --- a/src/main/java/com/carecode/core/client/sync/RegionCodeCatalog.java +++ b/src/main/java/com/carecode/external/publicdata/sync/RegionCodeCatalog.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.ClassPathResource; diff --git a/src/main/java/com/carecode/core/client/sync/SyncResult.java b/src/main/java/com/carecode/external/publicdata/sync/SyncResult.java similarity index 96% rename from src/main/java/com/carecode/core/client/sync/SyncResult.java rename to src/main/java/com/carecode/external/publicdata/sync/SyncResult.java index ec886390..580a0eb4 100644 --- a/src/main/java/com/carecode/core/client/sync/SyncResult.java +++ b/src/main/java/com/carecode/external/publicdata/sync/SyncResult.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; import lombok.Getter; diff --git a/src/main/java/com/carecode/core/client/sync/SyncSpec.java b/src/main/java/com/carecode/external/publicdata/sync/SyncSpec.java similarity index 89% rename from src/main/java/com/carecode/core/client/sync/SyncSpec.java rename to src/main/java/com/carecode/external/publicdata/sync/SyncSpec.java index 339c4469..7012ba90 100644 --- a/src/main/java/com/carecode/core/client/sync/SyncSpec.java +++ b/src/main/java/com/carecode/external/publicdata/sync/SyncSpec.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; -import com.carecode.core.client.provider.PublicDataProvider; +import com.carecode.external.publicdata.provider.PublicDataProvider; import com.fasterxml.jackson.databind.JsonNode; import lombok.Builder; import lombok.Getter; diff --git a/src/test/java/com/carecode/core/ops/sync/SyncRunTrackerTest.java b/src/test/java/com/carecode/core/ops/sync/SyncRunTrackerTest.java index cd5b0766..a30a6833 100644 --- a/src/test/java/com/carecode/core/ops/sync/SyncRunTrackerTest.java +++ b/src/test/java/com/carecode/core/ops/sync/SyncRunTrackerTest.java @@ -1,6 +1,6 @@ package com.carecode.core.ops.sync; -import com.carecode.core.client.sync.SyncResult; +import com.carecode.external.publicdata.sync.SyncResult; import com.carecode.core.ops.OperationalAlerter; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/carecode/core/benefit/BenefitProjectionCalculatorTest.java b/src/test/java/com/carecode/domain/policy/benefit/BenefitProjectionCalculatorTest.java similarity index 99% rename from src/test/java/com/carecode/core/benefit/BenefitProjectionCalculatorTest.java rename to src/test/java/com/carecode/domain/policy/benefit/BenefitProjectionCalculatorTest.java index 4626fb60..7a0d6e3b 100644 --- a/src/test/java/com/carecode/core/benefit/BenefitProjectionCalculatorTest.java +++ b/src/test/java/com/carecode/domain/policy/benefit/BenefitProjectionCalculatorTest.java @@ -1,4 +1,4 @@ -package com.carecode.core.benefit; +package com.carecode.domain.policy.benefit; import com.carecode.domain.policy.entity.Policy; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/carecode/domain/policy/service/RegionalBenefitComparisonServiceTest.java b/src/test/java/com/carecode/domain/policy/service/RegionalBenefitComparisonServiceTest.java index 11f81cf4..5ebe8897 100644 --- a/src/test/java/com/carecode/domain/policy/service/RegionalBenefitComparisonServiceTest.java +++ b/src/test/java/com/carecode/domain/policy/service/RegionalBenefitComparisonServiceTest.java @@ -1,6 +1,6 @@ package com.carecode.domain.policy.service; -import com.carecode.core.benefit.BenefitProjectionCalculator; +import com.carecode.domain.policy.benefit.BenefitProjectionCalculator; import com.carecode.core.exception.CareServiceException; import com.carecode.core.security.CurrentUserFacade; import com.carecode.domain.policy.dto.response.RegionalBenefitComparisonResponse; diff --git a/src/test/java/com/carecode/core/geocoding/FacilityGeocodingServiceTest.java b/src/test/java/com/carecode/external/geocoding/FacilityGeocodingServiceTest.java similarity index 99% rename from src/test/java/com/carecode/core/geocoding/FacilityGeocodingServiceTest.java rename to src/test/java/com/carecode/external/geocoding/FacilityGeocodingServiceTest.java index d32a4c9e..14130ebe 100644 --- a/src/test/java/com/carecode/core/geocoding/FacilityGeocodingServiceTest.java +++ b/src/test/java/com/carecode/external/geocoding/FacilityGeocodingServiceTest.java @@ -1,4 +1,4 @@ -package com.carecode.core.geocoding; +package com.carecode.external.geocoding; import com.carecode.domain.careFacility.entity.CareFacility; import com.carecode.domain.careFacility.repository.CareFacilityRepository; diff --git a/src/test/java/com/carecode/core/geocoding/KakaoGeocoderTest.java b/src/test/java/com/carecode/external/geocoding/KakaoGeocoderTest.java similarity index 99% rename from src/test/java/com/carecode/core/geocoding/KakaoGeocoderTest.java rename to src/test/java/com/carecode/external/geocoding/KakaoGeocoderTest.java index 12480319..6152850f 100644 --- a/src/test/java/com/carecode/core/geocoding/KakaoGeocoderTest.java +++ b/src/test/java/com/carecode/external/geocoding/KakaoGeocoderTest.java @@ -1,4 +1,4 @@ -package com.carecode.core.geocoding; +package com.carecode.external.geocoding; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/carecode/core/client/XmlResponseParserTest.java b/src/test/java/com/carecode/external/publicdata/XmlResponseParserTest.java similarity index 98% rename from src/test/java/com/carecode/core/client/XmlResponseParserTest.java rename to src/test/java/com/carecode/external/publicdata/XmlResponseParserTest.java index abcb86b0..24237ce1 100644 --- a/src/test/java/com/carecode/core/client/XmlResponseParserTest.java +++ b/src/test/java/com/carecode/external/publicdata/XmlResponseParserTest.java @@ -1,4 +1,4 @@ -package com.carecode.core.client; +package com.carecode.external.publicdata; import com.fasterxml.jackson.databind.JsonNode; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/carecode/core/client/constants/PublicDataApiConstantsTest.java b/src/test/java/com/carecode/external/publicdata/constants/PublicDataApiConstantsTest.java similarity index 96% rename from src/test/java/com/carecode/core/client/constants/PublicDataApiConstantsTest.java rename to src/test/java/com/carecode/external/publicdata/constants/PublicDataApiConstantsTest.java index 2ae02e7c..7f343140 100644 --- a/src/test/java/com/carecode/core/client/constants/PublicDataApiConstantsTest.java +++ b/src/test/java/com/carecode/external/publicdata/constants/PublicDataApiConstantsTest.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.constants; +package com.carecode.external.publicdata.constants; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/carecode/core/client/provider/ChildcarePortalProviderTest.java b/src/test/java/com/carecode/external/publicdata/provider/ChildcarePortalProviderTest.java similarity index 97% rename from src/test/java/com/carecode/core/client/provider/ChildcarePortalProviderTest.java rename to src/test/java/com/carecode/external/publicdata/provider/ChildcarePortalProviderTest.java index c1f1b471..42d9b18a 100644 --- a/src/test/java/com/carecode/core/client/provider/ChildcarePortalProviderTest.java +++ b/src/test/java/com/carecode/external/publicdata/provider/ChildcarePortalProviderTest.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.provider; +package com.carecode.external.publicdata.provider; -import com.carecode.core.client.exception.PublicDataApiException; +import com.carecode.external.publicdata.exception.PublicDataApiException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; diff --git a/src/test/java/com/carecode/core/client/provider/DataGoKrProviderTest.java b/src/test/java/com/carecode/external/publicdata/provider/DataGoKrProviderTest.java similarity index 97% rename from src/test/java/com/carecode/core/client/provider/DataGoKrProviderTest.java rename to src/test/java/com/carecode/external/publicdata/provider/DataGoKrProviderTest.java index 937b5cdc..aa3ec945 100644 --- a/src/test/java/com/carecode/core/client/provider/DataGoKrProviderTest.java +++ b/src/test/java/com/carecode/external/publicdata/provider/DataGoKrProviderTest.java @@ -1,6 +1,6 @@ -package com.carecode.core.client.provider; +package com.carecode.external.publicdata.provider; -import com.carecode.core.client.exception.PublicDataApiException; +import com.carecode.external.publicdata.exception.PublicDataApiException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.http.HttpMethod; diff --git a/src/test/java/com/carecode/core/client/sync/ChildcareApiStatusTest.java b/src/test/java/com/carecode/external/publicdata/sync/ChildcareApiStatusTest.java similarity index 98% rename from src/test/java/com/carecode/core/client/sync/ChildcareApiStatusTest.java rename to src/test/java/com/carecode/external/publicdata/sync/ChildcareApiStatusTest.java index daee3918..6d74fd4a 100644 --- a/src/test/java/com/carecode/core/client/sync/ChildcareApiStatusTest.java +++ b/src/test/java/com/carecode/external/publicdata/sync/ChildcareApiStatusTest.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/test/java/com/carecode/core/client/sync/KindergartenUpsertServiceTest.java b/src/test/java/com/carecode/external/publicdata/sync/KindergartenUpsertServiceTest.java similarity index 99% rename from src/test/java/com/carecode/core/client/sync/KindergartenUpsertServiceTest.java rename to src/test/java/com/carecode/external/publicdata/sync/KindergartenUpsertServiceTest.java index e5d3aeac..3e4136d7 100644 --- a/src/test/java/com/carecode/core/client/sync/KindergartenUpsertServiceTest.java +++ b/src/test/java/com/carecode/external/publicdata/sync/KindergartenUpsertServiceTest.java @@ -1,4 +1,4 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; import com.carecode.domain.careFacility.entity.CareFacility; import com.carecode.domain.careFacility.entity.FacilityType; diff --git a/src/test/java/com/carecode/core/client/sync/PagedSyncTemplateTest.java b/src/test/java/com/carecode/external/publicdata/sync/PagedSyncTemplateTest.java similarity index 98% rename from src/test/java/com/carecode/core/client/sync/PagedSyncTemplateTest.java rename to src/test/java/com/carecode/external/publicdata/sync/PagedSyncTemplateTest.java index f7c47e5e..560cfbdd 100644 --- a/src/test/java/com/carecode/core/client/sync/PagedSyncTemplateTest.java +++ b/src/test/java/com/carecode/external/publicdata/sync/PagedSyncTemplateTest.java @@ -1,7 +1,7 @@ -package com.carecode.core.client.sync; +package com.carecode.external.publicdata.sync; -import com.carecode.core.client.XmlResponseParser; -import com.carecode.core.client.provider.PublicDataProvider; +import com.carecode.external.publicdata.XmlResponseParser; +import com.carecode.external.publicdata.provider.PublicDataProvider; 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/LivePublicDataSyncTest.java b/src/test/java/com/carecode/integration/LivePublicDataSyncTest.java index 99614fa3..f8073693 100644 --- a/src/test/java/com/carecode/integration/LivePublicDataSyncTest.java +++ b/src/test/java/com/carecode/integration/LivePublicDataSyncTest.java @@ -1,11 +1,11 @@ package com.carecode.integration; import com.carecode.CareCodeApplication; -import com.carecode.core.client.sync.GovernmentBenefitSyncService; -import com.carecode.core.client.sync.NationwideChildcareFacilitySyncService; -import com.carecode.core.client.sync.KindergartenSyncService; -import com.carecode.core.client.sync.PediatricHospitalSyncService; -import com.carecode.core.client.sync.SyncResult; +import com.carecode.external.publicdata.sync.GovernmentBenefitSyncService; +import com.carecode.external.publicdata.sync.NationwideChildcareFacilitySyncService; +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; diff --git a/src/test/java/com/carecode/integration/SampleDataScenarioTest.java b/src/test/java/com/carecode/integration/SampleDataScenarioTest.java index 5429730e..bc31534a 100644 --- a/src/test/java/com/carecode/integration/SampleDataScenarioTest.java +++ b/src/test/java/com/carecode/integration/SampleDataScenarioTest.java @@ -1,8 +1,8 @@ package com.carecode.integration; import com.carecode.CareCodeApplication; -import com.carecode.core.devtools.SampleFacilitySeeder; -import com.carecode.core.devtools.SamplePolicySeeder; +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;