Merge pull request Kernel360#59 from HyunJunSon/feature/mypage_CRUD c…

…onflict solving
chan99k · Jan 18, 2024 · 09a8401 · 09a8401
2 parents b813242 + 3d939b4
commit 09a8401
Show file tree

Hide file tree

Showing 11 changed files with 227 additions and 17 deletions.
diff --git a/module-api/src/main/java/com/kernel360/main/controller/MainContoller.java b/module-api/src/main/java/com/kernel360/main/controller/MainContoller.java
@@ -0,0 +1,16 @@
+package com.kernel360.main.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+public class MainContoller {
+    @GetMapping("")
+    ResponseEntity<String> mainPage(){
+        return ResponseEntity.status(HttpStatus.OK).body("main page입니다.");
+    }
+
+}
diff --git a/module-api/src/main/java/com/kernel360/mypage/controller/MyPageController.java b/module-api/src/main/java/com/kernel360/mypage/controller/MyPageController.java
@@ -0,0 +1,61 @@
+package com.kernel360.mypage.controller;
+
+import com.kernel360.member.dto.MemberDto;
+import com.kernel360.member.service.MemberService;
+import com.kernel360.product.dto.ProductDto;
+import com.kernel360.product.service.ProductService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/mypage")
+@RequiredArgsConstructor
+public class MyPageController {
+    private final MemberService memberService;
+    private final ProductService productService;
+    @GetMapping("/main")
+    ResponseEntity<Model> main(Model model) {
+        List<ProductDto> productDtoList = productService.getProductListOrderByViewCount();
+        String bannerImageUrl = "http://localhost:8080/bannersample.png";
+        String suggestImageUrl = "http://localhost:8080/suggestsample.png";
+
+        model.addAllAttributes(Map.of("Banner" , bannerImageUrl,
+                                    "Suggest", suggestImageUrl,
+                                    "Product", productDtoList));
+
+        return ResponseEntity.status(HttpStatus.OK).body(model);
+    }
+
+    @GetMapping("/member")
+    ResponseEntity<String> myInfo() {
+        return ResponseEntity.status(HttpStatus.OK).body("mypage 내정보 page입니다.");
+    }
+
+    @GetMapping("/car")
+    ResponseEntity<String> myCar() {
+        return ResponseEntity.status(HttpStatus.OK).body("mypage 차량정보 page입니다.");
+    }
+
+    @DeleteMapping("/member")
+    ResponseEntity<String> memberDelete(@RequestBody MemberDto memberDto) {
+        return ResponseEntity.status(HttpStatus.OK).body(memberDto.id() + " 회원이 탈퇴되었습니다.");
+    }
+
+    @PostMapping("/member")
+    ResponseEntity<String> memberInfoAdd(@RequestBody MemberDto memberDto) {
+        return ResponseEntity.status(HttpStatus.OK).body(memberDto.id() + "회원의 회원정보가 추가되었습니다.");
+    }
+
+    @PatchMapping("/member")
+    ResponseEntity<String> changePassword(@RequestBody MemberDto memberDto) {
+        return ResponseEntity.status(HttpStatus.OK).body(memberDto.id() + "회원의 비밀번호가 변경 되었습니다.");
+    }
+
+
+}
diff --git a/module-api/src/main/java/com/kernel360/product/service/ProductService.java b/module-api/src/main/java/com/kernel360/product/service/ProductService.java
@@ -34,4 +34,11 @@ public List<ProductDto> getProductListByKeyword(String keyword) {
 
         return products.stream().map(ProductDto::from).toList();
     }
+
+    @Transactional(readOnly = true)
+    public List<ProductDto> getProductListOrderByViewCount(){
+        List<Product> products = productRepository.findAllByOrderByViewCountDesc();
+
+        return products.stream().map(ProductDto::from).toList();
+    }
 }
