Merge pull request #150 from YAPP-Github/develop

Release 0.2.9

src/main/java/com/yapp/artie/domain/archive/service/CategoryService.java

@@ -40,13 +40,10 @@ public Category findCategoryWithUser(Long id, Long userId) {
   }
 
   public List<CategoryDto> categoriesOf(Long userId) {
-    UserJpaEntity user = findUser(userId);
-    List<CategoryDto> 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<CategoryDto> categories) {
-    if (categories.size() == 0) {
-      throw new CategoryNotFoundException();
-    }
-  }
-
   private void validateDuplicateCategory(String name, UserJpaEntity user) {
     List<CategoryDto> categories = categoryRepository.findCategoryDto(user);
     long count = categories.stream()

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;

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;

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;

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;

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;

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;

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;

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);
+}

src/main/java/com/yapp/artie/domain/user/application/port/in/RenameUserUseCase.java → 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 {
 

src/main/java/com/yapp/artie/domain/user/application/port/in/UserWithdrawalUseCase.java → 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 {
 

src/main/java/com/yapp/artie/domain/user/application/port/in/GetTestUserTokenQuery.java → 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 {
 

src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserDetailsQuery.java → 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;

src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserJoinDateQuery.java → 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;
 

src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserQuery.java → 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;
 

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);
+}

src/main/java/com/yapp/artie/domain/user/application/port/in/GetTestUserTokenResponse.java → 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;

src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserJoinDateResponse.java → 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;

src/main/java/com/yapp/artie/domain/user/application/port/in/GetUserThumbnailResponse.java → 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;

src/main/java/com/yapp/artie/domain/user/application/port/in/RegisterUserResponse.java → 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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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<CategoryDto> actual = categoryService.categoriesOf(findUser("1").getId());
+    assertThat(actual.size()).isEqualTo(0);
   }
 
   @Test

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;

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;

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;

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;

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;

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;

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;

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;

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 {