diff --git a/backend/lined/config/spotbugs/spotbugs-exclude.xml b/backend/lined/config/spotbugs/spotbugs-exclude.xml index 46e1424..e838f4f 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 b558420..312988d 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 8305579..8157ef1 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 5d5a669..6ac7040 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 33d6b8e..5334710 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 6bbbecc..04fef18 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 dae545d..444a981 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 67ea45f..b84e5c3 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 ea75047..6eba615 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 d83025a..9cc2628 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 323045a..80298d5 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 abfdd19..0448732 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 af452e0..7477741 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 7ee26ed..6852c65 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 7fc3a78..de525fb 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 ff235ac..c0477b4 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 51daff1..4bf529a 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 c65a9ad..779a518 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 373f845..90859fe 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 e860825..c2d642d 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 325a7df..6e858a6 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 a86c58f..f8dadf9 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 dac9768..87ae4a1 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 fd86b4e..cb3c5e7 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 34b615e..5ca4e60 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 e142a04..3c9a089 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 854a2c3..6a8c417 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 e3aefe7..a784395 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 444ed4c..d4b1a51 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 3a7b9a8..5af0aa9 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 a9a9629..6e272b0 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 59c9b6d..7928460 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 411987b..39ecd95 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 a6e14f5..45f59f4 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 4a4be25..4ace489 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 8b632b1..97fc021 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 a1bd490..ad68b3d 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 cc775bd..84b477c 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 b8925fb..cd19202 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 812edeb..e9e6a5e 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 c6d0ce0..fba427c 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 69f13c7..5a4cedb 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 afd22bc..dcaa15e 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 226489b..d464276 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 e7fa031..69aa09d 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 6b4eecf..43f57d8 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 7d3cf65..6afde2e 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 aaf85fd..dc3f0d4 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 3c12c6e..8829243 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 6aa26ce..5b61c32 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 901bc4c..603bb03 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 8c9bcc8..90bd188 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 24f8173..b977c9b 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 acc2f44..7eae6ea 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 83fdd68..4037336 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 8f462a1..7a291d1 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 6799607..0ba310d 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 038e809..836e0d4 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 2ab79fe..c067375 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 c301567..9c9755f 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 d29db01..2b7b418 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 5bae86f..6022109 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 c90bb95..0686959 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;