Entity ID를 숫자가 아니라 문자열로 변경

ahastudio · ahastudio · commit aa45e75e5b90 · 2022-12-27T23:31:14.000+09:00
diff --git a/20221213/spring/README.md b/20221213/spring/README.md
@@ -0,0 +1 @@
+# Spring Boot Shop Demo
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/DemoApplication.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/DemoApplication.java
@@ -1,4 +1,4 @@
-package com.example.demo;
+package com.ahastudio.demo.shop;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/config/ModelMapperConfig.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/config/ModelMapperConfig.java
@@ -1,4 +1,4 @@
-package com.example.demo.config;
+package com.ahastudio.demo.shop.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/BackdoorController.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/BackdoorController.java
@@ -1,10 +1,11 @@
-package com.example.demo.controllers;
+package com.ahastudio.demo.shop.controllers;
 
 import java.time.LocalDateTime;
 
 import jakarta.transaction.Transactional;
 
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -21,6 +22,8 @@ public BackdoorController(JdbcTemplate jdbcTemplate) {
 
     @GetMapping("setup-database")
     public String setupDatabase() {
+        Model model;
+
         jdbcTemplate.execute("DELETE FROM products");
         jdbcTemplate.execute("DELETE FROM shops");
 
@@ -39,7 +42,7 @@ INSERT INTO shops(
                 ) VALUES(?, ?, ?, ?)
                 """;
 
-        jdbcTemplate.update(sql, 101L, "BestShop", now, now);
+        jdbcTemplate.update(sql, "00010001", "BestShop", now, now);
     }
 
     private void createProducts() {
@@ -51,6 +54,6 @@ INSERT INTO products(
                 ) VALUES(?, ?, ?, ?, ?)
                 """;
 
-        jdbcTemplate.update(sql, 201L, "Bread", 10_000L, now, now);
+        jdbcTemplate.update(sql, "00020001", "Bread", 10_000L, now, now);
     }
 }
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/ProductController.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/ProductController.java
@@ -1,4 +1,4 @@
-package com.example.demo.controllers;
+package com.ahastudio.demo.shop.controllers;
 
 import java.util.List;
 
@@ -12,12 +12,12 @@
 
 import org.modelmapper.ModelMapper;
 
-import com.example.demo.controllers.dtos.ProductDetailDto;
-import com.example.demo.controllers.dtos.ProductListDto;
-import com.example.demo.exceptions.ProductNotFound;
-import com.example.demo.models.Product;
-import com.example.demo.models.ProductId;
-import com.example.demo.repositories.ProductRepository;
+import com.ahastudio.demo.shop.controllers.dtos.ProductDetailDto;
+import com.ahastudio.demo.shop.controllers.dtos.ProductListDto;
+import com.ahastudio.demo.shop.exceptions.ProductNotFound;
+import com.ahastudio.demo.shop.models.Product;
+import com.ahastudio.demo.shop.models.ProductId;
+import com.ahastudio.demo.shop.repositories.ProductRepository;
 
 @RestController
 @RequestMapping("/products")
@@ -41,7 +41,7 @@ public ProductListDto list() {
     }
 
     @GetMapping("/{id}")
