[CI/CD] Deploy to EC2

build.gradle

@@ -20,6 +20,7 @@ configurations {
 }
 
 repositories {
+    maven { url 'https://jitpack.io' }
     mavenCentral()
 }
 
@@ -59,6 +60,9 @@ dependencies {
     // google maps
     implementation group: 'com.google.maps', name: 'google-maps-services', version: '2.2.0'
 
+    // payment
+    implementation 'com.github.iamport:iamport-rest-client-java:0.2.23'
+
     compileOnly 'org.projectlombok:lombok'
 
     runtimeOnly 'com.mysql:mysql-connector-j'

src/main/generated/com/gongspot/project/domain/order/entity/QOrder.java

@@ -0,0 +1,78 @@
+package com.gongspot.project.domain.order.entity;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.processing.Generated;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QOrder is a Querydsl query type for Order
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QOrder extends EntityPathBase<Order> {
+
+    private static final long serialVersionUID = 2108355418L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QOrder order = new QOrder("order1");
+
+    public final com.gongspot.project.common.entity.QBaseEntity _super = new com.gongspot.project.common.entity.QBaseEntity(this);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> deletedAt = _super.deletedAt;
+
+    public final StringPath merchantUid = createString("merchantUid");
+
+    public final StringPath ordererName = createString("ordererName");
+
+    public final NumberPath<Long> orderId = createNumber("orderId", Long.class);
+
+    public final EnumPath<PaymentStatus> paymentStatus = createEnum("paymentStatus", PaymentStatus.class);
+
+    public final EnumPath<PayMethod> payMethod = createEnum("payMethod", PayMethod.class);
+
+    public final com.gongspot.project.domain.point.entity.QPoint point;
+
+    public final QProduct product;
+
+    public final NumberPath<java.math.BigDecimal> totalPrice = createNumber("totalPrice", java.math.BigDecimal.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
+
+    public final com.gongspot.project.domain.user.entity.QUser user;
+
+    public QOrder(String variable) {
+        this(Order.class, forVariable(variable), INITS);
+    }
+
+    public QOrder(Path<? extends Order> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QOrder(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QOrder(PathMetadata metadata, PathInits inits) {
+        this(Order.class, metadata, inits);
+    }
+
+    public QOrder(Class<? extends Order> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.point = inits.isInitialized("point") ? new com.gongspot.project.domain.point.entity.QPoint(forProperty("point"), inits.get("point")) : null;
+        this.product = inits.isInitialized("product") ? new QProduct(forProperty("product")) : null;
+        this.user = inits.isInitialized("user") ? new com.gongspot.project.domain.user.entity.QUser(forProperty("user")) : null;
+    }
+
+}
+

src/main/generated/com/gongspot/project/domain/order/entity/QProduct.java

@@ -0,0 +1,43 @@
+package com.gongspot.project.domain.order.entity;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.processing.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QProduct is a Querydsl query type for Product
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QProduct extends EntityPathBase<Product> {
+
+    private static final long serialVersionUID = -197368325L;
+
+    public static final QProduct product = new QProduct("product");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final NumberPath<Integer> point = createNumber("point", Integer.class);
+
+    public final NumberPath<java.math.BigDecimal> price = createNumber("price", java.math.BigDecimal.class);
+
+    public QProduct(String variable) {
+        super(Product.class, forVariable(variable));
+    }
+
+    public QProduct(Path<? extends Product> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QProduct(PathMetadata metadata) {
+        super(Product.class, metadata);
+    }
+
+}
+

src/main/java/com/gongspot/project/common/code/status/ErrorStatus.java

@@ -73,7 +73,13 @@ public enum ErrorStatus implements BaseErrorCode {
     FILE_SIZE_EXCEEDED(HttpStatus.BAD_REQUEST, "FILE4003", "파일 크기가 제한을 초과했습니다."),
 
     //New Place
-    NEW_PLACE_NOT_FOUND(HttpStatus.NOT_FOUND, "NEWPLACE4001", "새로운 공간을 찾을 수 없습니다.");
+    NEW_PLACE_NOT_FOUND(HttpStatus.NOT_FOUND, "NEWPLACE4001", "새로운 공간을 찾을 수 없습니다."),
+
+    // 상품
+    PRODUCT_NOT_FOUND(HttpStatus.NOT_FOUND, "PRODUCT4001", "해당 상품을 찾을 수 없습니다."),
+    PAYMENT_AMOUNT_MISMATCH(HttpStatus.BAD_REQUEST, "PRODUCT4002", "결제 금액이 일치하지 않습니다."),
+    PAYMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "PRODUCT4003", "결제 내역이 없습니다."),
+    PAYMENT_VERIFICATION_FAILED(HttpStatus.BAD_REQUEST, "PRODUCT4004", "결제 인증이 실패했습니다."),
     ; // 위에 적을 것 !
 
     private final HttpStatus httpStatus;

src/main/java/com/gongspot/project/domain/order/controller/OrderController.java

@@ -0,0 +1,27 @@
+package com.gongspot.project.domain.order.controller;
+
+import com.gongspot.project.domain.order.dto.OrderRequestDTO;
+import com.gongspot.project.domain.order.entity.Order;
+import com.gongspot.project.domain.order.service.OrderService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("order")
+@RequiredArgsConstructor
+@Slf4j
+public class OrderController {
+
+    private final OrderService orderService;
+
+    @PostMapping("/payment/validate")
+    public String validatePayment(@RequestBody OrderRequestDTO request) {
+
+        Order validatedOrder = orderService.processPaymentDone(request);
+
+        log.info("결제 검증 및 주문 처리 성공. 주문 번호: {}", validatedOrder.getMerchantUid());
+
+        return "결제 성공 및 서버 검증 완료";
+    }
+}

src/main/java/com/gongspot/project/domain/order/dto/OrderRequestDTO.java

@@ -0,0 +1,22 @@
+package com.gongspot.project.domain.order.dto;
+
+import com.gongspot.project.domain.order.entity.PayMethod;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class OrderRequestDTO {
+
+    private String impUid;
+    private Long userId;
+    private Long productId;
+    private PayMethod payMethod;
+    private BigDecimal totalPrice;
+    private String merchantUid;
+
+}

src/main/java/com/gongspot/project/domain/order/entity/Order.java

@@ -0,0 +1,86 @@
+package com.gongspot.project.domain.order.entity;
+
+import com.gongspot.project.common.entity.BaseEntity;
+import com.gongspot.project.domain.point.entity.Point;
+import com.gongspot.project.domain.user.entity.User;
+import jakarta.persistence.*;
+import lombok.*;
+import java.math.BigDecimal;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Entity
+@Table(name = "order")
+public class Order extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "order_id")
+    private Long orderId; // PK
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @Column(name = "order_name")
+    private String ordererName; // 주문자 이름
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "product_id", nullable = false)
+    private Product product;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "pay_method")
+    private PayMethod payMethod; // 결제 방식
+
+    @Column(length = 100, name = "merchant_uid")
+    private String merchantUid; // 주문번호
+
+    @Column(name = "total_price", nullable = false)
+    private BigDecimal totalPrice; // 결제 금액
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "payment_status")
+    private PaymentStatus paymentStatus;
+
+    @OneToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "point_id")
+    private Point point;
+
+    @Builder(access = AccessLevel.PRIVATE)
+    private Order(User user, Product product, String merchantUid, PayMethod payMethod, String ordererName, BigDecimal totalPrice) {
+        this.user = user;
+        this.product = product;
+        this.merchantUid = merchantUid;
+        this.payMethod = payMethod;
+        this.ordererName = ordererName;
+        this.totalPrice = totalPrice;
+        this.paymentStatus = PaymentStatus.PENDING; // 초기 상태는 PENDING
+    }
+
+    public static Order createOrder(User user, Product product) {
+        return Order.builder()
+                .user(user)
+                .product(product)
+                .ordererName(user.getNickname())
+                .totalPrice(product.getPrice())
+                .build();
+    }
+
+    public void markAsPaid(String merchantUid, PayMethod payMethod) {
+        this.merchantUid = merchantUid;
+        this.payMethod = payMethod;
+        this.paymentStatus = PaymentStatus.SUCCESS;
+    }
+
+
+    public void markAsCanceled() {
+        this.paymentStatus = PaymentStatus.CANCELLED;
+    }
+
+
+    public void addPoint(Point point) {
+        this.point = point;
+    }
+}

