[11주차 코드 PR] Week to Dev

.github/workflows/deploy-ecs.yml

@@ -118,6 +118,11 @@ jobs:
             AWS_SECRET_KEY=${{ secrets.AWS_SECRET_KEY }}
             IMP_API_KEY=${{ secrets.IMP_API_KEY }}
             IMP_SECRET_KEY=${{ secrets.IMP_SECRET_KEY }}
+            KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }}
+            KAKAO_CLIENT_SECRET=${{ secrets.KAKAO_CLIENT_SECRET }}
+            NAVER_OCR_SECRET=${{ secrets.NAVER_OCR_SECRET }}
+            NAVER_OCR_INVOKE=${{ secrets.NAVER_OCR_INVOKE }}
+            NAVER_OCR_TEMPLATE=${{ secrets.NAVER_OCR_TEMPLATE }}
           cache-from: type=gha
           cache-to: type=gha,mode=min,ignore-error=true
 

Dockerfile

@@ -15,6 +15,11 @@ ARG AWS_ACCESS_KEY
 ARG AWS_SECRET_KEY
 ARG IMP_API_KEY
 ARG IMP_SECRET_KEY
+ARG KAKAO_CLIENT_ID
+ARG KAKAO_CLIENT_SECRET
+ARG NAVER_OCR_SECRET
+ARG NAVER_OCR_INVOKE
+ARG NAVER_OCR_TEMPLATE
 
 # 환경 변수 설정
 ENV SPRING_DATASOURCE_URL=$SPRING_DATASOURCE_URL
@@ -31,6 +36,12 @@ ENV AWS_ACCESS_KEY=$AWS_ACCESS_KEY
 ENV AWS_SECRET_KEY=$AWS_SECRET_KEY
 ENV IMP_API_KEY=$IMP_API_KEY
 ENV IMP_SECRET_KEY=$IMP_SECRET_KEY
