From 9076ae6c932c43bfbbf2075774991060dfd6ad73 Mon Sep 17 00:00:00 2001 From: androidlover5842 Date: Sun, 1 Feb 2026 17:23:21 +0530 Subject: [PATCH] Reorganize packages by domain --- .../component/{ => ai}/AadhaarUtils.kt | 4 +- .../component/{ => ai}/ExtractionQueue.kt | 2 +- .../component/{ => ai}/LlamaClient.kt | 2 +- .../component/{ => ai}/PaddleOcrClient.kt | 4 +- .../component/{ => auth}/PropertyAccess.kt | 7 ++- .../component/{ => booking}/BookingEvents.kt | 7 ++- .../DocumentExtractionService.kt | 21 ++++--- .../{ => document}/DocumentTokenService.kt | 2 +- .../{ => document}/GuestDocumentEvents.kt | 9 +-- .../{ => geo}/DataGovPincodeClient.kt | 2 +- .../{ => geo}/GoogleGeocodingClient.kt | 2 +- .../component/{ => geo}/PincodeResolver.kt | 2 +- .../{ => geo}/PostalPincodeClient.kt | 2 +- .../component/razorpay/RazorpayQrEvents.kt | 2 +- .../component/{ => room}/RoomBoardEvents.kt | 11 ++-- .../component/{ => sse}/SseHub.kt | 2 +- .../{ => storage}/DocumentStorage.kt | 2 +- .../component/{ => storage}/EmailStorage.kt | 2 +- .../{ => storage}/FileStorageUtils.kt | 2 +- .../{ => storage}/GuestSignatureStorage.kt | 2 +- .../{ => storage}/RoomImageStorage.kt | 2 +- .../config/{ => booking}/BookingSchemaFix.kt | 3 +- .../config/{ => card}/IssuedCardSchemaFix.kt | 3 +- .../config/{ => core}/ApiExceptionHandler.kt | 2 +- .../config/{ => core}/HttpConfig.kt | 2 +- .../config/{ => core}/JacksonConfig.kt | 2 +- .../config/{ => db}/PostgresSchemaFix.kt | 3 +- .../{ => guest}/GuestDocumentSchemaFix.kt | 3 +- .../config/{ => payment}/PaymentSchemaFix.kt | 3 +- .../config/{ => rate}/RatePlanSchemaFix.kt | 3 +- .../RazorpayPaymentAttemptSchemaFix.kt | 2 +- .../RazorpayPaymentLinkRequestSchemaFix.kt | 2 +- .../razorpay/RazorpayQrRequestSchemaFix.kt | 2 +- .../razorpay/RazorpaySettingsSchemaFix.kt | 2 +- .../razorpay/RazorpayWebhookLogSchemaFix.kt | 2 +- .../config/{ => room}/RoomImageSchemaFix.kt | 3 +- .../{ => room}/RoomImageTagSchemaFix.kt | 3 +- .../config/{ => room}/RoomStaySchemaFix.kt | 3 +- .../config/{ => room}/RoomTypeSchemaFix.kt | 3 +- .../controller/{ => assets}/IconFiles.kt | 2 +- .../controller/{ => auth}/Auth.kt | 10 ++-- .../{ => booking}/BookingBalances.kt | 14 +++-- .../controller/{ => booking}/BookingFlow.kt | 57 ++++++++++--------- .../{ => booking}/BookingSnapshotBuilder.kt | 14 +++-- .../controller/{ => card}/CardEncoding.kt | 2 +- .../{ => card}/IssuedCardMappings.kt | 4 +- .../controller/{ => card}/IssuedCards.kt | 29 ++++++---- .../{ => card}/TemporaryRoomCards.kt | 23 ++++---- .../{ => common}/ControllerAccess.kt | 11 +++- .../{ => common}/ControllerLookups.kt | 18 ++++-- .../{ => document}/DocumentPrompts.kt | 2 +- .../dto/{ => booking}/BookingDtos.kt | 2 +- .../dto/{ => guest}/GuestRatingDtos.kt | 2 +- .../dto/{ => payment}/ChargeDtos.kt | 2 +- .../dto/{ => payment}/PaymentDtos.kt | 2 +- .../dto/{ => property}/OrgPropertyDtos.kt | 2 +- .../controller/dto/{ => rate}/RateDtos.kt | 2 +- .../controller/dto/{ => room}/RoomDtos.kt | 2 +- .../controller/dto/{ => room}/RoomStayDtos.kt | 2 +- .../controller/dto/{ => room}/RoomTypeDtos.kt | 2 +- .../{ => email}/InboundEmailManual.kt | 14 +++-- .../controller/{ => email}/InboundEmails.kt | 8 ++- .../{ => guest}/GuestDocumentResponses.kt | 4 +- .../controller/{ => guest}/GuestDocuments.kt | 29 ++++++---- .../controller/{ => guest}/GuestRatings.kt | 21 ++++--- .../controller/{ => guest}/Guests.kt | 28 +++++---- .../controller/{ => payment}/Charges.kt | 20 ++++--- .../controller/{ => payment}/Payments.kt | 21 ++++--- .../controller/{ => property}/Properties.kt | 23 ++++---- .../controller/{ => rate}/RatePlans.kt | 27 +++++---- .../RazorpayPaymentLinksController.kt | 6 +- .../RazorpayPaymentRequestsController.kt | 6 +- .../controller/razorpay/RazorpayQrPayments.kt | 6 +- .../razorpay/RazorpayRefundsController.kt | 8 +-- .../razorpay/RazorpaySettingsController.kt | 6 +- .../razorpay/RazorpayWebhookCapture.kt | 8 +-- .../controller/{ => room}/RoomAmenities.kt | 14 +++-- .../controller/{ => room}/RoomImageTags.kt | 13 +++-- .../controller/{ => room}/RoomImages.kt | 25 ++++---- .../controller/{ => room}/RoomStayFlow.kt | 21 ++++--- .../controller/{ => room}/RoomStays.kt | 18 +++--- .../controller/{ => room}/RoomTypeImages.kt | 13 +++-- .../controller/{ => room}/RoomTypes.kt | 30 +++++----- .../controller/{ => room}/Rooms.kt | 41 ++++++------- .../controller/{ => system}/Health.kt | 2 +- .../{ => transport}/TransportModes.kt | 10 ++-- .../{db/repo => repo/booking}/BookingRepo.kt | 2 +- .../repo/{ => booking}/ChargeRepo.kt | 2 +- .../repo/{ => booking}/PaymentRepo.kt | 2 +- .../repo/{ => card}/IssuedCardRepo.kt | 2 +- .../{ => card}/PropertyCardCounterRepo.kt | 2 +- .../repo => repo/email}/InboundEmailRepo.kt | 2 +- .../repo => repo/guest}/GuestDocumentRepo.kt | 2 +- .../repo => repo/guest}/GuestRatingRepo.kt | 2 +- .../{db/repo => repo/guest}/GuestRepo.kt | 2 +- .../repo/{ => guest}/GuestVehicleRepo.kt | 2 +- .../repo/{ => property}/AppUserRepo.kt | 2 +- .../repo/{ => property}/PropertyRepo.kt | 2 +- .../repo/{ => property}/PropertyUserRepo.kt | 2 +- .../repo/{ => rate}/RateCalendarRepo.kt | 2 +- .../repo/{ => rate}/RatePlanRepo.kt | 2 +- .../repo/{ => room}/RoomAmenityRepo.kt | 2 +- .../repo/{ => room}/RoomImageRepo.kt | 2 +- .../repo/{ => room}/RoomImageTagRepo.kt | 2 +- .../repo/{ => room}/RoomRepo.kt | 2 +- .../repo/{ => room}/RoomStayChangeRepo.kt | 2 +- .../repo/{ => room}/RoomStayRepo.kt | 2 +- .../repo/{ => room}/RoomTypeRepo.kt | 2 +- .../trisolarisserver/security/AuthResolver.kt | 2 +- .../security/FirebaseAuthFilter.kt | 2 +- .../{ => email}/EmailIngestionService.kt | 14 ++--- 111 files changed, 467 insertions(+), 358 deletions(-) rename src/main/kotlin/com/android/trisolarisserver/component/{ => ai}/AadhaarUtils.kt (88%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => ai}/ExtractionQueue.kt (92%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => ai}/LlamaClient.kt (98%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => ai}/PaddleOcrClient.kt (96%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => auth}/PropertyAccess.kt (83%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => booking}/BookingEvents.kt (76%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => document}/DocumentExtractionService.kt (97%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => document}/DocumentTokenService.kt (97%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => document}/GuestDocumentEvents.kt (79%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => geo}/DataGovPincodeClient.kt (98%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => geo}/GoogleGeocodingClient.kt (98%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => geo}/PincodeResolver.kt (96%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => geo}/PostalPincodeClient.kt (98%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => room}/RoomBoardEvents.kt (79%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => sse}/SseHub.kt (97%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => storage}/DocumentStorage.kt (96%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => storage}/EmailStorage.kt (98%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => storage}/FileStorageUtils.kt (88%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => storage}/GuestSignatureStorage.kt (95%) rename src/main/kotlin/com/android/trisolarisserver/component/{ => storage}/RoomImageStorage.kt (98%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => booking}/BookingSchemaFix.kt (95%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => card}/IssuedCardSchemaFix.kt (92%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => core}/ApiExceptionHandler.kt (98%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => core}/HttpConfig.kt (91%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => core}/JacksonConfig.kt (87%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => db}/PostgresSchemaFix.kt (86%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => guest}/GuestDocumentSchemaFix.kt (91%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => payment}/PaymentSchemaFix.kt (91%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => rate}/RatePlanSchemaFix.kt (93%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => room}/RoomImageSchemaFix.kt (87%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => room}/RoomImageTagSchemaFix.kt (94%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => room}/RoomStaySchemaFix.kt (90%) rename src/main/kotlin/com/android/trisolarisserver/config/{ => room}/RoomTypeSchemaFix.kt (87%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => assets}/IconFiles.kt (97%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => auth}/Auth.kt (93%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => booking}/BookingBalances.kt (77%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => booking}/BookingFlow.kt (92%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => booking}/BookingSnapshotBuilder.kt (86%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => card}/CardEncoding.kt (97%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => card}/IssuedCardMappings.kt (79%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => card}/IssuedCards.kt (89%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => card}/TemporaryRoomCards.kt (87%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => common}/ControllerAccess.kt (75%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => common}/ControllerLookups.kt (80%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => document}/DocumentPrompts.kt (92%) rename src/main/kotlin/com/android/trisolarisserver/controller/dto/{ => booking}/BookingDtos.kt (98%) rename src/main/kotlin/com/android/trisolarisserver/controller/dto/{ => guest}/GuestRatingDtos.kt (86%) rename src/main/kotlin/com/android/trisolarisserver/controller/dto/{ => payment}/ChargeDtos.kt (87%) rename src/main/kotlin/com/android/trisolarisserver/controller/dto/{ => payment}/PaymentDtos.kt (93%) rename src/main/kotlin/com/android/trisolarisserver/controller/dto/{ => property}/OrgPropertyDtos.kt (97%) rename src/main/kotlin/com/android/trisolarisserver/controller/dto/{ => rate}/RateDtos.kt (96%) rename src/main/kotlin/com/android/trisolarisserver/controller/dto/{ => room}/RoomDtos.kt (97%) rename src/main/kotlin/com/android/trisolarisserver/controller/dto/{ => room}/RoomStayDtos.kt (86%) rename src/main/kotlin/com/android/trisolarisserver/controller/dto/{ => room}/RoomTypeDtos.kt (94%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => email}/InboundEmailManual.kt (87%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => email}/InboundEmails.kt (88%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => guest}/GuestDocumentResponses.kt (90%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => guest}/GuestDocuments.kt (90%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => guest}/GuestRatings.kt (83%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => guest}/Guests.kt (89%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => payment}/Charges.kt (83%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => payment}/Payments.kt (89%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => property}/Properties.kt (91%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => rate}/RatePlans.kt (90%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => room}/RoomAmenities.kt (89%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => room}/RoomImageTags.kt (87%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => room}/RoomImages.kt (93%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => room}/RoomStayFlow.kt (85%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => room}/RoomStays.kt (86%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => room}/RoomTypeImages.kt (87%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => room}/RoomTypes.kt (89%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => room}/Rooms.kt (92%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => system}/Health.kt (88%) rename src/main/kotlin/com/android/trisolarisserver/controller/{ => transport}/TransportModes.kt (81%) rename src/main/kotlin/com/android/trisolarisserver/{db/repo => repo/booking}/BookingRepo.kt (95%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => booking}/ChargeRepo.kt (84%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => booking}/PaymentRepo.kt (95%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => card}/IssuedCardRepo.kt (97%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => card}/PropertyCardCounterRepo.kt (93%) rename src/main/kotlin/com/android/trisolarisserver/{db/repo => repo/email}/InboundEmailRepo.kt (92%) rename src/main/kotlin/com/android/trisolarisserver/{db/repo => repo/guest}/GuestDocumentRepo.kt (93%) rename src/main/kotlin/com/android/trisolarisserver/{db/repo => repo/guest}/GuestRatingRepo.kt (95%) rename src/main/kotlin/com/android/trisolarisserver/{db/repo => repo/guest}/GuestRepo.kt (85%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => guest}/GuestVehicleRepo.kt (91%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => property}/AppUserRepo.kt (86%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => property}/PropertyRepo.kt (85%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => property}/PropertyUserRepo.kt (95%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => rate}/RateCalendarRepo.kt (93%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => rate}/RatePlanRepo.kt (93%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => room}/RoomAmenityRepo.kt (89%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => room}/RoomImageRepo.kt (98%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => room}/RoomImageTagRepo.kt (90%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => room}/RoomRepo.kt (97%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => room}/RoomStayChangeRepo.kt (87%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => room}/RoomStayRepo.kt (98%) rename src/main/kotlin/com/android/trisolarisserver/repo/{ => room}/RoomTypeRepo.kt (95%) rename src/main/kotlin/com/android/trisolarisserver/service/{ => email}/EmailIngestionService.kt (97%) diff --git a/src/main/kotlin/com/android/trisolarisserver/component/AadhaarUtils.kt b/src/main/kotlin/com/android/trisolarisserver/component/ai/AadhaarUtils.kt similarity index 88% rename from src/main/kotlin/com/android/trisolarisserver/component/AadhaarUtils.kt rename to src/main/kotlin/com/android/trisolarisserver/component/ai/AadhaarUtils.kt index 4d45486..379a756 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/AadhaarUtils.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/ai/AadhaarUtils.kt @@ -1,4 +1,6 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.ai +import com.android.trisolarisserver.component.ai.formatAadhaar +import com.android.trisolarisserver.component.ai.isValidAadhaar internal fun formatAadhaar(value: String): String { if (value.length != 12) return value diff --git a/src/main/kotlin/com/android/trisolarisserver/component/ExtractionQueue.kt b/src/main/kotlin/com/android/trisolarisserver/component/ai/ExtractionQueue.kt similarity index 92% rename from src/main/kotlin/com/android/trisolarisserver/component/ExtractionQueue.kt rename to src/main/kotlin/com/android/trisolarisserver/component/ai/ExtractionQueue.kt index 57fc5ec..495f93c 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/ExtractionQueue.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/ai/ExtractionQueue.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.ai import jakarta.annotation.PreDestroy import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/component/LlamaClient.kt b/src/main/kotlin/com/android/trisolarisserver/component/ai/LlamaClient.kt similarity index 98% rename from src/main/kotlin/com/android/trisolarisserver/component/LlamaClient.kt rename to src/main/kotlin/com/android/trisolarisserver/component/ai/LlamaClient.kt index 24c8bbd..608be47 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/LlamaClient.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/ai/LlamaClient.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.ai import com.fasterxml.jackson.databind.ObjectMapper import org.springframework.beans.factory.annotation.Value diff --git a/src/main/kotlin/com/android/trisolarisserver/component/PaddleOcrClient.kt b/src/main/kotlin/com/android/trisolarisserver/component/ai/PaddleOcrClient.kt similarity index 96% rename from src/main/kotlin/com/android/trisolarisserver/component/PaddleOcrClient.kt rename to src/main/kotlin/com/android/trisolarisserver/component/ai/PaddleOcrClient.kt index dd5685c..df1a16b 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/PaddleOcrClient.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/ai/PaddleOcrClient.kt @@ -1,4 +1,6 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.ai +import com.android.trisolarisserver.component.ai.formatAadhaar +import com.android.trisolarisserver.component.ai.isValidAadhaar import com.fasterxml.jackson.databind.ObjectMapper import org.slf4j.LoggerFactory diff --git a/src/main/kotlin/com/android/trisolarisserver/component/PropertyAccess.kt b/src/main/kotlin/com/android/trisolarisserver/component/auth/PropertyAccess.kt similarity index 83% rename from src/main/kotlin/com/android/trisolarisserver/component/PropertyAccess.kt rename to src/main/kotlin/com/android/trisolarisserver/component/auth/PropertyAccess.kt index 27165e0..deea862 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/PropertyAccess.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/auth/PropertyAccess.kt @@ -1,7 +1,8 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.auth +import com.android.trisolarisserver.controller.common.requireMember -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.PropertyUserRepo +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.property.PropertyUserRepo import com.android.trisolarisserver.models.property.Role import org.springframework.security.access.AccessDeniedException import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/component/BookingEvents.kt b/src/main/kotlin/com/android/trisolarisserver/component/booking/BookingEvents.kt similarity index 76% rename from src/main/kotlin/com/android/trisolarisserver/component/BookingEvents.kt rename to src/main/kotlin/com/android/trisolarisserver/component/booking/BookingEvents.kt index 083cf5d..13a36b2 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/BookingEvents.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/booking/BookingEvents.kt @@ -1,7 +1,8 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.booking +import com.android.trisolarisserver.component.sse.SseHub -import com.android.trisolarisserver.controller.BookingSnapshotBuilder -import com.android.trisolarisserver.controller.dto.BookingDetailResponse +import com.android.trisolarisserver.controller.booking.BookingSnapshotBuilder +import com.android.trisolarisserver.controller.dto.booking.BookingDetailResponse import org.springframework.scheduling.annotation.Scheduled import org.springframework.stereotype.Component import org.springframework.web.servlet.mvc.method.annotation.SseEmitter diff --git a/src/main/kotlin/com/android/trisolarisserver/component/DocumentExtractionService.kt b/src/main/kotlin/com/android/trisolarisserver/component/document/DocumentExtractionService.kt similarity index 97% rename from src/main/kotlin/com/android/trisolarisserver/component/DocumentExtractionService.kt rename to src/main/kotlin/com/android/trisolarisserver/component/document/DocumentExtractionService.kt index 14ec59e..6d062d4 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/DocumentExtractionService.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/document/DocumentExtractionService.kt @@ -1,13 +1,20 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.document +import com.android.trisolarisserver.component.ai.LlamaClient +import com.android.trisolarisserver.component.ai.PaddleOcrClient +import com.android.trisolarisserver.component.ai.PaddleOcrResult +import com.android.trisolarisserver.component.ai.formatAadhaar +import com.android.trisolarisserver.component.ai.isValidAadhaar +import com.android.trisolarisserver.component.booking.BookingEvents +import com.android.trisolarisserver.component.geo.PincodeResolver -import com.android.trisolarisserver.controller.DocumentPrompts -import com.android.trisolarisserver.db.repo.GuestRepo -import com.android.trisolarisserver.db.repo.GuestDocumentRepo -import com.android.trisolarisserver.db.repo.BookingRepo +import com.android.trisolarisserver.controller.document.DocumentPrompts +import com.android.trisolarisserver.repo.guest.GuestRepo +import com.android.trisolarisserver.repo.guest.GuestDocumentRepo +import com.android.trisolarisserver.repo.booking.BookingRepo import com.android.trisolarisserver.models.booking.GuestDocument import com.android.trisolarisserver.models.booking.GuestVehicle -import com.android.trisolarisserver.repo.GuestVehicleRepo -import com.android.trisolarisserver.repo.PropertyRepo +import com.android.trisolarisserver.repo.guest.GuestVehicleRepo +import com.android.trisolarisserver.repo.property.PropertyRepo import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper import java.time.OffsetDateTime diff --git a/src/main/kotlin/com/android/trisolarisserver/component/DocumentTokenService.kt b/src/main/kotlin/com/android/trisolarisserver/component/document/DocumentTokenService.kt similarity index 97% rename from src/main/kotlin/com/android/trisolarisserver/component/DocumentTokenService.kt rename to src/main/kotlin/com/android/trisolarisserver/component/document/DocumentTokenService.kt index 3f0a2de..a245d99 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/DocumentTokenService.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/document/DocumentTokenService.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.document import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/component/GuestDocumentEvents.kt b/src/main/kotlin/com/android/trisolarisserver/component/document/GuestDocumentEvents.kt similarity index 79% rename from src/main/kotlin/com/android/trisolarisserver/component/GuestDocumentEvents.kt rename to src/main/kotlin/com/android/trisolarisserver/component/document/GuestDocumentEvents.kt index 5053053..ea1f137 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/GuestDocumentEvents.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/document/GuestDocumentEvents.kt @@ -1,8 +1,9 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.document +import com.android.trisolarisserver.component.sse.SseHub -import com.android.trisolarisserver.controller.GuestDocumentResponse -import com.android.trisolarisserver.controller.toResponse -import com.android.trisolarisserver.db.repo.GuestDocumentRepo +import com.android.trisolarisserver.controller.guest.GuestDocumentResponse +import com.android.trisolarisserver.controller.guest.toResponse +import com.android.trisolarisserver.repo.guest.GuestDocumentRepo import com.fasterxml.jackson.databind.ObjectMapper import org.springframework.scheduling.annotation.Scheduled import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/component/DataGovPincodeClient.kt b/src/main/kotlin/com/android/trisolarisserver/component/geo/DataGovPincodeClient.kt similarity index 98% rename from src/main/kotlin/com/android/trisolarisserver/component/DataGovPincodeClient.kt rename to src/main/kotlin/com/android/trisolarisserver/component/geo/DataGovPincodeClient.kt index 6482c56..3a29793 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/DataGovPincodeClient.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/geo/DataGovPincodeClient.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.geo import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.ObjectMapper diff --git a/src/main/kotlin/com/android/trisolarisserver/component/GoogleGeocodingClient.kt b/src/main/kotlin/com/android/trisolarisserver/component/geo/GoogleGeocodingClient.kt similarity index 98% rename from src/main/kotlin/com/android/trisolarisserver/component/GoogleGeocodingClient.kt rename to src/main/kotlin/com/android/trisolarisserver/component/geo/GoogleGeocodingClient.kt index 8a06c37..c0fdc19 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/GoogleGeocodingClient.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/geo/GoogleGeocodingClient.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.geo import com.fasterxml.jackson.databind.ObjectMapper import org.slf4j.LoggerFactory diff --git a/src/main/kotlin/com/android/trisolarisserver/component/PincodeResolver.kt b/src/main/kotlin/com/android/trisolarisserver/component/geo/PincodeResolver.kt similarity index 96% rename from src/main/kotlin/com/android/trisolarisserver/component/PincodeResolver.kt rename to src/main/kotlin/com/android/trisolarisserver/component/geo/PincodeResolver.kt index 48fbb57..061a3b1 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/PincodeResolver.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/geo/PincodeResolver.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.geo import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/component/PostalPincodeClient.kt b/src/main/kotlin/com/android/trisolarisserver/component/geo/PostalPincodeClient.kt similarity index 98% rename from src/main/kotlin/com/android/trisolarisserver/component/PostalPincodeClient.kt rename to src/main/kotlin/com/android/trisolarisserver/component/geo/PostalPincodeClient.kt index f628faa..5ded4fb 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/PostalPincodeClient.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/geo/PostalPincodeClient.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.geo import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.ObjectMapper diff --git a/src/main/kotlin/com/android/trisolarisserver/component/razorpay/RazorpayQrEvents.kt b/src/main/kotlin/com/android/trisolarisserver/component/razorpay/RazorpayQrEvents.kt index c6b380b..a33dd50 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/razorpay/RazorpayQrEvents.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/razorpay/RazorpayQrEvents.kt @@ -1,5 +1,5 @@ package com.android.trisolarisserver.component.razorpay -import com.android.trisolarisserver.component.SseHub +import com.android.trisolarisserver.component.sse.SseHub import com.android.trisolarisserver.controller.dto.razorpay.RazorpayQrEventResponse import com.android.trisolarisserver.repo.razorpay.RazorpayQrRequestRepo diff --git a/src/main/kotlin/com/android/trisolarisserver/component/RoomBoardEvents.kt b/src/main/kotlin/com/android/trisolarisserver/component/room/RoomBoardEvents.kt similarity index 79% rename from src/main/kotlin/com/android/trisolarisserver/component/RoomBoardEvents.kt rename to src/main/kotlin/com/android/trisolarisserver/component/room/RoomBoardEvents.kt index 8fcec2a..a08414e 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/RoomBoardEvents.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/room/RoomBoardEvents.kt @@ -1,9 +1,10 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.room +import com.android.trisolarisserver.component.sse.SseHub -import com.android.trisolarisserver.controller.dto.RoomBoardResponse -import com.android.trisolarisserver.controller.dto.RoomBoardStatus -import com.android.trisolarisserver.repo.RoomRepo -import com.android.trisolarisserver.repo.RoomStayRepo +import com.android.trisolarisserver.controller.dto.room.RoomBoardResponse +import com.android.trisolarisserver.controller.dto.room.RoomBoardStatus +import com.android.trisolarisserver.repo.room.RoomRepo +import com.android.trisolarisserver.repo.room.RoomStayRepo import org.springframework.scheduling.annotation.Scheduled import org.springframework.stereotype.Component import org.springframework.web.servlet.mvc.method.annotation.SseEmitter diff --git a/src/main/kotlin/com/android/trisolarisserver/component/SseHub.kt b/src/main/kotlin/com/android/trisolarisserver/component/sse/SseHub.kt similarity index 97% rename from src/main/kotlin/com/android/trisolarisserver/component/SseHub.kt rename to src/main/kotlin/com/android/trisolarisserver/component/sse/SseHub.kt index 1b88afd..44448ba 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/SseHub.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/sse/SseHub.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.sse import org.springframework.web.servlet.mvc.method.annotation.SseEmitter import java.util.concurrent.ConcurrentHashMap diff --git a/src/main/kotlin/com/android/trisolarisserver/component/DocumentStorage.kt b/src/main/kotlin/com/android/trisolarisserver/component/storage/DocumentStorage.kt similarity index 96% rename from src/main/kotlin/com/android/trisolarisserver/component/DocumentStorage.kt rename to src/main/kotlin/com/android/trisolarisserver/component/storage/DocumentStorage.kt index 6701fb6..930404b 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/DocumentStorage.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/storage/DocumentStorage.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.storage import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/component/EmailStorage.kt b/src/main/kotlin/com/android/trisolarisserver/component/storage/EmailStorage.kt similarity index 98% rename from src/main/kotlin/com/android/trisolarisserver/component/EmailStorage.kt rename to src/main/kotlin/com/android/trisolarisserver/component/storage/EmailStorage.kt index 2df2749..d2046f8 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/EmailStorage.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/storage/EmailStorage.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.storage import org.apache.pdfbox.pdmodel.PDDocument import org.apache.pdfbox.pdmodel.PDPage diff --git a/src/main/kotlin/com/android/trisolarisserver/component/FileStorageUtils.kt b/src/main/kotlin/com/android/trisolarisserver/component/storage/FileStorageUtils.kt similarity index 88% rename from src/main/kotlin/com/android/trisolarisserver/component/FileStorageUtils.kt rename to src/main/kotlin/com/android/trisolarisserver/component/storage/FileStorageUtils.kt index 639c0e1..b773e23 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/FileStorageUtils.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/storage/FileStorageUtils.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.storage import java.nio.file.Files import java.nio.file.Path diff --git a/src/main/kotlin/com/android/trisolarisserver/component/GuestSignatureStorage.kt b/src/main/kotlin/com/android/trisolarisserver/component/storage/GuestSignatureStorage.kt similarity index 95% rename from src/main/kotlin/com/android/trisolarisserver/component/GuestSignatureStorage.kt rename to src/main/kotlin/com/android/trisolarisserver/component/storage/GuestSignatureStorage.kt index df7e8a1..62720bd 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/GuestSignatureStorage.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/storage/GuestSignatureStorage.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.storage import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/component/RoomImageStorage.kt b/src/main/kotlin/com/android/trisolarisserver/component/storage/RoomImageStorage.kt similarity index 98% rename from src/main/kotlin/com/android/trisolarisserver/component/RoomImageStorage.kt rename to src/main/kotlin/com/android/trisolarisserver/component/storage/RoomImageStorage.kt index 2aaa6ce..72cf395 100644 --- a/src/main/kotlin/com/android/trisolarisserver/component/RoomImageStorage.kt +++ b/src/main/kotlin/com/android/trisolarisserver/component/storage/RoomImageStorage.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.component +package com.android.trisolarisserver.component.storage import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/BookingSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/booking/BookingSchemaFix.kt similarity index 95% rename from src/main/kotlin/com/android/trisolarisserver/config/BookingSchemaFix.kt rename to src/main/kotlin/com/android/trisolarisserver/config/booking/BookingSchemaFix.kt index b9e7ef7..f937944 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/BookingSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/booking/BookingSchemaFix.kt @@ -1,4 +1,5 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.booking +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/IssuedCardSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/card/IssuedCardSchemaFix.kt similarity index 92% rename from src/main/kotlin/com/android/trisolarisserver/config/IssuedCardSchemaFix.kt rename to src/main/kotlin/com/android/trisolarisserver/config/card/IssuedCardSchemaFix.kt index f63b3bb..15fd903 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/IssuedCardSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/card/IssuedCardSchemaFix.kt @@ -1,4 +1,5 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.card +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/ApiExceptionHandler.kt b/src/main/kotlin/com/android/trisolarisserver/config/core/ApiExceptionHandler.kt similarity index 98% rename from src/main/kotlin/com/android/trisolarisserver/config/ApiExceptionHandler.kt rename to src/main/kotlin/com/android/trisolarisserver/config/core/ApiExceptionHandler.kt index dfe6de5..38029f5 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/ApiExceptionHandler.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/core/ApiExceptionHandler.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.core import jakarta.servlet.http.HttpServletRequest import org.springframework.http.HttpStatus diff --git a/src/main/kotlin/com/android/trisolarisserver/config/HttpConfig.kt b/src/main/kotlin/com/android/trisolarisserver/config/core/HttpConfig.kt similarity index 91% rename from src/main/kotlin/com/android/trisolarisserver/config/HttpConfig.kt rename to src/main/kotlin/com/android/trisolarisserver/config/core/HttpConfig.kt index 2714c62..a759a11 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/HttpConfig.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/core/HttpConfig.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.core import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/src/main/kotlin/com/android/trisolarisserver/config/JacksonConfig.kt b/src/main/kotlin/com/android/trisolarisserver/config/core/JacksonConfig.kt similarity index 87% rename from src/main/kotlin/com/android/trisolarisserver/config/JacksonConfig.kt rename to src/main/kotlin/com/android/trisolarisserver/config/core/JacksonConfig.kt index c88b3fd..898a5c8 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/JacksonConfig.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/core/JacksonConfig.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.core import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper diff --git a/src/main/kotlin/com/android/trisolarisserver/config/PostgresSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/db/PostgresSchemaFix.kt similarity index 86% rename from src/main/kotlin/com/android/trisolarisserver/config/PostgresSchemaFix.kt rename to src/main/kotlin/com/android/trisolarisserver/config/db/PostgresSchemaFix.kt index 42170ec..2e9b04a 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/PostgresSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/db/PostgresSchemaFix.kt @@ -1,4 +1,5 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.db +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.slf4j.LoggerFactory import org.springframework.boot.ApplicationArguments diff --git a/src/main/kotlin/com/android/trisolarisserver/config/GuestDocumentSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/guest/GuestDocumentSchemaFix.kt similarity index 91% rename from src/main/kotlin/com/android/trisolarisserver/config/GuestDocumentSchemaFix.kt rename to src/main/kotlin/com/android/trisolarisserver/config/guest/GuestDocumentSchemaFix.kt index 999bd99..2981369 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/GuestDocumentSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/guest/GuestDocumentSchemaFix.kt @@ -1,4 +1,5 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.guest +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/PaymentSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/payment/PaymentSchemaFix.kt similarity index 91% rename from src/main/kotlin/com/android/trisolarisserver/config/PaymentSchemaFix.kt rename to src/main/kotlin/com/android/trisolarisserver/config/payment/PaymentSchemaFix.kt index 631f754..a63f5eb 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/PaymentSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/payment/PaymentSchemaFix.kt @@ -1,4 +1,5 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.payment +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/RatePlanSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/rate/RatePlanSchemaFix.kt similarity index 93% rename from src/main/kotlin/com/android/trisolarisserver/config/RatePlanSchemaFix.kt rename to src/main/kotlin/com/android/trisolarisserver/config/rate/RatePlanSchemaFix.kt index 6ad278a..6ee021f 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/RatePlanSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/rate/RatePlanSchemaFix.kt @@ -1,4 +1,5 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.rate +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayPaymentAttemptSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayPaymentAttemptSchemaFix.kt index 15cd7ed..2215661 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayPaymentAttemptSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayPaymentAttemptSchemaFix.kt @@ -1,5 +1,5 @@ package com.android.trisolarisserver.config.razorpay -import com.android.trisolarisserver.config.PostgresSchemaFix +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayPaymentLinkRequestSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayPaymentLinkRequestSchemaFix.kt index 569e2b3..6b4f839 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayPaymentLinkRequestSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayPaymentLinkRequestSchemaFix.kt @@ -1,5 +1,5 @@ package com.android.trisolarisserver.config.razorpay -import com.android.trisolarisserver.config.PostgresSchemaFix +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayQrRequestSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayQrRequestSchemaFix.kt index 490e173..bf3bf45 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayQrRequestSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayQrRequestSchemaFix.kt @@ -1,5 +1,5 @@ package com.android.trisolarisserver.config.razorpay -import com.android.trisolarisserver.config.PostgresSchemaFix +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpaySettingsSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpaySettingsSchemaFix.kt index b1ce10d..cd7ff9b 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpaySettingsSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpaySettingsSchemaFix.kt @@ -1,5 +1,5 @@ package com.android.trisolarisserver.config.razorpay -import com.android.trisolarisserver.config.PostgresSchemaFix +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayWebhookLogSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayWebhookLogSchemaFix.kt index d2b888f..efd0b57 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayWebhookLogSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/razorpay/RazorpayWebhookLogSchemaFix.kt @@ -1,5 +1,5 @@ package com.android.trisolarisserver.config.razorpay -import com.android.trisolarisserver.config.PostgresSchemaFix +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/RoomImageSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/room/RoomImageSchemaFix.kt similarity index 87% rename from src/main/kotlin/com/android/trisolarisserver/config/RoomImageSchemaFix.kt rename to src/main/kotlin/com/android/trisolarisserver/config/room/RoomImageSchemaFix.kt index 7769728..5aad239 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/RoomImageSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/room/RoomImageSchemaFix.kt @@ -1,4 +1,5 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.room +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/RoomImageTagSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/room/RoomImageTagSchemaFix.kt similarity index 94% rename from src/main/kotlin/com/android/trisolarisserver/config/RoomImageTagSchemaFix.kt rename to src/main/kotlin/com/android/trisolarisserver/config/room/RoomImageTagSchemaFix.kt index 8d44cd3..d2ea994 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/RoomImageTagSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/room/RoomImageTagSchemaFix.kt @@ -1,4 +1,5 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.room +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/RoomStaySchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/room/RoomStaySchemaFix.kt similarity index 90% rename from src/main/kotlin/com/android/trisolarisserver/config/RoomStaySchemaFix.kt rename to src/main/kotlin/com/android/trisolarisserver/config/room/RoomStaySchemaFix.kt index 82aab1b..74e3854 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/RoomStaySchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/room/RoomStaySchemaFix.kt @@ -1,4 +1,5 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.room +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/config/RoomTypeSchemaFix.kt b/src/main/kotlin/com/android/trisolarisserver/config/room/RoomTypeSchemaFix.kt similarity index 87% rename from src/main/kotlin/com/android/trisolarisserver/config/RoomTypeSchemaFix.kt rename to src/main/kotlin/com/android/trisolarisserver/config/room/RoomTypeSchemaFix.kt index 0188859..e6d4990 100644 --- a/src/main/kotlin/com/android/trisolarisserver/config/RoomTypeSchemaFix.kt +++ b/src/main/kotlin/com/android/trisolarisserver/config/room/RoomTypeSchemaFix.kt @@ -1,4 +1,5 @@ -package com.android.trisolarisserver.config +package com.android.trisolarisserver.config.room +import com.android.trisolarisserver.config.db.PostgresSchemaFix import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/IconFiles.kt b/src/main/kotlin/com/android/trisolarisserver/controller/assets/IconFiles.kt similarity index 97% rename from src/main/kotlin/com/android/trisolarisserver/controller/IconFiles.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/assets/IconFiles.kt index 0d2134a..d1a4653 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/IconFiles.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/assets/IconFiles.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.assets import org.springframework.beans.factory.annotation.Value import org.springframework.core.io.FileSystemResource diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/Auth.kt b/src/main/kotlin/com/android/trisolarisserver/controller/auth/Auth.kt similarity index 93% rename from src/main/kotlin/com/android/trisolarisserver/controller/Auth.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/auth/Auth.kt index 395e63d..ff9083e 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/Auth.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/auth/Auth.kt @@ -1,9 +1,9 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.auth -import com.android.trisolarisserver.controller.dto.PropertyUserResponse -import com.android.trisolarisserver.controller.dto.UserResponse -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.PropertyUserRepo +import com.android.trisolarisserver.controller.dto.property.PropertyUserResponse +import com.android.trisolarisserver.controller.dto.property.UserResponse +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.property.PropertyUserRepo import com.android.trisolarisserver.security.MyPrincipal import jakarta.servlet.http.HttpServletRequest import org.slf4j.LoggerFactory diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/BookingBalances.kt b/src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingBalances.kt similarity index 77% rename from src/main/kotlin/com/android/trisolarisserver/controller/BookingBalances.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingBalances.kt index 8e002ad..785df8b 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/BookingBalances.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingBalances.kt @@ -1,10 +1,12 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.booking +import com.android.trisolarisserver.controller.common.computeExpectedPay +import com.android.trisolarisserver.controller.common.requireMember -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.controller.dto.BookingBalanceResponse -import com.android.trisolarisserver.db.repo.BookingRepo -import com.android.trisolarisserver.repo.PaymentRepo -import com.android.trisolarisserver.repo.RoomStayRepo +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.controller.dto.payment.BookingBalanceResponse +import com.android.trisolarisserver.repo.booking.BookingRepo +import com.android.trisolarisserver.repo.booking.PaymentRepo +import com.android.trisolarisserver.repo.room.RoomStayRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.http.HttpStatus import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/BookingFlow.kt b/src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingFlow.kt similarity index 92% rename from src/main/kotlin/com/android/trisolarisserver/controller/BookingFlow.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingFlow.kt index 90a2912..a9992c2 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/BookingFlow.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingFlow.kt @@ -1,36 +1,41 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.booking +import com.android.trisolarisserver.controller.common.computeExpectedPay +import com.android.trisolarisserver.controller.common.nowForProperty +import com.android.trisolarisserver.controller.common.parseOffset +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requireRole -import com.android.trisolarisserver.component.BookingEvents -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.component.RoomBoardEvents -import com.android.trisolarisserver.controller.dto.BookingCancelRequest -import com.android.trisolarisserver.controller.dto.BookingCheckInRequest -import com.android.trisolarisserver.controller.dto.BookingBulkCheckInRequest -import com.android.trisolarisserver.controller.dto.BookingCheckOutRequest -import com.android.trisolarisserver.controller.dto.BookingCreateRequest -import com.android.trisolarisserver.controller.dto.BookingCreateResponse -import com.android.trisolarisserver.controller.dto.BookingDetailResponse -import com.android.trisolarisserver.controller.dto.BookingExpectedDatesUpdateRequest -import com.android.trisolarisserver.controller.dto.BookingLinkGuestRequest -import com.android.trisolarisserver.controller.dto.BookingNoShowRequest -import com.android.trisolarisserver.controller.dto.BookingListItem -import com.android.trisolarisserver.controller.dto.RoomStayPreAssignRequest -import com.android.trisolarisserver.db.repo.BookingRepo -import com.android.trisolarisserver.db.repo.GuestDocumentRepo -import com.android.trisolarisserver.db.repo.GuestRepo -import com.android.trisolarisserver.db.repo.GuestRatingRepo +import com.android.trisolarisserver.component.booking.BookingEvents +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.component.room.RoomBoardEvents +import com.android.trisolarisserver.controller.dto.booking.BookingCancelRequest +import com.android.trisolarisserver.controller.dto.booking.BookingCheckInRequest +import com.android.trisolarisserver.controller.dto.booking.BookingBulkCheckInRequest +import com.android.trisolarisserver.controller.dto.booking.BookingCheckOutRequest +import com.android.trisolarisserver.controller.dto.booking.BookingCreateRequest +import com.android.trisolarisserver.controller.dto.booking.BookingCreateResponse +import com.android.trisolarisserver.controller.dto.booking.BookingDetailResponse +import com.android.trisolarisserver.controller.dto.booking.BookingExpectedDatesUpdateRequest +import com.android.trisolarisserver.controller.dto.booking.BookingLinkGuestRequest +import com.android.trisolarisserver.controller.dto.booking.BookingNoShowRequest +import com.android.trisolarisserver.controller.dto.booking.BookingListItem +import com.android.trisolarisserver.controller.dto.booking.RoomStayPreAssignRequest +import com.android.trisolarisserver.repo.booking.BookingRepo +import com.android.trisolarisserver.repo.guest.GuestDocumentRepo +import com.android.trisolarisserver.repo.guest.GuestRepo +import com.android.trisolarisserver.repo.guest.GuestRatingRepo import com.android.trisolarisserver.models.booking.BookingStatus import com.android.trisolarisserver.models.booking.MemberRelation import com.android.trisolarisserver.models.booking.TransportMode import com.android.trisolarisserver.models.room.RoomStay import com.android.trisolarisserver.models.room.RateSource import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.GuestVehicleRepo -import com.android.trisolarisserver.repo.PaymentRepo -import com.android.trisolarisserver.repo.PropertyRepo -import com.android.trisolarisserver.repo.RoomRepo -import com.android.trisolarisserver.repo.RoomStayRepo +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.guest.GuestVehicleRepo +import com.android.trisolarisserver.repo.booking.PaymentRepo +import com.android.trisolarisserver.repo.property.PropertyRepo +import com.android.trisolarisserver.repo.room.RoomRepo +import com.android.trisolarisserver.repo.room.RoomStayRepo import com.android.trisolarisserver.security.MyPrincipal import jakarta.servlet.http.HttpServletResponse import org.springframework.http.HttpStatus diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/BookingSnapshotBuilder.kt b/src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingSnapshotBuilder.kt similarity index 86% rename from src/main/kotlin/com/android/trisolarisserver/controller/BookingSnapshotBuilder.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingSnapshotBuilder.kt index f2272d3..1c43c5f 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/BookingSnapshotBuilder.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingSnapshotBuilder.kt @@ -1,10 +1,12 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.booking +import com.android.trisolarisserver.controller.common.computeExpectedPay +import com.android.trisolarisserver.controller.common.computeExpectedPayTotal -import com.android.trisolarisserver.controller.dto.BookingDetailResponse -import com.android.trisolarisserver.db.repo.BookingRepo -import com.android.trisolarisserver.repo.GuestVehicleRepo -import com.android.trisolarisserver.repo.PaymentRepo -import com.android.trisolarisserver.repo.RoomStayRepo +import com.android.trisolarisserver.controller.dto.booking.BookingDetailResponse +import com.android.trisolarisserver.repo.booking.BookingRepo +import com.android.trisolarisserver.repo.guest.GuestVehicleRepo +import com.android.trisolarisserver.repo.booking.PaymentRepo +import com.android.trisolarisserver.repo.room.RoomStayRepo import org.springframework.http.HttpStatus import org.springframework.stereotype.Component import org.springframework.web.server.ResponseStatusException diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/CardEncoding.kt b/src/main/kotlin/com/android/trisolarisserver/controller/card/CardEncoding.kt similarity index 97% rename from src/main/kotlin/com/android/trisolarisserver/controller/CardEncoding.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/card/CardEncoding.kt index 2ebf8c4..2216f6a 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/CardEncoding.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/card/CardEncoding.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.card import java.time.OffsetDateTime diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/IssuedCardMappings.kt b/src/main/kotlin/com/android/trisolarisserver/controller/card/IssuedCardMappings.kt similarity index 79% rename from src/main/kotlin/com/android/trisolarisserver/controller/IssuedCardMappings.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/card/IssuedCardMappings.kt index 8638670..6235fa7 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/IssuedCardMappings.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/card/IssuedCardMappings.kt @@ -1,6 +1,6 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.card -import com.android.trisolarisserver.controller.dto.IssuedCardResponse +import com.android.trisolarisserver.controller.dto.booking.IssuedCardResponse import com.android.trisolarisserver.models.room.IssuedCard internal fun IssuedCard.toResponse(): IssuedCardResponse { diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/IssuedCards.kt b/src/main/kotlin/com/android/trisolarisserver/controller/card/IssuedCards.kt similarity index 89% rename from src/main/kotlin/com/android/trisolarisserver/controller/IssuedCards.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/card/IssuedCards.kt index 1ec6380..982d159 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/IssuedCards.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/card/IssuedCards.kt @@ -1,18 +1,23 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.card +import com.android.trisolarisserver.controller.common.nowForProperty +import com.android.trisolarisserver.controller.common.parseOffset +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requireOpenRoomStayForProperty +import com.android.trisolarisserver.controller.common.requireRoomStayForProperty -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.controller.dto.CardPrepareRequest -import com.android.trisolarisserver.controller.dto.CardPrepareResponse -import com.android.trisolarisserver.controller.dto.CardRevokeResponse -import com.android.trisolarisserver.controller.dto.IssueCardRequest -import com.android.trisolarisserver.controller.dto.IssuedCardResponse +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.controller.dto.booking.CardPrepareRequest +import com.android.trisolarisserver.controller.dto.booking.CardPrepareResponse +import com.android.trisolarisserver.controller.dto.booking.CardRevokeResponse +import com.android.trisolarisserver.controller.dto.booking.IssueCardRequest +import com.android.trisolarisserver.controller.dto.booking.IssuedCardResponse import com.android.trisolarisserver.models.property.Role import com.android.trisolarisserver.models.room.IssuedCard -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.IssuedCardRepo -import com.android.trisolarisserver.repo.PropertyCardCounterRepo -import com.android.trisolarisserver.repo.PropertyRepo -import com.android.trisolarisserver.repo.RoomStayRepo +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.card.IssuedCardRepo +import com.android.trisolarisserver.repo.card.PropertyCardCounterRepo +import com.android.trisolarisserver.repo.property.PropertyRepo +import com.android.trisolarisserver.repo.room.RoomStayRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.http.HttpStatus import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/TemporaryRoomCards.kt b/src/main/kotlin/com/android/trisolarisserver/controller/card/TemporaryRoomCards.kt similarity index 87% rename from src/main/kotlin/com/android/trisolarisserver/controller/TemporaryRoomCards.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/card/TemporaryRoomCards.kt index 589871e..b147c1c 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/TemporaryRoomCards.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/card/TemporaryRoomCards.kt @@ -1,16 +1,19 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.card +import com.android.trisolarisserver.controller.common.nowForProperty +import com.android.trisolarisserver.controller.common.parseOffset +import com.android.trisolarisserver.controller.common.requireMember -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.controller.dto.CardPrepareResponse -import com.android.trisolarisserver.controller.dto.IssueTempCardRequest -import com.android.trisolarisserver.controller.dto.IssuedCardResponse +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.controller.dto.booking.CardPrepareResponse +import com.android.trisolarisserver.controller.dto.booking.IssueTempCardRequest +import com.android.trisolarisserver.controller.dto.booking.IssuedCardResponse import com.android.trisolarisserver.models.property.Role import com.android.trisolarisserver.models.room.IssuedCard -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.IssuedCardRepo -import com.android.trisolarisserver.repo.PropertyCardCounterRepo -import com.android.trisolarisserver.repo.PropertyRepo -import com.android.trisolarisserver.repo.RoomRepo +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.card.IssuedCardRepo +import com.android.trisolarisserver.repo.card.PropertyCardCounterRepo +import com.android.trisolarisserver.repo.property.PropertyRepo +import com.android.trisolarisserver.repo.room.RoomRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.http.HttpStatus import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/ControllerAccess.kt b/src/main/kotlin/com/android/trisolarisserver/controller/common/ControllerAccess.kt similarity index 75% rename from src/main/kotlin/com/android/trisolarisserver/controller/ControllerAccess.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/common/ControllerAccess.kt index 8d8df29..925e4d1 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/ControllerAccess.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/common/ControllerAccess.kt @@ -1,9 +1,14 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.common +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requirePrincipal +import com.android.trisolarisserver.controller.common.requireRole +import com.android.trisolarisserver.controller.common.requireSuperAdmin +import com.android.trisolarisserver.controller.common.requireUser -import com.android.trisolarisserver.component.PropertyAccess +import com.android.trisolarisserver.component.auth.PropertyAccess import com.android.trisolarisserver.models.property.AppUser import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.repo.AppUserRepo +import com.android.trisolarisserver.repo.property.AppUserRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.http.HttpStatus import org.springframework.web.server.ResponseStatusException diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/ControllerLookups.kt b/src/main/kotlin/com/android/trisolarisserver/controller/common/ControllerLookups.kt similarity index 80% rename from src/main/kotlin/com/android/trisolarisserver/controller/ControllerLookups.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/common/ControllerLookups.kt index cfb7eda..4b08185 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/ControllerLookups.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/common/ControllerLookups.kt @@ -1,11 +1,21 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.common +import com.android.trisolarisserver.controller.common.computeExpectedPay +import com.android.trisolarisserver.controller.common.computeExpectedPayTotal +import com.android.trisolarisserver.controller.common.daysBetweenInclusive +import com.android.trisolarisserver.controller.common.nowForProperty +import com.android.trisolarisserver.controller.common.parseDate +import com.android.trisolarisserver.controller.common.parseOffset +import com.android.trisolarisserver.controller.common.requireOpenRoomStayForProperty +import com.android.trisolarisserver.controller.common.requireProperty +import com.android.trisolarisserver.controller.common.requirePropertyGuest +import com.android.trisolarisserver.controller.common.requireRoomStayForProperty -import com.android.trisolarisserver.db.repo.GuestRepo +import com.android.trisolarisserver.repo.guest.GuestRepo import com.android.trisolarisserver.models.booking.Guest import com.android.trisolarisserver.models.property.Property import com.android.trisolarisserver.models.room.RoomStay -import com.android.trisolarisserver.repo.PropertyRepo -import com.android.trisolarisserver.repo.RoomStayRepo +import com.android.trisolarisserver.repo.property.PropertyRepo +import com.android.trisolarisserver.repo.room.RoomStayRepo import org.springframework.http.HttpStatus import org.springframework.web.server.ResponseStatusException import java.time.LocalDate diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/DocumentPrompts.kt b/src/main/kotlin/com/android/trisolarisserver/controller/document/DocumentPrompts.kt similarity index 92% rename from src/main/kotlin/com/android/trisolarisserver/controller/DocumentPrompts.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/document/DocumentPrompts.kt index a677296..4806cb1 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/DocumentPrompts.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/document/DocumentPrompts.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.document object DocumentPrompts { val NAME = "name" to "NAME? Reply only the name or NONE." diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/BookingDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/booking/BookingDtos.kt similarity index 98% rename from src/main/kotlin/com/android/trisolarisserver/controller/dto/BookingDtos.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/dto/booking/BookingDtos.kt index b9238cd..83f06d3 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/BookingDtos.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/booking/BookingDtos.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller.dto +package com.android.trisolarisserver.controller.dto.booking import java.util.UUID diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/GuestRatingDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/guest/GuestRatingDtos.kt similarity index 86% rename from src/main/kotlin/com/android/trisolarisserver/controller/dto/GuestRatingDtos.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/dto/guest/GuestRatingDtos.kt index 3d210fb..c02880e 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/GuestRatingDtos.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/guest/GuestRatingDtos.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller.dto +package com.android.trisolarisserver.controller.dto.guest import java.util.UUID diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/ChargeDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/payment/ChargeDtos.kt similarity index 87% rename from src/main/kotlin/com/android/trisolarisserver/controller/dto/ChargeDtos.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/dto/payment/ChargeDtos.kt index 64fbc5e..68c550f 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/ChargeDtos.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/payment/ChargeDtos.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller.dto +package com.android.trisolarisserver.controller.dto.payment import java.time.OffsetDateTime import java.util.UUID diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/PaymentDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/payment/PaymentDtos.kt similarity index 93% rename from src/main/kotlin/com/android/trisolarisserver/controller/dto/PaymentDtos.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/dto/payment/PaymentDtos.kt index f8d6856..496ffb6 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/PaymentDtos.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/payment/PaymentDtos.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller.dto +package com.android.trisolarisserver.controller.dto.payment import java.util.UUID diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/OrgPropertyDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/property/OrgPropertyDtos.kt similarity index 97% rename from src/main/kotlin/com/android/trisolarisserver/controller/dto/OrgPropertyDtos.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/dto/property/OrgPropertyDtos.kt index e8d8621..53857a5 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/OrgPropertyDtos.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/property/OrgPropertyDtos.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller.dto +package com.android.trisolarisserver.controller.dto.property import java.util.UUID diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RateDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/rate/RateDtos.kt similarity index 96% rename from src/main/kotlin/com/android/trisolarisserver/controller/dto/RateDtos.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/dto/rate/RateDtos.kt index 3ef9894..72ff52e 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RateDtos.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/rate/RateDtos.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller.dto +package com.android.trisolarisserver.controller.dto.rate import java.time.LocalDate import java.util.UUID diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/room/RoomDtos.kt similarity index 97% rename from src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomDtos.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/dto/room/RoomDtos.kt index 6f07fc9..9c56770 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomDtos.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/room/RoomDtos.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller.dto +package com.android.trisolarisserver.controller.dto.room import java.util.UUID diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomStayDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/room/RoomStayDtos.kt similarity index 86% rename from src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomStayDtos.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/dto/room/RoomStayDtos.kt index d6dbcd3..f4977d2 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomStayDtos.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/room/RoomStayDtos.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller.dto +package com.android.trisolarisserver.controller.dto.room import java.util.UUID diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomTypeDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/room/RoomTypeDtos.kt similarity index 94% rename from src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomTypeDtos.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/dto/room/RoomTypeDtos.kt index c01133d..087922e 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomTypeDtos.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/room/RoomTypeDtos.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller.dto +package com.android.trisolarisserver.controller.dto.room import java.util.UUID diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/InboundEmailManual.kt b/src/main/kotlin/com/android/trisolarisserver/controller/email/InboundEmailManual.kt similarity index 87% rename from src/main/kotlin/com/android/trisolarisserver/controller/InboundEmailManual.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/email/InboundEmailManual.kt index 13f76d8..fcac54d 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/InboundEmailManual.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/email/InboundEmailManual.kt @@ -1,14 +1,16 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.email +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requirePrincipal -import com.android.trisolarisserver.component.EmailStorage -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.db.repo.InboundEmailRepo +import com.android.trisolarisserver.component.storage.EmailStorage +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.repo.email.InboundEmailRepo import com.android.trisolarisserver.models.booking.InboundEmail import com.android.trisolarisserver.models.booking.InboundEmailStatus import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.repo.PropertyRepo +import com.android.trisolarisserver.repo.property.PropertyRepo import com.android.trisolarisserver.security.MyPrincipal -import com.android.trisolarisserver.service.EmailIngestionService +import com.android.trisolarisserver.service.email.EmailIngestionService import org.apache.pdfbox.pdmodel.PDDocument import org.apache.pdfbox.text.PDFTextStripper import org.springframework.http.HttpStatus diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/InboundEmails.kt b/src/main/kotlin/com/android/trisolarisserver/controller/email/InboundEmails.kt similarity index 88% rename from src/main/kotlin/com/android/trisolarisserver/controller/InboundEmails.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/email/InboundEmails.kt index 1065d57..0ed42f5 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/InboundEmails.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/email/InboundEmails.kt @@ -1,7 +1,9 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.email +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requirePrincipal -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.db.repo.InboundEmailRepo +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.repo.email.InboundEmailRepo import com.android.trisolarisserver.models.property.Role import com.android.trisolarisserver.security.MyPrincipal import org.springframework.core.io.FileSystemResource diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/GuestDocumentResponses.kt b/src/main/kotlin/com/android/trisolarisserver/controller/guest/GuestDocumentResponses.kt similarity index 90% rename from src/main/kotlin/com/android/trisolarisserver/controller/GuestDocumentResponses.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/guest/GuestDocumentResponses.kt index abb7e4d..4e5e508 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/GuestDocumentResponses.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/guest/GuestDocumentResponses.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.guest import com.android.trisolarisserver.models.booking.GuestDocument import com.fasterxml.jackson.databind.ObjectMapper @@ -18,7 +18,7 @@ data class GuestDocumentResponse( val extractedAt: String? ) -internal fun GuestDocument.toResponse(objectMapper: ObjectMapper): GuestDocumentResponse { +fun GuestDocument.toResponse(objectMapper: ObjectMapper): GuestDocumentResponse { val id = id ?: throw IllegalStateException("Document id missing") val extracted: Map? = extractedData?.let { try { diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/GuestDocuments.kt b/src/main/kotlin/com/android/trisolarisserver/controller/guest/GuestDocuments.kt similarity index 90% rename from src/main/kotlin/com/android/trisolarisserver/controller/GuestDocuments.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/guest/GuestDocuments.kt index 2e58de7..931fefe 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/GuestDocuments.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/guest/GuestDocuments.kt @@ -1,18 +1,23 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.guest +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requireProperty +import com.android.trisolarisserver.controller.common.requirePropertyGuest +import com.android.trisolarisserver.controller.common.requireRole +import com.android.trisolarisserver.controller.common.requireUser -import com.android.trisolarisserver.component.DocumentStorage -import com.android.trisolarisserver.component.DocumentTokenService -import com.android.trisolarisserver.component.ExtractionQueue -import com.android.trisolarisserver.component.GuestDocumentEvents -import com.android.trisolarisserver.component.DocumentExtractionService -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.db.repo.BookingRepo -import com.android.trisolarisserver.db.repo.GuestDocumentRepo -import com.android.trisolarisserver.db.repo.GuestRepo +import com.android.trisolarisserver.component.storage.DocumentStorage +import com.android.trisolarisserver.component.document.DocumentTokenService +import com.android.trisolarisserver.component.ai.ExtractionQueue +import com.android.trisolarisserver.component.document.GuestDocumentEvents +import com.android.trisolarisserver.component.document.DocumentExtractionService +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.repo.booking.BookingRepo +import com.android.trisolarisserver.repo.guest.GuestDocumentRepo +import com.android.trisolarisserver.repo.guest.GuestRepo import com.android.trisolarisserver.models.booking.GuestDocument import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.PropertyRepo +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.property.PropertyRepo import com.android.trisolarisserver.security.MyPrincipal import com.fasterxml.jackson.databind.ObjectMapper import org.springframework.core.io.FileSystemResource diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/GuestRatings.kt b/src/main/kotlin/com/android/trisolarisserver/controller/guest/GuestRatings.kt similarity index 83% rename from src/main/kotlin/com/android/trisolarisserver/controller/GuestRatings.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/guest/GuestRatings.kt index a918d21..97cc0be 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/GuestRatings.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/guest/GuestRatings.kt @@ -1,13 +1,16 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.guest +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requireProperty +import com.android.trisolarisserver.controller.common.requirePropertyGuest -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.controller.dto.GuestRatingCreateRequest -import com.android.trisolarisserver.controller.dto.GuestRatingResponse -import com.android.trisolarisserver.db.repo.BookingRepo -import com.android.trisolarisserver.db.repo.GuestRatingRepo -import com.android.trisolarisserver.db.repo.GuestRepo -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.PropertyRepo +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.controller.dto.guest.GuestRatingCreateRequest +import com.android.trisolarisserver.controller.dto.guest.GuestRatingResponse +import com.android.trisolarisserver.repo.booking.BookingRepo +import com.android.trisolarisserver.repo.guest.GuestRatingRepo +import com.android.trisolarisserver.repo.guest.GuestRepo +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.property.PropertyRepo import com.android.trisolarisserver.models.booking.GuestRating import com.android.trisolarisserver.models.booking.GuestRatingScore import com.android.trisolarisserver.security.MyPrincipal diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/Guests.kt b/src/main/kotlin/com/android/trisolarisserver/controller/guest/Guests.kt similarity index 89% rename from src/main/kotlin/com/android/trisolarisserver/controller/Guests.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/guest/Guests.kt index 8c89778..e6bbe7c 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/Guests.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/guest/Guests.kt @@ -1,18 +1,22 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.guest +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requireProperty +import com.android.trisolarisserver.controller.common.requirePropertyGuest +import com.android.trisolarisserver.controller.common.requireRole -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.component.GuestSignatureStorage -import com.android.trisolarisserver.controller.dto.GuestResponse -import com.android.trisolarisserver.controller.dto.GuestUpdateRequest -import com.android.trisolarisserver.controller.dto.GuestVehicleRequest -import com.android.trisolarisserver.controller.dto.GuestVisitCountResponse +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.component.storage.GuestSignatureStorage +import com.android.trisolarisserver.controller.dto.property.GuestResponse +import com.android.trisolarisserver.controller.dto.property.GuestUpdateRequest +import com.android.trisolarisserver.controller.dto.property.GuestVehicleRequest +import com.android.trisolarisserver.controller.dto.property.GuestVisitCountResponse import com.android.trisolarisserver.models.booking.Guest import com.android.trisolarisserver.models.booking.GuestVehicle -import com.android.trisolarisserver.db.repo.BookingRepo -import com.android.trisolarisserver.db.repo.GuestRepo -import com.android.trisolarisserver.db.repo.GuestRatingRepo -import com.android.trisolarisserver.repo.GuestVehicleRepo -import com.android.trisolarisserver.repo.PropertyRepo +import com.android.trisolarisserver.repo.booking.BookingRepo +import com.android.trisolarisserver.repo.guest.GuestRepo +import com.android.trisolarisserver.repo.guest.GuestRatingRepo +import com.android.trisolarisserver.repo.guest.GuestVehicleRepo +import com.android.trisolarisserver.repo.property.PropertyRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.core.io.FileSystemResource import org.springframework.http.HttpStatus diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/Charges.kt b/src/main/kotlin/com/android/trisolarisserver/controller/payment/Charges.kt similarity index 83% rename from src/main/kotlin/com/android/trisolarisserver/controller/Charges.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/payment/Charges.kt index 5f47955..e3c212e 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/Charges.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/payment/Charges.kt @@ -1,15 +1,19 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.payment +import com.android.trisolarisserver.controller.common.nowForProperty +import com.android.trisolarisserver.controller.common.parseOffset +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requireRole -import com.android.trisolarisserver.component.BookingEvents -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.controller.dto.ChargeCreateRequest -import com.android.trisolarisserver.controller.dto.ChargeResponse -import com.android.trisolarisserver.db.repo.BookingRepo +import com.android.trisolarisserver.component.booking.BookingEvents +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.controller.dto.payment.ChargeCreateRequest +import com.android.trisolarisserver.controller.dto.payment.ChargeResponse +import com.android.trisolarisserver.repo.booking.BookingRepo import com.android.trisolarisserver.models.booking.Charge import com.android.trisolarisserver.models.booking.ChargeType import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.ChargeRepo +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.booking.ChargeRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.http.HttpStatus import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/Payments.kt b/src/main/kotlin/com/android/trisolarisserver/controller/payment/Payments.kt similarity index 89% rename from src/main/kotlin/com/android/trisolarisserver/controller/Payments.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/payment/Payments.kt index 658f499..18e024f 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/Payments.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/payment/Payments.kt @@ -1,17 +1,20 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.payment +import com.android.trisolarisserver.controller.common.parseOffset +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requireRole -import com.android.trisolarisserver.component.BookingEvents -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.controller.dto.PaymentCreateRequest -import com.android.trisolarisserver.controller.dto.PaymentResponse -import com.android.trisolarisserver.db.repo.BookingRepo +import com.android.trisolarisserver.component.booking.BookingEvents +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.controller.dto.payment.PaymentCreateRequest +import com.android.trisolarisserver.controller.dto.payment.PaymentResponse +import com.android.trisolarisserver.repo.booking.BookingRepo import com.android.trisolarisserver.models.booking.BookingStatus import com.android.trisolarisserver.models.booking.Payment import com.android.trisolarisserver.models.booking.PaymentMethod import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.PaymentRepo -import com.android.trisolarisserver.repo.PropertyRepo +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.booking.PaymentRepo +import com.android.trisolarisserver.repo.property.PropertyRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.http.HttpStatus import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/Properties.kt b/src/main/kotlin/com/android/trisolarisserver/controller/property/Properties.kt similarity index 91% rename from src/main/kotlin/com/android/trisolarisserver/controller/Properties.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/property/Properties.kt index dc09f35..0442024 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/Properties.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/property/Properties.kt @@ -1,14 +1,17 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.property +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requirePrincipal +import com.android.trisolarisserver.controller.common.requireUser -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.controller.dto.PropertyCreateRequest -import com.android.trisolarisserver.controller.dto.PropertyResponse -import com.android.trisolarisserver.controller.dto.PropertyUpdateRequest -import com.android.trisolarisserver.controller.dto.PropertyUserResponse -import com.android.trisolarisserver.controller.dto.PropertyUserRoleRequest -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.PropertyRepo -import com.android.trisolarisserver.repo.PropertyUserRepo +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.controller.dto.property.PropertyCreateRequest +import com.android.trisolarisserver.controller.dto.property.PropertyResponse +import com.android.trisolarisserver.controller.dto.property.PropertyUpdateRequest +import com.android.trisolarisserver.controller.dto.property.PropertyUserResponse +import com.android.trisolarisserver.controller.dto.property.PropertyUserRoleRequest +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.property.PropertyRepo +import com.android.trisolarisserver.repo.property.PropertyUserRepo import com.android.trisolarisserver.models.property.Property import com.android.trisolarisserver.models.property.PropertyUser import com.android.trisolarisserver.models.property.PropertyUserId diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RatePlans.kt b/src/main/kotlin/com/android/trisolarisserver/controller/rate/RatePlans.kt similarity index 90% rename from src/main/kotlin/com/android/trisolarisserver/controller/RatePlans.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/rate/RatePlans.kt index 95ffe18..8d9ef26 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/RatePlans.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/rate/RatePlans.kt @@ -1,16 +1,19 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.rate +import com.android.trisolarisserver.controller.common.parseDate +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requireRole -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.controller.dto.RateCalendarResponse -import com.android.trisolarisserver.controller.dto.RateCalendarAverageResponse -import com.android.trisolarisserver.controller.dto.RateCalendarRangeUpsertRequest -import com.android.trisolarisserver.controller.dto.RatePlanCreateRequest -import com.android.trisolarisserver.controller.dto.RatePlanResponse -import com.android.trisolarisserver.controller.dto.RatePlanUpdateRequest -import com.android.trisolarisserver.repo.PropertyRepo -import com.android.trisolarisserver.repo.RateCalendarRepo -import com.android.trisolarisserver.repo.RatePlanRepo -import com.android.trisolarisserver.repo.RoomTypeRepo +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.controller.dto.rate.RateCalendarResponse +import com.android.trisolarisserver.controller.dto.rate.RateCalendarAverageResponse +import com.android.trisolarisserver.controller.dto.rate.RateCalendarRangeUpsertRequest +import com.android.trisolarisserver.controller.dto.rate.RatePlanCreateRequest +import com.android.trisolarisserver.controller.dto.rate.RatePlanResponse +import com.android.trisolarisserver.controller.dto.rate.RatePlanUpdateRequest +import com.android.trisolarisserver.repo.property.PropertyRepo +import com.android.trisolarisserver.repo.rate.RateCalendarRepo +import com.android.trisolarisserver.repo.rate.RatePlanRepo +import com.android.trisolarisserver.repo.room.RoomTypeRepo import com.android.trisolarisserver.models.property.Role import com.android.trisolarisserver.models.room.RateCalendar import com.android.trisolarisserver.models.room.RatePlan diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayPaymentLinksController.kt b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayPaymentLinksController.kt index 929f5d3..fc1fa7e 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayPaymentLinksController.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayPaymentLinksController.kt @@ -1,13 +1,13 @@ package com.android.trisolarisserver.controller.razorpay -import com.android.trisolarisserver.controller.requireRole +import com.android.trisolarisserver.controller.common.requireRole -import com.android.trisolarisserver.component.PropertyAccess +import com.android.trisolarisserver.component.auth.PropertyAccess import com.android.trisolarisserver.controller.dto.razorpay.RazorpayPaymentLinkCreateRequest import com.android.trisolarisserver.controller.dto.razorpay.RazorpayPaymentLinkCreateResponse import com.android.trisolarisserver.models.booking.BookingStatus import com.android.trisolarisserver.models.payment.RazorpayPaymentLinkRequest import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.db.repo.BookingRepo +import com.android.trisolarisserver.repo.booking.BookingRepo import com.android.trisolarisserver.repo.razorpay.RazorpayPaymentLinkRequestRepo import com.android.trisolarisserver.repo.razorpay.RazorpaySettingsRepo import com.android.trisolarisserver.security.MyPrincipal diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayPaymentRequestsController.kt b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayPaymentRequestsController.kt index 1816a52..3b08a6b 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayPaymentRequestsController.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayPaymentRequestsController.kt @@ -1,11 +1,11 @@ package com.android.trisolarisserver.controller.razorpay -import com.android.trisolarisserver.controller.requireRole +import com.android.trisolarisserver.controller.common.requireRole -import com.android.trisolarisserver.component.PropertyAccess +import com.android.trisolarisserver.component.auth.PropertyAccess import com.android.trisolarisserver.controller.dto.razorpay.RazorpayPaymentRequestCloseRequest import com.android.trisolarisserver.controller.dto.razorpay.RazorpayPaymentRequestCloseResponse import com.android.trisolarisserver.controller.dto.razorpay.RazorpayPaymentRequestResponse -import com.android.trisolarisserver.db.repo.BookingRepo +import com.android.trisolarisserver.repo.booking.BookingRepo import com.android.trisolarisserver.models.property.Role import com.android.trisolarisserver.repo.razorpay.RazorpayPaymentLinkRequestRepo import com.android.trisolarisserver.repo.razorpay.RazorpayQrRequestRepo diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayQrPayments.kt b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayQrPayments.kt index 536a804..bbedb8c 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayQrPayments.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayQrPayments.kt @@ -1,7 +1,7 @@ package com.android.trisolarisserver.controller.razorpay -import com.android.trisolarisserver.controller.requireRole +import com.android.trisolarisserver.controller.common.requireRole -import com.android.trisolarisserver.component.PropertyAccess +import com.android.trisolarisserver.component.auth.PropertyAccess import com.android.trisolarisserver.component.razorpay.RazorpayQrEvents import com.android.trisolarisserver.controller.dto.razorpay.RazorpayQrGenerateRequest import com.android.trisolarisserver.controller.dto.razorpay.RazorpayQrEventResponse @@ -10,7 +10,7 @@ import com.android.trisolarisserver.controller.dto.razorpay.RazorpayQrRecordResp import com.android.trisolarisserver.models.booking.BookingStatus import com.android.trisolarisserver.models.payment.RazorpayQrRequest import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.db.repo.BookingRepo +import com.android.trisolarisserver.repo.booking.BookingRepo import com.android.trisolarisserver.repo.razorpay.RazorpayQrRequestRepo import com.android.trisolarisserver.repo.razorpay.RazorpaySettingsRepo import com.android.trisolarisserver.repo.razorpay.RazorpayWebhookLogRepo diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayRefundsController.kt b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayRefundsController.kt index 176dcf7..43b53f0 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayRefundsController.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayRefundsController.kt @@ -1,12 +1,12 @@ package com.android.trisolarisserver.controller.razorpay -import com.android.trisolarisserver.controller.requireRole +import com.android.trisolarisserver.controller.common.requireRole -import com.android.trisolarisserver.component.PropertyAccess +import com.android.trisolarisserver.component.auth.PropertyAccess import com.android.trisolarisserver.controller.dto.razorpay.RazorpayRefundRequest import com.android.trisolarisserver.controller.dto.razorpay.RazorpayRefundResponse -import com.android.trisolarisserver.db.repo.BookingRepo +import com.android.trisolarisserver.repo.booking.BookingRepo import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.repo.PaymentRepo +import com.android.trisolarisserver.repo.booking.PaymentRepo import com.android.trisolarisserver.repo.razorpay.RazorpaySettingsRepo import com.android.trisolarisserver.security.MyPrincipal import com.fasterxml.jackson.databind.ObjectMapper diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpaySettingsController.kt b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpaySettingsController.kt index 3f0c889..991e1ea 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpaySettingsController.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpaySettingsController.kt @@ -1,12 +1,12 @@ package com.android.trisolarisserver.controller.razorpay -import com.android.trisolarisserver.controller.requireRole +import com.android.trisolarisserver.controller.common.requireRole -import com.android.trisolarisserver.component.PropertyAccess +import com.android.trisolarisserver.component.auth.PropertyAccess import com.android.trisolarisserver.controller.dto.razorpay.RazorpaySettingsResponse import com.android.trisolarisserver.controller.dto.razorpay.RazorpaySettingsUpsertRequest import com.android.trisolarisserver.models.payment.RazorpaySettings import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.repo.PropertyRepo +import com.android.trisolarisserver.repo.property.PropertyRepo import com.android.trisolarisserver.repo.razorpay.RazorpaySettingsRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.web.bind.annotation.GetMapping diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayWebhookCapture.kt b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayWebhookCapture.kt index bc5dcbb..25ce713 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayWebhookCapture.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/razorpay/RazorpayWebhookCapture.kt @@ -1,15 +1,15 @@ package com.android.trisolarisserver.controller.razorpay -import com.android.trisolarisserver.db.repo.BookingRepo +import com.android.trisolarisserver.repo.booking.BookingRepo import com.android.trisolarisserver.models.booking.Payment import com.android.trisolarisserver.models.booking.PaymentMethod import com.android.trisolarisserver.models.payment.RazorpayPaymentAttempt import com.android.trisolarisserver.models.payment.RazorpayWebhookLog import com.android.trisolarisserver.component.razorpay.RazorpayQrEvents -import com.android.trisolarisserver.component.BookingEvents +import com.android.trisolarisserver.component.booking.BookingEvents import com.android.trisolarisserver.controller.dto.razorpay.RazorpayQrEventResponse -import com.android.trisolarisserver.repo.PaymentRepo -import com.android.trisolarisserver.repo.PropertyRepo +import com.android.trisolarisserver.repo.booking.PaymentRepo +import com.android.trisolarisserver.repo.property.PropertyRepo import com.android.trisolarisserver.repo.razorpay.RazorpayPaymentAttemptRepo import com.android.trisolarisserver.repo.razorpay.RazorpayPaymentLinkRequestRepo import com.android.trisolarisserver.repo.razorpay.RazorpayQrRequestRepo diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RoomAmenities.kt b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomAmenities.kt similarity index 89% rename from src/main/kotlin/com/android/trisolarisserver/controller/RoomAmenities.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/room/RoomAmenities.kt index 9e63898..e7b59e2 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/RoomAmenities.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomAmenities.kt @@ -1,11 +1,13 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.room +import com.android.trisolarisserver.controller.common.requirePrincipal +import com.android.trisolarisserver.controller.common.requireSuperAdmin -import com.android.trisolarisserver.controller.dto.AmenityResponse -import com.android.trisolarisserver.controller.dto.AmenityUpsertRequest +import com.android.trisolarisserver.controller.dto.room.AmenityResponse +import com.android.trisolarisserver.controller.dto.room.AmenityUpsertRequest import com.android.trisolarisserver.models.room.RoomAmenity -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.RoomAmenityRepo -import com.android.trisolarisserver.repo.RoomTypeRepo +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.room.RoomAmenityRepo +import com.android.trisolarisserver.repo.room.RoomTypeRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.http.HttpStatus import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RoomImageTags.kt b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomImageTags.kt similarity index 87% rename from src/main/kotlin/com/android/trisolarisserver/controller/RoomImageTags.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/room/RoomImageTags.kt index d7356f2..ba873fd 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/RoomImageTags.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomImageTags.kt @@ -1,11 +1,12 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.room +import com.android.trisolarisserver.controller.common.requireSuperAdmin -import com.android.trisolarisserver.controller.dto.RoomImageTagResponse -import com.android.trisolarisserver.controller.dto.RoomImageTagUpsertRequest +import com.android.trisolarisserver.controller.dto.room.RoomImageTagResponse +import com.android.trisolarisserver.controller.dto.room.RoomImageTagUpsertRequest import com.android.trisolarisserver.models.room.RoomImageTag -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.RoomImageRepo -import com.android.trisolarisserver.repo.RoomImageTagRepo +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.room.RoomImageRepo +import com.android.trisolarisserver.repo.room.RoomImageTagRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.http.HttpStatus import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RoomImages.kt b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomImages.kt similarity index 93% rename from src/main/kotlin/com/android/trisolarisserver/controller/RoomImages.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/room/RoomImages.kt index 4da7e4f..8d2873c 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/RoomImages.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomImages.kt @@ -1,16 +1,19 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.room +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requireRole +import com.android.trisolarisserver.controller.dto.room.RoomImageTagResponse -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.component.RoomImageStorage -import com.android.trisolarisserver.controller.dto.RoomImageResponse -import com.android.trisolarisserver.controller.dto.RoomImageReorderRequest -import com.android.trisolarisserver.controller.dto.RoomImageTagUpdateRequest +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.component.storage.RoomImageStorage +import com.android.trisolarisserver.controller.dto.room.RoomImageResponse +import com.android.trisolarisserver.controller.dto.room.RoomImageReorderRequest +import com.android.trisolarisserver.controller.dto.room.RoomImageTagUpdateRequest import com.android.trisolarisserver.models.room.RoomImage import com.android.trisolarisserver.models.room.RoomImageTag import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.repo.RoomImageRepo -import com.android.trisolarisserver.repo.RoomImageTagRepo -import com.android.trisolarisserver.repo.RoomRepo +import com.android.trisolarisserver.repo.room.RoomImageRepo +import com.android.trisolarisserver.repo.room.RoomImageTagRepo +import com.android.trisolarisserver.repo.room.RoomRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.core.io.FileSystemResource import org.springframework.http.HttpHeaders @@ -329,9 +332,9 @@ private fun RoomImage.toResponse(baseUrl: String): RoomImageResponse { ) } -private fun RoomImageTag.toResponse(): com.android.trisolarisserver.controller.dto.RoomImageTagResponse { +private fun RoomImageTag.toResponse(): com.android.trisolarisserver.controller.dto.room.RoomImageTagResponse { val id = id ?: throw ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Tag id missing") - return com.android.trisolarisserver.controller.dto.RoomImageTagResponse( + return com.android.trisolarisserver.controller.dto.room.RoomImageTagResponse( id = id, name = name ) diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RoomStayFlow.kt b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomStayFlow.kt similarity index 85% rename from src/main/kotlin/com/android/trisolarisserver/controller/RoomStayFlow.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/room/RoomStayFlow.kt index 0935a8b..c6016a6 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/RoomStayFlow.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomStayFlow.kt @@ -1,16 +1,19 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.room +import com.android.trisolarisserver.controller.common.parseOffset +import com.android.trisolarisserver.controller.common.requireOpenRoomStayForProperty +import com.android.trisolarisserver.controller.common.requireRole -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.component.RoomBoardEvents -import com.android.trisolarisserver.controller.dto.RoomChangeRequest -import com.android.trisolarisserver.controller.dto.RoomChangeResponse +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.component.room.RoomBoardEvents +import com.android.trisolarisserver.controller.dto.booking.RoomChangeRequest +import com.android.trisolarisserver.controller.dto.booking.RoomChangeResponse import com.android.trisolarisserver.models.room.RoomStay import com.android.trisolarisserver.models.room.RoomStayChange import com.android.trisolarisserver.models.property.Role -import com.android.trisolarisserver.repo.AppUserRepo -import com.android.trisolarisserver.repo.RoomRepo -import com.android.trisolarisserver.repo.RoomStayChangeRepo -import com.android.trisolarisserver.repo.RoomStayRepo +import com.android.trisolarisserver.repo.property.AppUserRepo +import com.android.trisolarisserver.repo.room.RoomRepo +import com.android.trisolarisserver.repo.room.RoomStayChangeRepo +import com.android.trisolarisserver.repo.room.RoomStayRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.http.HttpStatus import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RoomStays.kt b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomStays.kt similarity index 86% rename from src/main/kotlin/com/android/trisolarisserver/controller/RoomStays.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/room/RoomStays.kt index 172b478..2f4c66f 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/RoomStays.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomStays.kt @@ -1,14 +1,18 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.room +import com.android.trisolarisserver.controller.common.parseOffset +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requireRole +import com.android.trisolarisserver.controller.common.requireRoomStayForProperty -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.controller.dto.ActiveRoomStayResponse -import com.android.trisolarisserver.controller.dto.RoomStayRateChangeRequest -import com.android.trisolarisserver.controller.dto.RoomStayRateChangeResponse +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.controller.dto.room.ActiveRoomStayResponse +import com.android.trisolarisserver.controller.dto.rate.RoomStayRateChangeRequest +import com.android.trisolarisserver.controller.dto.rate.RoomStayRateChangeResponse import com.android.trisolarisserver.models.property.Role import com.android.trisolarisserver.models.room.RateSource import com.android.trisolarisserver.models.room.RoomStay -import com.android.trisolarisserver.repo.PropertyUserRepo -import com.android.trisolarisserver.repo.RoomStayRepo +import com.android.trisolarisserver.repo.property.PropertyUserRepo +import com.android.trisolarisserver.repo.room.RoomStayRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.http.HttpStatus import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RoomTypeImages.kt b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomTypeImages.kt similarity index 87% rename from src/main/kotlin/com/android/trisolarisserver/controller/RoomTypeImages.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/room/RoomTypeImages.kt index 72eeb63..2bbd9f8 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/RoomTypeImages.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomTypeImages.kt @@ -1,10 +1,11 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.room +import com.android.trisolarisserver.controller.dto.room.RoomImageTagResponse -import com.android.trisolarisserver.controller.dto.RoomImageResponse +import com.android.trisolarisserver.controller.dto.room.RoomImageResponse import com.android.trisolarisserver.models.room.RoomImage import com.android.trisolarisserver.models.room.RoomImageTag -import com.android.trisolarisserver.repo.RoomImageRepo -import com.android.trisolarisserver.repo.RoomTypeRepo +import com.android.trisolarisserver.repo.room.RoomImageRepo +import com.android.trisolarisserver.repo.room.RoomTypeRepo import org.springframework.http.HttpStatus import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable @@ -74,9 +75,9 @@ private fun RoomImage.toResponse(baseUrl: String): RoomImageResponse { ) } -private fun RoomImageTag.toResponse(): com.android.trisolarisserver.controller.dto.RoomImageTagResponse { +private fun RoomImageTag.toResponse(): com.android.trisolarisserver.controller.dto.room.RoomImageTagResponse { val id = id ?: throw ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Tag id missing") - return com.android.trisolarisserver.controller.dto.RoomImageTagResponse( + return com.android.trisolarisserver.controller.dto.room.RoomImageTagResponse( id = id, name = name ) diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RoomTypes.kt b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomTypes.kt similarity index 89% rename from src/main/kotlin/com/android/trisolarisserver/controller/RoomTypes.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/room/RoomTypes.kt index 76a38a5..d6081c4 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/RoomTypes.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/room/RoomTypes.kt @@ -1,15 +1,19 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.room +import com.android.trisolarisserver.controller.common.parseDate +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requirePrincipal +import com.android.trisolarisserver.controller.dto.room.AmenityResponse -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.controller.dto.RateResolveResponse -import com.android.trisolarisserver.controller.dto.RoomTypeResponse -import com.android.trisolarisserver.controller.dto.RoomTypeUpsertRequest -import com.android.trisolarisserver.repo.PropertyRepo -import com.android.trisolarisserver.repo.RateCalendarRepo -import com.android.trisolarisserver.repo.RatePlanRepo -import com.android.trisolarisserver.repo.RoomAmenityRepo -import com.android.trisolarisserver.repo.RoomRepo -import com.android.trisolarisserver.repo.RoomTypeRepo +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.controller.dto.rate.RateResolveResponse +import com.android.trisolarisserver.controller.dto.room.RoomTypeResponse +import com.android.trisolarisserver.controller.dto.room.RoomTypeUpsertRequest +import com.android.trisolarisserver.repo.property.PropertyRepo +import com.android.trisolarisserver.repo.rate.RateCalendarRepo +import com.android.trisolarisserver.repo.rate.RatePlanRepo +import com.android.trisolarisserver.repo.room.RoomAmenityRepo +import com.android.trisolarisserver.repo.room.RoomRepo +import com.android.trisolarisserver.repo.room.RoomTypeRepo import com.android.trisolarisserver.models.property.Role import com.android.trisolarisserver.models.room.RoomAmenity import com.android.trisolarisserver.models.room.RoomType @@ -218,9 +222,9 @@ private fun RoomType.toResponse(): RoomTypeResponse { ) } -private fun RoomAmenity.toResponse(): com.android.trisolarisserver.controller.dto.AmenityResponse { +private fun RoomAmenity.toResponse(): com.android.trisolarisserver.controller.dto.room.AmenityResponse { val id = id ?: throw ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Amenity id missing") - return com.android.trisolarisserver.controller.dto.AmenityResponse( + return com.android.trisolarisserver.controller.dto.room.AmenityResponse( id = id, name = name, category = category, diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt b/src/main/kotlin/com/android/trisolarisserver/controller/room/Rooms.kt similarity index 92% rename from src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/room/Rooms.kt index 6c902c5..3c64a7f 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/room/Rooms.kt @@ -1,23 +1,26 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.room +import com.android.trisolarisserver.controller.common.parseDate +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requirePrincipal -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.component.RoomBoardEvents -import com.android.trisolarisserver.controller.dto.RoomAvailabilityRangeResponse -import com.android.trisolarisserver.controller.dto.RoomAvailabilityResponse -import com.android.trisolarisserver.controller.dto.RoomAvailabilityWithRateResponse -import com.android.trisolarisserver.controller.dto.RoomBoardResponse -import com.android.trisolarisserver.controller.dto.RoomBoardStatus -import com.android.trisolarisserver.controller.dto.RoomResponse -import com.android.trisolarisserver.controller.dto.RoomUpsertRequest -import com.android.trisolarisserver.repo.PropertyRepo -import com.android.trisolarisserver.repo.PropertyUserRepo -import com.android.trisolarisserver.repo.IssuedCardRepo -import com.android.trisolarisserver.repo.RoomImageRepo -import com.android.trisolarisserver.repo.RoomRepo -import com.android.trisolarisserver.repo.RoomStayRepo -import com.android.trisolarisserver.repo.RoomTypeRepo -import com.android.trisolarisserver.repo.RatePlanRepo -import com.android.trisolarisserver.repo.RateCalendarRepo +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.component.room.RoomBoardEvents +import com.android.trisolarisserver.controller.dto.room.RoomAvailabilityRangeResponse +import com.android.trisolarisserver.controller.dto.room.RoomAvailabilityResponse +import com.android.trisolarisserver.controller.dto.room.RoomAvailabilityWithRateResponse +import com.android.trisolarisserver.controller.dto.room.RoomBoardResponse +import com.android.trisolarisserver.controller.dto.room.RoomBoardStatus +import com.android.trisolarisserver.controller.dto.room.RoomResponse +import com.android.trisolarisserver.controller.dto.room.RoomUpsertRequest +import com.android.trisolarisserver.repo.property.PropertyRepo +import com.android.trisolarisserver.repo.property.PropertyUserRepo +import com.android.trisolarisserver.repo.card.IssuedCardRepo +import com.android.trisolarisserver.repo.room.RoomImageRepo +import com.android.trisolarisserver.repo.room.RoomRepo +import com.android.trisolarisserver.repo.room.RoomStayRepo +import com.android.trisolarisserver.repo.room.RoomTypeRepo +import com.android.trisolarisserver.repo.rate.RatePlanRepo +import com.android.trisolarisserver.repo.rate.RateCalendarRepo import com.android.trisolarisserver.models.room.Room import com.android.trisolarisserver.models.room.RatePlan import com.android.trisolarisserver.models.property.Role diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/Health.kt b/src/main/kotlin/com/android/trisolarisserver/controller/system/Health.kt similarity index 88% rename from src/main/kotlin/com/android/trisolarisserver/controller/Health.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/system/Health.kt index ba82591..9927ec0 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/Health.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/system/Health.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.system import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RestController diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/TransportModes.kt b/src/main/kotlin/com/android/trisolarisserver/controller/transport/TransportModes.kt similarity index 81% rename from src/main/kotlin/com/android/trisolarisserver/controller/TransportModes.kt rename to src/main/kotlin/com/android/trisolarisserver/controller/transport/TransportModes.kt index 3137322..bed187c 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/TransportModes.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/transport/TransportModes.kt @@ -1,9 +1,11 @@ -package com.android.trisolarisserver.controller +package com.android.trisolarisserver.controller.transport +import com.android.trisolarisserver.controller.common.requireMember +import com.android.trisolarisserver.controller.common.requirePrincipal -import com.android.trisolarisserver.component.PropertyAccess -import com.android.trisolarisserver.controller.dto.TransportModeStatusResponse +import com.android.trisolarisserver.component.auth.PropertyAccess +import com.android.trisolarisserver.controller.dto.property.TransportModeStatusResponse import com.android.trisolarisserver.models.booking.TransportMode -import com.android.trisolarisserver.repo.PropertyRepo +import com.android.trisolarisserver.repo.property.PropertyRepo import com.android.trisolarisserver.security.MyPrincipal import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.web.bind.annotation.GetMapping diff --git a/src/main/kotlin/com/android/trisolarisserver/db/repo/BookingRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/booking/BookingRepo.kt similarity index 95% rename from src/main/kotlin/com/android/trisolarisserver/db/repo/BookingRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/booking/BookingRepo.kt index c327159..9cbc8cf 100644 --- a/src/main/kotlin/com/android/trisolarisserver/db/repo/BookingRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/booking/BookingRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.db.repo +package com.android.trisolarisserver.repo.booking import com.android.trisolarisserver.models.booking.Booking import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/ChargeRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/booking/ChargeRepo.kt similarity index 84% rename from src/main/kotlin/com/android/trisolarisserver/repo/ChargeRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/booking/ChargeRepo.kt index b2b06c2..a1b550b 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/ChargeRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/booking/ChargeRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.booking import com.android.trisolarisserver.models.booking.Charge import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/PaymentRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/booking/PaymentRepo.kt similarity index 95% rename from src/main/kotlin/com/android/trisolarisserver/repo/PaymentRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/booking/PaymentRepo.kt index ab99710..9bf6340 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/PaymentRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/booking/PaymentRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.booking import com.android.trisolarisserver.models.booking.Payment import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/IssuedCardRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/card/IssuedCardRepo.kt similarity index 97% rename from src/main/kotlin/com/android/trisolarisserver/repo/IssuedCardRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/card/IssuedCardRepo.kt index be64f02..da8d111 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/IssuedCardRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/card/IssuedCardRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.card import com.android.trisolarisserver.models.room.IssuedCard import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/PropertyCardCounterRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/card/PropertyCardCounterRepo.kt similarity index 93% rename from src/main/kotlin/com/android/trisolarisserver/repo/PropertyCardCounterRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/card/PropertyCardCounterRepo.kt index a1f2374..eb166a0 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/PropertyCardCounterRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/card/PropertyCardCounterRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.card import com.android.trisolarisserver.models.room.PropertyCardCounter import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/db/repo/InboundEmailRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/email/InboundEmailRepo.kt similarity index 92% rename from src/main/kotlin/com/android/trisolarisserver/db/repo/InboundEmailRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/email/InboundEmailRepo.kt index af8c1b3..5bf9bfe 100644 --- a/src/main/kotlin/com/android/trisolarisserver/db/repo/InboundEmailRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/email/InboundEmailRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.db.repo +package com.android.trisolarisserver.repo.email import com.android.trisolarisserver.models.booking.InboundEmail import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/db/repo/GuestDocumentRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestDocumentRepo.kt similarity index 93% rename from src/main/kotlin/com/android/trisolarisserver/db/repo/GuestDocumentRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestDocumentRepo.kt index 7ddf2cd..faf53e3 100644 --- a/src/main/kotlin/com/android/trisolarisserver/db/repo/GuestDocumentRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestDocumentRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.db.repo +package com.android.trisolarisserver.repo.guest import com.android.trisolarisserver.models.booking.GuestDocument import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/db/repo/GuestRatingRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestRatingRepo.kt similarity index 95% rename from src/main/kotlin/com/android/trisolarisserver/db/repo/GuestRatingRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestRatingRepo.kt index a8d09f6..d61c5d4 100644 --- a/src/main/kotlin/com/android/trisolarisserver/db/repo/GuestRatingRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestRatingRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.db.repo +package com.android.trisolarisserver.repo.guest import com.android.trisolarisserver.models.booking.GuestRating import org.springframework.data.jpa.repository.Query diff --git a/src/main/kotlin/com/android/trisolarisserver/db/repo/GuestRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestRepo.kt similarity index 85% rename from src/main/kotlin/com/android/trisolarisserver/db/repo/GuestRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestRepo.kt index 7138505..5f77101 100644 --- a/src/main/kotlin/com/android/trisolarisserver/db/repo/GuestRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.db.repo +package com.android.trisolarisserver.repo.guest import com.android.trisolarisserver.models.booking.Guest import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/GuestVehicleRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestVehicleRepo.kt similarity index 91% rename from src/main/kotlin/com/android/trisolarisserver/repo/GuestVehicleRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestVehicleRepo.kt index 75f9943..a762603 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/GuestVehicleRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/guest/GuestVehicleRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.guest import com.android.trisolarisserver.models.booking.GuestVehicle import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/AppUserRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/property/AppUserRepo.kt similarity index 86% rename from src/main/kotlin/com/android/trisolarisserver/repo/AppUserRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/property/AppUserRepo.kt index 7e7cc6d..ae2058d 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/AppUserRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/property/AppUserRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.property import com.android.trisolarisserver.models.property.AppUser import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/PropertyRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/property/PropertyRepo.kt similarity index 85% rename from src/main/kotlin/com/android/trisolarisserver/repo/PropertyRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/property/PropertyRepo.kt index 0330b38..442aa88 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/PropertyRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/property/PropertyRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.property import com.android.trisolarisserver.models.property.Property import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/PropertyUserRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/property/PropertyUserRepo.kt similarity index 95% rename from src/main/kotlin/com/android/trisolarisserver/repo/PropertyUserRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/property/PropertyUserRepo.kt index 36334a0..2ac52a3 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/PropertyUserRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/property/PropertyUserRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.property import com.android.trisolarisserver.models.property.* import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/RateCalendarRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/rate/RateCalendarRepo.kt similarity index 93% rename from src/main/kotlin/com/android/trisolarisserver/repo/RateCalendarRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/rate/RateCalendarRepo.kt index 5b0ca8f..04aa04e 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/RateCalendarRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/rate/RateCalendarRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.rate import com.android.trisolarisserver.models.room.RateCalendar import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/RatePlanRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/rate/RatePlanRepo.kt similarity index 93% rename from src/main/kotlin/com/android/trisolarisserver/repo/RatePlanRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/rate/RatePlanRepo.kt index c1a8e84..cc14e8e 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/RatePlanRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/rate/RatePlanRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.rate import com.android.trisolarisserver.models.room.RatePlan import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/RoomAmenityRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomAmenityRepo.kt similarity index 89% rename from src/main/kotlin/com/android/trisolarisserver/repo/RoomAmenityRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/room/RoomAmenityRepo.kt index 31a4a15..86b76c7 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/RoomAmenityRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomAmenityRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.room import com.android.trisolarisserver.models.room.RoomAmenity import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomImageRepo.kt similarity index 98% rename from src/main/kotlin/com/android/trisolarisserver/repo/RoomImageRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/room/RoomImageRepo.kt index 2081802..d44f229 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomImageRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.room import com.android.trisolarisserver.models.room.RoomImage import org.springframework.data.jpa.repository.Query diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageTagRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomImageTagRepo.kt similarity index 90% rename from src/main/kotlin/com/android/trisolarisserver/repo/RoomImageTagRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/room/RoomImageTagRepo.kt index 6d29009..3142064 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageTagRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomImageTagRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.room import com.android.trisolarisserver.models.room.RoomImageTag import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/RoomRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomRepo.kt similarity index 97% rename from src/main/kotlin/com/android/trisolarisserver/repo/RoomRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/room/RoomRepo.kt index 0ecc700..27d5963 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/RoomRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.room import com.android.trisolarisserver.models.room.Room diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/RoomStayChangeRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomStayChangeRepo.kt similarity index 87% rename from src/main/kotlin/com/android/trisolarisserver/repo/RoomStayChangeRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/room/RoomStayChangeRepo.kt index fb35c0c..d9bb08b 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/RoomStayChangeRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomStayChangeRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.room import com.android.trisolarisserver.models.room.RoomStayChange import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/RoomStayRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomStayRepo.kt similarity index 98% rename from src/main/kotlin/com/android/trisolarisserver/repo/RoomStayRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/room/RoomStayRepo.kt index 1e7304d..fa72d05 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/RoomStayRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomStayRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.room import com.android.trisolarisserver.models.room.RoomStay import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/RoomTypeRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomTypeRepo.kt similarity index 95% rename from src/main/kotlin/com/android/trisolarisserver/repo/RoomTypeRepo.kt rename to src/main/kotlin/com/android/trisolarisserver/repo/room/RoomTypeRepo.kt index 18de351..c16d648 100644 --- a/src/main/kotlin/com/android/trisolarisserver/repo/RoomTypeRepo.kt +++ b/src/main/kotlin/com/android/trisolarisserver/repo/room/RoomTypeRepo.kt @@ -1,4 +1,4 @@ -package com.android.trisolarisserver.repo +package com.android.trisolarisserver.repo.room import com.android.trisolarisserver.models.room.RoomType import org.springframework.data.jpa.repository.EntityGraph diff --git a/src/main/kotlin/com/android/trisolarisserver/security/AuthResolver.kt b/src/main/kotlin/com/android/trisolarisserver/security/AuthResolver.kt index 4ba0c97..6a7b510 100644 --- a/src/main/kotlin/com/android/trisolarisserver/security/AuthResolver.kt +++ b/src/main/kotlin/com/android/trisolarisserver/security/AuthResolver.kt @@ -1,7 +1,7 @@ package com.android.trisolarisserver.security import com.android.trisolarisserver.models.property.AppUser -import com.android.trisolarisserver.repo.AppUserRepo +import com.android.trisolarisserver.repo.property.AppUserRepo import com.google.firebase.auth.FirebaseAuth import jakarta.servlet.http.HttpServletRequest import org.slf4j.LoggerFactory diff --git a/src/main/kotlin/com/android/trisolarisserver/security/FirebaseAuthFilter.kt b/src/main/kotlin/com/android/trisolarisserver/security/FirebaseAuthFilter.kt index f635bfb..067486c 100644 --- a/src/main/kotlin/com/android/trisolarisserver/security/FirebaseAuthFilter.kt +++ b/src/main/kotlin/com/android/trisolarisserver/security/FirebaseAuthFilter.kt @@ -1,6 +1,6 @@ package com.android.trisolarisserver.security -import com.android.trisolarisserver.repo.AppUserRepo +import com.android.trisolarisserver.repo.property.AppUserRepo import jakarta.servlet.FilterChain import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse diff --git a/src/main/kotlin/com/android/trisolarisserver/service/EmailIngestionService.kt b/src/main/kotlin/com/android/trisolarisserver/service/email/EmailIngestionService.kt similarity index 97% rename from src/main/kotlin/com/android/trisolarisserver/service/EmailIngestionService.kt rename to src/main/kotlin/com/android/trisolarisserver/service/email/EmailIngestionService.kt index 95d214d..a55f8e2 100644 --- a/src/main/kotlin/com/android/trisolarisserver/service/EmailIngestionService.kt +++ b/src/main/kotlin/com/android/trisolarisserver/service/email/EmailIngestionService.kt @@ -1,17 +1,17 @@ -package com.android.trisolarisserver.service +package com.android.trisolarisserver.service.email -import com.android.trisolarisserver.component.EmailStorage -import com.android.trisolarisserver.component.LlamaClient -import com.android.trisolarisserver.db.repo.BookingRepo -import com.android.trisolarisserver.db.repo.GuestRepo -import com.android.trisolarisserver.db.repo.InboundEmailRepo +import com.android.trisolarisserver.component.storage.EmailStorage +import com.android.trisolarisserver.component.ai.LlamaClient +import com.android.trisolarisserver.repo.booking.BookingRepo +import com.android.trisolarisserver.repo.guest.GuestRepo +import com.android.trisolarisserver.repo.email.InboundEmailRepo import com.android.trisolarisserver.models.booking.Booking import com.android.trisolarisserver.models.booking.BookingStatus import com.android.trisolarisserver.models.booking.Guest import com.android.trisolarisserver.models.booking.InboundEmail import com.android.trisolarisserver.models.booking.InboundEmailStatus import com.android.trisolarisserver.models.property.Property -import com.android.trisolarisserver.repo.PropertyRepo +import com.android.trisolarisserver.repo.property.PropertyRepo import com.fasterxml.jackson.databind.ObjectMapper import jakarta.mail.Flags import jakarta.mail.Folder