diff --git a/backend/server/src/main/java/dev/rheinsw/server/common/controller/exception/ApiException.java b/backend/common/src/main/java/dev/rheinsw/common/controller/exception/ApiException.java similarity index 82% rename from backend/server/src/main/java/dev/rheinsw/server/common/controller/exception/ApiException.java rename to backend/common/src/main/java/dev/rheinsw/common/controller/exception/ApiException.java index 3b7ae9b..cc29582 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/common/controller/exception/ApiException.java +++ b/backend/common/src/main/java/dev/rheinsw/common/controller/exception/ApiException.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.common.controller.exception; +package dev.rheinsw.common.controller.exception; /** * @author Thatsaphorn Atchariyaphap diff --git a/backend/server/src/main/java/dev/rheinsw/server/common/controller/exception/handler/GlobalExceptionHandler.java b/backend/common/src/main/java/dev/rheinsw/common/controller/exception/handler/GlobalExceptionHandler.java similarity index 80% rename from backend/server/src/main/java/dev/rheinsw/server/common/controller/exception/handler/GlobalExceptionHandler.java rename to backend/common/src/main/java/dev/rheinsw/common/controller/exception/handler/GlobalExceptionHandler.java index 3c5ac03..19f47ee 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/common/controller/exception/handler/GlobalExceptionHandler.java +++ b/backend/common/src/main/java/dev/rheinsw/common/controller/exception/handler/GlobalExceptionHandler.java @@ -1,9 +1,10 @@ -package dev.rheinsw.server.common.controller.exception.handler; +package dev.rheinsw.common.controller.exception.handler; -import dev.rheinsw.server.common.controller.exception.ApiException; -import dev.rheinsw.server.common.usecase.exception.UseCaseException; +import dev.rheinsw.common.controller.exception.ApiException; +import dev.rheinsw.common.usecase.exception.UseCaseException; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; import java.time.Instant; import java.util.List; diff --git a/backend/server/src/main/java/dev/rheinsw/server/common/usecase/exception/UseCaseException.java b/backend/common/src/main/java/dev/rheinsw/common/usecase/exception/UseCaseException.java similarity index 85% rename from backend/server/src/main/java/dev/rheinsw/server/common/usecase/exception/UseCaseException.java rename to backend/common/src/main/java/dev/rheinsw/common/usecase/exception/UseCaseException.java index cdcc9b2..99908e2 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/common/usecase/exception/UseCaseException.java +++ b/backend/common/src/main/java/dev/rheinsw/common/usecase/exception/UseCaseException.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.common.usecase.exception; +package dev.rheinsw.common.usecase.exception; /** * @author Thatsaphorn Atchariyaphap diff --git a/backend/server/src/main/java/dev/rheinsw/server/contact/controller/ContactController.java b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/controller/ContactController.java similarity index 83% rename from backend/server/src/main/java/dev/rheinsw/server/contact/controller/ContactController.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/contact/controller/ContactController.java index b0b7d02..f9209e4 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/contact/controller/ContactController.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/controller/ContactController.java @@ -1,7 +1,7 @@ -package dev.rheinsw.server.contact.controller; +package dev.rheinsw.server.internal.contact.controller; -import dev.rheinsw.server.contact.model.ContactRequestDto; -import dev.rheinsw.server.contact.usecase.SubmitContactUseCase; +import dev.rheinsw.server.internal.contact.model.ContactRequestDto; +import dev.rheinsw.server.internal.contact.usecase.SubmitContactUseCase; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend/server/src/main/java/dev/rheinsw/server/contact/model/ContactRequest.java b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/model/ContactRequest.java similarity index 97% rename from backend/server/src/main/java/dev/rheinsw/server/contact/model/ContactRequest.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/contact/model/ContactRequest.java index e7dfd42..bbd639c 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/contact/model/ContactRequest.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/model/ContactRequest.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.contact.model; +package dev.rheinsw.server.internal.contact.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/backend/server/src/main/java/dev/rheinsw/server/contact/model/ContactRequestDto.java b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/model/ContactRequestDto.java similarity index 89% rename from backend/server/src/main/java/dev/rheinsw/server/contact/model/ContactRequestDto.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/contact/model/ContactRequestDto.java index 735f243..dd19904 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/contact/model/ContactRequestDto.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/model/ContactRequestDto.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.contact.model; +package dev.rheinsw.server.internal.contact.model; import dev.rheinsw.shared.transport.Dto; diff --git a/backend/server/src/main/java/dev/rheinsw/server/contact/model/HCaptchaConfig.java b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/model/HCaptchaConfig.java similarity index 88% rename from backend/server/src/main/java/dev/rheinsw/server/contact/model/HCaptchaConfig.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/contact/model/HCaptchaConfig.java index 50eaa46..04a99e4 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/contact/model/HCaptchaConfig.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/model/HCaptchaConfig.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.contact.model; +package dev.rheinsw.server.internal.contact.model; import lombok.Getter; import lombok.Setter; diff --git a/backend/server/src/main/java/dev/rheinsw/server/contact/repository/ContactRequestsRepo.java b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/repository/ContactRequestsRepo.java similarity index 65% rename from backend/server/src/main/java/dev/rheinsw/server/contact/repository/ContactRequestsRepo.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/contact/repository/ContactRequestsRepo.java index c40da15..6d99eef 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/contact/repository/ContactRequestsRepo.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/repository/ContactRequestsRepo.java @@ -1,6 +1,6 @@ -package dev.rheinsw.server.contact.repository; +package dev.rheinsw.server.internal.contact.repository; -import dev.rheinsw.server.contact.model.ContactRequest; +import dev.rheinsw.server.internal.contact.model.ContactRequest; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/backend/server/src/main/java/dev/rheinsw/server/contact/usecase/SubmitContactUseCase.java b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/usecase/SubmitContactUseCase.java similarity index 65% rename from backend/server/src/main/java/dev/rheinsw/server/contact/usecase/SubmitContactUseCase.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/contact/usecase/SubmitContactUseCase.java index 4095c6a..b05f799 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/contact/usecase/SubmitContactUseCase.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/usecase/SubmitContactUseCase.java @@ -1,6 +1,6 @@ -package dev.rheinsw.server.contact.usecase; +package dev.rheinsw.server.internal.contact.usecase; -import dev.rheinsw.server.contact.model.ContactRequestDto; +import dev.rheinsw.server.internal.contact.model.ContactRequestDto; import org.springframework.http.ResponseEntity; /** diff --git a/backend/server/src/main/java/dev/rheinsw/server/contact/usecase/SubmitContactUseCaseImpl.java b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/usecase/SubmitContactUseCaseImpl.java similarity index 91% rename from backend/server/src/main/java/dev/rheinsw/server/contact/usecase/SubmitContactUseCaseImpl.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/contact/usecase/SubmitContactUseCaseImpl.java index 2070caf..3fffe84 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/contact/usecase/SubmitContactUseCaseImpl.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/usecase/SubmitContactUseCaseImpl.java @@ -1,11 +1,11 @@ -package dev.rheinsw.server.contact.usecase; +package dev.rheinsw.server.internal.contact.usecase; -import dev.rheinsw.server.contact.model.ContactRequest; -import dev.rheinsw.server.contact.model.ContactRequestDto; -import dev.rheinsw.server.contact.repository.ContactRequestsRepo; -import dev.rheinsw.server.contact.util.HCaptchaValidator; -import dev.rheinsw.server.mail.domain.MailRequest; -import dev.rheinsw.server.mail.usecase.SendMailUseCase; +import dev.rheinsw.server.internal.contact.model.ContactRequest; +import dev.rheinsw.server.internal.contact.model.ContactRequestDto; +import dev.rheinsw.server.internal.contact.repository.ContactRequestsRepo; +import dev.rheinsw.server.internal.contact.util.HCaptchaValidator; +import dev.rheinsw.server.internal.mail.domain.MailRequest; +import dev.rheinsw.server.internal.mail.usecase.SendMailUseCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/backend/server/src/main/java/dev/rheinsw/server/contact/util/HCaptchaValidator.java b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/util/HCaptchaValidator.java similarity index 94% rename from backend/server/src/main/java/dev/rheinsw/server/contact/util/HCaptchaValidator.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/contact/util/HCaptchaValidator.java index 7390e45..383021f 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/contact/util/HCaptchaValidator.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/contact/util/HCaptchaValidator.java @@ -1,6 +1,6 @@ -package dev.rheinsw.server.contact.util; +package dev.rheinsw.server.internal.contact.util; -import dev.rheinsw.server.contact.model.HCaptchaConfig; +import dev.rheinsw.server.internal.contact.model.HCaptchaConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/backend/server/src/main/java/dev/rheinsw/server/customer/controller/CustomerController.java b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/controller/CustomerController.java similarity index 80% rename from backend/server/src/main/java/dev/rheinsw/server/customer/controller/CustomerController.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/customer/controller/CustomerController.java index 582a4ca..9ce230e 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/customer/controller/CustomerController.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/controller/CustomerController.java @@ -1,12 +1,12 @@ -package dev.rheinsw.server.customer.controller; +package dev.rheinsw.server.internal.customer.controller; -import dev.rheinsw.server.common.controller.AbstractController; -import dev.rheinsw.server.customer.dtos.CreateCustomerDto; -import dev.rheinsw.server.customer.dtos.CustomerValidationRequest; -import dev.rheinsw.server.customer.model.Customer; -import dev.rheinsw.server.customer.repository.CustomerRepository; -import dev.rheinsw.server.customer.usecase.LoadCustomerQuery; -import dev.rheinsw.server.customer.usecase.RegisterCustomerUseCase; +import dev.rheinsw.server.system.controller.AbstractController; +import dev.rheinsw.server.internal.customer.dtos.CreateCustomerDto; +import dev.rheinsw.server.internal.customer.dtos.CustomerValidationRequest; +import dev.rheinsw.server.internal.customer.model.Customer; +import dev.rheinsw.server.internal.customer.repository.CustomerRepository; +import dev.rheinsw.server.internal.customer.usecase.LoadCustomerQuery; +import dev.rheinsw.server.internal.customer.usecase.RegisterCustomerUseCase; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/server/src/main/java/dev/rheinsw/server/customer/dtos/CreateCustomerDto.java b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/dtos/CreateCustomerDto.java similarity index 63% rename from backend/server/src/main/java/dev/rheinsw/server/customer/dtos/CreateCustomerDto.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/customer/dtos/CreateCustomerDto.java index 8e12d30..0238b9e 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/customer/dtos/CreateCustomerDto.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/dtos/CreateCustomerDto.java @@ -1,7 +1,7 @@ -package dev.rheinsw.server.customer.dtos; +package dev.rheinsw.server.internal.customer.dtos; -import dev.rheinsw.server.customer.model.records.CustomerNote; -import dev.rheinsw.server.customer.model.records.CustomerPhoneNumber; +import dev.rheinsw.server.internal.customer.model.records.CustomerNote; +import dev.rheinsw.server.internal.customer.model.records.CustomerPhoneNumber; import java.util.List; diff --git a/backend/server/src/main/java/dev/rheinsw/server/customer/dtos/CustomerValidationRequest.java b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/dtos/CustomerValidationRequest.java similarity index 81% rename from backend/server/src/main/java/dev/rheinsw/server/customer/dtos/CustomerValidationRequest.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/customer/dtos/CustomerValidationRequest.java index f81f2f2..0430fa1 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/customer/dtos/CustomerValidationRequest.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/dtos/CustomerValidationRequest.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.customer.dtos; +package dev.rheinsw.server.internal.customer.dtos; /** * @author Thatsaphorn Atchariyaphap diff --git a/backend/server/src/main/java/dev/rheinsw/server/customer/model/Customer.java b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/model/Customer.java similarity index 75% rename from backend/server/src/main/java/dev/rheinsw/server/customer/model/Customer.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/customer/model/Customer.java index c67e66c..27946a6 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/customer/model/Customer.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/model/Customer.java @@ -1,9 +1,9 @@ -package dev.rheinsw.server.customer.model; +package dev.rheinsw.server.internal.customer.model; import com.vladmihalcea.hibernate.type.json.JsonType; -import dev.rheinsw.server.common.entity.BaseEntity; -import dev.rheinsw.server.customer.model.records.CustomerNote; -import dev.rheinsw.server.customer.model.records.CustomerPhoneNumber; +import dev.rheinsw.server.system.entity.BaseEntity; +import dev.rheinsw.server.internal.customer.model.records.CustomerNote; +import dev.rheinsw.server.internal.customer.model.records.CustomerPhoneNumber; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.Type; diff --git a/backend/server/src/main/java/dev/rheinsw/server/customer/model/records/CustomerNote.java b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/model/records/CustomerNote.java similarity index 80% rename from backend/server/src/main/java/dev/rheinsw/server/customer/model/records/CustomerNote.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/customer/model/records/CustomerNote.java index 8c8a2ac..39de043 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/customer/model/records/CustomerNote.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/model/records/CustomerNote.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.customer.model.records; +package dev.rheinsw.server.internal.customer.model.records; import java.time.Instant; diff --git a/backend/server/src/main/java/dev/rheinsw/server/customer/model/records/CustomerPhoneNumber.java b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/model/records/CustomerPhoneNumber.java similarity index 82% rename from backend/server/src/main/java/dev/rheinsw/server/customer/model/records/CustomerPhoneNumber.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/customer/model/records/CustomerPhoneNumber.java index 1d0863c..6a4be33 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/customer/model/records/CustomerPhoneNumber.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/model/records/CustomerPhoneNumber.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.customer.model.records; +package dev.rheinsw.server.internal.customer.model.records; import java.time.Instant; diff --git a/backend/server/src/main/java/dev/rheinsw/server/customer/repository/CustomerRepository.java b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/repository/CustomerRepository.java similarity index 90% rename from backend/server/src/main/java/dev/rheinsw/server/customer/repository/CustomerRepository.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/customer/repository/CustomerRepository.java index f493224..1954ecf 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/customer/repository/CustomerRepository.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/repository/CustomerRepository.java @@ -1,6 +1,6 @@ -package dev.rheinsw.server.customer.repository; +package dev.rheinsw.server.internal.customer.repository; -import dev.rheinsw.server.customer.model.Customer; +import dev.rheinsw.server.internal.customer.model.Customer; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/backend/server/src/main/java/dev/rheinsw/server/customer/usecase/CustomerUseCaseImpl.java b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/usecase/CustomerUseCaseImpl.java similarity index 79% rename from backend/server/src/main/java/dev/rheinsw/server/customer/usecase/CustomerUseCaseImpl.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/customer/usecase/CustomerUseCaseImpl.java index 4ada165..216c842 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/customer/usecase/CustomerUseCaseImpl.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/usecase/CustomerUseCaseImpl.java @@ -1,14 +1,12 @@ -package dev.rheinsw.server.customer.usecase; +package dev.rheinsw.server.internal.customer.usecase; -import dev.rheinsw.server.common.controller.exception.ApiException; -import dev.rheinsw.server.common.usecase.exception.UseCaseException; -import dev.rheinsw.server.customer.model.Customer; -import dev.rheinsw.server.customer.model.records.CustomerNote; -import dev.rheinsw.server.customer.model.records.CustomerPhoneNumber; -import dev.rheinsw.server.customer.repository.CustomerRepository; -import dev.rheinsw.server.common.entity.User; +import dev.rheinsw.common.usecase.exception.UseCaseException; +import dev.rheinsw.server.internal.customer.model.Customer; +import dev.rheinsw.server.internal.customer.model.records.CustomerNote; +import dev.rheinsw.server.internal.customer.model.records.CustomerPhoneNumber; +import dev.rheinsw.server.internal.customer.repository.CustomerRepository; +import dev.rheinsw.server.security.user.entity.User; import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import java.time.Instant; diff --git a/backend/server/src/main/java/dev/rheinsw/server/customer/usecase/LoadCustomerQuery.java b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/usecase/LoadCustomerQuery.java similarity index 65% rename from backend/server/src/main/java/dev/rheinsw/server/customer/usecase/LoadCustomerQuery.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/customer/usecase/LoadCustomerQuery.java index 944f386..51eb97c 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/customer/usecase/LoadCustomerQuery.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/usecase/LoadCustomerQuery.java @@ -1,6 +1,6 @@ -package dev.rheinsw.server.customer.usecase; +package dev.rheinsw.server.internal.customer.usecase; -import dev.rheinsw.server.customer.model.Customer; +import dev.rheinsw.server.internal.customer.model.Customer; import java.util.List; import java.util.UUID; diff --git a/backend/server/src/main/java/dev/rheinsw/server/customer/usecase/RegisterCustomerUseCase.java b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/usecase/RegisterCustomerUseCase.java similarity index 63% rename from backend/server/src/main/java/dev/rheinsw/server/customer/usecase/RegisterCustomerUseCase.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/customer/usecase/RegisterCustomerUseCase.java index 62b2b45..13813ce 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/customer/usecase/RegisterCustomerUseCase.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/customer/usecase/RegisterCustomerUseCase.java @@ -1,8 +1,8 @@ -package dev.rheinsw.server.customer.usecase; +package dev.rheinsw.server.internal.customer.usecase; -import dev.rheinsw.server.customer.model.records.CustomerNote; -import dev.rheinsw.server.customer.model.records.CustomerPhoneNumber; -import dev.rheinsw.server.common.entity.User; +import dev.rheinsw.server.internal.customer.model.records.CustomerNote; +import dev.rheinsw.server.internal.customer.model.records.CustomerPhoneNumber; +import dev.rheinsw.server.security.user.entity.User; import java.util.List; import java.util.UUID; diff --git a/backend/server/src/main/java/dev/rheinsw/server/demo/model/Demo.java b/backend/server/src/main/java/dev/rheinsw/server/internal/demo/model/Demo.java similarity index 89% rename from backend/server/src/main/java/dev/rheinsw/server/demo/model/Demo.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/demo/model/Demo.java index 3178e3e..81379f4 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/demo/model/Demo.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/demo/model/Demo.java @@ -1,6 +1,6 @@ -package dev.rheinsw.server.demo.model; +package dev.rheinsw.server.internal.demo.model; -import dev.rheinsw.server.customer.model.Customer; +import dev.rheinsw.server.internal.customer.model.Customer; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; diff --git a/backend/server/src/main/java/dev/rheinsw/server/demo/model/DemoAccess.java b/backend/server/src/main/java/dev/rheinsw/server/internal/demo/model/DemoAccess.java similarity index 90% rename from backend/server/src/main/java/dev/rheinsw/server/demo/model/DemoAccess.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/demo/model/DemoAccess.java index 351a514..90576a5 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/demo/model/DemoAccess.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/demo/model/DemoAccess.java @@ -1,6 +1,6 @@ -package dev.rheinsw.server.demo.model; +package dev.rheinsw.server.internal.demo.model; -import dev.rheinsw.server.customer.model.Customer; +import dev.rheinsw.server.internal.customer.model.Customer; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; diff --git a/backend/server/src/main/java/dev/rheinsw/server/demo/model/DemoAccessHistory.java b/backend/server/src/main/java/dev/rheinsw/server/internal/demo/model/DemoAccessHistory.java similarity index 94% rename from backend/server/src/main/java/dev/rheinsw/server/demo/model/DemoAccessHistory.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/demo/model/DemoAccessHistory.java index 2126fed..3ef05ec 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/demo/model/DemoAccessHistory.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/demo/model/DemoAccessHistory.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.demo.model; +package dev.rheinsw.server.internal.demo.model; import jakarta.persistence.Entity; import jakarta.persistence.Id; diff --git a/backend/server/src/main/java/dev/rheinsw/server/mail/controller/MailController.java b/backend/server/src/main/java/dev/rheinsw/server/internal/mail/controller/MailController.java similarity index 80% rename from backend/server/src/main/java/dev/rheinsw/server/mail/controller/MailController.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/mail/controller/MailController.java index a15a8b0..927c37a 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/mail/controller/MailController.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/mail/controller/MailController.java @@ -1,7 +1,7 @@ -package dev.rheinsw.server.mail.controller; +package dev.rheinsw.server.internal.mail.controller; -import dev.rheinsw.server.mail.usecase.SendMailUseCase; -import dev.rheinsw.server.mail.domain.MailRequest; +import dev.rheinsw.server.internal.mail.usecase.SendMailUseCase; +import dev.rheinsw.server.internal.mail.domain.MailRequest; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; diff --git a/backend/server/src/main/java/dev/rheinsw/server/mail/domain/MailRequest.java b/backend/server/src/main/java/dev/rheinsw/server/internal/mail/domain/MailRequest.java similarity index 87% rename from backend/server/src/main/java/dev/rheinsw/server/mail/domain/MailRequest.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/mail/domain/MailRequest.java index 70f5699..ffd6be7 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/mail/domain/MailRequest.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/mail/domain/MailRequest.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.mail.domain; +package dev.rheinsw.server.internal.mail.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/backend/server/src/main/java/dev/rheinsw/server/mail/usecase/ISendMailUseCase.java b/backend/server/src/main/java/dev/rheinsw/server/internal/mail/usecase/ISendMailUseCase.java similarity index 65% rename from backend/server/src/main/java/dev/rheinsw/server/mail/usecase/ISendMailUseCase.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/mail/usecase/ISendMailUseCase.java index 51402b3..9d5049c 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/mail/usecase/ISendMailUseCase.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/mail/usecase/ISendMailUseCase.java @@ -1,6 +1,6 @@ -package dev.rheinsw.server.mail.usecase; +package dev.rheinsw.server.internal.mail.usecase; -import dev.rheinsw.server.mail.domain.MailRequest; +import dev.rheinsw.server.internal.mail.domain.MailRequest; import org.springframework.http.ResponseEntity; /** diff --git a/backend/server/src/main/java/dev/rheinsw/server/mail/usecase/SendMailUseCase.java b/backend/server/src/main/java/dev/rheinsw/server/internal/mail/usecase/SendMailUseCase.java similarity index 92% rename from backend/server/src/main/java/dev/rheinsw/server/mail/usecase/SendMailUseCase.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/mail/usecase/SendMailUseCase.java index 50080fb..9141967 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/mail/usecase/SendMailUseCase.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/mail/usecase/SendMailUseCase.java @@ -1,7 +1,7 @@ -package dev.rheinsw.server.mail.usecase; +package dev.rheinsw.server.internal.mail.usecase; -import dev.rheinsw.server.mail.domain.MailRequest; +import dev.rheinsw.server.internal.mail.domain.MailRequest; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import org.springframework.http.ResponseEntity; diff --git a/backend/server/src/main/java/dev/rheinsw/server/project/controller/ProjectController.java b/backend/server/src/main/java/dev/rheinsw/server/internal/project/controller/ProjectController.java similarity index 82% rename from backend/server/src/main/java/dev/rheinsw/server/project/controller/ProjectController.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/project/controller/ProjectController.java index d6db837..c222c7e 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/project/controller/ProjectController.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/project/controller/ProjectController.java @@ -1,10 +1,10 @@ -package dev.rheinsw.server.project.controller; +package dev.rheinsw.server.internal.project.controller; -import dev.rheinsw.server.common.controller.AbstractController; -import dev.rheinsw.server.project.model.CreateCustomerProjectDto; -import dev.rheinsw.server.project.model.Project; -import dev.rheinsw.server.project.model.records.ProjectNote; -import dev.rheinsw.server.project.usecase.ProjectUseCaseImpl; +import dev.rheinsw.server.system.controller.AbstractController; +import dev.rheinsw.server.internal.project.model.CreateCustomerProjectDto; +import dev.rheinsw.server.internal.project.model.Project; +import dev.rheinsw.server.internal.project.model.records.ProjectNote; +import dev.rheinsw.server.internal.project.usecase.ProjectUseCaseImpl; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/server/src/main/java/dev/rheinsw/server/project/model/CreateCustomerProjectDto.java b/backend/server/src/main/java/dev/rheinsw/server/internal/project/model/CreateCustomerProjectDto.java similarity index 83% rename from backend/server/src/main/java/dev/rheinsw/server/project/model/CreateCustomerProjectDto.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/project/model/CreateCustomerProjectDto.java index 6b6971c..3704f1c 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/project/model/CreateCustomerProjectDto.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/project/model/CreateCustomerProjectDto.java @@ -1,6 +1,6 @@ -package dev.rheinsw.server.project.model; +package dev.rheinsw.server.internal.project.model; -import dev.rheinsw.server.project.model.enums.ProjectStatus; +import dev.rheinsw.server.internal.project.model.enums.ProjectStatus; import java.time.LocalDate; import java.util.List; diff --git a/backend/server/src/main/java/dev/rheinsw/server/project/model/Project.java b/backend/server/src/main/java/dev/rheinsw/server/internal/project/model/Project.java similarity index 80% rename from backend/server/src/main/java/dev/rheinsw/server/project/model/Project.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/project/model/Project.java index 3b8c599..d518300 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/project/model/Project.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/project/model/Project.java @@ -1,9 +1,9 @@ -package dev.rheinsw.server.project.model; +package dev.rheinsw.server.internal.project.model; import com.vladmihalcea.hibernate.type.json.JsonType; -import dev.rheinsw.server.common.entity.BaseEntity; -import dev.rheinsw.server.project.model.enums.ProjectStatus; -import dev.rheinsw.server.project.model.records.ProjectNote; +import dev.rheinsw.server.system.entity.BaseEntity; +import dev.rheinsw.server.internal.project.model.enums.ProjectStatus; +import dev.rheinsw.server.internal.project.model.records.ProjectNote; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -17,7 +17,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.Type; -import java.time.Instant; import java.util.List; import java.util.UUID; diff --git a/backend/server/src/main/java/dev/rheinsw/server/project/model/enums/ProjectStatus.java b/backend/server/src/main/java/dev/rheinsw/server/internal/project/model/enums/ProjectStatus.java similarity index 74% rename from backend/server/src/main/java/dev/rheinsw/server/project/model/enums/ProjectStatus.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/project/model/enums/ProjectStatus.java index f38868c..b567cd0 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/project/model/enums/ProjectStatus.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/project/model/enums/ProjectStatus.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.project.model.enums; +package dev.rheinsw.server.internal.project.model.enums; /** * @author Thatsaphorn Atchariyaphap diff --git a/backend/server/src/main/java/dev/rheinsw/server/project/model/records/ProjectNote.java b/backend/server/src/main/java/dev/rheinsw/server/internal/project/model/records/ProjectNote.java similarity index 83% rename from backend/server/src/main/java/dev/rheinsw/server/project/model/records/ProjectNote.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/project/model/records/ProjectNote.java index de00929..b1d56d8 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/project/model/records/ProjectNote.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/project/model/records/ProjectNote.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.project.model.records; +package dev.rheinsw.server.internal.project.model.records; import java.time.Instant; diff --git a/backend/server/src/main/java/dev/rheinsw/server/project/repository/ProjectRepository.java b/backend/server/src/main/java/dev/rheinsw/server/internal/project/repository/ProjectRepository.java similarity index 67% rename from backend/server/src/main/java/dev/rheinsw/server/project/repository/ProjectRepository.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/project/repository/ProjectRepository.java index 93750d2..6de6447 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/project/repository/ProjectRepository.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/project/repository/ProjectRepository.java @@ -1,7 +1,6 @@ -package dev.rheinsw.server.project.repository; +package dev.rheinsw.server.internal.project.repository; -import dev.rheinsw.server.customer.model.Customer; -import dev.rheinsw.server.project.model.Project; +import dev.rheinsw.server.internal.project.model.Project; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/backend/server/src/main/java/dev/rheinsw/server/project/usecase/CreateProjectUseCase.java b/backend/server/src/main/java/dev/rheinsw/server/internal/project/usecase/CreateProjectUseCase.java similarity index 59% rename from backend/server/src/main/java/dev/rheinsw/server/project/usecase/CreateProjectUseCase.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/project/usecase/CreateProjectUseCase.java index a66463d..55fa37a 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/project/usecase/CreateProjectUseCase.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/project/usecase/CreateProjectUseCase.java @@ -1,8 +1,8 @@ -package dev.rheinsw.server.project.usecase; +package dev.rheinsw.server.internal.project.usecase; -import dev.rheinsw.server.common.entity.User; -import dev.rheinsw.server.project.model.enums.ProjectStatus; -import dev.rheinsw.server.project.model.records.ProjectNote; +import dev.rheinsw.server.security.user.entity.User; +import dev.rheinsw.server.internal.project.model.enums.ProjectStatus; +import dev.rheinsw.server.internal.project.model.records.ProjectNote; import java.util.List; import java.util.UUID; diff --git a/backend/server/src/main/java/dev/rheinsw/server/project/usecase/LoadProjectUseCase.java b/backend/server/src/main/java/dev/rheinsw/server/internal/project/usecase/LoadProjectUseCase.java similarity index 69% rename from backend/server/src/main/java/dev/rheinsw/server/project/usecase/LoadProjectUseCase.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/project/usecase/LoadProjectUseCase.java index a8cf1b4..f0b0436 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/project/usecase/LoadProjectUseCase.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/project/usecase/LoadProjectUseCase.java @@ -1,6 +1,6 @@ -package dev.rheinsw.server.project.usecase; +package dev.rheinsw.server.internal.project.usecase; -import dev.rheinsw.server.project.model.Project; +import dev.rheinsw.server.internal.project.model.Project; import java.util.List; import java.util.UUID; diff --git a/backend/server/src/main/java/dev/rheinsw/server/project/usecase/ProjectUseCaseImpl.java b/backend/server/src/main/java/dev/rheinsw/server/internal/project/usecase/ProjectUseCaseImpl.java similarity index 79% rename from backend/server/src/main/java/dev/rheinsw/server/project/usecase/ProjectUseCaseImpl.java rename to backend/server/src/main/java/dev/rheinsw/server/internal/project/usecase/ProjectUseCaseImpl.java index 602e216..6e911b1 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/project/usecase/ProjectUseCaseImpl.java +++ b/backend/server/src/main/java/dev/rheinsw/server/internal/project/usecase/ProjectUseCaseImpl.java @@ -1,10 +1,10 @@ -package dev.rheinsw.server.project.usecase; +package dev.rheinsw.server.internal.project.usecase; -import dev.rheinsw.server.common.entity.User; -import dev.rheinsw.server.project.model.Project; -import dev.rheinsw.server.project.model.enums.ProjectStatus; -import dev.rheinsw.server.project.model.records.ProjectNote; -import dev.rheinsw.server.project.repository.ProjectRepository; +import dev.rheinsw.server.security.user.entity.User; +import dev.rheinsw.server.internal.project.model.Project; +import dev.rheinsw.server.internal.project.model.enums.ProjectStatus; +import dev.rheinsw.server.internal.project.model.records.ProjectNote; +import dev.rheinsw.server.internal.project.repository.ProjectRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/backend/server/src/main/java/dev/rheinsw/server/security/user/UserService.java b/backend/server/src/main/java/dev/rheinsw/server/security/user/UserService.java index 22a0dbf..cf66518 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/security/user/UserService.java +++ b/backend/server/src/main/java/dev/rheinsw/server/security/user/UserService.java @@ -1,6 +1,6 @@ package dev.rheinsw.server.security.user; -import dev.rheinsw.server.common.entity.User; +import dev.rheinsw.server.security.user.entity.User; import dev.rheinsw.server.security.session.model.CurrentSession; import dev.rheinsw.server.security.user.repository.UserRepository; import jakarta.transaction.Transactional; diff --git a/backend/server/src/main/java/dev/rheinsw/server/common/entity/User.java b/backend/server/src/main/java/dev/rheinsw/server/security/user/entity/User.java similarity index 97% rename from backend/server/src/main/java/dev/rheinsw/server/common/entity/User.java rename to backend/server/src/main/java/dev/rheinsw/server/security/user/entity/User.java index 9e8aa90..93cba55 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/common/entity/User.java +++ b/backend/server/src/main/java/dev/rheinsw/server/security/user/entity/User.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.common.entity; +package dev.rheinsw.server.security.user.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/backend/server/src/main/java/dev/rheinsw/server/security/user/repository/UserRepository.java b/backend/server/src/main/java/dev/rheinsw/server/security/user/repository/UserRepository.java index 81637e2..aae6a13 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/security/user/repository/UserRepository.java +++ b/backend/server/src/main/java/dev/rheinsw/server/security/user/repository/UserRepository.java @@ -1,6 +1,6 @@ package dev.rheinsw.server.security.user.repository; -import dev.rheinsw.server.common.entity.User; +import dev.rheinsw.server.security.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/backend/server/src/main/java/dev/rheinsw/server/common/controller/AbstractController.java b/backend/server/src/main/java/dev/rheinsw/server/system/controller/AbstractController.java similarity index 91% rename from backend/server/src/main/java/dev/rheinsw/server/common/controller/AbstractController.java rename to backend/server/src/main/java/dev/rheinsw/server/system/controller/AbstractController.java index 2e96982..3bfdcef 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/common/controller/AbstractController.java +++ b/backend/server/src/main/java/dev/rheinsw/server/system/controller/AbstractController.java @@ -1,9 +1,9 @@ -package dev.rheinsw.server.common.controller; +package dev.rheinsw.server.system.controller; import dev.rheinsw.server.security.session.CurrentSessionProvider; import dev.rheinsw.server.security.session.model.CurrentSession; import dev.rheinsw.server.security.user.UserService; -import dev.rheinsw.server.common.entity.User; +import dev.rheinsw.server.security.user.entity.User; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/backend/server/src/main/java/dev/rheinsw/server/common/entity/BaseEntity.java b/backend/server/src/main/java/dev/rheinsw/server/system/entity/BaseEntity.java similarity index 96% rename from backend/server/src/main/java/dev/rheinsw/server/common/entity/BaseEntity.java rename to backend/server/src/main/java/dev/rheinsw/server/system/entity/BaseEntity.java index ba42a9f..1b495d8 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/common/entity/BaseEntity.java +++ b/backend/server/src/main/java/dev/rheinsw/server/system/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.common.entity; +package dev.rheinsw.server.system.entity; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; diff --git a/backend/server/src/main/java/dev/rheinsw/server/common/entity/config/JpaAuditingConfig.java b/backend/server/src/main/java/dev/rheinsw/server/system/entity/config/JpaAuditingConfig.java similarity index 86% rename from backend/server/src/main/java/dev/rheinsw/server/common/entity/config/JpaAuditingConfig.java rename to backend/server/src/main/java/dev/rheinsw/server/system/entity/config/JpaAuditingConfig.java index 0cecdc8..f508738 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/common/entity/config/JpaAuditingConfig.java +++ b/backend/server/src/main/java/dev/rheinsw/server/system/entity/config/JpaAuditingConfig.java @@ -1,4 +1,4 @@ -package dev.rheinsw.server.common.entity.config; +package dev.rheinsw.server.system.entity.config; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;