diff --git a/module-api/src/test/java/com/kernel360/mypage/controller/MyPageControllerTest.java b/module-api/src/test/java/com/kernel360/mypage/controller/MyPageControllerTest.java
@@ -0,0 +1,86 @@
+package com.kernel360.mypage.controller;
+
+import com.kernel360.member.service.MemberService;
+import com.kernel360.product.dto.ProductDto;
+import com.kernel360.product.service.ProductService;
+import com.navercorp.fixturemonkey.FixtureMonkey;
+import com.navercorp.fixturemonkey.api.introspector.*;
+import com.navercorp.fixturemonkey.api.type.TypeReference;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+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.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.ui.Model;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.filter.CharacterEncodingFilter;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.mockito.Mockito.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+@WebMvcTest(MyPageController.class)
+class MyPageControllerTest {
+
+    private MockMvc mockMvc;
+
+    @Autowired
+    private WebApplicationContext context;
+
+    @MockBean
+    private MemberService memberService;
+
+    @MockBean
+    private ProductService productService;
+
+    @MockBean
+    private Model model;
+    private FixtureMonkey fixtureMonkey;
+
+    @BeforeEach
+    void 준비(WebApplicationContext webApplicationContext) {
+        fixtureMonkey = FixtureMonkey.builder()
+                .objectIntrospector(new FailoverIntrospector(
+                        Arrays.asList(
+                                BuilderArbitraryIntrospector.INSTANCE,
+                                FieldReflectionArbitraryIntrospector.INSTANCE,
+                                ConstructorPropertiesArbitraryIntrospector.INSTANCE,
+                                BeanArbitraryIntrospector.INSTANCE
+                        )
+                ))
+                .build();
+
+        mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext)
+                .build();
+    }
+
+    @Test
+    void 마이페이지_메인요청이왔을때_200요청과_응답이_잘반환되는지() throws Exception {
+        //given
+        List<ProductDto> productDtoList = fixtureMonkey.giveMeBuilder(ProductDto.class).sampleList(5);
+
+        //when
+        when(productService.getProductListOrderByViewCount()).thenReturn(productDtoList);
+
+        //then
+        mockMvc.perform(get("/mypage/main"))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+                .andExpect(jsonPath("$.Banner").value("http://localhost:8080/bannersample.png"))
+                .andExpect(jsonPath("$.Suggest").value("http://localhost:8080/suggestsample.png"))
+                .andExpect(jsonPath("$.Product", hasSize(5)));
+
+        verify(productService, times(1)).getProductListOrderByViewCount();
+    }
+
+
+}
diff --git a/module-domain/src/main/java/com/kernel360/brand/entity/Brand.java b/module-domain/src/main/java/com/kernel360/brand/entity/Brand.java
@@ -4,6 +4,7 @@
 import com.kernel360.product.entity.Product;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -33,10 +34,10 @@ public class Brand extends BaseEntity {
     @Column(name = "description", length = Integer.MAX_VALUE)
     private String description;
 
-    @Column(name = "nation_name")
+    @Column(name = "nation_name", length = Integer.MAX_VALUE)
     private String nationName;
 
-    @OneToMany(mappedBy = "brand")
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "brand")
     private List<Product> productList = new ArrayList<>();
 
 

diff --git a/module-domain/src/main/java/com/kernel360/carinfo/entity/CarInfo.java b/module-domain/src/main/java/com/kernel360/carinfo/entity/CarInfo.java
@@ -1,6 +1,7 @@
 package com.kernel360.carinfo.entity;
 
 import com.kernel360.base.BaseEntity;
+import com.kernel360.member.entity.Member;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,11 @@ public class CarInfo extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "car_info_id_gen")
     @SequenceGenerator(name = "car_info_id_gen", sequenceName = "car_info_car_no_seq")
     @Column(name = "car_no", nullable = false)
-    private Integer carNo;
+    private Long carNo;
+
+    @OneToOne
+    @JoinColumn(name = "member_no")
+    private Member member;
 
     @Column(name = "car_brand")
     private String carBrand;

diff --git a/module-domain/src/main/java/com/kernel360/carinfo/repository/CarInfoRepository.java b/module-domain/src/main/java/com/kernel360/carinfo/repository/CarInfoRepository.java
@@ -0,0 +1,7 @@
+package com.kernel360.carinfo.repository;
+
+import com.kernel360.carinfo.entity.CarInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface CarInfoRepository extends JpaRepository<CarInfo, Long> {
+}
diff --git a/module-domain/src/main/java/com/kernel360/member/entity/Member.java b/module-domain/src/main/java/com/kernel360/member/entity/Member.java
@@ -1,6 +1,8 @@
 package com.kernel360.member.entity;
 
 import com.kernel360.base.BaseEntity;
