부산대_BE 김상해 6주차 과제(3단계)

README.md

@@ -1 +1,3 @@
-# spring-gift-point
+# spring-gift-point
+
+-[x] 5주차 코드 가져오기

scripts/deploy.sh

@@ -1,20 +1,41 @@
 #!/bin/bash
-BUILD_PATH=$(ls /../build/*.jar)
+
+# 프로젝트 루트 디렉토리 설정
+PROJECT_ROOT=$(pwd)
+
+# JAR 파일 찾기
+BUILD_PATH=$(find $PROJECT_ROOT -name '*.jar' | grep '/build/libs/')
+if [ -z "$BUILD_PATH" ]; then
+    echo "Error: JAR file not found"
+    exit 1
+fi
 JAR_NAME=$(basename $BUILD_PATH)
 
+# 현재 실행 중인 프로세스 확인
 CURRENT_PID=$(pgrep -f $JAR_NAME)
 
-if [ -z $CURRENT_PID ]
+# 실행 중인 프로세스가 있으면 종료
+if [ -z "$CURRENT_PID" ]
 then
-  sleep 1
+  echo "No process running."
 else
+  echo "Killing process $CURRENT_PID"
   kill -15 $CURRENT_PID
   sleep 5
 fi
 
-DEPLOY_PATH=../
+# 배포 경로 설정
+DEPLOY_PATH=$PROJECT_ROOT/
+
+# JAR 파일 복사
 cp $BUILD_PATH $DEPLOY_PATH
+
+# 배포 디렉토리로 이동
 cd $DEPLOY_PATH
 
+# JAR 파일 실행
 DEPLOY_JAR=$DEPLOY_PATH$JAR_NAME
-nohup java -jar $DEPLOY_JAR > /dev/null 2> /dev/null < /dev/null &
+echo "Deploying $DEPLOY_JAR"
+nohup java -jar $DEPLOY_JAR > /dev/null 2> /dev/null < /dev/null &
+
+echo "Deployment completed"

src/main/java/gift/kakaomember/controller/KakaoLoginController.java

@@ -1,13 +1,22 @@
+<<<<<<<< HEAD:src/main/java/gift/kakaomember/controller/KakaoLoginController.java
 package gift.kakaomember.controller;
+========
+package gift.member.kakaomember.controller;
+>>>>>>>> 624afd6 (feat: 회원 이메일 예외 추가):src/main/java/gift/member/kakaomember/controller/KakaoLoginController.java
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import gift.dto.ApiResponse;
 import gift.exception.IllegalEmailException;
+<<<<<<<< HEAD:src/main/java/gift/kakaomember/controller/KakaoLoginController.java
 import gift.member.dto.MemberResponse;
 import gift.member.service.MemberService;
 import gift.dto.HttpResult;
+========
+import gift.member.service.MemberService;
+import gift.model.HttpResult;
+>>>>>>>> 624afd6 (feat: 회원 이메일 예외 추가):src/main/java/gift/member/kakaomember/controller/KakaoLoginController.java
 import jakarta.servlet.http.HttpSession;
 import java.util.HashMap;
 import java.util.Optional;
@@ -97,10 +106,16 @@ public ResponseEntity<MemberResponse> loginAsKakaoMember(HttpSession session)
                 );
             }
         } catch (Exception | IllegalEmailException e) {
+<<<<<<<< HEAD:src/main/java/gift/kakaomember/controller/KakaoLoginController.java
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(
                 new MemberResponse(HttpResult.ERROR, "카카오 로그인 처리 중 오류 발생",
                     HttpStatus.INTERNAL_SERVER_ERROR, null)
             );
+========
+            return new ResponseEntity<>(
+                new ApiResponse(HttpResult.ERROR, "카카오 로그인 처리 중 오류 발생", HttpStatus.INTERNAL_SERVER_ERROR),
+                HttpStatus.INTERNAL_SERVER_ERROR);
+>>>>>>>> 624afd6 (feat: 회원 이메일 예외 추가):src/main/java/gift/member/kakaomember/controller/KakaoLoginController.java
         }
     }
 

src/main/java/gift/member/model/Member.java

@@ -45,11 +45,14 @@ public class Member {
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
     private final List<Wish> wishList = new ArrayList<>();
 
+    private int point;
+
     public Member() {
     }
 
     public Member(String kakaoId) {
         this.kakaoId = kakaoId;
+        this.point = 0;
     }
 
     public Member(String email, String password) throws IllegalEmailException {
@@ -62,6 +65,7 @@ public Member(String email, String password, String kakaoId) throws IllegalEmail
         this.email = email;
         this.password = password;
         this.kakaoId = kakaoId;
+        this.point = 0;
     }
 
 
@@ -88,4 +92,12 @@ public void setId(Long memberId) {
     public void setKakaoId(String hashedKakaoId) {
         this.kakaoId = hashedKakaoId;
     }
+
+    public void addPoint(int point) {
+        this.point += point;
+    }
+
+    public void subPoint(int point) {
+        this.point -= point;
+    }
 }

src/main/java/gift/order/controller/OrderController.java

@@ -52,18 +52,10 @@ public ResponseEntity<OrderResponse> addOrder(
         @RequestBody OrderRequest orderRequest) throws JsonProcessingException {
 
         var accessToken = authHead.replace("Bearer ", "");
-
-//        // 멤버 정보 필요
-//        var memberDto = new MemberRequest(member.getEmail(),member.getPassword());
-
-        // orderResponse
-//        var orderResponse = new OrderResponse(orderRequest.getOptionId(),
-//            orderRequest.getQuantity(), orderRequest.getMessage());
-
         var headers = getHttpHeadersForSelfMessage(accessToken);
         // 주문 처리 -> 위시 리스트 삭제, 옵션 수량 감소
         var order = orderService.addOrder(member, orderRequest);
-        System.out.println(member);
+
         if (member.getKakaoId() == null) {
             return ResponseEntity.ok(
                 new OrderResponse(HttpResult.OK, "주문 추가 성공", HttpStatus.OK, order));
@@ -107,7 +99,8 @@ public ResponseEntity<OrderResponse> getOrderListPage(
         String property = sortParams[0];
         Direction direction =
             sortParams.length > 1 ? Direction.valueOf(sortParams[1]) : Direction.ASC;
-        Page<Order> orderListPage = orderService.getOrderListPage(member,page, size, property, direction);
+        Page<Order> orderListPage = orderService.getOrderListPage(member, page, size, property,
+            direction);
         return ResponseEntity.ok(
             new OrderResponse(HttpResult.OK, "주문 리스트 조회 성공", HttpStatus.OK, orderListPage));
     }

src/main/java/gift/order/dto/OrderRequest.java

@@ -1,5 +1,6 @@
 package gift.order.dto;
 
+import jakarta.validation.constraints.Pattern;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -10,4 +11,8 @@ public class OrderRequest {
     private Long optionId;
     private int quantity;
     private String message;
+    private boolean isCashReceipt;
+
+    @Pattern(regexp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$", message = "10 ~ 11 자리의 숫자만 입력 가능합니다.")
+    private String phoneNumber;
 }

src/main/java/gift/order/model/Order.java

@@ -35,6 +35,10 @@ public class Order {
 
     private Long productId;
 
+    private int totalPrice;
+
+    private String cashReceipt;
+
 
     @ManyToOne
     @JoinColumn(name = "member_id")
@@ -43,11 +47,16 @@ public class Order {
 
 
     public Order(Long productId,Long optionId, int quantity, String message,Member member) {
+        this(productId, optionId, quantity, message, member, 0,"");
+    }
+    public Order(Long productId,Long optionId, int quantity, String message,Member member, int totalPrice, String cashReceipt) {
         this.productId = productId;
         this.message = message;
         this.optionId = optionId;
         this.quantity = quantity;
         this.member = member;
         this.orderDateTime = LocalDateTime.now();
+        this.totalPrice = totalPrice;
+        this.cashReceipt = cashReceipt;
     }
 }

src/main/java/gift/order/service/OrderService.java

@@ -1,12 +1,18 @@
 package gift.order.service;
 
+import gift.exception.IllegalProductException;
 import gift.member.model.Member;
 import gift.member.repository.MemberRepository;
+import gift.option.model.Option;
 import gift.option.repository.OptionRepository;
 import gift.option.service.OptionService;
 import gift.order.dto.OrderRequest;
 import gift.order.model.Order;
 import gift.order.repository.OrderRepository;
+import gift.product.model.Product;
+import gift.product.repository.ProductRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -24,13 +30,16 @@ public class OrderService {
     private final OptionService optionService;
     private final OptionRepository optionRepository;
     private final OrderRepository orderRepository;
+    private final ProductRepository productRepository;
 
     public OrderService(MemberRepository memberRepository, OptionService optionService,
-        OptionRepository optionRepository, OrderRepository orderRepository) {
+        OptionRepository optionRepository, OrderRepository orderRepository,
+        ProductRepository productRepository) {
         this.memberRepository = memberRepository;
         this.optionService = optionService;
         this.optionRepository = optionRepository;
         this.orderRepository = orderRepository;
+        this.productRepository = productRepository;
     }
 
 
@@ -47,9 +56,6 @@ public Order addOrder(
         Member member,
         OrderRequest orderRequest
     ) {
-//        var member = memberRepository.findByEmail(memberRequest.getEmail())
-//            .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 회원입니다"));
-
         var selectedWish = member.getWishList().stream()
             .filter(wish -> wish.getProduct().getId().equals(orderRequest.getProductId()))
             .findFirst().orElse(null);
@@ -67,13 +73,61 @@ public Order addOrder(
         } catch (Exception e) {
             throw new IllegalArgumentException("옵션 수량 업데이트 중 오류가 발생했습니다: " + e.getMessage());
         }
+        System.out.println("포인트");
+
+        // 포인트 적립
+        addPoint(member, orderRequest);
+        Logger logger = LoggerFactory.getLogger(OrderService.class);
+        logger.atInfo().log(member.toString());
+
+        // 5만원 이상이면 10% 할일
+        int totalPrice = getTotalPrice(orderRequest,
+            productRepository.findById(orderRequest.getProductId())
+                .orElseThrow(() -> new IllegalProductException("존재 하지 않는 상품입니다.")));
+        if (totalPrice > 50000) {
+            totalPrice = (int) (totalPrice * 0.9);
+        }
+
+        logger.atInfo().log(orderRequest.toString());
+        // 현금 영수증 사용 여부
+        if (orderRequest.isCashReceipt()) {
+            // 휴대폰 번호 여부 확인
+            if (orderRequest.getPhoneNumber() != null) {
+                logger.atInfo().log(orderRequest.getPhoneNumber());
+                Order order = new Order(orderRequest.getProductId(), orderRequest.getOptionId(),
+                    orderRequest.getQuantity(), orderRequest.getMessage(), member, totalPrice,
+                    orderRequest.getPhoneNumber());
+                return orderRepository.save(order);
+            }
+        }
 
         return orderRepository.save(new Order(
             orderRequest.getProductId(), orderRequest.getOptionId(), orderRequest.getQuantity(),
-            orderRequest.getMessage(),member
+            orderRequest.getMessage(), member, totalPrice, ""
         ));
     }
 
+    public void addPoint(Member member, OrderRequest orderRequest) {
+        Product product = productRepository.findById(orderRequest.getProductId())
+            .orElseThrow(() -> new IllegalProductException("존재 하지 않는 상품입니다."));
+
+        int totalPrice = getTotalPrice(orderRequest, product);
+
+        int point = totalPrice / 100;
+        member.addPoint(point);
+    }
+
+    private int getTotalPrice(OrderRequest orderRequest, Product product) {
+        return product.getPrice() * orderRequest.getQuantity();
+    }
+
+    public void discountCharge(OrderRequest orderRequest) {
+        Product product = productRepository.findById(orderRequest.getProductId())
+            .orElseThrow(() -> new IllegalProductException("존재 하지 않는 상품입니다."));
+
+    }
+
+
     public MultiValueMap<String, String> makeOrderMessage() {
         // Create the template object as a JSON string
         String templateObject =