5주차: 유효성검사 추가 및 회원관리

app/src/main/java/com/codesoom/assignment/application/ProductService.java → app/src/main/java/com/codesoom/assignment/application/product/ProductService.java

@@ -1,9 +1,9 @@
-package com.codesoom.assignment.application;
+package com.codesoom.assignment.application.product;
 
 import com.codesoom.assignment.ProductNotFoundException;
-import com.codesoom.assignment.domain.Product;
-import com.codesoom.assignment.domain.ProductRepository;
-import com.codesoom.assignment.dto.ProductData;
+import com.codesoom.assignment.domain.product.Product;
+import com.codesoom.assignment.domain.product.ProductRepository;
+import com.codesoom.assignment.dto.product.ProductData;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;

app/src/main/java/com/codesoom/assignment/application/user/UserCreator.java

@@ -0,0 +1,18 @@
+package com.codesoom.assignment.application.user;
+
+import com.codesoom.assignment.domain.user.User;
+import com.codesoom.assignment.domain.user.UserRepository;
+import com.codesoom.assignment.dto.user.UserRequest;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserCreator {
+    private final UserRepository userRepository;
+    public UserCreator(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    public User createUser(UserRequest userRequest) {
+        return userRepository.save(userRequest.toUser());
+    }
+}

app/src/main/java/com/codesoom/assignment/application/user/UserReader.java

@@ -0,0 +1,21 @@
+
+package com.codesoom.assignment.application.user;
+
+import com.codesoom.assignment.domain.user.User;
+import com.codesoom.assignment.domain.user.UserRepository;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserReader {
+    private final UserRepository userRepository;
+
+    public UserReader(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    public User getUser(Long id) {
+        User user = userRepository.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException("해당하는 유저가 없습니다."));
+        return user;
+    }
+}

app/src/main/java/com/codesoom/assignment/application/user/UserUpdater.java

@@ -0,0 +1,27 @@
+package com.codesoom.assignment.application.user;
+
+import com.codesoom.assignment.domain.user.User;
+import com.codesoom.assignment.domain.user.UserRepository;
+import com.codesoom.assignment.dto.user.UserRequest;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+
+@Service
+public class UserUpdater {
+    private UserRepository userRepository;
+
+    public UserUpdater(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    @Transactional
+    public User updateUser(Long id, UserRequest userRequest) {
+        User user = userRepository.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException("해당하는 유저가 없습니다."));
+        user.change(userRequest.getName(), userRequest.getEmail(), userRequest.getPassword());
+
+        User updatedUser = userRepository.save(user);
+        return updatedUser;
+    }
+}

app/src/main/java/com/codesoom/assignment/controllers/NotFoundErrorAdvice.java → app/src/main/java/com/codesoom/assignment/controllers/ExceptionAdvice.java

@@ -9,7 +9,7 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ControllerAdvice
-public class NotFoundErrorAdvice {
+public class ExceptionAdvice {
     @ResponseBody
     @ResponseStatus(HttpStatus.NOT_FOUND)
     @ExceptionHandler(ProductNotFoundException.class)

app/src/main/java/com/codesoom/assignment/controllers/ProductController.java → app/src/main/java/com/codesoom/assignment/controllers/product/ProductController.java

@@ -1,8 +1,8 @@
-package com.codesoom.assignment.controllers;
+package com.codesoom.assignment.controllers.product;
 
-import com.codesoom.assignment.application.ProductService;
-import com.codesoom.assignment.domain.Product;
-import com.codesoom.assignment.dto.ProductData;
+import com.codesoom.assignment.application.product.ProductService;
+import com.codesoom.assignment.domain.product.Product;
+import com.codesoom.assignment.dto.product.ProductData;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 

app/src/main/java/com/codesoom/assignment/domain/Product.java → app/src/main/java/com/codesoom/assignment/domain/product/Product.java

@@ -1,4 +1,4 @@
-package com.codesoom.assignment.domain;
+package com.codesoom.assignment.domain.product;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

app/src/main/java/com/codesoom/assignment/domain/ProductRepository.java → app/src/main/java/com/codesoom/assignment/domain/product/ProductRepository.java

@@ -1,4 +1,4 @@
-package com.codesoom.assignment.domain;
+package com.codesoom.assignment.domain.product;
 
 import java.util.List;
 import java.util.Optional;

app/src/main/java/com/codesoom/assignment/domain/user/User.java

@@ -0,0 +1,33 @@
+package com.codesoom.assignment.domain.user;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class User {
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private String name;
+
+    private String email;
+
+    private String password;
+
+    public void change(String name, String email, String password) {
+        this.name = name;
+        this.email = email;
+        this.password = password;
+    }
+}

app/src/main/java/com/codesoom/assignment/domain/user/UserRepository.java

@@ -0,0 +1,15 @@
+package com.codesoom.assignment.domain.user;
+
+import com.codesoom.assignment.domain.product.Product;
+
+import java.util.Optional;
+
+public interface UserRepository {
+    User save(User user);
+
+    Optional<User> findById(Long id);
+
+    void delete(User user);
+
+    void deleteAll();
+}

app/src/main/java/com/codesoom/assignment/dto/ProductData.java → app/src/main/java/com/codesoom/assignment/dto/product/ProductData.java

@@ -1,4 +1,4 @@
-package com.codesoom.assignment.dto;
+package com.codesoom.assignment.dto.product;
 
 import lombok.*;
 

app/src/main/java/com/codesoom/assignment/dto/user/UserRequest.java

@@ -0,0 +1,23 @@
+package com.codesoom.assignment.dto.user;
+
+import com.codesoom.assignment.domain.user.User;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserRequest {
+    private String name;
+    private String email;
+    private String password;
+
+    public User toUser() {
+        return User.builder()
+                .name(name)
+                .email(email)
+                .password(password)
+                .build();
+    }
+}

app/src/main/java/com/codesoom/assignment/infra/JpaProductRepository.java → app/src/main/java/com/codesoom/assignment/infra/product/JpaProductRepository.java

@@ -1,7 +1,7 @@
-package com.codesoom.assignment.infra;
+package com.codesoom.assignment.infra.product;
 
-import com.codesoom.assignment.domain.Product;
-import com.codesoom.assignment.domain.ProductRepository;
+import com.codesoom.assignment.domain.product.Product;
+import com.codesoom.assignment.domain.product.ProductRepository;
 import org.springframework.context.annotation.Primary;
 import org.springframework.data.repository.CrudRepository;
 

app/src/main/java/com/codesoom/assignment/infra/user/JpaUserRepository.java

@@ -0,0 +1,12 @@
+package com.codesoom.assignment.infra.user;
+
+import com.codesoom.assignment.domain.user.User;
+import com.codesoom.assignment.domain.user.UserRepository;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.CrudRepository;
+
+@Primary
+public interface JpaUserRepository extends
+        UserRepository, CrudRepository<User, Long> {
+}

app/src/test/java/com/codesoom/assignment/application/JpaTest.java

@@ -0,0 +1,15 @@
+package com.codesoom.assignment.application;
+
+import com.codesoom.assignment.domain.user.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+
+@DataJpaTest
+public class JpaTest {
+    @Autowired
+    public UserRepository userRepository;
+
+    public UserRepository getUserRepository() {
+        return userRepository;
+    }
+}

app/src/test/java/com/codesoom/assignment/application/ProductServiceTest.java

@@ -1,9 +1,10 @@
 package com.codesoom.assignment.application;
 
 import com.codesoom.assignment.ProductNotFoundException;
-import com.codesoom.assignment.domain.Product;
-import com.codesoom.assignment.domain.ProductRepository;
-import com.codesoom.assignment.dto.ProductData;
+import com.codesoom.assignment.application.product.ProductService;
+import com.codesoom.assignment.domain.product.Product;
+import com.codesoom.assignment.domain.product.ProductRepository;
+import com.codesoom.assignment.dto.product.ProductData;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

app/src/test/java/com/codesoom/assignment/application/user/UserCreatorTest.java

@@ -0,0 +1,51 @@
+package com.codesoom.assignment.application.user;
+
+import com.codesoom.assignment.application.JpaTest;
+import com.codesoom.assignment.domain.user.User;
+import com.codesoom.assignment.dto.user.UserRequest;
+import org.junit.jupiter.api.*;
+
+import org.assertj.core.api.Assertions;
+
+@SuppressWarnings({"InnerClassMayBeStatic", "NonAsciiCharacters"})
+@DisplayName("UserCreator 클래스")
+class UserCreatorTest extends JpaTest {
+    private final String TEST_NAME = "testName";
+    private final String TEST_EMAIL = "test@Email.com";
+    private final String TEST_PASSWORD = "testPassword";
+
+    private UserRequest createUserRequest() {
+        return new UserRequest(
+                TEST_NAME,
+                TEST_EMAIL,
+                TEST_PASSWORD
+        );
+    }
+
+    @Nested
+    @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+    class createUser_메서드는 {
+        @Nested
+        @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+        class 유저_정보가_주어지면 {
+                private UserRequest USER_REQUEST;
+                private UserCreator userCreator;
+                @BeforeEach
+                void setUp() {
+                    USER_REQUEST = createUserRequest();
+                    userCreator = new UserCreator(getUserRepository());
+                }
+
+                @Test
+                @DisplayName("해당_유저정보를_저장_후_저장한_유저정보를_리턴한다")
+                void it_saves_and_returns_user() {
+                    User user = userCreator.createUser(USER_REQUEST);
+
+                    Assertions.assertThat(user.getName()).isEqualTo(TEST_NAME);
+                    Assertions.assertThat(user.getEmail()).isEqualTo(TEST_EMAIL);
+                    Assertions.assertThat(user.getPassword()).isEqualTo(TEST_PASSWORD);
+                }
+
+            }
+        }
+}

app/src/test/java/com/codesoom/assignment/application/user/UserReaderTest.java

@@ -0,0 +1,51 @@
+package com.codesoom.assignment.application.user;
+
+import com.codesoom.assignment.application.JpaTest;
+import com.codesoom.assignment.dto.user.UserRequest;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.*;
+
+
+@SuppressWarnings({"InnerClassMayBeStatic", "NonAsciiCharacters"})
+@DisplayName("UserReader 클래스")
+class UserReaderTest extends JpaTest {
+    private final String TEST_NAME = "testName";
+    private final String TEST_EMAIL = "test@Email.com";
+    private final String TEST_PASSWORD = "testPassword";
+
+    private UserRequest createUserRequest() {
+        return new UserRequest(
+                TEST_NAME,
+                TEST_EMAIL,
+                TEST_PASSWORD
+        );
+    }
+
+    @Nested
+    @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+    class getUser_메서드는 {
+        @Nested
+        @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+        class 유저_아이디가_주어지면 {
+            private UserRequest USER_REQUEST;
+            private Long savedUserId;
+            private UserReader userReader;
+
+            @BeforeEach
+            void setUp() {
+                USER_REQUEST = createUserRequest();
+                savedUserId = getUserRepository().save(USER_REQUEST.toUser()).getId();
+                userReader = new UserReader(getUserRepository());
+            }
+
+            @DisplayName("해당_유저정보를_리턴한다")
+            @Test
+            void it_returns_user() {
+                Assertions.assertThat(userReader.getUser(savedUserId).getName()).isEqualTo(TEST_NAME);
+                Assertions.assertThat(userReader.getUser(savedUserId).getEmail()).isEqualTo(TEST_EMAIL);
+                Assertions.assertThat(userReader.getUser(savedUserId).getPassword()).isEqualTo(TEST_PASSWORD);
+            }
+        }
+    }
+
+}