From 90ea282e8024427d73bb216ecf8721b380291fdb Mon Sep 17 00:00:00 2001 From: miyabayt <4364793+miyabayt@users.noreply.github.com> Date: Fri, 3 Feb 2023 21:31:12 +0900 Subject: [PATCH] refactor: rename packages --- .../lambda/controller/auth/AuthController.java | 2 +- .../codecategories/CodeCategoryController.java | 8 ++++---- .../codecategories/CodeCategoryCsv.java | 2 +- .../codecategories/CodeCategoryRequest.java | 2 +- .../DeleteCodeCategoryRequest.java | 2 +- .../SearchCodeCategoryRequest.java | 2 +- .../{system => }/codes/CodeController.java | 12 ++++++------ .../controller/{system => }/codes/CodeCsv.java | 2 +- .../{system => }/codes/CodeRequest.java | 2 +- .../{system => }/codes/DeleteCodeRequest.java | 2 +- .../{system => }/codes/SearchCodeRequest.java | 2 +- .../holidays/DeleteHolidayRequest.java | 2 +- .../{system => }/holidays/HolidayController.java | 8 ++++---- .../{system => }/holidays/HolidayCsv.java | 2 +- .../{system => }/holidays/HolidayRequest.java | 2 +- .../holidays/SearchHolidayRequest.java | 2 +- .../mailtemplates/DeleteMailTemplateRequest.java | 2 +- .../mailtemplates/MailTemplateController.java | 8 ++++---- .../mailtemplates/MailTemplateCsv.java | 2 +- .../mailtemplates/MailTemplateRequest.java | 2 +- .../mailtemplates/SearchMailTemplateRequest.java | 2 +- .../{system => }/roles/DeleteRoleRequest.java | 2 +- .../{system => }/roles/RoleController.java | 12 ++++++------ .../controller/{system => }/roles/RoleCsv.java | 2 +- .../{system => }/roles/RoleRequest.java | 2 +- .../{system => }/roles/SearchRoleRequest.java | 2 +- .../{system => }/staffs/DeleteStaffRequest.java | 2 +- .../{system => }/staffs/SearchStaffRequest.java | 2 +- .../{system => }/staffs/StaffController.java | 8 ++++---- .../controller/{system => }/staffs/StaffCsv.java | 2 +- .../{system => }/staffs/StaffRequest.java | 2 +- .../uploadfiles/UploadFileController.java | 2 +- .../users/{users => }/DeleteUserRequest.java | 2 +- .../users/{users => }/SearchUserRequest.java | 2 +- .../users/{users => }/UserController.java | 8 ++++---- .../controller/users/{users => }/UserCsv.java | 2 +- .../users/{users => }/UserRequest.java | 2 +- .../lambda/domain/model/{system => }/Code.java | 2 +- .../domain/model/{system => }/CodeCategory.java | 2 +- .../model/{system => }/CodeCategoryCriteria.java | 2 +- .../domain/model/{system => }/CodeCriteria.java | 2 +- .../domain/model/{system => }/Holiday.java | 2 +- .../model/{system => }/HolidayCriteria.java | 2 +- .../domain/model/{system => }/MailTemplate.java | 2 +- .../model/{system => }/MailTemplateCriteria.java | 2 +- .../domain/model/{system => }/Permission.java | 2 +- .../model/{system => }/PermissionCriteria.java | 2 +- .../lambda/domain/model/{system => }/Role.java | 2 +- .../domain/model/{system => }/RoleCriteria.java | 2 +- .../model/{system => }/RolePermission.java | 2 +- .../{system => }/RolePermissionCriteria.java | 2 +- .../lambda/domain/model/{system => }/Staff.java | 2 +- .../domain/model/{system => }/StaffCriteria.java | 2 +- .../domain/model/{system => }/StaffRole.java | 2 +- .../model/{system => }/StaffRoleCriteria.java | 2 +- .../domain/model/{system => }/UploadFile.java | 2 +- .../lambda/domain/model/{users => }/User.java | 2 +- .../domain/model/{users => }/UserCriteria.java | 2 +- .../domain/model/{users => }/UserRole.java | 2 +- .../{system => }/CodeCategoryRepository.java | 4 ++-- .../{system => }/CodeCategorySpecifications.java | 4 ++-- .../repository/{system => }/CodeRepository.java | 4 ++-- .../{system => }/CodeSpecifications.java | 4 ++-- .../{system => }/HolidayRepository.java | 4 ++-- .../{system => }/HolidaySpecifications.java | 4 ++-- .../{system => }/MailTemplateRepository.java | 4 ++-- .../{system => }/MailTemplateSpecifications.java | 4 ++-- .../{system => }/PermissionRepository.java | 4 ++-- .../{system => }/PermissionSpecifications.java | 4 ++-- .../{system => }/RolePermissionRepository.java | 4 ++-- .../RolePermissionSpecifications.java | 4 ++-- .../repository/{system => }/RoleRepository.java | 4 ++-- .../{system => }/RoleSpecifications.java | 4 ++-- .../repository/{system => }/StaffRepository.java | 4 ++-- .../{system => }/StaffRoleRepository.java | 4 ++-- .../{system => }/StaffRoleSpecifications.java | 4 ++-- .../{system => }/StaffSpecifications.java | 4 ++-- .../repository/{users => }/UserRepository.java | 4 ++-- .../{users => }/UserSpecifications.java | 4 ++-- .../{system => }/CodeCategoryService.java | 12 ++++++------ .../domain/service/{system => }/CodeService.java | 16 ++++++++-------- .../service/{system => }/HolidayService.java | 12 ++++++------ .../{system => }/MailTemplateService.java | 10 +++++----- .../service/{system => }/PermissionService.java | 12 ++++++------ .../domain/service/{system => }/RoleService.java | 16 +++++++++------- .../service/{system => }/StaffService.java | 10 +++++----- .../domain/service/{users => }/UserService.java | 10 +++++----- .../security/RedisRefreshTokenPersistence.java | 10 +++++----- .../StaffRoleAuthenticationProvider.java | 10 +++++----- 89 files changed, 184 insertions(+), 182 deletions(-) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/codecategories/CodeCategoryController.java (96%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/codecategories/CodeCategoryCsv.java (91%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/codecategories/CodeCategoryRequest.java (84%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/codecategories/DeleteCodeCategoryRequest.java (75%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/codecategories/SearchCodeCategoryRequest.java (81%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/codes/CodeController.java (95%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/codes/CodeCsv.java (94%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/codes/CodeRequest.java (89%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/codes/DeleteCodeRequest.java (76%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/codes/SearchCodeRequest.java (84%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/holidays/DeleteHolidayRequest.java (76%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/holidays/HolidayController.java (96%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/holidays/HolidayCsv.java (92%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/holidays/HolidayRequest.java (85%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/holidays/SearchHolidayRequest.java (84%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/mailtemplates/DeleteMailTemplateRequest.java (75%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/mailtemplates/MailTemplateController.java (97%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/mailtemplates/MailTemplateCsv.java (92%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/mailtemplates/MailTemplateRequest.java (87%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/mailtemplates/SearchMailTemplateRequest.java (87%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/roles/DeleteRoleRequest.java (76%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/roles/RoleController.java (96%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/roles/RoleCsv.java (91%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/roles/RoleRequest.java (87%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/roles/SearchRoleRequest.java (84%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/staffs/DeleteStaffRequest.java (76%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/staffs/SearchStaffRequest.java (86%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/staffs/StaffController.java (97%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/staffs/StaffCsv.java (93%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/staffs/StaffRequest.java (90%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/{system => }/uploadfiles/UploadFileController.java (97%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/{users => }/DeleteUserRequest.java (96%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/{users => }/SearchUserRequest.java (98%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/{users => }/UserController.java (97%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/{users => }/UserCsv.java (99%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/{users => }/UserRequest.java (98%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/Code.java (92%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/CodeCategory.java (89%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/CodeCategoryCriteria.java (71%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/CodeCriteria.java (68%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/Holiday.java (89%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/HolidayCriteria.java (81%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/MailTemplate.java (90%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/MailTemplateCriteria.java (71%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/Permission.java (89%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/PermissionCriteria.java (70%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/Role.java (93%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/RoleCriteria.java (68%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/RolePermission.java (89%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/RolePermissionCriteria.java (71%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/Staff.java (93%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/StaffCriteria.java (69%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/StaffRole.java (89%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/StaffRoleCriteria.java (70%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{system => }/UploadFile.java (91%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{users => }/User.java (92%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{users => }/UserCriteria.java (78%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/{users => }/UserRole.java (90%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/CodeCategoryRepository.java (88%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/CodeCategorySpecifications.java (88%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/CodeRepository.java (88%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/CodeSpecifications.java (88%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/HolidayRepository.java (88%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/HolidaySpecifications.java (89%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/MailTemplateRepository.java (89%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/MailTemplateSpecifications.java (90%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/PermissionRepository.java (89%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/PermissionSpecifications.java (88%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/RolePermissionRepository.java (90%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/RolePermissionSpecifications.java (87%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/RoleRepository.java (89%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/RoleSpecifications.java (88%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/StaffRepository.java (88%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/StaffRoleRepository.java (88%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/StaffRoleSpecifications.java (83%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{system => }/StaffSpecifications.java (90%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{users => }/UserRepository.java (88%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/{users => }/UserSpecifications.java (91%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/{system => }/CodeCategoryService.java (92%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/{system => }/CodeService.java (92%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/{system => }/HolidayService.java (92%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/{system => }/MailTemplateService.java (94%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/{system => }/PermissionService.java (92%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/{system => }/RoleService.java (93%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/{system => }/StaffService.java (94%) rename src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/{users => }/UserService.java (94%) diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/auth/AuthController.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/auth/AuthController.java index fd4d80d..ce2dcdf 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/auth/AuthController.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/auth/AuthController.java @@ -3,7 +3,7 @@ import com.bigtreetc.sample.micronaut.aws.lambda.base.exception.NoDataFoundException; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.AbstractRestController; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.StaffRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.StaffRepository; import com.nimbusds.jwt.JWTParser; import io.micronaut.http.HttpRequest; import io.micronaut.http.MutableHttpResponse; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryController.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryController.java similarity index 96% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryController.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryController.java index b53a2d0..68af205 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryController.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryController.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories; import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission; import com.bigtreetc.sample.micronaut.aws.lambda.base.util.CsvUtils; @@ -6,9 +6,9 @@ import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCategory; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCategoryCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.CodeCategoryService; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCategory; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCategoryCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.CodeCategoryService; import io.micronaut.data.model.Pageable; import io.micronaut.http.HttpResponse; import io.micronaut.http.MediaType; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryCsv.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryCsv.java similarity index 91% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryCsv.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryCsv.java index f2f6aca..e91d350 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryCsv.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryCsv.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryRequest.java similarity index 84% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryRequest.java index f52b281..89370eb 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories; import io.micronaut.core.annotation.Introspected; import java.util.UUID; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/DeleteCodeCategoryRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/DeleteCodeCategoryRequest.java similarity index 75% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/DeleteCodeCategoryRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/DeleteCodeCategoryRequest.java index acb6c46..43ef2c0 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/DeleteCodeCategoryRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/DeleteCodeCategoryRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories; import io.micronaut.core.annotation.Introspected; import java.util.UUID; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/SearchCodeCategoryRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/SearchCodeCategoryRequest.java similarity index 81% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/SearchCodeCategoryRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/SearchCodeCategoryRequest.java index 28e52c8..d5a85ee 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/SearchCodeCategoryRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/SearchCodeCategoryRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories; import io.micronaut.core.annotation.Introspected; import io.micronaut.core.annotation.Nullable; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeController.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeController.java similarity index 95% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeController.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeController.java index db7de57..6551700 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeController.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeController.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codes; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.codes; import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission; import com.bigtreetc.sample.micronaut.aws.lambda.base.util.CsvUtils; @@ -6,11 +6,11 @@ import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam; -import com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories.CodeCategoryCsv; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Code; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.CodeCategoryService; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.CodeService; +import com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories.CodeCategoryCsv; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Code; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.CodeCategoryService; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.CodeService; import io.micronaut.data.model.Pageable; import io.micronaut.http.HttpResponse; import io.micronaut.http.MediaType; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeCsv.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeCsv.java similarity index 94% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeCsv.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeCsv.java index b37d6e8..a9d2b82 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeCsv.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeCsv.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codes; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.codes; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeRequest.java similarity index 89% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeRequest.java index c5b1c22..7b904bf 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codes; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.codes; import io.micronaut.core.annotation.Introspected; import java.util.UUID; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/DeleteCodeRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/DeleteCodeRequest.java similarity index 76% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/DeleteCodeRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/DeleteCodeRequest.java index cf5a6c4..79353cc 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/DeleteCodeRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/DeleteCodeRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codes; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.codes; import io.micronaut.core.annotation.Introspected; import java.util.UUID; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/SearchCodeRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/SearchCodeRequest.java similarity index 84% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/SearchCodeRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/SearchCodeRequest.java index 3569954..8bcb259 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/SearchCodeRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/SearchCodeRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codes; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.codes; import io.micronaut.core.annotation.Introspected; import io.micronaut.core.annotation.Nullable; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/DeleteHolidayRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/DeleteHolidayRequest.java similarity index 76% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/DeleteHolidayRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/DeleteHolidayRequest.java index 1678008..999dfd5 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/DeleteHolidayRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/DeleteHolidayRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.holidays; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.holidays; import io.micronaut.core.annotation.Introspected; import java.util.UUID; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayController.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayController.java similarity index 96% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayController.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayController.java index 1201b1d..54c6493 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayController.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayController.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.holidays; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.holidays; import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission; import com.bigtreetc.sample.micronaut.aws.lambda.base.util.CsvUtils; @@ -6,9 +6,9 @@ import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Holiday; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.HolidayCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.HolidayService; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Holiday; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.HolidayCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.HolidayService; import io.micronaut.data.model.Pageable; import io.micronaut.http.HttpResponse; import io.micronaut.http.MediaType; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayCsv.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayCsv.java similarity index 92% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayCsv.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayCsv.java index bf6d109..89bec79 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayCsv.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayCsv.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.holidays; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.holidays; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayRequest.java similarity index 85% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayRequest.java index 3501e20..5e7523e 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.holidays; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.holidays; import io.micronaut.core.annotation.Introspected; import java.time.LocalDate; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/SearchHolidayRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/SearchHolidayRequest.java similarity index 84% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/SearchHolidayRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/SearchHolidayRequest.java index a269feb..3096ce9 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/SearchHolidayRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/SearchHolidayRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.holidays; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.holidays; import io.micronaut.core.annotation.Introspected; import io.micronaut.core.annotation.Nullable; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/DeleteMailTemplateRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/DeleteMailTemplateRequest.java similarity index 75% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/DeleteMailTemplateRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/DeleteMailTemplateRequest.java index df996b0..95f56bf 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/DeleteMailTemplateRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/DeleteMailTemplateRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.mailtemplates; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.mailtemplates; import io.micronaut.core.annotation.Introspected; import java.util.UUID; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateController.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateController.java similarity index 97% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateController.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateController.java index 2cbacf3..91d79c9 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateController.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateController.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.mailtemplates; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.mailtemplates; import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission; import com.bigtreetc.sample.micronaut.aws.lambda.base.util.CsvUtils; @@ -6,9 +6,9 @@ import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.MailTemplate; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.MailTemplateCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.MailTemplateService; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.MailTemplate; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.MailTemplateCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.MailTemplateService; import io.micronaut.data.model.Pageable; import io.micronaut.http.HttpResponse; import io.micronaut.http.MediaType; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateCsv.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateCsv.java similarity index 92% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateCsv.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateCsv.java index 315d08b..be52770 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateCsv.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateCsv.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.mailtemplates; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.mailtemplates; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateRequest.java similarity index 87% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateRequest.java index 933d562..076df4b 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.mailtemplates; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.mailtemplates; import io.micronaut.core.annotation.Introspected; import java.util.UUID; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/SearchMailTemplateRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/SearchMailTemplateRequest.java similarity index 87% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/SearchMailTemplateRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/SearchMailTemplateRequest.java index 40fd6d6..b28d0ac 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/SearchMailTemplateRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/SearchMailTemplateRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.mailtemplates; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.mailtemplates; import io.micronaut.core.annotation.Introspected; import io.micronaut.core.annotation.Nullable; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/DeleteRoleRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/DeleteRoleRequest.java similarity index 76% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/DeleteRoleRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/DeleteRoleRequest.java index e3a767f..f65c96c 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/DeleteRoleRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/DeleteRoleRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.roles; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.roles; import io.micronaut.core.annotation.Introspected; import java.util.UUID; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleController.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleController.java similarity index 96% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleController.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleController.java index 2eacfca..dacdf34 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleController.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleController.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.roles; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.roles; import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission; import com.bigtreetc.sample.micronaut.aws.lambda.base.util.CsvUtils; @@ -6,11 +6,11 @@ import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Role; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.RoleCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.RolePermission; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.PermissionService; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.RoleService; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Role; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.RoleCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.RolePermission; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.PermissionService; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.RoleService; import io.micronaut.data.model.Pageable; import io.micronaut.http.HttpResponse; import io.micronaut.http.MediaType; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleCsv.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleCsv.java similarity index 91% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleCsv.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleCsv.java index 13a930a..2ed011d 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleCsv.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleCsv.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.roles; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.roles; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleRequest.java similarity index 87% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleRequest.java index 6afd82d..c5551b1 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.roles; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.roles; import io.micronaut.core.annotation.Introspected; import java.util.HashMap; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/SearchRoleRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/SearchRoleRequest.java similarity index 84% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/SearchRoleRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/SearchRoleRequest.java index fa1ee9a..e0184b3 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/SearchRoleRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/SearchRoleRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.roles; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.roles; import io.micronaut.core.annotation.Introspected; import io.micronaut.core.annotation.Nullable; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/DeleteStaffRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/DeleteStaffRequest.java similarity index 76% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/DeleteStaffRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/DeleteStaffRequest.java index f52f3a0..f1a8773 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/DeleteStaffRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/DeleteStaffRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.staffs; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.staffs; import io.micronaut.core.annotation.Introspected; import java.util.UUID; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/SearchStaffRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/SearchStaffRequest.java similarity index 86% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/SearchStaffRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/SearchStaffRequest.java index 20126d2..f22acee 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/SearchStaffRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/SearchStaffRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.staffs; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.staffs; import io.micronaut.core.annotation.Introspected; import io.micronaut.core.annotation.Nullable; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffController.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffController.java similarity index 97% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffController.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffController.java index d722316..9ec8cac 100755 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffController.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffController.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.staffs; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.staffs; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isNotEmpty; @@ -8,9 +8,9 @@ import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Staff; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.StaffCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.StaffService; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Staff; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.StaffCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.StaffService; import io.micronaut.data.model.Pageable; import io.micronaut.http.HttpResponse; import io.micronaut.http.MediaType; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffCsv.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffCsv.java similarity index 93% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffCsv.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffCsv.java index 3a53746..8b120ea 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffCsv.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffCsv.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.staffs; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.staffs; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffRequest.java similarity index 90% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffRequest.java index 9ef3dd5..74caf72 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.staffs; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.staffs; import io.micronaut.core.annotation.Introspected; import java.util.UUID; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/uploadfiles/UploadFileController.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/uploadfiles/UploadFileController.java similarity index 97% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/uploadfiles/UploadFileController.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/uploadfiles/UploadFileController.java index e7f168a..7de63c8 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/uploadfiles/UploadFileController.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/uploadfiles/UploadFileController.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.uploadfiles; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.uploadfiles; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.helper.FileHelper; import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/DeleteUserRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/DeleteUserRequest.java similarity index 96% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/DeleteUserRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/DeleteUserRequest.java index 06c184e..aa63573 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/DeleteUserRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/DeleteUserRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.users.users; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.users; import io.micronaut.core.annotation.Introspected; import java.util.UUID; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/SearchUserRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/SearchUserRequest.java similarity index 98% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/SearchUserRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/SearchUserRequest.java index 25780c2..2ffca91 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/SearchUserRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/SearchUserRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.users.users; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.users; import io.micronaut.core.annotation.Introspected; import io.micronaut.core.annotation.Nullable; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserController.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserController.java similarity index 97% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserController.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserController.java index 773efce..3b914a4 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserController.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserController.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.users.users; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.users; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isNotEmpty; @@ -8,9 +8,9 @@ import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse; import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.users.User; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.users.UserCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.users.UserService; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.User; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.UserCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.UserService; import io.micronaut.data.model.Pageable; import io.micronaut.http.HttpResponse; import io.micronaut.http.MediaType; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserCsv.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserCsv.java similarity index 99% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserCsv.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserCsv.java index c412811..b88e63f 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserCsv.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserCsv.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.users.users; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.users; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserRequest.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserRequest.java similarity index 98% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserRequest.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserRequest.java index dfb4a65..8a084d3 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserRequest.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserRequest.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.controller.users.users; +package com.bigtreetc.sample.micronaut.aws.lambda.controller.users; import java.util.UUID; import javax.validation.constraints.Digits; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Code.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Code.java similarity index 92% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Code.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Code.java index 66a007f..f877727 100755 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Code.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Code.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl; import io.micronaut.data.annotation.AutoPopulated; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCategory.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCategory.java similarity index 89% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCategory.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCategory.java index 34dd003..9bdfd47 100755 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCategory.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCategory.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl; import io.micronaut.data.annotation.AutoPopulated; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCategoryCriteria.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCategoryCriteria.java similarity index 71% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCategoryCriteria.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCategoryCriteria.java index 3951625..3ae59ef 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCategoryCriteria.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCategoryCriteria.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCriteria.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCriteria.java similarity index 68% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCriteria.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCriteria.java index a263152..08ddd94 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCriteria.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCriteria.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Holiday.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Holiday.java similarity index 89% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Holiday.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Holiday.java index 440d54e..2a4bad6 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Holiday.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Holiday.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl; import io.micronaut.data.annotation.AutoPopulated; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/HolidayCriteria.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/HolidayCriteria.java similarity index 81% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/HolidayCriteria.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/HolidayCriteria.java index ececbd7..bd07074 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/HolidayCriteria.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/HolidayCriteria.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import java.time.LocalDate; import java.util.List; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/MailTemplate.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/MailTemplate.java similarity index 90% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/MailTemplate.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/MailTemplate.java index a86a46c..e4df5e6 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/MailTemplate.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/MailTemplate.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl; import io.micronaut.data.annotation.AutoPopulated; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/MailTemplateCriteria.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/MailTemplateCriteria.java similarity index 71% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/MailTemplateCriteria.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/MailTemplateCriteria.java index eb24ece..5c1dff7 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/MailTemplateCriteria.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/MailTemplateCriteria.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Permission.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Permission.java similarity index 89% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Permission.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Permission.java index f570046..327b14d 100755 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Permission.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Permission.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl; import io.micronaut.data.annotation.AutoPopulated; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/PermissionCriteria.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/PermissionCriteria.java similarity index 70% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/PermissionCriteria.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/PermissionCriteria.java index e442956..b787ca6 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/PermissionCriteria.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/PermissionCriteria.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Role.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Role.java similarity index 93% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Role.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Role.java index 671e409..b27d83a 100755 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Role.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Role.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEquals; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/RoleCriteria.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/RoleCriteria.java similarity index 68% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/RoleCriteria.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/RoleCriteria.java index 50da311..413b3c6 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/RoleCriteria.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/RoleCriteria.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/RolePermission.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/RolePermission.java similarity index 89% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/RolePermission.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/RolePermission.java index 88839c0..8859b25 100755 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/RolePermission.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/RolePermission.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl; import io.micronaut.data.annotation.AutoPopulated; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/RolePermissionCriteria.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/RolePermissionCriteria.java similarity index 71% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/RolePermissionCriteria.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/RolePermissionCriteria.java index 1cca6dc..79ebdea 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/RolePermissionCriteria.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/RolePermissionCriteria.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Staff.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Staff.java similarity index 93% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Staff.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Staff.java index 9c56102..a13e09e 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Staff.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Staff.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/StaffCriteria.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/StaffCriteria.java similarity index 69% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/StaffCriteria.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/StaffCriteria.java index 6fb5311..9713fcd 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/StaffCriteria.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/StaffCriteria.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/StaffRole.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/StaffRole.java similarity index 89% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/StaffRole.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/StaffRole.java index 6575beb..6bfc71c 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/StaffRole.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/StaffRole.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl; import io.micronaut.data.annotation.AutoPopulated; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/StaffRoleCriteria.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/StaffRoleCriteria.java similarity index 70% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/StaffRoleCriteria.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/StaffRoleCriteria.java index 1d58382..8352029 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/StaffRoleCriteria.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/StaffRoleCriteria.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/UploadFile.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/UploadFile.java similarity index 91% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/UploadFile.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/UploadFile.java index 0abeb11..1ced090 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/UploadFile.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/UploadFile.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl; import io.micronaut.data.annotation.AutoPopulated; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/users/User.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/User.java similarity index 92% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/users/User.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/User.java index 51cc871..a193525 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/users/User.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/User.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.users; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/users/UserCriteria.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/UserCriteria.java similarity index 78% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/users/UserCriteria.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/UserCriteria.java index f8bfd37..265cb9d 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/users/UserCriteria.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/UserCriteria.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.users; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import io.micronaut.core.annotation.Introspected; import java.util.List; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/users/UserRole.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/UserRole.java similarity index 90% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/users/UserRole.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/UserRole.java index 7625d03..df05f16 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/users/UserRole.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/UserRole.java @@ -1,4 +1,4 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.users; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.model; import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl; import io.micronaut.data.annotation.AutoPopulated; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeCategoryRepository.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeCategoryRepository.java similarity index 88% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeCategoryRepository.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeCategoryRepository.java index c34ac2a..f0f7e26 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeCategoryRepository.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeCategoryRepository.java @@ -1,6 +1,6 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCategory; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCategory; import io.micronaut.data.model.query.builder.sql.Dialect; import io.micronaut.data.r2dbc.annotation.R2dbcRepository; import io.micronaut.data.repository.jpa.reactive.ReactorJpaSpecificationExecutor; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeCategorySpecifications.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeCategorySpecifications.java similarity index 88% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeCategorySpecifications.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeCategorySpecifications.java index a27d787..68aec10 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeCategorySpecifications.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeCategorySpecifications.java @@ -1,8 +1,8 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEmpty; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCategory; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCategory; import io.micronaut.data.repository.jpa.criteria.PredicateSpecification; public class CodeCategorySpecifications { diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeRepository.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeRepository.java similarity index 88% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeRepository.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeRepository.java index 77ac4ea..49c744a 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeRepository.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeRepository.java @@ -1,6 +1,6 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Code; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Code; import io.micronaut.data.model.query.builder.sql.Dialect; import io.micronaut.data.r2dbc.annotation.R2dbcRepository; import io.micronaut.data.repository.jpa.reactive.ReactorJpaSpecificationExecutor; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeSpecifications.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeSpecifications.java similarity index 88% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeSpecifications.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeSpecifications.java index f882baf..15c3dea 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/CodeSpecifications.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/CodeSpecifications.java @@ -1,8 +1,8 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEmpty; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Code; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Code; import io.micronaut.data.repository.jpa.criteria.PredicateSpecification; public class CodeSpecifications { diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/HolidayRepository.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/HolidayRepository.java similarity index 88% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/HolidayRepository.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/HolidayRepository.java index 7f32a75..d4b37c8 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/HolidayRepository.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/HolidayRepository.java @@ -1,6 +1,6 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Holiday; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Holiday; import io.micronaut.data.model.query.builder.sql.Dialect; import io.micronaut.data.r2dbc.annotation.R2dbcRepository; import io.micronaut.data.repository.jpa.reactive.ReactorJpaSpecificationExecutor; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/HolidaySpecifications.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/HolidaySpecifications.java similarity index 89% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/HolidaySpecifications.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/HolidaySpecifications.java index 2dfd9a7..54a07e1 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/HolidaySpecifications.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/HolidaySpecifications.java @@ -1,8 +1,8 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEmpty; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Holiday; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Holiday; import io.micronaut.data.repository.jpa.criteria.PredicateSpecification; import java.time.LocalDate; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/MailTemplateRepository.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/MailTemplateRepository.java similarity index 89% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/MailTemplateRepository.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/MailTemplateRepository.java index 0c2291d..c52dc43 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/MailTemplateRepository.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/MailTemplateRepository.java @@ -1,6 +1,6 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.MailTemplate; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.MailTemplate; import io.micronaut.data.model.query.builder.sql.Dialect; import io.micronaut.data.r2dbc.annotation.R2dbcRepository; import io.micronaut.data.repository.jpa.reactive.ReactorJpaSpecificationExecutor; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/MailTemplateSpecifications.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/MailTemplateSpecifications.java similarity index 90% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/MailTemplateSpecifications.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/MailTemplateSpecifications.java index 671dd0f..6ae9dcf 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/MailTemplateSpecifications.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/MailTemplateSpecifications.java @@ -1,8 +1,8 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEmpty; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.MailTemplate; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.MailTemplate; import io.micronaut.data.repository.jpa.criteria.PredicateSpecification; public class MailTemplateSpecifications { diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/PermissionRepository.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/PermissionRepository.java similarity index 89% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/PermissionRepository.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/PermissionRepository.java index 4613f29..e3ef76b 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/PermissionRepository.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/PermissionRepository.java @@ -1,6 +1,6 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Permission; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Permission; import io.micronaut.data.model.query.builder.sql.Dialect; import io.micronaut.data.r2dbc.annotation.R2dbcRepository; import io.micronaut.data.repository.jpa.reactive.ReactorJpaSpecificationExecutor; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/PermissionSpecifications.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/PermissionSpecifications.java similarity index 88% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/PermissionSpecifications.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/PermissionSpecifications.java index 904483d..0e3c410 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/PermissionSpecifications.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/PermissionSpecifications.java @@ -1,8 +1,8 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEmpty; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Permission; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Permission; import io.micronaut.data.repository.jpa.criteria.PredicateSpecification; public class PermissionSpecifications { diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RolePermissionRepository.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RolePermissionRepository.java similarity index 90% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RolePermissionRepository.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RolePermissionRepository.java index 2915b85..4332f0d 100755 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RolePermissionRepository.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RolePermissionRepository.java @@ -1,6 +1,6 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.RolePermission; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.RolePermission; import io.micronaut.data.model.query.builder.sql.Dialect; import io.micronaut.data.r2dbc.annotation.R2dbcRepository; import io.micronaut.data.repository.jpa.reactive.ReactorJpaSpecificationExecutor; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RolePermissionSpecifications.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RolePermissionSpecifications.java similarity index 87% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RolePermissionSpecifications.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RolePermissionSpecifications.java index b73540d..31bb101 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RolePermissionSpecifications.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RolePermissionSpecifications.java @@ -1,8 +1,8 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEmpty; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.RolePermission; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.RolePermission; import io.micronaut.data.repository.jpa.criteria.PredicateSpecification; public class RolePermissionSpecifications { diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RoleRepository.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RoleRepository.java similarity index 89% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RoleRepository.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RoleRepository.java index 09670ce..5845560 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RoleRepository.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RoleRepository.java @@ -1,6 +1,6 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Role; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Role; import io.micronaut.data.model.query.builder.sql.Dialect; import io.micronaut.data.r2dbc.annotation.R2dbcRepository; import io.micronaut.data.repository.jpa.reactive.ReactorJpaSpecificationExecutor; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RoleSpecifications.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RoleSpecifications.java similarity index 88% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RoleSpecifications.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RoleSpecifications.java index 25efa15..32195e6 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/RoleSpecifications.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/RoleSpecifications.java @@ -1,8 +1,8 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEmpty; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Role; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Role; import io.micronaut.data.repository.jpa.criteria.PredicateSpecification; public class RoleSpecifications { diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffRepository.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffRepository.java similarity index 88% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffRepository.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffRepository.java index 15be121..454ce8a 100755 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffRepository.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffRepository.java @@ -1,6 +1,6 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Staff; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Staff; import io.micronaut.data.model.query.builder.sql.Dialect; import io.micronaut.data.r2dbc.annotation.R2dbcRepository; import io.micronaut.data.repository.jpa.reactive.ReactorJpaSpecificationExecutor; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffRoleRepository.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffRoleRepository.java similarity index 88% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffRoleRepository.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffRoleRepository.java index 2f5ba9e..b1aa29b 100755 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffRoleRepository.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffRoleRepository.java @@ -1,6 +1,6 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.StaffRole; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.StaffRole; import io.micronaut.data.model.query.builder.sql.Dialect; import io.micronaut.data.r2dbc.annotation.R2dbcRepository; import io.micronaut.data.repository.jpa.reactive.ReactorJpaSpecificationExecutor; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffRoleSpecifications.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffRoleSpecifications.java similarity index 83% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffRoleSpecifications.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffRoleSpecifications.java index 000f015..c2ce457 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffRoleSpecifications.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffRoleSpecifications.java @@ -1,8 +1,8 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEmpty; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.StaffRole; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.StaffRole; import io.micronaut.data.repository.jpa.criteria.PredicateSpecification; public class StaffRoleSpecifications { diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffSpecifications.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffSpecifications.java similarity index 90% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffSpecifications.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffSpecifications.java index 095b20e..6a7de56 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/system/StaffSpecifications.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/StaffSpecifications.java @@ -1,8 +1,8 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEmpty; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Staff; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Staff; import io.micronaut.data.repository.jpa.criteria.PredicateSpecification; public class StaffSpecifications { diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/users/UserRepository.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/UserRepository.java similarity index 88% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/users/UserRepository.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/UserRepository.java index f9a0dd9..e8f6e7a 100755 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/users/UserRepository.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/UserRepository.java @@ -1,6 +1,6 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.users; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.users.User; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.User; import io.micronaut.data.model.query.builder.sql.Dialect; import io.micronaut.data.r2dbc.annotation.R2dbcRepository; import io.micronaut.data.repository.jpa.reactive.ReactorJpaSpecificationExecutor; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/users/UserSpecifications.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/UserSpecifications.java similarity index 91% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/users/UserSpecifications.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/UserSpecifications.java index 84650b2..afc313e 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/users/UserSpecifications.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/repository/UserSpecifications.java @@ -1,8 +1,8 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.users; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.repository; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEmpty; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.users.User; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.User; import io.micronaut.data.repository.jpa.criteria.PredicateSpecification; public class UserSpecifications { diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/CodeCategoryService.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/CodeCategoryService.java similarity index 92% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/CodeCategoryService.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/CodeCategoryService.java index aec814f..cf18dde 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/CodeCategoryService.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/CodeCategoryService.java @@ -1,13 +1,13 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.service; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.CodeCategorySpecifications.categoryCodeEquals; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.CodeCategorySpecifications.categoryNameContains; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.CodeCategorySpecifications.categoryCodeEquals; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.CodeCategorySpecifications.categoryNameContains; import static io.micronaut.data.repository.jpa.criteria.QuerySpecification.where; import com.bigtreetc.sample.micronaut.aws.lambda.base.exception.NoDataFoundException; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCategory; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCategoryCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.CodeCategoryRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCategory; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCategoryCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.CodeCategoryRepository; import io.micronaut.data.model.Page; import io.micronaut.data.model.Pageable; import io.micronaut.transaction.annotation.ReadOnly; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/CodeService.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/CodeService.java similarity index 92% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/CodeService.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/CodeService.java index a587c4c..448ce96 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/CodeService.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/CodeService.java @@ -1,16 +1,16 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.service; import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEquals; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.CodeSpecifications.categoryCodeEquals; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.CodeSpecifications.codeNameContains; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.CodeSpecifications.categoryCodeEquals; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.CodeSpecifications.codeNameContains; import static io.micronaut.data.repository.jpa.criteria.QuerySpecification.where; import com.bigtreetc.sample.micronaut.aws.lambda.base.exception.NoDataFoundException; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Code; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCategory; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.CodeCategoryRepository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.CodeRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Code; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCategory; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.CodeCategoryRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.CodeRepository; import io.micronaut.data.model.Page; import io.micronaut.data.model.Pageable; import io.micronaut.transaction.annotation.ReadOnly; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/HolidayService.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/HolidayService.java similarity index 92% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/HolidayService.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/HolidayService.java index 3178fab..3c1813d 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/HolidayService.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/HolidayService.java @@ -1,13 +1,13 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.service; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.HolidaySpecifications.holidayDateBetween; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.HolidaySpecifications.holidayNameContains; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.HolidaySpecifications.holidayDateBetween; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.HolidaySpecifications.holidayNameContains; import static io.micronaut.data.repository.jpa.criteria.QuerySpecification.where; import com.bigtreetc.sample.micronaut.aws.lambda.base.exception.NoDataFoundException; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Holiday; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.HolidayCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.HolidayRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Holiday; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.HolidayCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.HolidayRepository; import io.micronaut.data.model.Page; import io.micronaut.data.model.Pageable; import io.micronaut.transaction.annotation.ReadOnly; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/MailTemplateService.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/MailTemplateService.java similarity index 94% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/MailTemplateService.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/MailTemplateService.java index 1ef400f..9700871 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/MailTemplateService.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/MailTemplateService.java @@ -1,12 +1,12 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.service; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.MailTemplateSpecifications.*; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.MailTemplateSpecifications.*; import static io.micronaut.data.repository.jpa.criteria.QuerySpecification.where; import com.bigtreetc.sample.micronaut.aws.lambda.base.exception.NoDataFoundException; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.MailTemplate; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.MailTemplateCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.MailTemplateRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.MailTemplate; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.MailTemplateCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.MailTemplateRepository; import io.micronaut.data.model.Page; import io.micronaut.data.model.Pageable; import io.micronaut.transaction.annotation.ReadOnly; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/PermissionService.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/PermissionService.java similarity index 92% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/PermissionService.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/PermissionService.java index 6aa201b..6106689 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/PermissionService.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/PermissionService.java @@ -1,13 +1,13 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.service; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.PermissionSpecifications.permissionCodeEquals; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.PermissionSpecifications.permissionNameContains; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.PermissionSpecifications.permissionCodeEquals; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.PermissionSpecifications.permissionNameContains; import static io.micronaut.data.repository.jpa.criteria.PredicateSpecification.where; import com.bigtreetc.sample.micronaut.aws.lambda.base.exception.NoDataFoundException; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Permission; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.PermissionCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.PermissionRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Permission; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.PermissionCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.PermissionRepository; import io.micronaut.data.model.Page; import io.micronaut.data.model.Pageable; import io.micronaut.transaction.annotation.ReadOnly; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/RoleService.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/RoleService.java similarity index 93% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/RoleService.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/RoleService.java index 14c5876..df02b1d 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/RoleService.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/RoleService.java @@ -1,14 +1,16 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.service; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.RoleSpecifications.roleCodeEquals; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.RoleSpecifications.roleNameContains; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.RoleSpecifications.roleCodeEquals; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.RoleSpecifications.roleNameContains; import static io.micronaut.data.repository.jpa.criteria.QuerySpecification.where; import com.bigtreetc.sample.micronaut.aws.lambda.base.exception.NoDataFoundException; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.*; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.PermissionRepository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.RolePermissionRepository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.RoleRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Role; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.RoleCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.RolePermission; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.PermissionRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.RolePermissionRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.RoleRepository; import io.micronaut.data.model.Page; import io.micronaut.data.model.Pageable; import io.micronaut.transaction.annotation.ReadOnly; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/StaffService.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/StaffService.java similarity index 94% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/StaffService.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/StaffService.java index 16832db..ee18ee5 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/system/StaffService.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/StaffService.java @@ -1,12 +1,12 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.service; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.StaffSpecifications.*; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.StaffSpecifications.*; import static io.micronaut.data.repository.jpa.criteria.QuerySpecification.where; import com.bigtreetc.sample.micronaut.aws.lambda.base.exception.NoDataFoundException; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Staff; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.StaffCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.StaffRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Staff; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.StaffCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.StaffRepository; import io.micronaut.data.model.Page; import io.micronaut.data.model.Pageable; import io.micronaut.transaction.annotation.ReadOnly; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/users/UserService.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/UserService.java similarity index 94% rename from src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/users/UserService.java rename to src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/UserService.java index 044c3d7..a9555d8 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/users/UserService.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/service/UserService.java @@ -1,12 +1,12 @@ -package com.bigtreetc.sample.micronaut.aws.lambda.domain.service.users; +package com.bigtreetc.sample.micronaut.aws.lambda.domain.service; -import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.users.UserSpecifications.*; +import static com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.UserSpecifications.*; import static io.micronaut.data.repository.jpa.criteria.QuerySpecification.where; import com.bigtreetc.sample.micronaut.aws.lambda.base.exception.NoDataFoundException; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.users.User; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.users.UserCriteria; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.users.UserRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.User; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.UserCriteria; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.UserRepository; import io.micronaut.data.model.Page; import io.micronaut.data.model.Pageable; import io.micronaut.transaction.annotation.ReadOnly; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/security/RedisRefreshTokenPersistence.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/security/RedisRefreshTokenPersistence.java index d3ab46d..f2e167c 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/security/RedisRefreshTokenPersistence.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/security/RedisRefreshTokenPersistence.java @@ -3,11 +3,11 @@ import static io.micronaut.security.errors.IssuingAnAccessTokenErrorCode.INVALID_GRANT; import com.bigtreetc.sample.micronaut.aws.lambda.base.util.JacksonUtils; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.RolePermission; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.StaffRole; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.RolePermissionRepository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.StaffRepository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.StaffRoleRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.RolePermission; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.StaffRole; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.RolePermissionRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.StaffRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.StaffRoleRepository; import io.lettuce.core.api.StatefulRedisConnection; import io.micronaut.runtime.event.annotation.EventListener; import io.micronaut.security.authentication.Authentication; diff --git a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/security/StaffRoleAuthenticationProvider.java b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/security/StaffRoleAuthenticationProvider.java index 6b60996..39410cf 100644 --- a/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/security/StaffRoleAuthenticationProvider.java +++ b/src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/security/StaffRoleAuthenticationProvider.java @@ -2,11 +2,11 @@ import static io.micronaut.security.authentication.AuthenticationFailureReason.USER_NOT_FOUND; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.RolePermission; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.StaffRole; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.RolePermissionRepository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.StaffRepository; -import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.StaffRoleRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.RolePermission; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.StaffRole; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.RolePermissionRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.StaffRepository; +import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.StaffRoleRepository; import io.micronaut.http.HttpRequest; import io.micronaut.security.authentication.AuthenticationProvider; import io.micronaut.security.authentication.AuthenticationRequest;