+ENV KAKAO_CLIENT_ID=$KAKAO_CLIENT_ID
+ENV KAKAO_CLIENT_SECRET=$KAKAO_CLIENT_SECRET
+ENV NAVER_OCR_SECRET=$NAVER_OCR_SECRET
+ENV NAVER_OCR_INVOKE=$NAVER_OCR_INVOKE
+ENV NAVER_OCR_TEMPLATE=$NAVER_OCR_TEMPLATE
+
 
 COPY build/libs/*.jar app.jar
 
@@ -49,4 +60,9 @@ ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", \
     "-Daws.secret=${AWS_SECRET_KEY}", \
     "-Dimp.api.key=${IMP_API_KEY}", \
     "-Dimp.api.secretKey=${IMP_SECRET_KEY}", \
+    "-Dkakao.client.id=${KAKAO_CLIENT_ID}", \
+    "-Dkakao.client.secret=${KAKAO_CLIENT_SECRET}", \
+    "-Dnaver.ocr.secret=${NAVER_OCR_SECRET}", \
+    "-Dnaver.ocr.invoke=${NAVER_OCR_INVOKE}", \
+    "-Dnaver.ocr.template=${NAVER_OCR_TEMPLATE}", \
     "-jar", "/app.jar"]

build.gradle

@@ -45,7 +45,7 @@ dependencies {
     // JSON
     implementation 'org.json:json:20210307'
     implementation 'com.google.code.gson:gson:2.10.1'
-
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
     // JWT
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
@@ -66,6 +66,9 @@ dependencies {
     implementation(platform("software.amazon.awssdk:bom:2.27.21"))
     implementation("software.amazon.awssdk:s3")
 
+    implementation platform("io.awspring.cloud:spring-cloud-aws-dependencies:3.0.1")
+    implementation 'io.awspring.cloud:spring-cloud-aws-starter-sqs'
+
     // 아임포트 및 아임포트 웹훅
     implementation 'com.github.iamport:iamport-rest-client-java:0.2.23'
 

src/main/java/poomasi/domain/aftersales/controller/AfterSalesController.java

@@ -0,0 +1,61 @@
+package poomasi.domain.aftersales.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import poomasi.domain.aftersales.dto.cancel.request.FarmCancelRequest;
+import poomasi.domain.aftersales.dto.cancel.request.ProductCancelRequest;
+import poomasi.domain.aftersales.dto.refund.request.ProductRefundRequest;
+import poomasi.domain.aftersales.dto.refund.request.ProductRefundRequestApprovalRequest;
+import poomasi.domain.aftersales.service.FarmAfterSalesService;
+import poomasi.domain.aftersales.service.ProductAfterSalesService;
+
+@RestController
+@RequestMapping("/api/aftersales")
+@RequiredArgsConstructor
+public class AfterSalesController {
+
+    private final ProductAfterSalesService productAfterSalesService;
+    private final FarmAfterSalesService farmAfterSalesService;
+
+    @Secured({"ROLE_CUSTOMER", "ROLE_FARMER"})
+    @PostMapping("/products/cancel")
+    public ResponseEntity<?> productCancel(@RequestBody ProductCancelRequest productCancelRequest) {
+        return ResponseEntity.ok(
+                productAfterSalesService.cancel(productCancelRequest)
+        );
+    }
+
+    @Secured({"ROLE_CUSTOMER", "ROLE_FARMER"})
+    @PostMapping("/products/refund-request")
+    public ResponseEntity<?> requestRefund(@RequestBody ProductRefundRequest productRefundRequest) {
+        return ResponseEntity.ok(
+                productAfterSalesService.
+                        refund(productRefundRequest)
+        );
+    }
+
+    @Secured({"ROLE_FARMER"})
+    @PostMapping("/approve-products-refund")
+    public ResponseEntity<?> approveRefund(@RequestBody ProductRefundRequestApprovalRequest productRefundRequestApprovalRequest) {
+        return ResponseEntity.ok(
+                productAfterSalesService.processRefundApproval(productRefundRequestApprovalRequest)
+        );
+    }
+
+    @Secured({"ROLE_CUSTOMER", "ROLE_FARMER"})
+    @PostMapping("/farms/cancel")
+    public ResponseEntity<?> farmCancel(@RequestBody FarmCancelRequest farmCancelRequest){
+        return ResponseEntity.ok(
+                farmAfterSalesService.cancel(farmCancelRequest)
+        );
+    }
+
+
+
+
+}

src/main/java/poomasi/domain/aftersales/dto/cancel/request/FarmCancelRequest.java

@@ -0,0 +1,4 @@
+package poomasi.domain.aftersales.dto.cancel.request;
+
+public record FarmCancelRequest(Long reservationId) {
+}

src/main/java/poomasi/domain/aftersales/dto/cancel/request/ProductCancelRequest.java

@@ -0,0 +1,4 @@
+package poomasi.domain.aftersales.dto.cancel.request;
+
+public record ProductCancelRequest(Long orderedProductId) {
+}

src/main/java/poomasi/domain/aftersales/dto/cancel/response/FarmCancelResponse.java

@@ -0,0 +1,10 @@
+package poomasi.domain.aftersales.dto.cancel.response;
+
+import poomasi.domain.reservation.entity.ReservationStatus;
+
+import java.math.BigDecimal;
+
+public record FarmCancelResponse(Long reservationId,
+                                 ReservationStatus reservationStatus,
+                                 BigDecimal finalCancelAmount) {
+}

src/main/java/poomasi/domain/aftersales/dto/cancel/response/ProductCancelResponse.java

@@ -0,0 +1,11 @@
+package poomasi.domain.aftersales.dto.cancel.response;
+
+import poomasi.domain.order.entity.OrderedProductStatus;
+
+import java.math.BigDecimal;
+
+public record ProductCancelResponse(
+        Long orderedProductId,
+        OrderedProductStatus orderedProductStatus,
+        BigDecimal finalCancelAmount) {
+}

src/main/java/poomasi/domain/aftersales/dto/refund/request/ProductRefundRequest.java

@@ -0,0 +1,8 @@
+package poomasi.domain.aftersales.dto.refund.request;
+
+import jakarta.validation.constraints.NotNull;
+
+public record ProductRefundRequest(
+        @NotNull Long orderedProductId
+) {
+}

src/main/java/poomasi/domain/aftersales/dto/refund/request/ProductRefundRequestApprovalRequest.java

@@ -0,0 +1,4 @@
+package poomasi.domain.aftersales.dto.refund.request;
+
+public record ProductRefundRequestApprovalRequest(Long productAfterSalesId) {
+}

src/main/java/poomasi/domain/aftersales/dto/refund/response/ProductRefundRequestApprovalResponse.java

@@ -0,0 +1,12 @@
+package poomasi.domain.aftersales.dto.refund.response;
+
+import poomasi.domain.order.entity.OrderedProductStatus;
+
+import java.math.BigDecimal;
+
+public record ProductRefundRequestApprovalResponse(
+        Long orderedProductId,
+        OrderedProductStatus orderedProductStatus,
+        BigDecimal refundAmount
+) {
+}

src/main/java/poomasi/domain/aftersales/dto/refund/response/ProductRefundResponse.java

@@ -0,0 +1,14 @@
+package poomasi.domain.aftersales.dto.refund.response;
+
+import poomasi.domain.order.entity.OrderedProductStatus;
+
+import java.math.BigDecimal;
+
+public record ProductRefundResponse(
+        Long orderedProductId,
+        OrderedProductStatus orderedProductStatus,
+        BigDecimal finalRefundAmount
+) {
+}
+
+

src/main/java/poomasi/domain/aftersales/entity/AfterSalesType.java

@@ -0,0 +1,8 @@
+package poomasi.domain.aftersales.entity;
+
+public enum AfterSalesType {
+    REFUND,
+    CANCEL
+}
+
+

src/main/java/poomasi/domain/aftersales/entity/FarmAfterSales.java

@@ -0,0 +1,51 @@
+package poomasi.domain.aftersales.entity;
+
+
+import jakarta.persistence.*;
+import jdk.jfr.Description;
+import jdk.jfr.Timestamp;
+import lombok.Builder;
+import lombok.Data;
+import org.hibernate.annotations.UpdateTimestamp;
+import poomasi.domain.reservation.entity.Reservation;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Entity
+@Table
+@Data
+public class FarmAfterSales {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    Long id;
+
+    @Description("금액")
+    private BigDecimal afterSalesAmount;
+
+    @Column(name = "created_at")
+    @UpdateTimestamp
+    private LocalDateTime createdAt = LocalDateTime.now();
+
+    @Column(name = "updated_at")
+    @UpdateTimestamp
+    private LocalDateTime updateAt = LocalDateTime.now();
+
+    @Column(name = "deleted_at")
+    @Timestamp
+    private LocalDateTime deletedAt;
+
+    @OneToOne
+    private Reservation reservation;
+
+    public FarmAfterSales(){
+
+    }
+
+    @Builder
+    public FarmAfterSales(BigDecimal afterSalesAmount, Reservation reservation) {
+        this.afterSalesAmount = afterSalesAmount;
+        this.reservation = reservation;
+    }
+}

src/main/java/poomasi/domain/aftersales/entity/ProductAfterSales.java

@@ -0,0 +1,47 @@
+package poomasi.domain.aftersales.entity;
+
+import jakarta.persistence.*;
+import jdk.jfr.Description;
+import jdk.jfr.Timestamp;
+import lombok.Builder;
+import lombok.Data;
+import org.hibernate.annotations.UpdateTimestamp;
+import poomasi.domain.order.entity.OrderedProduct;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@Entity
+@Table(name="product_after_sales")
+public class ProductAfterSales {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Description("금액")
+    private BigDecimal afterSalesAmount;
+
+    @Description("타입")
+    private AfterSalesType afterSalesType;
+
+    @Column(name = "created_at")
+    @UpdateTimestamp
+    private LocalDateTime createdAt = LocalDateTime.now();
+
+    @Column(name = "updated_at")
+    @UpdateTimestamp
+    private LocalDateTime updateAt = LocalDateTime.now();
+
+    @Column(name = "deleted_at")
+    @Timestamp
+    private LocalDateTime deletedAt;
+
+    @OneToOne
+    private OrderedProduct orderedProduct;
+
+    public ProductAfterSales(){
+    }
+
+
+}

src/main/java/poomasi/domain/aftersales/repository/FarmAfterSalesRepository.java

@@ -0,0 +1,7 @@
+package poomasi.domain.aftersales.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import poomasi.domain.aftersales.entity.FarmAfterSales;
+
+public interface FarmAfterSalesRepository extends JpaRepository<FarmAfterSales, Long> {
+}

src/main/java/poomasi/domain/aftersales/repository/ProductAfterSalesRepository.java

@@ -0,0 +1,9 @@
+package poomasi.domain.aftersales.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import poomasi.domain.aftersales.entity.ProductAfterSales;
+
+@Repository
+public interface ProductAfterSalesRepository extends JpaRepository<ProductAfterSales, Long> {
+}

src/main/java/poomasi/domain/aftersales/service/CancelService.java

@@ -0,0 +1,5 @@
+package poomasi.domain.aftersales.service;
+
+public interface CancelService<T, P> {
+    T cancel(P parameter);
+}