Merge pull request #10 from Team-Flory/fix/#9/member-id-field-setting

[Fix] memberId 필드 추가

src/main/java/zerobibim/flory/domain/flower/repository/FlowerInitializer.java

@@ -1,8 +1,5 @@
 package zerobibim.flory.domain.flower.repository;
 
-import jakarta.annotation.PostConstruct;
-import org.springframework.stereotype.Component;
-import zerobibim.flory.domain.flower.entity.Flower;
 /*
 @Component
 public class FlowerInitializer {

src/main/java/zerobibim/flory/domain/flower/repository/JpaFlowerRepository.java

@@ -3,7 +3,5 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import zerobibim.flory.domain.flower.entity.Flower;
 
-import java.util.List;
-
 public interface JpaFlowerRepository extends JpaRepository<Flower, Long>, FlowerRepository {
 }

src/main/java/zerobibim/flory/domain/member/dto/request/MemberSignUpRequest.java

@@ -1,12 +1,8 @@
 package zerobibim.flory.domain.member.dto.request;
 
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.springframework.format.annotation.NumberFormat;
 
 @Getter
 @AllArgsConstructor

src/main/java/zerobibim/flory/domain/member/entity/Member.java

@@ -19,16 +19,19 @@ public class Member extends BaseTime {
     @Column(nullable = false)
     private String name;
 
-    @Column(unique = true, nullable = false)
+    @Column(nullable = false)
     private String email;
 
     @Column(nullable = false)
     private String password;
 
     private String phoneNumber;
+    @Column(nullable = false)
     private String nickname;
 
+    @Column(nullable = false)
     private String walletAddress;
+    @Column(nullable = false)
     private String walletPassword;
 
 

src/main/java/zerobibim/flory/domain/member/service/MemberService.java

@@ -23,7 +23,11 @@ public class MemberService implements EntityLoader<Member, Long> {
     public MemberIdResponse createMember(MemberSignUpRequest request) {
         // TODO Validation 추가하기
 
-        // TODO 이메일, 닉네임 중복 여부
+        // 이메일, 닉네임 중복 여부 체크
+        Optional<Member> member = memberRepository.findMemberByEmail(request.getEmail());
+        if(member.isPresent()) throw new ExceptionHandler(ErrorStatus.MEMBER_EXISTED);
+        member = memberRepository.findMemberByNickname(request.getNickname());
+        if(member.isPresent()) throw new ExceptionHandler(ErrorStatus.NICKNAME_DUPLICATED);
 
         // TODO 비밀번호 암호화
 
@@ -46,7 +50,7 @@ public MemberIdResponse checkMember(MemberSignInRequest request) {
         return new MemberIdResponse(member.get().getId());
     }
 
-    public Member findReceiver(String nickname) {
+    public Member findMemberByNickname(String nickname) {
         Optional<Member> member = memberRepository.findMemberByNickname(nickname);
         // 해당 닉네임 존재하지 않을 경우
         if(member.isEmpty()) throw new ExceptionHandler(ErrorStatus.RECEIVER_NOT_FOUND);

src/main/java/zerobibim/flory/domain/purchase/dto/request/PurchaseCreateRequest.java

@@ -8,6 +8,7 @@
 @Getter
 @AllArgsConstructor
 public class PurchaseCreateRequest {
+    private Long memberId;
     private String receiverName;
     private String receiverAddress;
     private String receiverNickname;

src/main/java/zerobibim/flory/domain/purchase/entity/Purchase.java

@@ -3,7 +3,6 @@
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.Where;
-import org.springframework.cglib.core.Local;
 import zerobibim.flory.domain.flower.entity.Flower;
 import zerobibim.flory.domain.member.entity.Member;
 import zerobibim.flory.global.common.BaseTime;

src/main/java/zerobibim/flory/domain/purchase/service/PurchaseService.java

@@ -26,14 +26,13 @@ public class PurchaseService implements EntityLoader<Purchase, Long> {
     private final FlowerService flowerService;
 
     public PurchaseIdResponse createPurchase(PurchaseCreateRequest request) {
-        // TODO Validation 추가
-
-        Member receiver = memberService.findReceiver(request.getReceiverNickname());
+        Member sender = memberService.loadEntity(request.getMemberId());
+        Member receiver = memberService.findMemberByNickname(request.getReceiverNickname());
         Flower flower = flowerService.loadEntity(request.getFlowerId());
 
         Purchase newPurchase = purchaseRepository.save(
                 purchaseMapper.toEntity(
-                        null, receiver, request.getReceiveDate(), flower, request.getReceiverName(), request.getReceiverAddress(),
+                        sender, receiver, request.getReceiveDate(), flower, request.getReceiverName(), request.getReceiverAddress(),
                         request.getFlowerQuentity(), request.getNftComment(), request.getDeliveryTip(), request.getTotalPrice()
                 ));
 

src/main/java/zerobibim/flory/global/common/ApiPayload/code/status/ErrorStatus.java

@@ -17,8 +17,10 @@ public enum ErrorStatus implements BaseErrorCode {
 
     // 멤버 관련 응답
     MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER4001", "존재하지 않는 사용자입니다."),
-    MEMBER_EXISTED(HttpStatus.BAD_REQUEST, "MEMBER4002", "이미 존재하는 사용자입니다."),
+    MEMBER_EXISTED(HttpStatus.BAD_REQUEST, "MEMBER4002", "이미 사용중인 계정입니다."),
     PASSWORD_NOT_MATCH(HttpStatus.BAD_REQUEST, "MEMBER4003","비밀번호가 일치하지 않습니다."),
+    NICKNAME_DUPLICATED(HttpStatus.BAD_REQUEST, "MEMBER4004", "이미 사용중인 닉네임입니다."),
+
     // 꽃 관련 응답
     FLOWER_NOT_FOUND(HttpStatus.BAD_REQUEST, "FLOWER4001", "존재하지 않는 꽃입니다."),
     FLOWER_EXISTED(HttpStatus.BAD_REQUEST, "FLOWER4002","이미 존재하는 꽃입니다."),