diff --git a/src/main/java/com/yapp/artie/domain/archive/service/CategoryService.java b/src/main/java/com/yapp/artie/domain/archive/service/CategoryService.java index 550086c7..13237b34 100644 --- a/src/main/java/com/yapp/artie/domain/archive/service/CategoryService.java +++ b/src/main/java/com/yapp/artie/domain/archive/service/CategoryService.java @@ -40,13 +40,10 @@ public Category findCategoryWithUser(Long id, Long userId) { } public List categoriesOf(Long userId) { - UserJpaEntity user = findUser(userId); - List categories = categoryRepository.findCategoriesByUserOrderBySequence(user) - .stream().map(this::buildCategoryDto).collect( - Collectors.toList()); - validateExistAtLeastOneCategory(categories); - - return categories; + return categoryRepository.findCategoriesByUserOrderBySequence(findUser(userId)) + .stream() + .map(this::buildCategoryDto) + .collect(Collectors.toList()); } @Transactional @@ -110,12 +107,6 @@ private int getSequence(UserJpaEntity user) { return categoryRepository.countCategoriesByUser(user); } - private void validateExistAtLeastOneCategory(List categories) { - if (categories.size() == 0) { - throw new CategoryNotFoundException(); - } - } - private void validateDuplicateCategory(String name, UserJpaEntity user) { List categories = categoryRepository.findCategoryDto(user); long count = categories.stream() diff --git a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetTestUserTokenController.java b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetTestUserTokenController.java index c50c1fd5..370c56e8 100644 --- a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetTestUserTokenController.java +++ b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetTestUserTokenController.java @@ -1,7 +1,7 @@ package com.yapp.artie.domain.user.adapter.in.web; -import com.yapp.artie.domain.user.application.port.in.GetTestUserTokenQuery; -import com.yapp.artie.domain.user.application.port.in.GetTestUserTokenResponse; +import com.yapp.artie.domain.user.application.port.in.query.GetTestUserTokenQuery; +import com.yapp.artie.domain.user.application.port.in.response.GetTestUserTokenResponse; import com.yapp.artie.global.common.annotation.WebAdapter; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserController.java b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserController.java index a8e360b7..aa6d1fec 100644 --- a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserController.java +++ b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserController.java @@ -1,6 +1,6 @@ package com.yapp.artie.domain.user.adapter.in.web; -import com.yapp.artie.domain.user.application.port.in.GetUserQuery; +import com.yapp.artie.domain.user.application.port.in.query.GetUserQuery; import com.yapp.artie.domain.user.domain.User; import com.yapp.artie.global.common.annotation.WebAdapter; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserJoinDateController.java b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserJoinDateController.java index f41bf966..96824437 100644 --- a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserJoinDateController.java +++ b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserJoinDateController.java @@ -1,7 +1,7 @@ package com.yapp.artie.domain.user.adapter.in.web; -import com.yapp.artie.domain.user.application.port.in.GetUserJoinDateQuery; -import com.yapp.artie.domain.user.application.port.in.GetUserJoinDateResponse; +import com.yapp.artie.domain.user.application.port.in.query.GetUserJoinDateQuery; +import com.yapp.artie.domain.user.application.port.in.response.GetUserJoinDateResponse; import com.yapp.artie.global.common.annotation.WebAdapter; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserThumbnailController.java b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserThumbnailController.java index 5712c625..860c0d3e 100644 --- a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserThumbnailController.java +++ b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/GetUserThumbnailController.java @@ -1,8 +1,8 @@ package com.yapp.artie.domain.user.adapter.in.web; import com.yapp.artie.domain.user.adapter.out.persistence.UserJpaEntity; -import com.yapp.artie.domain.user.application.port.in.GetUserThumbnailQuery; -import com.yapp.artie.domain.user.application.port.in.GetUserThumbnailResponse; +import com.yapp.artie.domain.user.application.port.in.query.GetUserThumbnailQuery; +import com.yapp.artie.domain.user.application.port.in.response.GetUserThumbnailResponse; import com.yapp.artie.global.common.annotation.WebAdapter; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; diff --git a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/RegisterUserController.java b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/RegisterUserController.java index 39cffaf2..4e1b118d 100644 --- a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/RegisterUserController.java +++ b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/RegisterUserController.java @@ -1,8 +1,8 @@ package com.yapp.artie.domain.user.adapter.in.web; -import com.yapp.artie.domain.user.application.port.in.RegisterUserResponse; -import com.yapp.artie.domain.user.application.port.in.RegisterUserUseCase; +import com.yapp.artie.domain.user.application.port.in.command.RegisterUserUseCase; +import com.yapp.artie.domain.user.application.port.in.response.RegisterUserResponse; import com.yapp.artie.domain.user.application.port.out.TokenParsingPort; import com.yapp.artie.domain.user.domain.ArtieToken; import com.yapp.artie.global.common.annotation.WebAdapter; diff --git a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/RenameUserController.java b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/RenameUserController.java index b3e325ed..f19b027b 100644 --- a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/RenameUserController.java +++ b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/RenameUserController.java @@ -1,6 +1,6 @@ package com.yapp.artie.domain.user.adapter.in.web; -import com.yapp.artie.domain.user.application.port.in.RenameUserUseCase; +import com.yapp.artie.domain.user.application.port.in.command.RenameUserUseCase; import com.yapp.artie.global.common.annotation.WebAdapter; import com.yapp.artie.global.common.exception.ErrorResponse; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/UserWithdrawalController.java b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/UserWithdrawalController.java index bd7fd920..b74479d9 100644 --- a/src/main/java/com/yapp/artie/domain/user/adapter/in/web/UserWithdrawalController.java +++ b/src/main/java/com/yapp/artie/domain/user/adapter/in/web/UserWithdrawalController.java @@ -1,6 +1,6 @@ package com.yapp.artie.domain.user.adapter.in.web; -import com.yapp.artie.domain.user.application.port.in.UserWithdrawalUseCase; +import com.yapp.artie.domain.user.application.port.in.command.UserWithdrawalUseCase; import com.yapp.artie.global.common.annotation.WebAdapter; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserThumbnailQuery.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserThumbnailQuery.java deleted file mode 100644 index b0573255..00000000 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserThumbnailQuery.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yapp.artie.domain.user.application.port.in; - -public interface GetUserThumbnailQuery { - - GetUserThumbnailResponse loadUserThumbnailById(Long id); -} diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/RegisterUserUseCase.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/RegisterUserUseCase.java deleted file mode 100644 index b98ea7b9..00000000 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/RegisterUserUseCase.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yapp.artie.domain.user.application.port.in; - -public interface RegisterUserUseCase { - - RegisterUserResponse register(String uid, String username, String picture); -} diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/command/RegisterUserUseCase.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/command/RegisterUserUseCase.java new file mode 100644 index 00000000..95063788 --- /dev/null +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/command/RegisterUserUseCase.java @@ -0,0 +1,8 @@ +package com.yapp.artie.domain.user.application.port.in.command; + +import com.yapp.artie.domain.user.application.port.in.response.RegisterUserResponse; + +public interface RegisterUserUseCase { + + RegisterUserResponse register(String uid, String username, String picture); +} diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/RenameUserUseCase.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/command/RenameUserUseCase.java similarity index 56% rename from src/main/java/com/yapp/artie/domain/user/application/port/in/RenameUserUseCase.java rename to src/main/java/com/yapp/artie/domain/user/application/port/in/command/RenameUserUseCase.java index 256511ff..949ac203 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/RenameUserUseCase.java +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/command/RenameUserUseCase.java @@ -1,4 +1,4 @@ -package com.yapp.artie.domain.user.application.port.in; +package com.yapp.artie.domain.user.application.port.in.command; public interface RenameUserUseCase { diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/UserWithdrawalUseCase.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/command/UserWithdrawalUseCase.java similarity index 51% rename from src/main/java/com/yapp/artie/domain/user/application/port/in/UserWithdrawalUseCase.java rename to src/main/java/com/yapp/artie/domain/user/application/port/in/command/UserWithdrawalUseCase.java index 1920b2e0..56ed9e17 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/UserWithdrawalUseCase.java +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/command/UserWithdrawalUseCase.java @@ -1,4 +1,4 @@ -package com.yapp.artie.domain.user.application.port.in; +package com.yapp.artie.domain.user.application.port.in.command; public interface UserWithdrawalUseCase { diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetTestUserTokenQuery.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetTestUserTokenQuery.java similarity index 58% rename from src/main/java/com/yapp/artie/domain/user/application/port/in/GetTestUserTokenQuery.java rename to src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetTestUserTokenQuery.java index 2960bd99..b29915eb 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetTestUserTokenQuery.java +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetTestUserTokenQuery.java @@ -1,4 +1,4 @@ -package com.yapp.artie.domain.user.application.port.in; +package com.yapp.artie.domain.user.application.port.in.query; public interface GetTestUserTokenQuery { diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserDetailsQuery.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserDetailsQuery.java similarity index 80% rename from src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserDetailsQuery.java rename to src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserDetailsQuery.java index a4639edf..063a5b9c 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserDetailsQuery.java +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserDetailsQuery.java @@ -1,4 +1,4 @@ -package com.yapp.artie.domain.user.application.port.in; +package com.yapp.artie.domain.user.application.port.in.query; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserJoinDateQuery.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserJoinDateQuery.java similarity index 66% rename from src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserJoinDateQuery.java rename to src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserJoinDateQuery.java index 6a0e2cfd..dde78d58 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserJoinDateQuery.java +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserJoinDateQuery.java @@ -1,4 +1,4 @@ -package com.yapp.artie.domain.user.application.port.in; +package com.yapp.artie.domain.user.application.port.in.query; import java.time.LocalDateTime; diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserQuery.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserQuery.java similarity index 65% rename from src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserQuery.java rename to src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserQuery.java index c3e73bc7..b47c6156 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserQuery.java +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserQuery.java @@ -1,4 +1,4 @@ -package com.yapp.artie.domain.user.application.port.in; +package com.yapp.artie.domain.user.application.port.in.query; import com.yapp.artie.domain.user.domain.User; diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserThumbnailQuery.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserThumbnailQuery.java new file mode 100644 index 00000000..f32f9dff --- /dev/null +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/query/GetUserThumbnailQuery.java @@ -0,0 +1,8 @@ +package com.yapp.artie.domain.user.application.port.in.query; + +import com.yapp.artie.domain.user.application.port.in.response.GetUserThumbnailResponse; + +public interface GetUserThumbnailQuery { + + GetUserThumbnailResponse loadUserThumbnailById(Long id); +} diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetTestUserTokenResponse.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/response/GetTestUserTokenResponse.java similarity index 83% rename from src/main/java/com/yapp/artie/domain/user/application/port/in/GetTestUserTokenResponse.java rename to src/main/java/com/yapp/artie/domain/user/application/port/in/response/GetTestUserTokenResponse.java index 1bc6f47b..0022c55f 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetTestUserTokenResponse.java +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/response/GetTestUserTokenResponse.java @@ -1,4 +1,4 @@ -package com.yapp.artie.domain.user.application.port.in; +package com.yapp.artie.domain.user.application.port.in.response; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserJoinDateResponse.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/response/GetUserJoinDateResponse.java similarity index 84% rename from src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserJoinDateResponse.java rename to src/main/java/com/yapp/artie/domain/user/application/port/in/response/GetUserJoinDateResponse.java index 9d1379c2..d228947a 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserJoinDateResponse.java +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/response/GetUserJoinDateResponse.java @@ -1,4 +1,4 @@ -package com.yapp.artie.domain.user.application.port.in; +package com.yapp.artie.domain.user.application.port.in.response; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserThumbnailResponse.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/response/GetUserThumbnailResponse.java similarity index 89% rename from src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserThumbnailResponse.java rename to src/main/java/com/yapp/artie/domain/user/application/port/in/response/GetUserThumbnailResponse.java index dd38855f..714bccdb 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserThumbnailResponse.java +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/response/GetUserThumbnailResponse.java @@ -1,4 +1,4 @@ -package com.yapp.artie.domain.user.application.port.in; +package com.yapp.artie.domain.user.application.port.in.response; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; diff --git a/src/main/java/com/yapp/artie/domain/user/application/port/in/RegisterUserResponse.java b/src/main/java/com/yapp/artie/domain/user/application/port/in/response/RegisterUserResponse.java similarity index 81% rename from src/main/java/com/yapp/artie/domain/user/application/port/in/RegisterUserResponse.java rename to src/main/java/com/yapp/artie/domain/user/application/port/in/response/RegisterUserResponse.java index 86421d08..cfb1f9cf 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/port/in/RegisterUserResponse.java +++ b/src/main/java/com/yapp/artie/domain/user/application/port/in/response/RegisterUserResponse.java @@ -1,4 +1,4 @@ -package com.yapp.artie.domain.user.application.port.in; +package com.yapp.artie.domain.user.application.port.in.response; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/com/yapp/artie/domain/user/application/service/GetTestUserTokenService.java b/src/main/java/com/yapp/artie/domain/user/application/service/GetTestUserTokenService.java index 883de48e..38554cd9 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/service/GetTestUserTokenService.java +++ b/src/main/java/com/yapp/artie/domain/user/application/service/GetTestUserTokenService.java @@ -1,6 +1,6 @@ package com.yapp.artie.domain.user.application.service; -import com.yapp.artie.domain.user.application.port.in.GetTestUserTokenQuery; +import com.yapp.artie.domain.user.application.port.in.query.GetTestUserTokenQuery; import com.yapp.artie.domain.user.application.port.out.GenerateTestTokenPort; import com.yapp.artie.domain.user.application.port.out.LoadUserPort; import com.yapp.artie.global.common.annotation.UseCase; diff --git a/src/main/java/com/yapp/artie/domain/user/application/service/GetUserDetailsService.java b/src/main/java/com/yapp/artie/domain/user/application/service/GetUserDetailsService.java index 46083596..9fd23c71 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/service/GetUserDetailsService.java +++ b/src/main/java/com/yapp/artie/domain/user/application/service/GetUserDetailsService.java @@ -2,7 +2,7 @@ import static org.springframework.security.core.userdetails.User.builder; -import com.yapp.artie.domain.user.application.port.in.GetUserDetailsQuery; +import com.yapp.artie.domain.user.application.port.in.query.GetUserDetailsQuery; import com.yapp.artie.domain.user.application.port.out.LoadUserPort; import com.yapp.artie.domain.user.domain.User; import com.yapp.artie.global.common.annotation.UseCase; diff --git a/src/main/java/com/yapp/artie/domain/user/application/service/GetUserJoinDateService.java b/src/main/java/com/yapp/artie/domain/user/application/service/GetUserJoinDateService.java index ece71184..2ab1df21 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/service/GetUserJoinDateService.java +++ b/src/main/java/com/yapp/artie/domain/user/application/service/GetUserJoinDateService.java @@ -1,6 +1,6 @@ package com.yapp.artie.domain.user.application.service; -import com.yapp.artie.domain.user.application.port.in.GetUserJoinDateQuery; +import com.yapp.artie.domain.user.application.port.in.query.GetUserJoinDateQuery; import com.yapp.artie.domain.user.application.port.out.LoadUserPort; import com.yapp.artie.global.common.annotation.UseCase; import java.time.LocalDateTime; diff --git a/src/main/java/com/yapp/artie/domain/user/application/service/GetUserService.java b/src/main/java/com/yapp/artie/domain/user/application/service/GetUserService.java index 85b6b3c5..b2d61886 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/service/GetUserService.java +++ b/src/main/java/com/yapp/artie/domain/user/application/service/GetUserService.java @@ -1,6 +1,6 @@ package com.yapp.artie.domain.user.application.service; -import com.yapp.artie.domain.user.application.port.in.GetUserQuery; +import com.yapp.artie.domain.user.application.port.in.query.GetUserQuery; import com.yapp.artie.domain.user.application.port.out.LoadUserPort; import com.yapp.artie.domain.user.domain.User; import com.yapp.artie.global.common.annotation.UseCase; diff --git a/src/main/java/com/yapp/artie/domain/user/application/service/GetUserThumbnailService.java b/src/main/java/com/yapp/artie/domain/user/application/service/GetUserThumbnailService.java index 6f78fea6..90683d64 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/service/GetUserThumbnailService.java +++ b/src/main/java/com/yapp/artie/domain/user/application/service/GetUserThumbnailService.java @@ -2,8 +2,8 @@ import com.yapp.artie.domain.archive.service.ExhibitService; -import com.yapp.artie.domain.user.application.port.in.GetUserThumbnailQuery; -import com.yapp.artie.domain.user.application.port.in.GetUserThumbnailResponse; +import com.yapp.artie.domain.user.application.port.in.query.GetUserThumbnailQuery; +import com.yapp.artie.domain.user.application.port.in.response.GetUserThumbnailResponse; import com.yapp.artie.domain.user.application.port.out.LoadUserPort; import com.yapp.artie.domain.user.domain.User; import com.yapp.artie.global.common.annotation.UseCase; diff --git a/src/main/java/com/yapp/artie/domain/user/application/service/RegisterUserService.java b/src/main/java/com/yapp/artie/domain/user/application/service/RegisterUserService.java index 1f0a8408..65613a5f 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/service/RegisterUserService.java +++ b/src/main/java/com/yapp/artie/domain/user/application/service/RegisterUserService.java @@ -1,7 +1,7 @@ package com.yapp.artie.domain.user.application.service; -import com.yapp.artie.domain.user.application.port.in.RegisterUserResponse; -import com.yapp.artie.domain.user.application.port.in.RegisterUserUseCase; +import com.yapp.artie.domain.user.application.port.in.command.RegisterUserUseCase; +import com.yapp.artie.domain.user.application.port.in.response.RegisterUserResponse; import com.yapp.artie.domain.user.application.port.out.LoadUserPort; import com.yapp.artie.domain.user.application.port.out.SaveUserPort; import com.yapp.artie.domain.user.domain.User; diff --git a/src/main/java/com/yapp/artie/domain/user/application/service/RenameUserService.java b/src/main/java/com/yapp/artie/domain/user/application/service/RenameUserService.java index d2e253a3..706630d1 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/service/RenameUserService.java +++ b/src/main/java/com/yapp/artie/domain/user/application/service/RenameUserService.java @@ -1,6 +1,6 @@ package com.yapp.artie.domain.user.application.service; -import com.yapp.artie.domain.user.application.port.in.RenameUserUseCase; +import com.yapp.artie.domain.user.application.port.in.command.RenameUserUseCase; import com.yapp.artie.domain.user.application.port.out.LoadUserPort; import com.yapp.artie.domain.user.application.port.out.UpdateUserStatePort; import com.yapp.artie.domain.user.domain.User; diff --git a/src/main/java/com/yapp/artie/domain/user/application/service/UserAlreadyExistException.java b/src/main/java/com/yapp/artie/domain/user/application/service/UserAlreadyExistException.java deleted file mode 100644 index df9e1a4b..00000000 --- a/src/main/java/com/yapp/artie/domain/user/application/service/UserAlreadyExistException.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yapp.artie.domain.user.application.service; - -import com.yapp.artie.global.common.exception.BusinessException; -import com.yapp.artie.global.common.exception.ErrorCode; - -public class UserAlreadyExistException extends BusinessException { - - public UserAlreadyExistException() { - super(ErrorCode.USER_ALREADY_EXISTS); - } -} \ No newline at end of file diff --git a/src/main/java/com/yapp/artie/domain/user/application/service/UserWithdrawalService.java b/src/main/java/com/yapp/artie/domain/user/application/service/UserWithdrawalService.java index 3fd423c5..37e608a4 100644 --- a/src/main/java/com/yapp/artie/domain/user/application/service/UserWithdrawalService.java +++ b/src/main/java/com/yapp/artie/domain/user/application/service/UserWithdrawalService.java @@ -2,7 +2,7 @@ import com.yapp.artie.domain.archive.repository.CategoryRepository; import com.yapp.artie.domain.user.adapter.out.persistence.UserJpaEntity; -import com.yapp.artie.domain.user.application.port.in.UserWithdrawalUseCase; +import com.yapp.artie.domain.user.application.port.in.command.UserWithdrawalUseCase; import com.yapp.artie.domain.user.application.port.out.DeleteExternalUserPort; import com.yapp.artie.domain.user.application.port.out.DeleteUserPort; import com.yapp.artie.domain.user.application.port.out.LoadUserPort; diff --git a/src/main/java/com/yapp/artie/global/config/SecurityConfig.java b/src/main/java/com/yapp/artie/global/config/SecurityConfig.java index 7c89c1fc..554dfa16 100644 --- a/src/main/java/com/yapp/artie/global/config/SecurityConfig.java +++ b/src/main/java/com/yapp/artie/global/config/SecurityConfig.java @@ -42,6 +42,8 @@ public void configure(HttpSecurity http) throws Exception { http.exceptionHandling() .authenticationEntryPoint(new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED)); + + http.cors(); } @Override diff --git a/src/test/java/com/yapp/artie/domain/archive/service/CategoryServiceTest.java b/src/test/java/com/yapp/artie/domain/archive/service/CategoryServiceTest.java index cb65e211..a1cd7e27 100644 --- a/src/test/java/com/yapp/artie/domain/archive/service/CategoryServiceTest.java +++ b/src/test/java/com/yapp/artie/domain/archive/service/CategoryServiceTest.java @@ -139,10 +139,9 @@ private Category findCategory(Long id) { } @Test - public void categoriesOf_카테고리가_하나도_존재하지_않으면_예외를_발생한다() throws Exception { - assertThatThrownBy(() -> { - categoryService.categoriesOf(findUser("1").getId()); - }).isInstanceOf(CategoryNotFoundException.class); + public void categoriesOf_카테고리가_하나도_존재하지_않는다면_빈_리스트를_반환한다() throws Exception { + List actual = categoryService.categoriesOf(findUser("1").getId()); + assertThat(actual.size()).isEqualTo(0); } @Test diff --git a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetTestUserTokenControllerTest.java b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetTestUserTokenControllerTest.java index 20d4fd12..8426ae34 100644 --- a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetTestUserTokenControllerTest.java +++ b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetTestUserTokenControllerTest.java @@ -7,7 +7,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.yapp.artie.common.BaseControllerIntegrationTest; -import com.yapp.artie.domain.user.application.port.in.GetTestUserTokenQuery; +import com.yapp.artie.domain.user.application.port.in.query.GetTestUserTokenQuery; import org.junit.jupiter.api.Test; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserControllerTest.java b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserControllerTest.java index 0d896735..62d0e9a7 100644 --- a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserControllerTest.java +++ b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserControllerTest.java @@ -7,7 +7,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.yapp.artie.common.BaseControllerIntegrationTest; -import com.yapp.artie.domain.user.application.port.in.GetUserQuery; +import com.yapp.artie.domain.user.application.port.in.query.GetUserQuery; import org.junit.jupiter.api.Test; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserJoinDateControllerTest.java b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserJoinDateControllerTest.java index b209d5bf..fe2edac5 100644 --- a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserJoinDateControllerTest.java +++ b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserJoinDateControllerTest.java @@ -7,7 +7,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.yapp.artie.common.BaseControllerIntegrationTest; -import com.yapp.artie.domain.user.application.port.in.GetUserJoinDateQuery; +import com.yapp.artie.domain.user.application.port.in.query.GetUserJoinDateQuery; import org.junit.jupiter.api.Test; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserThumbnailControllerTest.java b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserThumbnailControllerTest.java index 61539bcf..c2821e6d 100644 --- a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserThumbnailControllerTest.java +++ b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/GetUserThumbnailControllerTest.java @@ -7,7 +7,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.yapp.artie.common.BaseControllerIntegrationTest; -import com.yapp.artie.domain.user.application.port.in.GetUserThumbnailQuery; +import com.yapp.artie.domain.user.application.port.in.query.GetUserThumbnailQuery; import org.junit.jupiter.api.Test; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/RegisterUserControllerTest.java b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/RegisterUserControllerTest.java index 75448793..41d23a61 100644 --- a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/RegisterUserControllerTest.java +++ b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/RegisterUserControllerTest.java @@ -7,7 +7,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.yapp.artie.common.BaseControllerIntegrationTest; -import com.yapp.artie.domain.user.application.port.in.RegisterUserUseCase; +import com.yapp.artie.domain.user.application.port.in.command.RegisterUserUseCase; import org.junit.jupiter.api.Test; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/RenameUserControllerTest.java b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/RenameUserControllerTest.java index 3700f67d..f58829ad 100644 --- a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/RenameUserControllerTest.java +++ b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/RenameUserControllerTest.java @@ -7,7 +7,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.yapp.artie.common.BaseControllerIntegrationTest; -import com.yapp.artie.domain.user.application.port.in.RenameUserUseCase; +import com.yapp.artie.domain.user.application.port.in.command.RenameUserUseCase; import org.junit.jupiter.api.Test; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/UserWithdrawalControllerTest.java b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/UserWithdrawalControllerTest.java index 5cce7405..79ce2d3f 100644 --- a/src/test/java/com/yapp/artie/domain/user/adapter/in/web/UserWithdrawalControllerTest.java +++ b/src/test/java/com/yapp/artie/domain/user/adapter/in/web/UserWithdrawalControllerTest.java @@ -7,7 +7,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.yapp.artie.common.BaseControllerIntegrationTest; -import com.yapp.artie.domain.user.application.port.in.UserWithdrawalUseCase; +import com.yapp.artie.domain.user.application.port.in.command.UserWithdrawalUseCase; import org.junit.jupiter.api.Test; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/src/test/java/com/yapp/artie/domain/user/application/service/GetUserThumbnailServiceTest.java b/src/test/java/com/yapp/artie/domain/user/application/service/GetUserThumbnailServiceTest.java index 08684909..7148db4f 100644 --- a/src/test/java/com/yapp/artie/domain/user/application/service/GetUserThumbnailServiceTest.java +++ b/src/test/java/com/yapp/artie/domain/user/application/service/GetUserThumbnailServiceTest.java @@ -8,7 +8,7 @@ import com.yapp.artie.common.BaseUserUnitTest; import com.yapp.artie.domain.archive.service.ExhibitService; -import com.yapp.artie.domain.user.application.port.in.GetUserThumbnailResponse; +import com.yapp.artie.domain.user.application.port.in.response.GetUserThumbnailResponse; import com.yapp.artie.domain.user.domain.User; import com.yapp.artie.domain.user.domain.UserNotFoundException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/yapp/artie/domain/user/application/service/RegisterUserServiceTest.java b/src/test/java/com/yapp/artie/domain/user/application/service/RegisterUserServiceTest.java index 7a03419c..47cb6384 100644 --- a/src/test/java/com/yapp/artie/domain/user/application/service/RegisterUserServiceTest.java +++ b/src/test/java/com/yapp/artie/domain/user/application/service/RegisterUserServiceTest.java @@ -6,7 +6,7 @@ import static org.mockito.Mockito.never; import com.yapp.artie.common.BaseUserUnitTest; -import com.yapp.artie.domain.user.application.port.in.RegisterUserResponse; +import com.yapp.artie.domain.user.application.port.in.response.RegisterUserResponse; import org.junit.jupiter.api.Test; class RegisterUserServiceTest extends BaseUserUnitTest {