Merge branch 'PracLee' into PracLee-1

src/main/java/com/example/demo/application/product/CreateProductService.java

@@ -17,7 +17,7 @@ public CreateProductService(ProductRepository productRepository) {
 
  public Product createProduct(String name, Money price, String imageUrl) {
  Product product = Product.create(name, price, imageUrl);
-
+ 
  productRepository.save(product);
 
  return product;

src/main/java/com/example/demo/controllers/ProductController.java

@@ -10,6 +10,8 @@
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+
 @RestController
 @RequestMapping("products")
 @CrossOrigin
@@ -33,8 +35,10 @@ public ProductListDto list() {
 
  @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
  @ResponseStatus(HttpStatus.CREATED)
- public void create(@ModelAttribute CreateProductDto dto) {
+ public void create(@ModelAttribute CreateProductDto dto)
+ throws IOException {
  String name = dto.name().strip();
+ String imageUrl = imageStorage.save(dto.image());
  Money price = new Money(dto.price());
  String imageUrl = imageStorage.save(dto.image());
  createProductService.createProduct(name, price, imageUrl);

src/main/java/com/example/demo/infrastructure/CartDtoFetcher.java

@@ -20,7 +20,7 @@ public CartDto fetchCartDto(CartId cartId) {
  String sql = """
  SELECT
  *,
- products.name AS product_name
+ products.name AS product_name2
  FROM line_items
  JOIN products ON line_items.product_id = products.id
  WHERE line_items.cart_id = ?
@@ -31,7 +31,7 @@ public CartDto fetchCartDto(CartId cartId) {
  sql,
  (ResultSet resultSet, int rowNum) -> new CartDto.LineItemDto(
  resultSet.getString("id"),
- resultSet.getString("product_name"),
+ resultSet.getString("product_name2"),
  resultSet.getLong("unit_price"),
  resultSet.getInt("quantity"),
  resultSet.getLong("total_price")

src/main/java/com/example/demo/models/Cart.java

@@ -26,7 +26,7 @@ public class Cart {
  @UpdateTimestamp
  private LocalDateTime updatedAt;
 
- private Cart() {
+ protected Cart() {
  }
 
  public Cart(CartId cartId) {

src/main/java/com/example/demo/models/CartId.java

@@ -7,7 +7,7 @@ public class CartId extends EntityId {
  // TODO: Delete this! (카트가 하나만 존재한다고 가정)
  public static final CartId DEFAULT = new CartId("0BV000000CART");
 
- private CartId() {
+ protected CartId() {
  super();
  }
 

src/main/java/com/example/demo/models/EntityId.java

@@ -4,17 +4,18 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.MappedSuperclass;
 
+import java.io.Serializable;
 import java.util.Objects;
 
 @MappedSuperclass
-public abstract class EntityId {
+public abstract class EntityId implements Serializable {
  @Column(name = "id")
  private String value;
 
- protected EntityId() {
+ public EntityId() {
  }
 
- protected EntityId(String value) {
+ public EntityId(String value) {
  this.value = value;
  }
 

src/main/java/com/example/demo/models/LineItem.java

@@ -33,7 +33,7 @@ public class LineItem {
  @UpdateTimestamp
  private LocalDateTime updatedAt;
 
- private LineItem() {
+ protected LineItem() {
  }
 
  public LineItem(LineItemId id, Product product, int quantity) {

src/main/java/com/example/demo/models/LineItemId.java

@@ -1,7 +1,10 @@
 package com.example.demo.models;
 
+import jakarta.persistence.Embeddable;
+
+@Embeddable
 public class LineItemId extends EntityId {
- private LineItemId() {
+ public LineItemId() {
  super();
  }
 

src/main/java/com/example/demo/models/Money.java

@@ -10,7 +10,7 @@ public class Money {
  @Column(name = "money")
  private Long value;
 
- private Money() {
+ public Money() {
 
  }
 

src/main/java/com/example/demo/models/Product.java

@@ -28,12 +28,13 @@ public class Product {
  @AttributeOverride(name = "value", column = @Column(name = "price"))
  private Money price;
 
- private Product() {
+ public Product() {
  }
 
  public Product(ProductId id, String name, Money price, String imageUrl) {
  this.id = id;
  this.name = name;
+ this.imageUrl = imageUrl;
  this.price = price;
  this.imageUrl = imageUrl;
  }
@@ -50,6 +51,9 @@ public String name() {
  return name;
  }
 
+ public String imageUrl() {
+ return imageUrl;
+ }
  public Money price() {
  return price;
  }

src/main/java/com/example/demo/models/ProductId.java

@@ -1,7 +1,10 @@
 package com.example.demo.models;
 
+import jakarta.persistence.Embeddable;
+
+@Embeddable
 public class ProductId extends EntityId {
- private ProductId() {
+ public ProductId() {
  super();
  }
 

src/test/java/com/example/demo/Fixtures.java

@@ -12,12 +12,15 @@ public static Product product() {
  public static Product product(int number) {
  ProductId productId = new ProductId("012300000000" + number);
  return new Product(
- productId, "Product #" + number, new Money(123_000L));
+ productId, "Product #" + number,
+ "IMAGE_URL",
+ new Money(123_000L)
+ );
  }
 
- public static Cart cart() {
- return cart(List.of());
- }
+  public static Cart cart() {
+  return cart(List.of());
+  }
 
  public static Cart cart(List<Product> products) {
  CartId cartId = new CartId("0124000000001");

src/test/java/com/example/demo/application/product/CreateProductServiceTest.java

@@ -25,12 +25,14 @@ void setUp() {
  @Test
  void createProduct() {
  String name = "제-품";
+ String imageUrl = "IMAGE_URL";
  Money price = new Money(100_000L);
  String imageUrl = "IMAGE_URL";
 
  Product product = createProductService.createProduct(name, price, imageUrl);
 
  assertThat(product.name()).isEqualTo(name);
+ assertThat(product.imageUrl()).isEqualTo(imageUrl);
  assertThat(product.price()).isEqualTo(price);
  assertThat(product.imageUrl()).isEqualTo(imageUrl);
 

src/test/java/com/example/demo/controllers/ProductControllerTest.java

@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
@@ -20,8 +21,7 @@
 import static com.example.demo.controllers.helpers.ResultMatchers.contentContains;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.verify;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @WebMvcTest(ProductController.class)
@@ -59,18 +59,7 @@ void create() throws Exception {
  String filename = "src/test/resources/files/test.jpg";
  MockMultipartFile file = new MockMultipartFile(
  "image", "test.jpg", "image/jpeg",
- new FileInputStream(filename)
- );
-
- String json = String.format(
- """
- {
- "name": "멋진 제품",
- "price": %d
- }
- """,
- 100_000L
- );
+ new FileInputStream(filename));
 
  given(imageStorage.save(file)).willReturn("data/image.jpg");
 

src/test/java/com/example/demo/models/ProductTest.java

@@ -7,10 +7,15 @@
 class ProductTest {
  @Test
  void creation() {
- Product product = Product.create("제품명", new Money(123_456L));
+ Product product = Product.create(
+ "제품명",
+ "IMAGE_URL",
+ new Money(123_456L)
+ );
 
  assertThat(product.id()).isNotNull();
  assertThat(product.name()).isEqualTo("제품명");
+ assertThat(product.imageUrl()).isEqualTo("IMAGE_URL");
  assertThat(product.price()).isEqualTo(new Money(123_456L));
  }
 }