src/main/java/com/gongspot/project/domain/order/entity/PayMethod.java

@@ -0,0 +1,11 @@
+package com.gongspot.project.domain.order.entity;
+
+public enum PayMethod {
+    CARD,       // 신용/체크카드
+    BANK,       // 계좌이체
+    PHONE,      // 휴대폰 결제
+    VIRTUAL,    // 가상계좌
+    KAKAO,      // 카카오페이
+    NAVER,      // 네이버페이
+    PAYCO       // 페이코
+}

src/main/java/com/gongspot/project/domain/order/entity/PaymentStatus.java

@@ -0,0 +1,9 @@
+package com.gongspot.project.domain.order.entity;
+
+public enum PaymentStatus {
+    PENDING,
+    SUCCESS,
+    FAILED,
+    CANCELLED,
+    READY
+}

src/main/java/com/gongspot/project/domain/order/entity/Product.java

@@ -0,0 +1,36 @@
+package com.gongspot.project.domain.order.entity;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@Entity
+@Table(name = "product")
+public class Product {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "product_id")
+    private Long id;
+
+    @Column(name = "name", nullable = false)
+    private String name;
+
+    @Column(name = "price", nullable = false)
+    private BigDecimal price;
+
+    @Column(name = "point", nullable = false)
+    private Integer point;
+
+    public Product(String name, BigDecimal price, Integer point) {
+        this.name = name;
+        this.price = price;
+        this.point = point;
+    }
+}

src/main/java/com/gongspot/project/domain/order/repository/OrderRepository.java

@@ -0,0 +1,10 @@
+package com.gongspot.project.domain.order.repository;
+
+import com.gongspot.project.domain.order.entity.Order;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface OrderRepository extends JpaRepository<Order, Long> {
+    Order findByMerchantUid(String merchantUid);
+}

src/main/java/com/gongspot/project/domain/order/repository/ProductRepository.java

@@ -0,0 +1,10 @@
+package com.gongspot.project.domain.order.repository;
+
+import com.gongspot.project.domain.order.entity.Product;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProductRepository extends JpaRepository<Product, Long> {
+    Product findByName(String name);
+}