5주차 과제- 고양이 장난감가게 만들기 (심화)

.gitignore

@@ -24,3 +24,4 @@ Thumbs.db
 Thumbs.db:encryptable
 ehthumbs.db
 ehthumbs_vista.db
+/app/out/

app/build.gradle

@@ -64,6 +64,10 @@ dependencies {
     // Spring Developer Tools
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
 
+    // DozerMapper
+    // DTO와 Domain을 매핑해주는 역할
+    implementation 'com.github.dozermapper:dozer-core:6.4.0'
+
     // Spring Boot Test
     testImplementation('org.springframework.boot:spring-boot-starter-test') {
         exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'

app/src/main/java/com/codesoom/assignment/App.java

@@ -1,7 +1,10 @@
 package com.codesoom.assignment;
 
+import com.github.dozermapper.core.DozerBeanMapperBuilder;
+import com.github.dozermapper.core.Mapper;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 public class App {
@@ -12,4 +15,9 @@ public String getGreeting() {
     public static void main(String[] args) {
         SpringApplication.run(App.class, args);
     }
+
+    @Bean
+    public Mapper dozerMapper(){
+        return DozerBeanMapperBuilder.buildDefault();
+    }
 }

app/src/main/java/com/codesoom/assignment/ResourceNotFoundException.java

@@ -0,0 +1,7 @@
+package com.codesoom.assignment;
+
+public class ResourceNotFoundException extends RuntimeException {
+    public ResourceNotFoundException(Long id) {
+        super("식별자에 해당하는 자원이 존재하지 않습니다. : " + id);
+    }
+}

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

@@ -1,9 +1,10 @@
 package com.codesoom.assignment.application;
 
-import com.codesoom.assignment.ProductNotFoundException;
+import com.codesoom.assignment.ResourceNotFoundException;
 import com.codesoom.assignment.domain.Product;
 import com.codesoom.assignment.domain.ProductRepository;
 import com.codesoom.assignment.dto.ProductData;
+import com.github.dozermapper.core.Mapper;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
@@ -12,43 +13,64 @@
 @Service
 @Transactional
 public class ProductService {
+    private final Mapper mapper;
     private final ProductRepository productRepository;
 
-    public ProductService(ProductRepository productRepository) {
+    public ProductService(Mapper dozerMapper , ProductRepository productRepository) {
+        this.mapper = dozerMapper;
         this.productRepository = productRepository;
     }
 
+    /**
+     * 모든 상품들을 반환한다.
+     */
     public List<Product> getProducts() {
         return productRepository.findAll();
     }
 
+    /**
+     * 상품을 찾아 반환한다.
+     *
+     * @param id 찾으려는 상품의 식별자
+     * @return 식별자에 해당하는 상품
+     * @throws ResourceNotFoundException 식별자에 해당하는 상품이 없는 경우
+     */
     public Product getProduct(Long id) {
         return findProduct(id);
     }
 
+    /**
+     * 상품을 저장한다.
+     *
+     * @param productData 저장할 상품의 DTO
+     * @return 저장한 상품
+     */
     public Product createProduct(ProductData productData) {
-        Product product = Product.builder()
-                .name(productData.getName())
-                .maker(productData.getMaker())
-                .price(productData.getPrice())
-                .imageUrl(productData.getImageUrl())
-                .build();
+        Product product = mapper.map(productData, Product.class);
         return productRepository.save(product);
     }
 
+    /**
+     * 식별자에 해당하는 상품을 수정한다.
+     *
+     * @param id 수정하려는 상품의 식별자
+     * @param productData 수정할 정보 상품의 DTO
+     * @return 수정 후 저장된 상품
+     * @throws ResourceNotFoundException 식별자에 해당하는 상품이 없는 경우
+     */
     public Product updateProduct(Long id, ProductData productData) {
         Product product = findProduct(id);
-
-        product.change(
-                productData.getName(),
-                productData.getMaker(),
-                productData.getPrice(),
-                productData.getImageUrl()
-        );
-
+        product.change(mapper.map(productData , Product.class));
         return product;
     }
 
+    /**
+     * 식별자에 해당하는 상품을 삭제한다
+     *
+     * @param id 삭제하려는 상품의 식별자
+     * @return 식별자에 해당하는 상품
+     * @throws ResourceNotFoundException 식별자에 해당하는 상품이 없는 경우
+     */
     public Product deleteProduct(Long id) {
         Product product = findProduct(id);
 
@@ -57,8 +79,15 @@ public Product deleteProduct(Long id) {
         return product;
     }
 
+    /**
+     * 식별자에 해당하는 상품을 조회한다
+     *
+     * @param id 조회할 상품의 식별자
+     * @return 식별자에 해당하는 상품
+     * @throws ResourceNotFoundException 식별자에 해당하는 상품이 없는 경우
+     */
     private Product findProduct(Long id) {
         return productRepository.findById(id)
-                .orElseThrow(() -> new ProductNotFoundException(id));
+                .orElseThrow(() -> new ResourceNotFoundException(id));
     }
 }

app/src/main/java/com/codesoom/assignment/application/UserCommandService.java

@@ -0,0 +1,33 @@
+package com.codesoom.assignment.application;
+
+import com.codesoom.assignment.ResourceNotFoundException;
+import com.codesoom.assignment.domain.User;
+import com.codesoom.assignment.domain.UserRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+public class UserCommandService {
+
+    private UserRepository repository;
+
+    public UserCommandService(UserRepository repository) {
+        this.repository = repository;
+    }
+
+    public User save(User user){
+        return repository.save(user);
+    }
+
+    public User update(User beforeUser , User user){
+        return beforeUser.update(user);
+    }
+
+    public User delete(User user){
+        repository.delete(user);
+        return user;
+    }
+}

app/src/main/java/com/codesoom/assignment/application/UserQueryService.java

@@ -0,0 +1,29 @@
+package com.codesoom.assignment.application;
+
+import com.codesoom.assignment.ResourceNotFoundException;
+import com.codesoom.assignment.domain.User;
+import com.codesoom.assignment.domain.UserRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(readOnly = true)
+public class UserQueryService {
+
+    private UserRepository repository;
+
+    public UserQueryService(UserRepository repository) {
+        this.repository = repository;
+    }
+
+    public List<User> findAll(){
+        return repository.findAll();
+    }
+
+    public User findUser(Long id) {
+        return repository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException(id));
+    }
+}

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

@@ -1,6 +1,6 @@
 package com.codesoom.assignment.controllers;
 
-import com.codesoom.assignment.ProductNotFoundException;
+import com.codesoom.assignment.ResourceNotFoundException;
 import com.codesoom.assignment.dto.ErrorResponse;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -12,7 +12,7 @@
 public class NotFoundErrorAdvice {
     @ResponseBody
     @ResponseStatus(HttpStatus.NOT_FOUND)
-    @ExceptionHandler(ProductNotFoundException.class)
+    @ExceptionHandler(ResourceNotFoundException.class)
     public ErrorResponse handleProductTaskNotFound() {
         return new ErrorResponse("Product not found");
     }

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

@@ -1,14 +1,19 @@
 package com.codesoom.assignment.controllers;
 
+import com.codesoom.assignment.ResourceNotFoundException;
 import com.codesoom.assignment.application.ProductService;
 import com.codesoom.assignment.domain.Product;
 import com.codesoom.assignment.dto.ProductData;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
 
+/**
+ * 상품을 조회, 생성, 삭제한다.
+ */
 @RestController
 @RequestMapping("/products")
 public class ProductController {
@@ -18,22 +23,48 @@ public ProductController(ProductService productService) {
         this.productService = productService;
     }
 
+    /**
+     * 모든 상품들을 반환한다.
+     */
     @GetMapping
     public List<Product> list() {
         return productService.getProducts();
     }
 
+    /**
+     * 식별자에 해당하는 상품을 조회한다.
+     *
+     * @param id 찾으려는 상품의 식별자
+     * @return 식별자에 해당하는 상품
+     * @throws ResourceNotFoundException 식별자에 해당하는 상품이 없는 경우
+     */
     @GetMapping("{id}")
     public Product detail(@PathVariable Long id) {
         return productService.getProduct(id);
     }
 
+    /**
+     * 상품 정보를 저장한다.
+     *
+     * @param productData 저장할 정보
+     * @return 생성된 상품
+     * @throws MethodArgumentNotValidException 필수 정보가 비어있는 경우
+     */
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
     public Product create(@RequestBody @Valid ProductData productData) {
         return productService.createProduct(productData);
     }
 
+    /**
+     * 식별자에 해당하는 상품을 전달받은 상품으로 수정한다.
+     *
+     * @param id 수정할 상품의 식별자
+     * @param productData 수정할 정보
+     * @return 수정된 상품
+     * @throws MethodArgumentNotValidException 필수 정보가 비어있는 경우
+     * @throws ResourceNotFoundException 식별자에 해당하는 상품이 없는 경우
+     */
     @PatchMapping("{id}")
     public Product update(
             @PathVariable Long id,
@@ -42,6 +73,12 @@ public Product update(
         return productService.updateProduct(id, productData);
     }
 
+    /**
+     * 식별자에 해당하는 상품을 삭제한다.
+     *
+     * @param id 삭제할 상품의 식별자
+     * @throws ResourceNotFoundException 식별자에 해당하는 상품이 없는 경우
+     */
     @DeleteMapping("{id}")
     @ResponseStatus(HttpStatus.NO_CONTENT)
     public void destroy(@PathVariable Long id) {