From 6f7e0f668decc24389c3e248e39d9d33c538f0be Mon Sep 17 00:00:00 2001 From: Oleksii Makieiev Date: Mon, 16 Mar 2026 10:10:17 +0200 Subject: [PATCH] Move DTOs to a new package --- backend/lined/config/spotbugs/spotbugs-exclude.xml | 2 +- .../backend/lined/app/AccountApplicationService.java | 6 +++--- .../lined/app/AccountApplicationServiceImpl.java | 8 ++++---- .../io/backend/lined/event/api/EventController.java | 5 +++++ .../lined/event/api/{ => dto}/EventConflictDto.java | 2 +- .../lined/event/api/{ => dto}/EventCreateDto.java | 2 +- .../backend/lined/event/api/{ => dto}/EventDto.java | 2 +- .../lined/event/api/{ => dto}/EventMapper.java | 2 +- .../lined/event/api/{ => dto}/EventUpdateDto.java | 2 +- .../lined/event/api/{ => dto}/UserConflictDto.java | 2 +- .../io/backend/lined/event/service/EventService.java | 10 +++++----- .../lined/event/service/EventServiceImpl.java | 12 ++++++------ .../io/backend/lined/lobby/api/LobbyController.java | 2 ++ .../lined/lobby/api/{ => dto}/LobbyCreateDto.java | 2 +- .../backend/lined/lobby/api/{ => dto}/LobbyDto.java | 2 +- .../lined/lobby/api/{ => dto}/LobbyMapper.java | 2 +- .../io/backend/lined/lobby/service/LobbyService.java | 4 ++-- .../lined/lobby/service/LobbyServiceImpl.java | 6 +++--- .../io/backend/lined/plan/api/PlanController.java | 3 +++ .../lined/plan/api/{ => dto}/PlanCreateDto.java | 2 +- .../io/backend/lined/plan/api/{ => dto}/PlanDto.java | 2 +- .../backend/lined/plan/api/{ => dto}/PlanMapper.java | 2 +- .../lined/plan/api/{ => dto}/PlanUpdateDto.java | 2 +- .../io/backend/lined/plan/service/PlanService.java | 6 +++--- .../backend/lined/plan/service/PlanServiceImpl.java | 8 ++++---- .../io/backend/lined/role/api/RoleController.java | 3 +++ .../role/api/{ => dto}/AssignRolesRequestDto.java | 2 +- .../io/backend/lined/role/api/{ => dto}/RoleDto.java | 2 +- .../backend/lined/role/api/{ => dto}/RoleMapper.java | 2 +- .../lined/role/api/{ => dto}/RoleNameDto.java | 2 +- .../io/backend/lined/role/service/RoleService.java | 2 +- .../backend/lined/role/service/RoleServiceImpl.java | 4 ++-- .../subscription/api/SubscriptionController.java | 2 ++ .../api/{ => dto}/SubscriptionCreateDto.java | 2 +- .../subscription/api/{ => dto}/SubscriptionDto.java | 2 +- .../api/{ => dto}/SubscriptionMapper.java | 2 +- .../subscription/service/SubscriptionService.java | 2 +- .../service/SubscriptionServiceImpl.java | 4 ++-- .../io/backend/lined/task/api/TaskController.java | 3 +++ .../lined/task/api/{ => dto}/TaskCreateDto.java | 2 +- .../io/backend/lined/task/api/{ => dto}/TaskDto.java | 2 +- .../backend/lined/task/api/{ => dto}/TaskMapper.java | 2 +- .../lined/task/api/{ => dto}/TaskUpdateDto.java | 2 +- .../io/backend/lined/task/service/TaskService.java | 6 +++--- .../backend/lined/task/service/TaskServiceImpl.java | 8 ++++---- .../io/backend/lined/user/api/UserController.java | 4 ++++ .../lined/user/api/{ => dto}/UserCreateDto.java | 2 +- .../io/backend/lined/user/api/{ => dto}/UserDto.java | 2 +- .../backend/lined/user/api/{ => dto}/UserMapper.java | 6 +++--- .../lined/user/api/{ => dto}/UserPageDto.java | 2 +- .../user/api/{ => dto}/UserSearchResultDto.java | 2 +- .../lined/user/api/{ => dto}/UserUpdateDto.java | 2 +- .../io/backend/lined/user/service/UserService.java | 8 ++++---- .../backend/lined/user/service/UserServiceImpl.java | 12 ++++++------ .../lined/app/AccountApplicationServiceImplTest.java | 8 ++++---- .../event/service/EventServiceImplConflictTest.java | 8 ++++---- .../lined/event/service/EventServiceImplTest.java | 8 ++++---- .../lined/lobby/service/LobbyServiceImplTest.java | 6 +++--- .../lined/plan/service/PlanServiceImplTest.java | 8 ++++---- .../lined/role/service/RoleServiceImplTest.java | 4 ++-- .../service/SubscriptionServiceImplTest.java | 4 ++-- .../user/service/UserServiceImplSearchTest.java | 6 +++--- .../lined/user/service/UserServiceImplTest.java | 8 ++++---- 63 files changed, 138 insertions(+), 116 deletions(-) rename backend/lined/src/main/java/io/backend/lined/event/api/{ => dto}/EventConflictDto.java (92%) rename backend/lined/src/main/java/io/backend/lined/event/api/{ => dto}/EventCreateDto.java (94%) rename backend/lined/src/main/java/io/backend/lined/event/api/{ => dto}/EventDto.java (94%) rename backend/lined/src/main/java/io/backend/lined/event/api/{ => dto}/EventMapper.java (92%) rename backend/lined/src/main/java/io/backend/lined/event/api/{ => dto}/EventUpdateDto.java (91%) rename backend/lined/src/main/java/io/backend/lined/event/api/{ => dto}/UserConflictDto.java (91%) rename backend/lined/src/main/java/io/backend/lined/lobby/api/{ => dto}/LobbyCreateDto.java (94%) rename backend/lined/src/main/java/io/backend/lined/lobby/api/{ => dto}/LobbyDto.java (91%) rename backend/lined/src/main/java/io/backend/lined/lobby/api/{ => dto}/LobbyMapper.java (94%) rename backend/lined/src/main/java/io/backend/lined/plan/api/{ => dto}/PlanCreateDto.java (90%) rename backend/lined/src/main/java/io/backend/lined/plan/api/{ => dto}/PlanDto.java (91%) rename backend/lined/src/main/java/io/backend/lined/plan/api/{ => dto}/PlanMapper.java (95%) rename backend/lined/src/main/java/io/backend/lined/plan/api/{ => dto}/PlanUpdateDto.java (90%) rename backend/lined/src/main/java/io/backend/lined/role/api/{ => dto}/AssignRolesRequestDto.java (84%) rename backend/lined/src/main/java/io/backend/lined/role/api/{ => dto}/RoleDto.java (55%) rename backend/lined/src/main/java/io/backend/lined/role/api/{ => dto}/RoleMapper.java (90%) rename backend/lined/src/main/java/io/backend/lined/role/api/{ => dto}/RoleNameDto.java (53%) rename backend/lined/src/main/java/io/backend/lined/subscription/api/{ => dto}/SubscriptionCreateDto.java (94%) rename backend/lined/src/main/java/io/backend/lined/subscription/api/{ => dto}/SubscriptionDto.java (84%) rename backend/lined/src/main/java/io/backend/lined/subscription/api/{ => dto}/SubscriptionMapper.java (92%) rename backend/lined/src/main/java/io/backend/lined/task/api/{ => dto}/TaskCreateDto.java (92%) rename backend/lined/src/main/java/io/backend/lined/task/api/{ => dto}/TaskDto.java (94%) rename backend/lined/src/main/java/io/backend/lined/task/api/{ => dto}/TaskMapper.java (93%) rename backend/lined/src/main/java/io/backend/lined/task/api/{ => dto}/TaskUpdateDto.java (91%) rename backend/lined/src/main/java/io/backend/lined/user/api/{ => dto}/UserCreateDto.java (90%) rename backend/lined/src/main/java/io/backend/lined/user/api/{ => dto}/UserDto.java (96%) rename backend/lined/src/main/java/io/backend/lined/user/api/{ => dto}/UserMapper.java (94%) rename backend/lined/src/main/java/io/backend/lined/user/api/{ => dto}/UserPageDto.java (81%) rename backend/lined/src/main/java/io/backend/lined/user/api/{ => dto}/UserSearchResultDto.java (93%) rename backend/lined/src/main/java/io/backend/lined/user/api/{ => dto}/UserUpdateDto.java (88%) diff --git a/backend/lined/config/spotbugs/spotbugs-exclude.xml b/backend/lined/config/spotbugs/spotbugs-exclude.xml index 46e14245..e838f4fb 100644 --- a/backend/lined/config/spotbugs/spotbugs-exclude.xml +++ b/backend/lined/config/spotbugs/spotbugs-exclude.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/backend/lined/src/main/java/io/backend/lined/app/AccountApplicationService.java b/backend/lined/src/main/java/io/backend/lined/app/AccountApplicationService.java index b558420f..312988d1 100644 --- a/backend/lined/src/main/java/io/backend/lined/app/AccountApplicationService.java +++ b/backend/lined/src/main/java/io/backend/lined/app/AccountApplicationService.java @@ -1,8 +1,8 @@ package io.backend.lined.app; -import io.backend.lined.subscription.api.SubscriptionDto; -import io.backend.lined.user.api.UserCreateDto; -import io.backend.lined.user.api.UserDto; +import io.backend.lined.subscription.api.dto.SubscriptionDto; +import io.backend.lined.user.api.dto.UserCreateDto; +import io.backend.lined.user.api.dto.UserDto; import java.util.Set; public interface AccountApplicationService { diff --git a/backend/lined/src/main/java/io/backend/lined/app/AccountApplicationServiceImpl.java b/backend/lined/src/main/java/io/backend/lined/app/AccountApplicationServiceImpl.java index 83055794..8157ef15 100644 --- a/backend/lined/src/main/java/io/backend/lined/app/AccountApplicationServiceImpl.java +++ b/backend/lined/src/main/java/io/backend/lined/app/AccountApplicationServiceImpl.java @@ -1,12 +1,12 @@ package io.backend.lined.app; -import io.backend.lined.plan.api.PlanDto; +import io.backend.lined.plan.api.dto.PlanDto; import io.backend.lined.plan.service.PlanService; import io.backend.lined.role.service.RoleService; -import io.backend.lined.subscription.api.SubscriptionDto; +import io.backend.lined.subscription.api.dto.SubscriptionDto; import io.backend.lined.subscription.service.SubscriptionService; -import io.backend.lined.user.api.UserCreateDto; -import io.backend.lined.user.api.UserDto; +import io.backend.lined.user.api.dto.UserCreateDto; +import io.backend.lined.user.api.dto.UserDto; import io.backend.lined.user.service.UserService; import jakarta.transaction.Transactional; import java.util.Set; diff --git a/backend/lined/src/main/java/io/backend/lined/event/api/EventController.java b/backend/lined/src/main/java/io/backend/lined/event/api/EventController.java index 5d5a6696..6ac7040a 100644 --- a/backend/lined/src/main/java/io/backend/lined/event/api/EventController.java +++ b/backend/lined/src/main/java/io/backend/lined/event/api/EventController.java @@ -1,5 +1,10 @@ package io.backend.lined.event.api; +import io.backend.lined.event.api.dto.EventConflictDto; +import io.backend.lined.event.api.dto.EventCreateDto; +import io.backend.lined.event.api.dto.EventDto; +import io.backend.lined.event.api.dto.EventUpdateDto; +import io.backend.lined.event.api.dto.UserConflictDto; import io.backend.lined.event.service.EventService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/backend/lined/src/main/java/io/backend/lined/event/api/EventConflictDto.java b/backend/lined/src/main/java/io/backend/lined/event/api/dto/EventConflictDto.java similarity index 92% rename from backend/lined/src/main/java/io/backend/lined/event/api/EventConflictDto.java rename to backend/lined/src/main/java/io/backend/lined/event/api/dto/EventConflictDto.java index 33d6b8e3..5334710e 100644 --- a/backend/lined/src/main/java/io/backend/lined/event/api/EventConflictDto.java +++ b/backend/lined/src/main/java/io/backend/lined/event/api/dto/EventConflictDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.event.api; +package io.backend.lined.event.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.time.OffsetDateTime; diff --git a/backend/lined/src/main/java/io/backend/lined/event/api/EventCreateDto.java b/backend/lined/src/main/java/io/backend/lined/event/api/dto/EventCreateDto.java similarity index 94% rename from backend/lined/src/main/java/io/backend/lined/event/api/EventCreateDto.java rename to backend/lined/src/main/java/io/backend/lined/event/api/dto/EventCreateDto.java index 6bbbeccc..04fef184 100644 --- a/backend/lined/src/main/java/io/backend/lined/event/api/EventCreateDto.java +++ b/backend/lined/src/main/java/io/backend/lined/event/api/dto/EventCreateDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.event.api; +package io.backend.lined.event.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/backend/lined/src/main/java/io/backend/lined/event/api/EventDto.java b/backend/lined/src/main/java/io/backend/lined/event/api/dto/EventDto.java similarity index 94% rename from backend/lined/src/main/java/io/backend/lined/event/api/EventDto.java rename to backend/lined/src/main/java/io/backend/lined/event/api/dto/EventDto.java index dae545d5..444a9816 100644 --- a/backend/lined/src/main/java/io/backend/lined/event/api/EventDto.java +++ b/backend/lined/src/main/java/io/backend/lined/event/api/dto/EventDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.event.api; +package io.backend.lined.event.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.time.OffsetDateTime; diff --git a/backend/lined/src/main/java/io/backend/lined/event/api/EventMapper.java b/backend/lined/src/main/java/io/backend/lined/event/api/dto/EventMapper.java similarity index 92% rename from backend/lined/src/main/java/io/backend/lined/event/api/EventMapper.java rename to backend/lined/src/main/java/io/backend/lined/event/api/dto/EventMapper.java index 67ea45f3..b84e5c3d 100644 --- a/backend/lined/src/main/java/io/backend/lined/event/api/EventMapper.java +++ b/backend/lined/src/main/java/io/backend/lined/event/api/dto/EventMapper.java @@ -1,4 +1,4 @@ -package io.backend.lined.event.api; +package io.backend.lined.event.api.dto; import io.backend.lined.event.domain.EventEntity; import org.mapstruct.Mapper; diff --git a/backend/lined/src/main/java/io/backend/lined/event/api/EventUpdateDto.java b/backend/lined/src/main/java/io/backend/lined/event/api/dto/EventUpdateDto.java similarity index 91% rename from backend/lined/src/main/java/io/backend/lined/event/api/EventUpdateDto.java rename to backend/lined/src/main/java/io/backend/lined/event/api/dto/EventUpdateDto.java index ea750475..6eba6154 100644 --- a/backend/lined/src/main/java/io/backend/lined/event/api/EventUpdateDto.java +++ b/backend/lined/src/main/java/io/backend/lined/event/api/dto/EventUpdateDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.event.api; +package io.backend.lined.event.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.time.OffsetDateTime; diff --git a/backend/lined/src/main/java/io/backend/lined/event/api/UserConflictDto.java b/backend/lined/src/main/java/io/backend/lined/event/api/dto/UserConflictDto.java similarity index 91% rename from backend/lined/src/main/java/io/backend/lined/event/api/UserConflictDto.java rename to backend/lined/src/main/java/io/backend/lined/event/api/dto/UserConflictDto.java index d83025a9..9cc26286 100644 --- a/backend/lined/src/main/java/io/backend/lined/event/api/UserConflictDto.java +++ b/backend/lined/src/main/java/io/backend/lined/event/api/dto/UserConflictDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.event.api; +package io.backend.lined.event.api.dto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/lined/src/main/java/io/backend/lined/event/service/EventService.java b/backend/lined/src/main/java/io/backend/lined/event/service/EventService.java index 323045aa..80298d54 100644 --- a/backend/lined/src/main/java/io/backend/lined/event/service/EventService.java +++ b/backend/lined/src/main/java/io/backend/lined/event/service/EventService.java @@ -1,10 +1,10 @@ package io.backend.lined.event.service; -import io.backend.lined.event.api.EventConflictDto; -import io.backend.lined.event.api.EventCreateDto; -import io.backend.lined.event.api.EventDto; -import io.backend.lined.event.api.EventUpdateDto; -import io.backend.lined.event.api.UserConflictDto; +import io.backend.lined.event.api.dto.EventConflictDto; +import io.backend.lined.event.api.dto.EventCreateDto; +import io.backend.lined.event.api.dto.EventDto; +import io.backend.lined.event.api.dto.EventUpdateDto; +import io.backend.lined.event.api.dto.UserConflictDto; import java.time.OffsetDateTime; import java.util.List; diff --git a/backend/lined/src/main/java/io/backend/lined/event/service/EventServiceImpl.java b/backend/lined/src/main/java/io/backend/lined/event/service/EventServiceImpl.java index abfdd19b..0448732c 100644 --- a/backend/lined/src/main/java/io/backend/lined/event/service/EventServiceImpl.java +++ b/backend/lined/src/main/java/io/backend/lined/event/service/EventServiceImpl.java @@ -1,11 +1,11 @@ package io.backend.lined.event.service; -import io.backend.lined.event.api.EventConflictDto; -import io.backend.lined.event.api.EventCreateDto; -import io.backend.lined.event.api.EventDto; -import io.backend.lined.event.api.EventMapper; -import io.backend.lined.event.api.EventUpdateDto; -import io.backend.lined.event.api.UserConflictDto; +import io.backend.lined.event.api.dto.EventConflictDto; +import io.backend.lined.event.api.dto.EventCreateDto; +import io.backend.lined.event.api.dto.EventDto; +import io.backend.lined.event.api.dto.EventMapper; +import io.backend.lined.event.api.dto.EventUpdateDto; +import io.backend.lined.event.api.dto.UserConflictDto; import io.backend.lined.event.domain.EventEntity; import io.backend.lined.event.domain.EventRepository; import io.backend.lined.lobby.domain.LobbyEntity; diff --git a/backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyController.java b/backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyController.java index af452e05..74777414 100644 --- a/backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyController.java +++ b/backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyController.java @@ -1,5 +1,7 @@ package io.backend.lined.lobby.api; +import io.backend.lined.lobby.api.dto.LobbyCreateDto; +import io.backend.lined.lobby.api.dto.LobbyDto; import io.backend.lined.lobby.service.LobbyService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyCreateDto.java b/backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyCreateDto.java similarity index 94% rename from backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyCreateDto.java rename to backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyCreateDto.java index 7ee26ed0..6852c653 100644 --- a/backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyCreateDto.java +++ b/backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyCreateDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.lobby.api; +package io.backend.lined.lobby.api.dto; import io.backend.lined.lobby.domain.LobbyTypes; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyDto.java b/backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyDto.java similarity index 91% rename from backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyDto.java rename to backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyDto.java index 7fc3a78a..de525fbc 100644 --- a/backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyDto.java +++ b/backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.lobby.api; +package io.backend.lined.lobby.api.dto; import io.backend.lined.lobby.domain.LobbyTypes; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyMapper.java b/backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyMapper.java similarity index 94% rename from backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyMapper.java rename to backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyMapper.java index ff235acd..c0477b40 100644 --- a/backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyMapper.java +++ b/backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyMapper.java @@ -1,4 +1,4 @@ -package io.backend.lined.lobby.api; +package io.backend.lined.lobby.api.dto; import io.backend.lined.lobby.domain.LobbyEntity; import io.backend.lined.user.domain.UserEntity; diff --git a/backend/lined/src/main/java/io/backend/lined/lobby/service/LobbyService.java b/backend/lined/src/main/java/io/backend/lined/lobby/service/LobbyService.java index 51daff12..4bf529a0 100644 --- a/backend/lined/src/main/java/io/backend/lined/lobby/service/LobbyService.java +++ b/backend/lined/src/main/java/io/backend/lined/lobby/service/LobbyService.java @@ -1,7 +1,7 @@ package io.backend.lined.lobby.service; -import io.backend.lined.lobby.api.LobbyCreateDto; -import io.backend.lined.lobby.api.LobbyDto; +import io.backend.lined.lobby.api.dto.LobbyCreateDto; +import io.backend.lined.lobby.api.dto.LobbyDto; import java.util.List; public interface LobbyService { diff --git a/backend/lined/src/main/java/io/backend/lined/lobby/service/LobbyServiceImpl.java b/backend/lined/src/main/java/io/backend/lined/lobby/service/LobbyServiceImpl.java index c65a9adb..779a5185 100644 --- a/backend/lined/src/main/java/io/backend/lined/lobby/service/LobbyServiceImpl.java +++ b/backend/lined/src/main/java/io/backend/lined/lobby/service/LobbyServiceImpl.java @@ -1,8 +1,8 @@ package io.backend.lined.lobby.service; -import io.backend.lined.lobby.api.LobbyCreateDto; -import io.backend.lined.lobby.api.LobbyDto; -import io.backend.lined.lobby.api.LobbyMapper; +import io.backend.lined.lobby.api.dto.LobbyCreateDto; +import io.backend.lined.lobby.api.dto.LobbyDto; +import io.backend.lined.lobby.api.dto.LobbyMapper; import io.backend.lined.lobby.domain.LobbyEntity; import io.backend.lined.lobby.domain.LobbyRepository; import io.backend.lined.user.domain.UserRepository; diff --git a/backend/lined/src/main/java/io/backend/lined/plan/api/PlanController.java b/backend/lined/src/main/java/io/backend/lined/plan/api/PlanController.java index 373f8454..90859fec 100644 --- a/backend/lined/src/main/java/io/backend/lined/plan/api/PlanController.java +++ b/backend/lined/src/main/java/io/backend/lined/plan/api/PlanController.java @@ -1,5 +1,8 @@ package io.backend.lined.plan.api; +import io.backend.lined.plan.api.dto.PlanCreateDto; +import io.backend.lined.plan.api.dto.PlanDto; +import io.backend.lined.plan.api.dto.PlanUpdateDto; import io.backend.lined.plan.service.PlanService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/backend/lined/src/main/java/io/backend/lined/plan/api/PlanCreateDto.java b/backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanCreateDto.java similarity index 90% rename from backend/lined/src/main/java/io/backend/lined/plan/api/PlanCreateDto.java rename to backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanCreateDto.java index e860825e..c2d642d2 100644 --- a/backend/lined/src/main/java/io/backend/lined/plan/api/PlanCreateDto.java +++ b/backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanCreateDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.plan.api; +package io.backend.lined.plan.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/backend/lined/src/main/java/io/backend/lined/plan/api/PlanDto.java b/backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanDto.java similarity index 91% rename from backend/lined/src/main/java/io/backend/lined/plan/api/PlanDto.java rename to backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanDto.java index 325a7df2..6e858a62 100644 --- a/backend/lined/src/main/java/io/backend/lined/plan/api/PlanDto.java +++ b/backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.plan.api; +package io.backend.lined.plan.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/backend/lined/src/main/java/io/backend/lined/plan/api/PlanMapper.java b/backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanMapper.java similarity index 95% rename from backend/lined/src/main/java/io/backend/lined/plan/api/PlanMapper.java rename to backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanMapper.java index a86c58fe..f8dadf94 100644 --- a/backend/lined/src/main/java/io/backend/lined/plan/api/PlanMapper.java +++ b/backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanMapper.java @@ -1,4 +1,4 @@ -package io.backend.lined.plan.api; +package io.backend.lined.plan.api.dto; import io.backend.lined.plan.domain.PlanEntity; import org.mapstruct.Mapper; diff --git a/backend/lined/src/main/java/io/backend/lined/plan/api/PlanUpdateDto.java b/backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanUpdateDto.java similarity index 90% rename from backend/lined/src/main/java/io/backend/lined/plan/api/PlanUpdateDto.java rename to backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanUpdateDto.java index dac97681..87ae4a1d 100644 --- a/backend/lined/src/main/java/io/backend/lined/plan/api/PlanUpdateDto.java +++ b/backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanUpdateDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.plan.api; +package io.backend.lined.plan.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/backend/lined/src/main/java/io/backend/lined/plan/service/PlanService.java b/backend/lined/src/main/java/io/backend/lined/plan/service/PlanService.java index fd86b4ee..cb3c5e73 100644 --- a/backend/lined/src/main/java/io/backend/lined/plan/service/PlanService.java +++ b/backend/lined/src/main/java/io/backend/lined/plan/service/PlanService.java @@ -1,8 +1,8 @@ package io.backend.lined.plan.service; -import io.backend.lined.plan.api.PlanCreateDto; -import io.backend.lined.plan.api.PlanDto; -import io.backend.lined.plan.api.PlanUpdateDto; +import io.backend.lined.plan.api.dto.PlanCreateDto; +import io.backend.lined.plan.api.dto.PlanDto; +import io.backend.lined.plan.api.dto.PlanUpdateDto; import java.util.List; public interface PlanService { diff --git a/backend/lined/src/main/java/io/backend/lined/plan/service/PlanServiceImpl.java b/backend/lined/src/main/java/io/backend/lined/plan/service/PlanServiceImpl.java index 34b615e7..5ca4e602 100644 --- a/backend/lined/src/main/java/io/backend/lined/plan/service/PlanServiceImpl.java +++ b/backend/lined/src/main/java/io/backend/lined/plan/service/PlanServiceImpl.java @@ -1,10 +1,10 @@ package io.backend.lined.plan.service; import io.backend.lined.common.exception.NotFoundException; -import io.backend.lined.plan.api.PlanCreateDto; -import io.backend.lined.plan.api.PlanDto; -import io.backend.lined.plan.api.PlanMapper; -import io.backend.lined.plan.api.PlanUpdateDto; +import io.backend.lined.plan.api.dto.PlanCreateDto; +import io.backend.lined.plan.api.dto.PlanDto; +import io.backend.lined.plan.api.dto.PlanMapper; +import io.backend.lined.plan.api.dto.PlanUpdateDto; import io.backend.lined.plan.domain.PlanEntity; import io.backend.lined.plan.domain.PlanRepository; import java.util.List; diff --git a/backend/lined/src/main/java/io/backend/lined/role/api/RoleController.java b/backend/lined/src/main/java/io/backend/lined/role/api/RoleController.java index e142a04d..3c9a089a 100644 --- a/backend/lined/src/main/java/io/backend/lined/role/api/RoleController.java +++ b/backend/lined/src/main/java/io/backend/lined/role/api/RoleController.java @@ -1,5 +1,8 @@ package io.backend.lined.role.api; +import io.backend.lined.role.api.dto.AssignRolesRequestDto; +import io.backend.lined.role.api.dto.RoleDto; +import io.backend.lined.role.api.dto.RoleNameDto; import io.backend.lined.role.service.RoleService; import jakarta.validation.Valid; import java.util.List; diff --git a/backend/lined/src/main/java/io/backend/lined/role/api/AssignRolesRequestDto.java b/backend/lined/src/main/java/io/backend/lined/role/api/dto/AssignRolesRequestDto.java similarity index 84% rename from backend/lined/src/main/java/io/backend/lined/role/api/AssignRolesRequestDto.java rename to backend/lined/src/main/java/io/backend/lined/role/api/dto/AssignRolesRequestDto.java index 854a2c32..6a8c4175 100644 --- a/backend/lined/src/main/java/io/backend/lined/role/api/AssignRolesRequestDto.java +++ b/backend/lined/src/main/java/io/backend/lined/role/api/dto/AssignRolesRequestDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.role.api; +package io.backend.lined.role.api.dto; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.Size; diff --git a/backend/lined/src/main/java/io/backend/lined/role/api/RoleDto.java b/backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleDto.java similarity index 55% rename from backend/lined/src/main/java/io/backend/lined/role/api/RoleDto.java rename to backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleDto.java index e3aefe7a..a7843954 100644 --- a/backend/lined/src/main/java/io/backend/lined/role/api/RoleDto.java +++ b/backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.role.api; +package io.backend.lined.role.api.dto; public record RoleDto(long id, String name) { } diff --git a/backend/lined/src/main/java/io/backend/lined/role/api/RoleMapper.java b/backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleMapper.java similarity index 90% rename from backend/lined/src/main/java/io/backend/lined/role/api/RoleMapper.java rename to backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleMapper.java index 444ed4ce..d4b1a51c 100644 --- a/backend/lined/src/main/java/io/backend/lined/role/api/RoleMapper.java +++ b/backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleMapper.java @@ -1,4 +1,4 @@ -package io.backend.lined.role.api; +package io.backend.lined.role.api.dto; import io.backend.lined.role.domain.RoleEntity; import org.mapstruct.Mapper; diff --git a/backend/lined/src/main/java/io/backend/lined/role/api/RoleNameDto.java b/backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleNameDto.java similarity index 53% rename from backend/lined/src/main/java/io/backend/lined/role/api/RoleNameDto.java rename to backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleNameDto.java index 3a7b9a8a..5af0aa9a 100644 --- a/backend/lined/src/main/java/io/backend/lined/role/api/RoleNameDto.java +++ b/backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleNameDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.role.api; +package io.backend.lined.role.api.dto; public record RoleNameDto(String name) { } diff --git a/backend/lined/src/main/java/io/backend/lined/role/service/RoleService.java b/backend/lined/src/main/java/io/backend/lined/role/service/RoleService.java index a9a9629e..6e272b08 100644 --- a/backend/lined/src/main/java/io/backend/lined/role/service/RoleService.java +++ b/backend/lined/src/main/java/io/backend/lined/role/service/RoleService.java @@ -1,6 +1,6 @@ package io.backend.lined.role.service; -import io.backend.lined.role.api.RoleDto; +import io.backend.lined.role.api.dto.RoleDto; import java.util.List; import java.util.Set; diff --git a/backend/lined/src/main/java/io/backend/lined/role/service/RoleServiceImpl.java b/backend/lined/src/main/java/io/backend/lined/role/service/RoleServiceImpl.java index 59c9b6d3..79284600 100644 --- a/backend/lined/src/main/java/io/backend/lined/role/service/RoleServiceImpl.java +++ b/backend/lined/src/main/java/io/backend/lined/role/service/RoleServiceImpl.java @@ -3,8 +3,8 @@ import static java.lang.String.format; import io.backend.lined.common.exception.NotFoundException; -import io.backend.lined.role.api.RoleDto; -import io.backend.lined.role.api.RoleMapper; +import io.backend.lined.role.api.dto.RoleDto; +import io.backend.lined.role.api.dto.RoleMapper; import io.backend.lined.role.domain.RoleEntity; import io.backend.lined.role.domain.RoleRepository; import io.backend.lined.user.domain.UserEntity; diff --git a/backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionController.java b/backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionController.java index 411987b6..39ecd952 100644 --- a/backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionController.java +++ b/backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionController.java @@ -1,5 +1,7 @@ package io.backend.lined.subscription.api; +import io.backend.lined.subscription.api.dto.SubscriptionCreateDto; +import io.backend.lined.subscription.api.dto.SubscriptionDto; import io.backend.lined.subscription.service.SubscriptionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionCreateDto.java b/backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionCreateDto.java similarity index 94% rename from backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionCreateDto.java rename to backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionCreateDto.java index a6e14f5b..45f59f4a 100644 --- a/backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionCreateDto.java +++ b/backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionCreateDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.subscription.api; +package io.backend.lined.subscription.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionDto.java b/backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionDto.java similarity index 84% rename from backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionDto.java rename to backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionDto.java index 4a4be254..4ace4896 100644 --- a/backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionDto.java +++ b/backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.subscription.api; +package io.backend.lined.subscription.api.dto; import java.time.OffsetDateTime; diff --git a/backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionMapper.java b/backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionMapper.java similarity index 92% rename from backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionMapper.java rename to backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionMapper.java index 8b632b12..97fc0211 100644 --- a/backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionMapper.java +++ b/backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionMapper.java @@ -1,4 +1,4 @@ -package io.backend.lined.subscription.api; +package io.backend.lined.subscription.api.dto; import io.backend.lined.subscription.domain.UserSubscriptionEntity; import org.mapstruct.Mapper; diff --git a/backend/lined/src/main/java/io/backend/lined/subscription/service/SubscriptionService.java b/backend/lined/src/main/java/io/backend/lined/subscription/service/SubscriptionService.java index a1bd4902..ad68b3da 100644 --- a/backend/lined/src/main/java/io/backend/lined/subscription/service/SubscriptionService.java +++ b/backend/lined/src/main/java/io/backend/lined/subscription/service/SubscriptionService.java @@ -1,6 +1,6 @@ package io.backend.lined.subscription.service; -import io.backend.lined.subscription.api.SubscriptionDto; +import io.backend.lined.subscription.api.dto.SubscriptionDto; import java.time.OffsetDateTime; import java.util.List; import java.util.Optional; diff --git a/backend/lined/src/main/java/io/backend/lined/subscription/service/SubscriptionServiceImpl.java b/backend/lined/src/main/java/io/backend/lined/subscription/service/SubscriptionServiceImpl.java index cc775bdc..84b477ce 100644 --- a/backend/lined/src/main/java/io/backend/lined/subscription/service/SubscriptionServiceImpl.java +++ b/backend/lined/src/main/java/io/backend/lined/subscription/service/SubscriptionServiceImpl.java @@ -3,8 +3,8 @@ import io.backend.lined.common.exception.NotFoundException; import io.backend.lined.plan.domain.PlanEntity; import io.backend.lined.plan.domain.PlanRepository; -import io.backend.lined.subscription.api.SubscriptionDto; -import io.backend.lined.subscription.api.SubscriptionMapper; +import io.backend.lined.subscription.api.dto.SubscriptionDto; +import io.backend.lined.subscription.api.dto.SubscriptionMapper; import io.backend.lined.subscription.domain.UserSubscriptionEntity; import io.backend.lined.subscription.domain.UserSubscriptionRepository; import io.backend.lined.user.domain.UserEntity; diff --git a/backend/lined/src/main/java/io/backend/lined/task/api/TaskController.java b/backend/lined/src/main/java/io/backend/lined/task/api/TaskController.java index b8925fb8..cd192022 100644 --- a/backend/lined/src/main/java/io/backend/lined/task/api/TaskController.java +++ b/backend/lined/src/main/java/io/backend/lined/task/api/TaskController.java @@ -1,5 +1,8 @@ package io.backend.lined.task.api; +import io.backend.lined.task.api.dto.TaskCreateDto; +import io.backend.lined.task.api.dto.TaskDto; +import io.backend.lined.task.api.dto.TaskUpdateDto; import io.backend.lined.task.service.TaskService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/backend/lined/src/main/java/io/backend/lined/task/api/TaskCreateDto.java b/backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskCreateDto.java similarity index 92% rename from backend/lined/src/main/java/io/backend/lined/task/api/TaskCreateDto.java rename to backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskCreateDto.java index 812edeb2..e9e6a5ef 100644 --- a/backend/lined/src/main/java/io/backend/lined/task/api/TaskCreateDto.java +++ b/backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskCreateDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.task.api; +package io.backend.lined.task.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/backend/lined/src/main/java/io/backend/lined/task/api/TaskDto.java b/backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskDto.java similarity index 94% rename from backend/lined/src/main/java/io/backend/lined/task/api/TaskDto.java rename to backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskDto.java index c6d0ce0c..fba427c6 100644 --- a/backend/lined/src/main/java/io/backend/lined/task/api/TaskDto.java +++ b/backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.task.api; +package io.backend.lined.task.api.dto; import io.backend.lined.task.domain.TaskStatus; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/lined/src/main/java/io/backend/lined/task/api/TaskMapper.java b/backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskMapper.java similarity index 93% rename from backend/lined/src/main/java/io/backend/lined/task/api/TaskMapper.java rename to backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskMapper.java index 69f13c7b..5a4cedbc 100644 --- a/backend/lined/src/main/java/io/backend/lined/task/api/TaskMapper.java +++ b/backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskMapper.java @@ -1,4 +1,4 @@ -package io.backend.lined.task.api; +package io.backend.lined.task.api.dto; import io.backend.lined.task.domain.TaskEntity; import org.mapstruct.Mapper; diff --git a/backend/lined/src/main/java/io/backend/lined/task/api/TaskUpdateDto.java b/backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskUpdateDto.java similarity index 91% rename from backend/lined/src/main/java/io/backend/lined/task/api/TaskUpdateDto.java rename to backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskUpdateDto.java index afd22bc3..dcaa15e1 100644 --- a/backend/lined/src/main/java/io/backend/lined/task/api/TaskUpdateDto.java +++ b/backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskUpdateDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.task.api; +package io.backend.lined.task.api.dto; import io.backend.lined.task.domain.TaskStatus; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/lined/src/main/java/io/backend/lined/task/service/TaskService.java b/backend/lined/src/main/java/io/backend/lined/task/service/TaskService.java index 226489b2..d4642768 100644 --- a/backend/lined/src/main/java/io/backend/lined/task/service/TaskService.java +++ b/backend/lined/src/main/java/io/backend/lined/task/service/TaskService.java @@ -1,9 +1,9 @@ package io.backend.lined.task.service; -import io.backend.lined.task.api.TaskCreateDto; -import io.backend.lined.task.api.TaskDto; -import io.backend.lined.task.api.TaskUpdateDto; +import io.backend.lined.task.api.dto.TaskCreateDto; +import io.backend.lined.task.api.dto.TaskDto; +import io.backend.lined.task.api.dto.TaskUpdateDto; import java.util.List; public interface TaskService { diff --git a/backend/lined/src/main/java/io/backend/lined/task/service/TaskServiceImpl.java b/backend/lined/src/main/java/io/backend/lined/task/service/TaskServiceImpl.java index e7fa0314..69aa09d3 100644 --- a/backend/lined/src/main/java/io/backend/lined/task/service/TaskServiceImpl.java +++ b/backend/lined/src/main/java/io/backend/lined/task/service/TaskServiceImpl.java @@ -2,10 +2,10 @@ import io.backend.lined.lobby.domain.LobbyEntity; import io.backend.lined.lobby.domain.LobbyRepository; -import io.backend.lined.task.api.TaskCreateDto; -import io.backend.lined.task.api.TaskDto; -import io.backend.lined.task.api.TaskMapper; -import io.backend.lined.task.api.TaskUpdateDto; +import io.backend.lined.task.api.dto.TaskCreateDto; +import io.backend.lined.task.api.dto.TaskDto; +import io.backend.lined.task.api.dto.TaskMapper; +import io.backend.lined.task.api.dto.TaskUpdateDto; import io.backend.lined.task.domain.TaskEntity; import io.backend.lined.task.domain.TaskRepository; import io.backend.lined.task.domain.TaskStatus; diff --git a/backend/lined/src/main/java/io/backend/lined/user/api/UserController.java b/backend/lined/src/main/java/io/backend/lined/user/api/UserController.java index 6b4eecf0..43f57d85 100644 --- a/backend/lined/src/main/java/io/backend/lined/user/api/UserController.java +++ b/backend/lined/src/main/java/io/backend/lined/user/api/UserController.java @@ -1,5 +1,9 @@ package io.backend.lined.user.api; +import io.backend.lined.user.api.dto.UserCreateDto; +import io.backend.lined.user.api.dto.UserDto; +import io.backend.lined.user.api.dto.UserPageDto; +import io.backend.lined.user.api.dto.UserUpdateDto; import io.backend.lined.user.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/backend/lined/src/main/java/io/backend/lined/user/api/UserCreateDto.java b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserCreateDto.java similarity index 90% rename from backend/lined/src/main/java/io/backend/lined/user/api/UserCreateDto.java rename to backend/lined/src/main/java/io/backend/lined/user/api/dto/UserCreateDto.java index 7d3cf655..6afde2eb 100644 --- a/backend/lined/src/main/java/io/backend/lined/user/api/UserCreateDto.java +++ b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserCreateDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.user.api; +package io.backend.lined.user.api.dto; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/backend/lined/src/main/java/io/backend/lined/user/api/UserDto.java b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserDto.java similarity index 96% rename from backend/lined/src/main/java/io/backend/lined/user/api/UserDto.java rename to backend/lined/src/main/java/io/backend/lined/user/api/dto/UserDto.java index aaf85fd9..dc3f0d4c 100644 --- a/backend/lined/src/main/java/io/backend/lined/user/api/UserDto.java +++ b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.user.api; +package io.backend.lined.user.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.time.OffsetDateTime; diff --git a/backend/lined/src/main/java/io/backend/lined/user/api/UserMapper.java b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserMapper.java similarity index 94% rename from backend/lined/src/main/java/io/backend/lined/user/api/UserMapper.java rename to backend/lined/src/main/java/io/backend/lined/user/api/dto/UserMapper.java index 3c12c6e4..88292438 100644 --- a/backend/lined/src/main/java/io/backend/lined/user/api/UserMapper.java +++ b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserMapper.java @@ -1,8 +1,8 @@ -package io.backend.lined.user.api; +package io.backend.lined.user.api.dto; -import io.backend.lined.role.api.RoleMapper; +import io.backend.lined.role.api.dto.RoleMapper; import io.backend.lined.role.domain.RoleEntity; -import io.backend.lined.subscription.api.SubscriptionMapper; +import io.backend.lined.subscription.api.dto.SubscriptionMapper; import io.backend.lined.subscription.domain.UserSubscriptionEntity; import io.backend.lined.user.domain.UserEntity; import java.time.OffsetDateTime; diff --git a/backend/lined/src/main/java/io/backend/lined/user/api/UserPageDto.java b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserPageDto.java similarity index 81% rename from backend/lined/src/main/java/io/backend/lined/user/api/UserPageDto.java rename to backend/lined/src/main/java/io/backend/lined/user/api/dto/UserPageDto.java index 6aa26cef..5b61c324 100644 --- a/backend/lined/src/main/java/io/backend/lined/user/api/UserPageDto.java +++ b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserPageDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.user.api; +package io.backend.lined.user.api.dto; import java.util.List; diff --git a/backend/lined/src/main/java/io/backend/lined/user/api/UserSearchResultDto.java b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserSearchResultDto.java similarity index 93% rename from backend/lined/src/main/java/io/backend/lined/user/api/UserSearchResultDto.java rename to backend/lined/src/main/java/io/backend/lined/user/api/dto/UserSearchResultDto.java index 901bc4ca..603bb030 100644 --- a/backend/lined/src/main/java/io/backend/lined/user/api/UserSearchResultDto.java +++ b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserSearchResultDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.user.api; +package io.backend.lined.user.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.time.OffsetDateTime; diff --git a/backend/lined/src/main/java/io/backend/lined/user/api/UserUpdateDto.java b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserUpdateDto.java similarity index 88% rename from backend/lined/src/main/java/io/backend/lined/user/api/UserUpdateDto.java rename to backend/lined/src/main/java/io/backend/lined/user/api/dto/UserUpdateDto.java index 8c9bcc8b..90bd1888 100644 --- a/backend/lined/src/main/java/io/backend/lined/user/api/UserUpdateDto.java +++ b/backend/lined/src/main/java/io/backend/lined/user/api/dto/UserUpdateDto.java @@ -1,4 +1,4 @@ -package io.backend.lined.user.api; +package io.backend.lined.user.api.dto; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Size; diff --git a/backend/lined/src/main/java/io/backend/lined/user/service/UserService.java b/backend/lined/src/main/java/io/backend/lined/user/service/UserService.java index 24f81733..b977c9b2 100644 --- a/backend/lined/src/main/java/io/backend/lined/user/service/UserService.java +++ b/backend/lined/src/main/java/io/backend/lined/user/service/UserService.java @@ -1,9 +1,9 @@ package io.backend.lined.user.service; -import io.backend.lined.user.api.UserCreateDto; -import io.backend.lined.user.api.UserDto; -import io.backend.lined.user.api.UserPageDto; -import io.backend.lined.user.api.UserUpdateDto; +import io.backend.lined.user.api.dto.UserCreateDto; +import io.backend.lined.user.api.dto.UserDto; +import io.backend.lined.user.api.dto.UserPageDto; +import io.backend.lined.user.api.dto.UserUpdateDto; public interface UserService { diff --git a/backend/lined/src/main/java/io/backend/lined/user/service/UserServiceImpl.java b/backend/lined/src/main/java/io/backend/lined/user/service/UserServiceImpl.java index acc2f445..7eae6ea0 100644 --- a/backend/lined/src/main/java/io/backend/lined/user/service/UserServiceImpl.java +++ b/backend/lined/src/main/java/io/backend/lined/user/service/UserServiceImpl.java @@ -6,12 +6,12 @@ import io.backend.lined.common.exception.NotFoundException; import io.backend.lined.role.domain.RoleEntity; import io.backend.lined.role.domain.RoleRepository; -import io.backend.lined.user.api.UserCreateDto; -import io.backend.lined.user.api.UserDto; -import io.backend.lined.user.api.UserMapper; -import io.backend.lined.user.api.UserPageDto; -import io.backend.lined.user.api.UserSearchResultDto; -import io.backend.lined.user.api.UserUpdateDto; +import io.backend.lined.user.api.dto.UserCreateDto; +import io.backend.lined.user.api.dto.UserDto; +import io.backend.lined.user.api.dto.UserMapper; +import io.backend.lined.user.api.dto.UserPageDto; +import io.backend.lined.user.api.dto.UserSearchResultDto; +import io.backend.lined.user.api.dto.UserUpdateDto; import io.backend.lined.user.domain.UserEntity; import io.backend.lined.user.domain.UserRepository; import jakarta.transaction.Transactional; diff --git a/backend/lined/src/test/java/io/backend/lined/app/AccountApplicationServiceImplTest.java b/backend/lined/src/test/java/io/backend/lined/app/AccountApplicationServiceImplTest.java index 83fdd684..4037336c 100644 --- a/backend/lined/src/test/java/io/backend/lined/app/AccountApplicationServiceImplTest.java +++ b/backend/lined/src/test/java/io/backend/lined/app/AccountApplicationServiceImplTest.java @@ -8,13 +8,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.backend.lined.plan.api.PlanDto; +import io.backend.lined.plan.api.dto.PlanDto; import io.backend.lined.plan.service.PlanService; import io.backend.lined.role.service.RoleService; -import io.backend.lined.subscription.api.SubscriptionDto; +import io.backend.lined.subscription.api.dto.SubscriptionDto; import io.backend.lined.subscription.service.SubscriptionService; -import io.backend.lined.user.api.UserCreateDto; -import io.backend.lined.user.api.UserDto; +import io.backend.lined.user.api.dto.UserCreateDto; +import io.backend.lined.user.api.dto.UserDto; import io.backend.lined.user.service.UserService; import java.math.BigDecimal; import java.time.OffsetDateTime; diff --git a/backend/lined/src/test/java/io/backend/lined/event/service/EventServiceImplConflictTest.java b/backend/lined/src/test/java/io/backend/lined/event/service/EventServiceImplConflictTest.java index 8f462a19..7a291d12 100644 --- a/backend/lined/src/test/java/io/backend/lined/event/service/EventServiceImplConflictTest.java +++ b/backend/lined/src/test/java/io/backend/lined/event/service/EventServiceImplConflictTest.java @@ -8,10 +8,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.backend.lined.event.api.EventConflictDto; -import io.backend.lined.event.api.EventDto; -import io.backend.lined.event.api.EventMapper; -import io.backend.lined.event.api.UserConflictDto; +import io.backend.lined.event.api.dto.EventConflictDto; +import io.backend.lined.event.api.dto.EventDto; +import io.backend.lined.event.api.dto.EventMapper; +import io.backend.lined.event.api.dto.UserConflictDto; import io.backend.lined.event.domain.EventEntity; import io.backend.lined.event.domain.EventRepository; import io.backend.lined.lobby.domain.LobbyEntity; diff --git a/backend/lined/src/test/java/io/backend/lined/event/service/EventServiceImplTest.java b/backend/lined/src/test/java/io/backend/lined/event/service/EventServiceImplTest.java index 6799607f..0ba310dd 100644 --- a/backend/lined/src/test/java/io/backend/lined/event/service/EventServiceImplTest.java +++ b/backend/lined/src/test/java/io/backend/lined/event/service/EventServiceImplTest.java @@ -7,10 +7,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.backend.lined.event.api.EventCreateDto; -import io.backend.lined.event.api.EventDto; -import io.backend.lined.event.api.EventMapper; -import io.backend.lined.event.api.EventUpdateDto; +import io.backend.lined.event.api.dto.EventCreateDto; +import io.backend.lined.event.api.dto.EventDto; +import io.backend.lined.event.api.dto.EventMapper; +import io.backend.lined.event.api.dto.EventUpdateDto; import io.backend.lined.event.domain.EventEntity; import io.backend.lined.event.domain.EventRepository; import io.backend.lined.lobby.domain.LobbyEntity; diff --git a/backend/lined/src/test/java/io/backend/lined/lobby/service/LobbyServiceImplTest.java b/backend/lined/src/test/java/io/backend/lined/lobby/service/LobbyServiceImplTest.java index 038e809a..836e0d4c 100644 --- a/backend/lined/src/test/java/io/backend/lined/lobby/service/LobbyServiceImplTest.java +++ b/backend/lined/src/test/java/io/backend/lined/lobby/service/LobbyServiceImplTest.java @@ -1,8 +1,8 @@ package io.backend.lined.lobby.service; -import io.backend.lined.lobby.api.LobbyCreateDto; -import io.backend.lined.lobby.api.LobbyDto; -import io.backend.lined.lobby.api.LobbyMapper; +import io.backend.lined.lobby.api.dto.LobbyCreateDto; +import io.backend.lined.lobby.api.dto.LobbyDto; +import io.backend.lined.lobby.api.dto.LobbyMapper; import io.backend.lined.lobby.domain.LobbyEntity; import io.backend.lined.lobby.domain.LobbyRepository; import io.backend.lined.lobby.domain.LobbyTypes; diff --git a/backend/lined/src/test/java/io/backend/lined/plan/service/PlanServiceImplTest.java b/backend/lined/src/test/java/io/backend/lined/plan/service/PlanServiceImplTest.java index 2ab79fe8..c067375e 100644 --- a/backend/lined/src/test/java/io/backend/lined/plan/service/PlanServiceImplTest.java +++ b/backend/lined/src/test/java/io/backend/lined/plan/service/PlanServiceImplTest.java @@ -1,10 +1,10 @@ package io.backend.lined.plan.service; import io.backend.lined.common.exception.NotFoundException; -import io.backend.lined.plan.api.PlanCreateDto; -import io.backend.lined.plan.api.PlanDto; -import io.backend.lined.plan.api.PlanMapper; -import io.backend.lined.plan.api.PlanUpdateDto; +import io.backend.lined.plan.api.dto.PlanCreateDto; +import io.backend.lined.plan.api.dto.PlanDto; +import io.backend.lined.plan.api.dto.PlanMapper; +import io.backend.lined.plan.api.dto.PlanUpdateDto; import io.backend.lined.plan.domain.PlanEntity; import io.backend.lined.plan.domain.PlanRepository; import org.junit.jupiter.api.BeforeEach; diff --git a/backend/lined/src/test/java/io/backend/lined/role/service/RoleServiceImplTest.java b/backend/lined/src/test/java/io/backend/lined/role/service/RoleServiceImplTest.java index c301567f..9c9755f9 100644 --- a/backend/lined/src/test/java/io/backend/lined/role/service/RoleServiceImplTest.java +++ b/backend/lined/src/test/java/io/backend/lined/role/service/RoleServiceImplTest.java @@ -1,8 +1,8 @@ package io.backend.lined.role.service; import io.backend.lined.common.exception.NotFoundException; -import io.backend.lined.role.api.RoleDto; -import io.backend.lined.role.api.RoleMapper; +import io.backend.lined.role.api.dto.RoleDto; +import io.backend.lined.role.api.dto.RoleMapper; import io.backend.lined.role.domain.RoleEntity; import io.backend.lined.role.domain.RoleRepository; import io.backend.lined.user.domain.UserEntity; diff --git a/backend/lined/src/test/java/io/backend/lined/subscription/service/SubscriptionServiceImplTest.java b/backend/lined/src/test/java/io/backend/lined/subscription/service/SubscriptionServiceImplTest.java index d29db01e..2b7b4185 100644 --- a/backend/lined/src/test/java/io/backend/lined/subscription/service/SubscriptionServiceImplTest.java +++ b/backend/lined/src/test/java/io/backend/lined/subscription/service/SubscriptionServiceImplTest.java @@ -3,8 +3,8 @@ import io.backend.lined.common.exception.NotFoundException; import io.backend.lined.plan.domain.PlanEntity; import io.backend.lined.plan.domain.PlanRepository; -import io.backend.lined.subscription.api.SubscriptionDto; -import io.backend.lined.subscription.api.SubscriptionMapper; +import io.backend.lined.subscription.api.dto.SubscriptionDto; +import io.backend.lined.subscription.api.dto.SubscriptionMapper; import io.backend.lined.subscription.domain.UserSubscriptionEntity; import io.backend.lined.subscription.domain.UserSubscriptionRepository; import io.backend.lined.user.domain.UserEntity; diff --git a/backend/lined/src/test/java/io/backend/lined/user/service/UserServiceImplSearchTest.java b/backend/lined/src/test/java/io/backend/lined/user/service/UserServiceImplSearchTest.java index 5bae86f2..60221099 100644 --- a/backend/lined/src/test/java/io/backend/lined/user/service/UserServiceImplSearchTest.java +++ b/backend/lined/src/test/java/io/backend/lined/user/service/UserServiceImplSearchTest.java @@ -11,9 +11,9 @@ import io.backend.lined.common.exception.NotFoundException; import io.backend.lined.role.domain.RoleEntity; import io.backend.lined.role.domain.RoleRepository; -import io.backend.lined.user.api.UserMapper; -import io.backend.lined.user.api.UserPageDto; -import io.backend.lined.user.api.UserSearchResultDto; +import io.backend.lined.user.api.dto.UserMapper; +import io.backend.lined.user.api.dto.UserPageDto; +import io.backend.lined.user.api.dto.UserSearchResultDto; import io.backend.lined.user.domain.UserEntity; import io.backend.lined.user.domain.UserRepository; import java.time.OffsetDateTime; diff --git a/backend/lined/src/test/java/io/backend/lined/user/service/UserServiceImplTest.java b/backend/lined/src/test/java/io/backend/lined/user/service/UserServiceImplTest.java index c90bb952..0686959f 100644 --- a/backend/lined/src/test/java/io/backend/lined/user/service/UserServiceImplTest.java +++ b/backend/lined/src/test/java/io/backend/lined/user/service/UserServiceImplTest.java @@ -12,10 +12,10 @@ import io.backend.lined.common.exception.NotFoundException; import io.backend.lined.role.domain.RoleEntity; import io.backend.lined.role.domain.RoleRepository; -import io.backend.lined.user.api.UserCreateDto; -import io.backend.lined.user.api.UserDto; -import io.backend.lined.user.api.UserMapper; -import io.backend.lined.user.api.UserUpdateDto; +import io.backend.lined.user.api.dto.UserCreateDto; +import io.backend.lined.user.api.dto.UserDto; +import io.backend.lined.user.api.dto.UserMapper; +import io.backend.lined.user.api.dto.UserUpdateDto; import io.backend.lined.user.domain.UserEntity; import io.backend.lined.user.domain.UserRepository; import java.util.Optional;