Feature/product testcode

docker-compose.yml

@@ -10,8 +10,9 @@ services:
 
 #  batch:
 #    build: ./module-batch
+#    image: ${IMAGE}
 #    ports:
-#      - "8082:8080"
+#      - "8082:8082"
 #    depends_on:
 #      - db-edit
 #
@@ -36,7 +37,7 @@ services:
 #  db-read:
 #    image: younglong/pg-washpedia:latest
 #    volumes:
-#      - postgreEditDB:/var/lib/postgresql/data
+#      - ./postgreEditDB:/var/lib/postgresql/data
 #    environment:
 #      POSTGRES_DB: read_db
 #      POSTGRES_USER: ${{ secrets.PROJECT_USER }}

module-api/build.gradle

@@ -41,10 +41,15 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok'
     testCompileOnly 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
-
+    // validataion
+    implementation 'org.springframework.boot:spring-boot-starter-validation:2.7.4'
     // test
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
+    // test - fixture Monkey
+    testImplementation 'net.jqwik:jqwik:1.7.3'
+    testImplementation("com.navercorp.fixturemonkey:fixture-monkey-starter:1.0.0")
+    testImplementation("com.navercorp.fixturemonkey:fixture-monkey-jakarta-validation:1.0.0")
 }
 
 tasks.named('test') {

module-api/lombok.config

@@ -0,0 +1 @@
+lombok.anyConstructor.addConstructorProperties=true

module-api/src/main/java/com/kernel360/commoncode/dto/CommonCodeDto.java

@@ -7,7 +7,7 @@
 /**
  * DTO for {@link com.kernel360.commoncode.entity.CommonCode}
  */
-public record CommonCodeDto(Integer codeNo,
+public record CommonCodeDto(Long codeNo,
                             String codeName,
                             Integer upperNo,
                             String upperName,
@@ -25,7 +25,7 @@ public record CommonCodeDto(Integer codeNo,
      * **/
 
     public static CommonCodeDto of(
-            Integer codeNo,
+            Long codeNo,
             String codeName,
             Integer upperNo,
             String upperName,

module-api/src/main/java/com/kernel360/member/dto/MemberDto.java

@@ -7,7 +7,7 @@
 /**
  * DTO for {@link com.kernel360.member.entity.Member}
  */
-public record MemberDto(Integer memberNo,
+public record MemberDto(Long memberNo,
                         String id,
                         String email,
                         String password,
@@ -21,7 +21,7 @@ public record MemberDto(Integer memberNo,
 ) {
 
     public static MemberDto of(
-            Integer memberNo,
+            Long memberNo,
             String id,
             String email,
             String password,
@@ -66,12 +66,12 @@ public static MemberDto from(Member entity) {
 
     public Member toEntity(MemberDto memberDto) {
         return Member.of(
-                this.memberNo,
-                this.id,
-                this.email,
-                this.password,
-                this.gender,
-                this.birthdate
+                memberDto.memberNo(),
+                memberDto.id(),
+                memberDto.email(),
+                memberDto.password(),
+                memberDto.gender(),
+                memberDto.birthdate()
         );
     }
 

module-api/src/main/java/com/kernel360/member/service/MemberService.java

@@ -10,6 +10,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
@@ -26,6 +27,7 @@ public class MemberService {
     /**
      * 가입
      **/
+    @Transactional
     public void joinMember(MemberDto requestDto) {
 
         Member entity = getNewJoinMemberEntity(requestDto);
@@ -43,6 +45,7 @@ protected Member getNewJoinMemberEntity(MemberDto requestDto) {
     /**
      * 로그인
      **/
+    @Transactional
     public MemberDto login(MemberDto loginDto) {
 
         Member loginEntity = getReqeustLoginEntity(loginDto);
@@ -67,7 +70,7 @@ protected Auth modifyAuthJwt(Auth modifyAuth, String encryptToken) {
         return modifyAuth;
     }
 
-    protected Auth createAuthJwt(Integer memberNo, String encryptToken) {
+    protected Auth createAuthJwt(Long memberNo, String encryptToken) {
 
         return Auth.of(null, memberNo, encryptToken, null);
     }
@@ -78,14 +81,14 @@ private Member getReqeustLoginEntity(MemberDto loginDto) {
 
         return Member.loginMember(loginDto.id(), encodePassword);
     }
-
-
+    @Transactional(readOnly = true)
     public boolean duplicatedCheckId(String id) {
         Member member = memberRepository.findOneById(id);
 
         return member != null;
     }
 
+    @Transactional(readOnly = true)
     public boolean duplicatedCheckEmail(String email) {
         Member member = memberRepository.findOneByEmail(email);
 

module-api/src/main/java/com/kernel360/product/controller/ProductController.java

@@ -36,7 +36,7 @@ ResponseEntity<ProductDto> findProductById(@PathVariable("id") Long productId) {
                 .orElse(ResponseEntity.status(HttpStatus.NOT_FOUND).build());
     }
 
-    @GetMapping("/products/")
+    @GetMapping("/products")
     ResponseEntity<List<ProductDto>> findProductByKeyword(@RequestParam("keyword") String keyword){
         final List<ProductDto> list = productService.getProductListByKeyword(keyword);
 

module-api/src/main/java/com/kernel360/product/dto/ProductDto.java

@@ -8,7 +8,7 @@
  * DTO for {@link com.kernel360.product.entity.Product}
  */
 
-public record ProductDto(Integer productNo,
+public record ProductDto(Long productNo,
                          String productName,
                          String barcode,
                          String description,
@@ -22,7 +22,7 @@ public record ProductDto(Integer productNo,
 ) {
 
     public static ProductDto of(
-            Integer productNo,
+            Long productNo,
             String productName,
             String barcode,
             String description,

module-api/src/main/java/com/kernel360/product/service/ProductService.java

@@ -5,31 +5,33 @@
 import com.kernel360.product.repository.ProductRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 public class ProductService {
 
     private final ProductRepository productRepository;
 
+    @Transactional(readOnly = true)
     public Optional<Product> getProductById(Long id) {
 
         return productRepository.findById(id);
     }
 
+    @Transactional(readOnly = true)
     public List<Product> getProductList() {
 
         return productRepository.findAll();
     }
 
+    @Transactional(readOnly = true)
     public List<ProductDto> getProductListByKeyword(String keyword) {
         List<Product> products = productRepository.findByKeyword(keyword);
 
         return products.stream().map(ProductDto::from).toList();
     }
-
 }

module-api/src/test/java/com/kernel360/product/dto/ProductDtoTest.java

@@ -0,0 +1,47 @@
+package com.kernel360.product.dto;
+
+import com.kernel360.product.entity.Product;
+import com.navercorp.fixturemonkey.FixtureMonkey;
+import com.navercorp.fixturemonkey.api.introspector.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+
+class ProductDtoTest {
+    private FixtureMonkey fixtureMonkey;
+
+    @BeforeEach
+    void 준비() {
+        fixtureMonkey = FixtureMonkey.builder()
+                .objectIntrospector(new FailoverIntrospector(
+                        Arrays.asList(
+                                FieldReflectionArbitraryIntrospector.INSTANCE,
+                                ConstructorPropertiesArbitraryIntrospector.INSTANCE,
+                                BeanArbitraryIntrospector.INSTANCE,
+                                BuilderArbitraryIntrospector.INSTANCE
+                        )
+                ))
+                .build();
+    }
+
+    @Test
+    void 엔티티객체를_ProductDto객체로_잘_변환하는지() {
+        //given
+        Product product = fixtureMonkey.giveMeBuilder(Product.class).sample();
+        ProductDto productDto = ProductDto.from(product);
+
+        //then
+        assertEquals(product.getProductName(), productDto.productName());
+        assertEquals(product.getProductNo(), productDto.productNo());
+        assertEquals(product.getViewCount(), productDto.viewCount());
+        assertEquals(product.getIsViolation(), productDto.isViolation());
+        assertEquals(product.getBarcode(), productDto.barcode());
+        assertEquals(product.getDeclareNo(), productDto.declareNo());
+        assertEquals(product.getDescription(), productDto.description());
+
+    }
+}

module-api/src/test/java/com/kernel360/product/service/ProductServiceTest.java

@@ -0,0 +1,79 @@
+package com.kernel360.product.service;
+
+import com.kernel360.product.dto.ProductDto;
+import com.kernel360.product.entity.Product;
+import com.kernel360.product.repository.ProductRepository;
+import com.navercorp.fixturemonkey.FixtureMonkey;
+import com.navercorp.fixturemonkey.api.introspector.FieldReflectionArbitraryIntrospector;
+import com.navercorp.fixturemonkey.jakarta.validation.plugin.JakartaValidationPlugin;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import static org.assertj.core.api.BDDAssertions.then;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class ProductServiceTest {
+    private FixtureMonkey fixtureMonkey;
+    private ProductRepository productRepository;
+    private ProductService productService;
+    @BeforeEach
+    void 테스트준비() {
+        fixtureMonkey = FixtureMonkey.builder()
+                .objectIntrospector(FieldReflectionArbitraryIntrospector.INSTANCE)
+                .plugin(new JakartaValidationPlugin())
+                .build();
+
+        productRepository = mock(ProductRepository.class);
+        productService = new ProductService(productRepository);
+    }
+
+    @Test
+    void 아이디로_제품찾기() {
+
+        Product product = fixtureMonkey.giveMeBuilder(Product.class)
+                .set("productNo", 1L)
+                .sample();
+
+        when(productRepository.findById(1L)).thenReturn(Optional.of(product));
+        Optional<Product> foundProduct = productService.getProductById(1L);
+
+        then(foundProduct).isPresent();
+        then(foundProduct.get()).isEqualTo(product);
+    }
+
+    @Test
+    void 전체_제품_목록_조회(){
+        //given
+        List<Product> products = fixtureMonkey.giveMe(Product.class, 3);
+        //when
+        when(productRepository.findAll()).thenReturn(products);
+        List<Product> productList = productService.getProductList();
+        //then
+        then(productList).isEqualTo(products);
+    }
+
+    @Test
+    void 키워드로_제품_목록_조회(){
+        //given
+        List<Product> products = new ArrayList<>();
+        String keyword = "sample";
+
+        for (int i = 0; i < 5; i++) {
+            Product product = fixtureMonkey.giveMeBuilder(Product.class)
+                    .set("productName", keyword + i) // Append a unique number to each productName
+                    .sample();
+            products.add(product);
+        }
+        //when
+        when(productRepository.findByKeyword(keyword)).thenReturn(products);
+        List<ProductDto> productListByKeyword = productService.getProductListByKeyword(keyword);
+        //then
+        then(productListByKeyword).hasSize(5);
+        then(productListByKeyword).allSatisfy(productDto -> then(productDto.productName()).contains(keyword));
+    }
+}

module-domain/src/main/java/com/kernel360/auth/entity/Auth.java

@@ -17,10 +17,10 @@ public class Auth extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "auth_id_gen")
     @SequenceGenerator(name = "auth_id_gen", sequenceName = "auth_auth_no_seq")
     @Column(name = "auth_no", nullable = false)
-    private Integer authNo;
+    private Long authNo;
 
     @Column(name = "member_no")
-    private Integer memberNo;
+    private Long memberNo;
 
     @Column(name = "jwt_token")
     private String jwtToken;
@@ -32,31 +32,31 @@ public class Auth extends BaseEntity {
     /**
      * all create
      **/
-    public static Auth of(Integer authNo, Integer memberNo, String jwtToken, String snsToken) {
+    public static Auth of(Long authNo, Long memberNo, String jwtToken, String snsToken) {
 
         return new Auth(authNo, memberNo, jwtToken, snsToken);
     }
 
     /**
      * all binding
      **/
-    private Auth(Integer authNo, Integer memberNo, String jwtToken, String snsToken) {
+    private Auth(Long authNo, Long memberNo, String jwtToken, String snsToken) {
         this.authNo = authNo;
         this.memberNo = memberNo;
         this.jwtToken = jwtToken;
         this.snsToken = snsToken;
     }
 
 
-    public static Auth jwt(Integer authNo, Integer memberNo, String jwtToken) {
+    public static Auth jwt(Long authNo, Long memberNo, String jwtToken) {
 
         return new Auth(authNo, memberNo, jwtToken);
     }
 
     /**
      * JWT
      **/
-    private Auth(Integer authNo, Integer memberNo, String jwtToken) {
+    private Auth(Long authNo, Long memberNo, String jwtToken) {
         this.authNo = authNo;
         this.memberNo = memberNo;
         this.jwtToken = jwtToken;

module-domain/src/main/java/com/kernel360/auth/repository/AuthRepository.java

@@ -6,6 +6,6 @@
 
 public interface AuthRepository extends JpaRepository <Auth, Id> {
 
-    Auth findOneByMemberNo(Integer memberNo);
+    Auth findOneByMemberNo(Long memberNo);
 
 }