Feat/mypage (#25)

* Fix: Builder 생성자 수정 * Fix: 멤버 엔티티 빌더 생성자에 id 추가 * Fix: DealCreateRequest 생성자 수정 * Fix: 포인트 생성 리퀘스트 DTO 삭제 및 관련 내용 수정 * Fix: 멤버 생성 리퀘스트 DTO 삭제 및 관련 내용 수정
AnywayClear · Jul 31, 2023 · 8b7f15c · 8b7f15c
1 parent 801e01e
commit 8b7f15c
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 57 deletions.
diff --git a/src/main/java/com/anywayclear/controller/PointController.java b/src/main/java/com/anywayclear/controller/PointController.java
@@ -1,14 +1,10 @@
 package com.anywayclear.controller;
 
-import com.anywayclear.dto.request.PointCreateRequest;
 import com.anywayclear.dto.response.PointResponse;
 import com.anywayclear.service.PointService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import java.net.URI;
-
 @RestController
 @RequestMapping("/api/points")
 public class PointController {

diff --git a/src/main/java/com/anywayclear/dto/request/DealCreateRequest.java b/src/main/java/com/anywayclear/dto/request/DealCreateRequest.java
@@ -18,18 +18,15 @@ public class DealCreateRequest {
     @NotNull
     private int endPrice;
     @NotNull
-    private boolean ispaid;
-    @NotNull
     private Member consumer;
     @NotNull
     private Member seller;
     @NotNull
     private Produce produce;
 
     @Builder
-    public DealCreateRequest(int endPrice, boolean ispaid, Member consumer, Member seller, Produce produce) {
+    public DealCreateRequest(int endPrice, Member consumer, Member seller, Produce produce) {
         this.endPrice = endPrice;
-        this.ispaid = ispaid;
         this.consumer = consumer;
         this.seller = seller;
         this.produce = produce;

diff --git a/src/main/java/com/anywayclear/dto/request/MemberCreateRequest.java b/src/main/java/com/anywayclear/dto/request/MemberCreateRequest.java
@@ -12,10 +12,6 @@
 @NoArgsConstructor
 public class MemberCreateRequest {
 
-    @NotBlank
-    private String id;
-    @NotBlank
-    private String userId;
     @NotBlank
     private String nickname;
     @NotBlank
@@ -30,9 +26,7 @@ public class MemberCreateRequest {
     private String companyAddress;
 
     @Builder
-    public MemberCreateRequest(String id, String userId, String nickname, String image, String emailAddress, String role,String phoneNumber, String description, String companyRegistrationNumber, String companyAddress) {
-        this.id = id;
-        this.userId = userId;
+    public MemberCreateRequest(String nickname, String image, String emailAddress, String role,String phoneNumber, String description, String companyRegistrationNumber, String companyAddress) {
         this.nickname = nickname;
         this.image = image;
         this.emailAddress = emailAddress;

diff --git a/src/main/java/com/anywayclear/dto/request/PointCreateRequest.java b/src/main/java/com/anywayclear/dto/request/PointCreateRequest.java
diff --git a/src/main/java/com/anywayclear/entity/Member.java b/src/main/java/com/anywayclear/entity/Member.java
@@ -61,8 +61,6 @@ public Member(String id, String userId, String nickname, String image, String em
 
     public static Member toEntity(MemberCreateRequest request) {
         return Member.builder()
-                .id(request.getId())
-                .userId(request.getUserId())
                 .nickname(request.getNickname())
                 .image(request.getImage())
                 .emailAddress(request.getEmailAddress())

diff --git a/src/main/java/com/anywayclear/entity/Point.java b/src/main/java/com/anywayclear/entity/Point.java
@@ -1,6 +1,5 @@
 package com.anywayclear.entity;
 
-import com.anywayclear.dto.request.PointCreateRequest;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 import lombok.Builder;
 import lombok.Getter;
@@ -36,10 +35,4 @@ public Point(Member member) {
         this.member = member;
 //        this.updatedAt = LocalDateTime.now();
     }
-
-    public static Point toEntity(PointCreateRequest request) {
-        return Point.builder()
-                .member(request.getMember())
-                .build();
-    }
 }
diff --git a/src/main/java/com/anywayclear/service/PointService.java b/src/main/java/com/anywayclear/service/PointService.java
@@ -1,6 +1,5 @@
 package com.anywayclear.service;
 
-import com.anywayclear.dto.request.PointCreateRequest;
 import com.anywayclear.dto.response.PointResponse;
 import com.anywayclear.entity.Member;
 import com.anywayclear.entity.Point;

diff --git a/src/test/java/com/anywayclear/repository/MemberTest.java b/src/test/java/com/anywayclear/repository/MemberTest.java
@@ -25,7 +25,6 @@ void SignUpTest() {
         member.setNickname("flowerdonk");
 //        member.setPhone_number("01085025150");
         member.setDescription("싱싱한 딸기");
-
 //        member.setCompany_registration_number("123456");
 //        member.setCompany_address("Incheon");
         Member savedMember = memberRepository.save(member);