-    public ProductDetailDto detail(@PathVariable Long id) {
+    public ProductDetailDto detail(@PathVariable String id) {
         Product product = productRepository.findById(new ProductId(id))
                 .orElseThrow(ProductNotFound::new);
 
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/ShopController.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/ShopController.java
@@ -1,4 +1,4 @@
-package com.example.demo.controllers;
+package com.ahastudio.demo.shop.controllers;
 
 import java.util.List;
 
@@ -12,12 +12,12 @@
 
 import org.modelmapper.ModelMapper;
 
-import com.example.demo.controllers.dtos.ShopDetailDto;
-import com.example.demo.controllers.dtos.ShopListDto;
-import com.example.demo.exceptions.ShopNotFound;
-import com.example.demo.models.Shop;
-import com.example.demo.models.ShopId;
-import com.example.demo.repositories.ShopRepository;
+import com.ahastudio.demo.shop.controllers.dtos.ShopDetailDto;
+import com.ahastudio.demo.shop.controllers.dtos.ShopListDto;
+import com.ahastudio.demo.shop.exceptions.ShopNotFound;
+import com.ahastudio.demo.shop.models.Shop;
+import com.ahastudio.demo.shop.models.ShopId;
+import com.ahastudio.demo.shop.repositories.ShopRepository;
 
 @RestController
 @RequestMapping("/shops")
@@ -41,7 +41,7 @@ public ShopListDto list() {
     }
 
     @GetMapping("/{id}")
-    public ShopDetailDto detail(@PathVariable Long id) {
+    public ShopDetailDto detail(@PathVariable String id) {
         Shop shop = shopRepository.findById(new ShopId(id))
                 .orElseThrow(ShopNotFound::new);
 
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/dtos/ProductDetailDto.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/dtos/ProductDetailDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.controllers.dtos;
+package com.ahastudio.demo.shop.controllers.dtos;
 
 import lombok.Getter;
 
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/dtos/ProductListDto.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/dtos/ProductListDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.controllers.dtos;
+package com.ahastudio.demo.shop.controllers.dtos;
 
 import java.util.List;
 
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/dtos/ShopDetailDto.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/dtos/ShopDetailDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.controllers.dtos;
+package com.ahastudio.demo.shop.controllers.dtos;
 
 import lombok.Getter;
 
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/dtos/ShopListDto.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/controllers/dtos/ShopListDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.controllers.dtos;
+package com.ahastudio.demo.shop.controllers.dtos;
 
 import java.util.List;
 
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/exceptions/ProductNotFound.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/exceptions/ProductNotFound.java
@@ -1,4 +1,4 @@
-package com.example.demo.exceptions;
+package com.ahastudio.demo.shop.exceptions;
 
 public class ProductNotFound extends RuntimeException {
 }
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/exceptions/ShopNotFound.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/exceptions/ShopNotFound.java
@@ -1,4 +1,4 @@
-package com.example.demo.exceptions;
+package com.ahastudio.demo.shop.exceptions;
 
 public class ShopNotFound extends RuntimeException {
 }
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/models/Money.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/models/Money.java
@@ -1,4 +1,4 @@
-package com.example.demo.models;
+package com.ahastudio.demo.shop.models;
 
 import java.math.BigDecimal;
 
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/models/Product.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/models/Product.java
@@ -1,11 +1,10 @@
-package com.example.demo.models;
+package com.ahastudio.demo.shop.models;
 
 import java.time.LocalDateTime;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Table;
 
 import org.hibernate.annotations.CreationTimestamp;
@@ -17,8 +16,6 @@
 @Table(name = "products")
 public class Product {
     @EmbeddedId
-    @GeneratedValue
-//    @AttributeOverride(name = "value", column = @Column(name = "id"))
     private ProductId id;
 
     private String name;
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/models/ProductId.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/models/ProductId.java
@@ -1,4 +1,4 @@
-package com.example.demo.models;
+package com.ahastudio.demo.shop.models;
 
 import jakarta.persistence.Column;
 
@@ -7,12 +7,12 @@
 @EqualsAndHashCode
 public class ProductId {
     @Column(name = "id")
-    private Long value;
+    private String value;
 
     private ProductId() {
     }
 
-    public ProductId(Long value) {
+    public ProductId(String value) {
         this.value = value;
     }
 
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/models/Shop.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/models/Shop.java
@@ -1,10 +1,9 @@
-package com.example.demo.models;
+package com.ahastudio.demo.shop.models;
 
 import java.time.LocalDateTime;
 
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Table;
 
 import org.hibernate.annotations.CreationTimestamp;
@@ -16,8 +15,6 @@
 @Table(name = "shops")
 public class Shop {
     @EmbeddedId
-    @GeneratedValue
-//    @AttributeOverride(name = "value", column = @Column(name = "id"))
     private ShopId id;
 
     private String name;
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/models/ShopId.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/models/ShopId.java
@@ -1,4 +1,4 @@
-package com.example.demo.models;
+package com.ahastudio.demo.shop.models;
 
 import jakarta.persistence.Column;
 
@@ -7,12 +7,12 @@
 @EqualsAndHashCode
 public class ShopId {
     @Column(name = "id")
-    private Long value;
+    private String value;
 
     private ShopId() {
     }
 
-    public ShopId(Long value) {
+    public ShopId(String value) {
         this.value = value;
     }
 
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/repositories/ProductRepository.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/repositories/ProductRepository.java
@@ -1,9 +1,9 @@
-package com.example.demo.repositories;
+package com.ahastudio.demo.shop.repositories;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.example.demo.models.Product;
-import com.example.demo.models.ProductId;
+import com.ahastudio.demo.shop.models.Product;
+import com.ahastudio.demo.shop.models.ProductId;
 
 public interface ProductRepository extends JpaRepository<Product, ProductId> {
 }
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/repositories/ShopRepository.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/repositories/ShopRepository.java
@@ -1,9 +1,9 @@
-package com.example.demo.repositories;
+package com.ahastudio.demo.shop.repositories;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.example.demo.models.Shop;
-import com.example.demo.models.ShopId;
+import com.ahastudio.demo.shop.models.Shop;
+import com.ahastudio.demo.shop.models.ShopId;
 
 public interface ShopRepository extends JpaRepository<Shop, ShopId> {
 }
diff --git a/20221213/spring/src/main/java/com/ahastudio/demo/shop/repositories/converters/MoneyConverter.java b/20221213/spring/src/main/java/com/ahastudio/demo/shop/repositories/converters/MoneyConverter.java
@@ -1,9 +1,9 @@
-package com.example.demo.repositories.converters;
+package com.ahastudio.demo.shop.repositories.converters;
 
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
 
-import com.example.demo.models.Money;
+import com.ahastudio.demo.shop.models.Money;
 
 @Converter(autoApply = true)
 public class MoneyConverter implements AttributeConverter<Money, Long> {
diff --git a/20221213/spring/src/test/java/com/ahastudio/demo/shop/DemoApplicationTests.java b/20221213/spring/src/test/java/com/ahastudio/demo/shop/DemoApplicationTests.java
@@ -1,10 +1,12 @@
-package com.example.demo;
+package com.ahastudio.demo.shop;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
+@ActiveProfiles("test")
 class DemoApplicationTests {
     @Test
     void contextLoads() {
diff --git a/20221213/spring/src/test/java/com/ahastudio/demo/shop/controllers/BackdoorControllerTest.java b/20221213/spring/src/test/java/com/ahastudio/demo/shop/controllers/BackdoorControllerTest.java
@@ -1,4 +1,4 @@
-package com.example.demo.controllers;
+package com.ahastudio.demo.shop.controllers;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/20221213/spring/src/test/java/com/ahastudio/demo/shop/controllers/ProductControllerTest.java b/20221213/spring/src/test/java/com/ahastudio/demo/shop/controllers/ProductControllerTest.java
@@ -1,4 +1,4 @@
-package com.example.demo.controllers;
+package com.ahastudio.demo.shop.controllers;
 
 import java.util.List;
 import java.util.Optional;
@@ -13,10 +13,10 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 
-import com.example.demo.models.Money;
-import com.example.demo.models.Product;
-import com.example.demo.models.ProductId;
-import com.example.demo.repositories.ProductRepository;
+import com.ahastudio.demo.shop.models.Money;
+import com.ahastudio.demo.shop.models.Product;
+import com.ahastudio.demo.shop.models.ProductId;
+import com.ahastudio.demo.shop.repositories.ProductRepository;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.mockito.ArgumentMatchers.any;
@@ -26,7 +26,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @WebMvcTest(ProductController.class)
-@ComponentScan("com.example.demo.config")
+@ComponentScan("com.ahastudio.demo.shop.config")
 @ActiveProfiles("test")
 class ProductControllerTest {
     @Autowired
@@ -39,7 +39,7 @@ class ProductControllerTest {
     @DisplayName("GET /products")
     void list() throws Exception {
         Product product = Product.builder()
-                .id(new ProductId(201L))
+                .id(new ProductId("00020001"))
                 .name("Test")
                 .price(Money.krw(10_000L))
                 .build();
@@ -52,14 +52,14 @@ void list() throws Exception {
                         containsString("\"products\":[")
                 ))
                 .andExpect(content().string(
-                        containsString("\"id\":\"201\"")
+                        containsString("\"id\":\"00020001\"")
                 ));
     }
 
     @Test
     @DisplayName("GET /products/{id} (when product exists)")
     void detail() throws Exception {
-        ProductId id = new ProductId(201L);
+        ProductId id = new ProductId("00020001");
 
         Product product = Product.builder()
                 .id(id)
diff --git a/20221213/spring/src/test/java/com/ahastudio/demo/shop/controllers/ShopControllerTest.java b/20221213/spring/src/test/java/com/ahastudio/demo/shop/controllers/ShopControllerTest.java
diff --git a/20221213/spring/src/test/java/com/ahastudio/demo/shop/models/MoneyTest.java b/20221213/spring/src/test/java/com/ahastudio/demo/shop/models/MoneyTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.example.demo;`
	`1`	`+package com.ahastudio.demo.shop;`
`2`	`2`
`3`	`3`	`import org.springframework.boot.SpringApplication;`
`4`	`4`	`import org.springframework.boot.autoconfigure.SpringBootApplication;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.example.demo.config;`
	`1`	`+package com.ahastudio.demo.shop.config;`
`2`	`2`
`3`	`3`	`import org.springframework.context.annotation.Bean;`
`4`	`4`	`import org.springframework.context.annotation.Configuration;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.example.demo.controllers.dtos;`
	`1`	`+package com.ahastudio.demo.shop.controllers.dtos;`
`2`	`2`
`3`	`3`	`import lombok.Getter;`
`4`	`4`