+import com.kernel360.carinfo.entity.CarInfo;
+import com.kernel360.washinfo.entity.WashInfo;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -22,6 +24,12 @@ public class Member extends BaseEntity {
     @Column(name = "id", nullable = false)
     private String id;
 
+    @OneToOne(mappedBy = "member")
+    private CarInfo carInfo;
+
+    @OneToOne(mappedBy = "member")
+    private WashInfo washInfo;
+
     @Column(name = "email", nullable = false)
     private String email;
 
@@ -39,15 +47,17 @@ public static Member of(Long memberNo, String id, String email, String password,
         return new Member(memberNo, id, email, password, gender, birthdate);
     }
 
-    /** All Binding **/
+    /**
+     * All Binding
+     **/
     private Member(
             Long memberNo,
             String id,
             String email,
             String password,
             String gender,
             LocalDate birthdate
-    )    {
+    ) {
         this.memberNo = memberNo;
         this.id = id;
         this.email = email;
@@ -56,27 +66,35 @@ private Member(
         this.birthdate = birthdate;
     }
 
-    /** joinMember **/
-    public static Member createJoinMember(String id, String email, String password){
+    /**
+     * joinMember
+     **/
+    public static Member createJoinMember(String id, String email, String password) {
 
-        return new Member(id,email,password);
+        return new Member(id, email, password);
     }
 
-    /** joinMember Binding **/
-    private Member(String id, String email, String password){
+    /**
+     * joinMember Binding
+     **/
+    private Member(String id, String email, String password) {
         this.id = id;
         this.email = email;
         this.password = password;
     }
 
-    /** loginMember **/
-    public static Member loginMember(String id, String password){
+    /**
+     * loginMember
+     **/
+    public static Member loginMember(String id, String password) {
 
-        return new Member(id,password);
+        return new Member(id, password);
     }
 
-    /** loginMember Binding **/
-    private Member(String id, String password){
+    /**
+     * loginMember Binding
+     **/
+    private Member(String id, String password) {
         this.id = id;
         this.password = password;
     }

diff --git a/module-domain/src/main/java/com/kernel360/product/repository/ProductRepository.java b/module-domain/src/main/java/com/kernel360/product/repository/ProductRepository.java
@@ -13,6 +13,8 @@ public interface ProductRepository extends JpaRepository<Product, Long> {
     @Query(value = "SELECT * FROM Product WHERE product_name LIKE CONCAT('%', :keyword, '%') OR barcode LIKE CONCAT('%', :keyword, '%') OR description LIKE CONCAT('%', :keyword, '%')", nativeQuery = true)
     List<Product> findByKeyword(@Param("keyword") String keyword);
 
+    List<Product> findAllByOrderByViewCountDesc();
+
     @Query(value = "SELECT p FROM Product  p WHERE p.productName = :productName AND p.reportNumber = :reportNumber")
     Optional<Product> findProductByProductNameAndReportNumber(@Param("productName") String productName,
                                                               @Param("reportNumber") String reportNumber);

diff --git a/module-domain/src/main/java/com/kernel360/washinfo/entity/WashInfo.java b/module-domain/src/main/java/com/kernel360/washinfo/entity/WashInfo.java
@@ -17,9 +17,9 @@ public class WashInfo extends BaseEntity {
     @Column(name = "wash_no", nullable = false)
     private Integer washNo;
 
-    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_no", nullable = false)
-    private Member memberNo;
+    private Member member;
 
     @Column(name = "wash_count")
     private Integer washCount;

diff --git a/module-domain/src/main/java/com/kernel360/washinfo/repository/WashInfoRepository.java b/module-domain/src/main/java/com/kernel360/washinfo/repository/WashInfoRepository.java
@@ -0,0 +1,7 @@
+package com.kernel360.washinfo.repository;
+
+import com.kernel360.washinfo.entity.WashInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface WashInfoRepository extends JpaRepository<WashInfo, Long> {
+}