[#25] 객실 예약 도메인 구현

app/src/main/java/com/hotelJava/accommodation/domain/Accommodation.java

@@ -3,6 +3,7 @@
 import com.hotelJava.common.embeddable.Address;
 import com.hotelJava.common.util.BaseTimeEntity;
 import com.hotelJava.picture.domain.Picture;
+import com.hotelJava.picture.domain.PictureType;
 import com.hotelJava.reservation.domain.ReservationStatus;
 import com.hotelJava.room.domain.Room;
 import jakarta.persistence.CascadeType;
@@ -84,11 +85,12 @@ public Accommodation updateAccommodation(
   // == 연관관계 편의 메소드 ==//
   public void setPicture(Picture picture) {
     this.picture = picture;
+    picture.setPictureType(PictureType.ACCOMMODATION);
     picture.setAccommodation(this);
   }
 
   public void createAccommodation(List<Room> rooms, Picture accommodationPicture) {
-    this.picture = accommodationPicture;
+    setPicture(accommodationPicture);
     this.rooms.addAll(rooms);
     rooms.forEach(room -> room.setAccommodation(this));
   }

app/src/main/java/com/hotelJava/common/embeddable/CheckDate.java

@@ -21,4 +21,13 @@ public class CheckDate {
 
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private LocalDate checkOutDate;
+
+  public CheckDate(LocalDate checkInDate, int duration) {
+    this.checkInDate = checkInDate;
+    this.checkOutDate = checkInDate.plusDays(duration);
+  }
+
+  public boolean matches(LocalDate date) {
+    return date.isEqual(checkInDate) || (date.isAfter(checkInDate) && date.isBefore(checkOutDate));
+  }
 }

app/src/main/java/com/hotelJava/common/error/ErrorCode.java

@@ -25,11 +25,23 @@ public enum ErrorCode {
   DUPLICATED_NAME_FOUND(409, "숙소명이 이미 존재합니다."),
   NO_MINIMUM_PRICE_FOUND(500, "숙소의 최소 가격을 찾을 수 없습니다."),
 
+  // 객실 관련 에러
+  ROOM_NOT_FOUND(404, "해당 객실이 존재하지 않습니다"),
+
+  // 예약 관련 에러
+  OUT_OF_STOCK(400, "재고 수량이 부족합니다"),
+  OVER_MAX_OCCUPANCY(400, "객실 최대 인원을 초과하였습니다"),
+  RESERVATION_NOT_FOUND(404, "결제 대기중인 예약을 찾을 수 없습니다"),
+
+  // 결제 관련 에러
+  PAYMENT_FAIL(400, "결제 오류"),
+  PAYMENT_TIME_OUT(408, "결제 유효 시간을 초과하였습니다"),
+
   // 클라이언트 에러
-  BAD_REQUEST_ERROR(400, "요청값이 잘못되었습니다."),
-  
+  BAD_REQUEST_ERROR(400, "요청값이 잘못되었습니다"),
+
   // 서버 에러
-  INTERNAL_SERVER_ERROR(500, "요청을 정상 처리하지 못하였습니다.");
+  INTERNAL_SERVER_ERROR(500, "요청을 정상 처리하지 못하였습니다");
 
   private final int code;
   private final String message;

app/src/main/java/com/hotelJava/inventory/Inventory.java → app/src/main/java/com/hotelJava/inventory/domain/Inventory.java

@@ -1,18 +1,23 @@
-package com.hotelJava.inventory;
+package com.hotelJava.inventory.domain;
 
 import com.hotelJava.common.util.BaseTimeEntity;
+import com.hotelJava.room.domain.Room;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import java.time.LocalDate;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Entity
 @Getter
 @Setter
@@ -25,11 +30,28 @@ public class Inventory extends BaseTimeEntity {
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   private Long id;
 
-  private Long accommodationId;
+  @ManyToOne
+  @JoinColumn(name = "room_id")
+  private Room room;
 
-  private Long roomId;
-
   private LocalDate date;
-  
+
   private long quantity;
+
+  public Inventory(LocalDate date, long quantity) {
+    this.date = date;
+    this.quantity = quantity;
+  }
+
+  public boolean isZeroQuantity() {
+    if (quantity <= 0) {
+      log.info("quantity at {} is 0", date);
+      return true;
+    }
+    return false;
+  }
+
+  public void calcQuantity(int value) {
+    quantity += value;
+  }
 }

app/src/main/java/com/hotelJava/inventory/repository/InventoryRepository.java

@@ -1,11 +1,11 @@
 package com.hotelJava.inventory.repository;
 
-import com.hotelJava.inventory.Inventory;
+import com.hotelJava.inventory.domain.Inventory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;import java.util.List;
 
 @Repository
 public interface InventoryRepository extends JpaRepository<Inventory, Long> {
 
-  List<Inventory> findByAccommodationIdAndRoomId(Long accommodationId, Long roomId);
+  List<Inventory> findByRoomId(Long roomId);
 }

app/src/main/java/com/hotelJava/payment/domain/Payment.java

@@ -0,0 +1,63 @@
+package com.hotelJava.payment.domain;
+
+import com.hotelJava.reservation.domain.Reservation;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import java.time.LocalDateTime;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Builder.Default;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Entity
+@Getter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class Payment {
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
+
+  private int amount;
+
+  @Enumerated(EnumType.STRING)
+  private PaymentType paymentType;
+
+  private LocalDateTime paymentDate;
+
+  @Enumerated(EnumType.STRING)
+  @Default
+  private PaymentStatus status = PaymentStatus.WAITING;
+
+  @OneToOne(fetch = FetchType.LAZY)
+  @JoinColumn(name = "reservation_id")
+  private Reservation reservation;
+
+  public Payment(int amount) {
+    this.amount = amount;
+  }
+
+  public PaymentStatus approve(PaymentResult paymentResult) {
+    if (paymentResult.isPayed(amount)) {
+      return status = PaymentStatus.COMPLETE;
+    }
+    log.info("payment fail");
+    return status = PaymentStatus.ERROR;
+  }
+
+  public boolean isExpired() {
+    return status != PaymentStatus.WAITING;
+  }
+}

app/src/main/java/com/hotelJava/payment/domain/PaymentResult.java

@@ -0,0 +1,5 @@
+package com.hotelJava.payment.domain;
+
+public interface PaymentResult {
+  boolean isPayed(int money);
+}

app/src/main/java/com/hotelJava/payment/domain/PaymentStatus.java

@@ -0,0 +1,15 @@
+package com.hotelJava.payment.domain;
+
+public enum PaymentStatus {
+  WAITING("결제대기"),
+  COMPLETE("결제완료"),
+  CANCEL("결제취소"),
+  ERROR("결제오류"),
+  TIMEOUT("결제시간초과");
+
+  private final String label;
+
+  PaymentStatus(String label) {
+    this.label = label;
+  }
+}

app/src/main/java/com/hotelJava/reservation/domain/GuestInfo.java

@@ -0,0 +1,14 @@
+package com.hotelJava.reservation.domain;
+
+import com.hotelJava.common.embeddable.CheckDate;
+
+public interface GuestInfo {
+
+  String getGuestName();
+
+  String getGuestPhone();
+
+  int getNumberOfGuests();
+
+  CheckDate getCheckDate();
+}

app/src/main/java/com/hotelJava/reservation/domain/Reservation.java

@@ -3,56 +3,47 @@
 import com.hotelJava.common.embeddable.CheckDate;
 import com.hotelJava.common.util.BaseTimeEntity;
 import com.hotelJava.member.domain.Member;
-import com.hotelJava.payment.domain.PaymentType;
+import com.hotelJava.payment.domain.Payment;
+import com.hotelJava.payment.domain.PaymentResult;
 import com.hotelJava.room.domain.Room;
-import jakarta.persistence.Embedded;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Entity
 @Getter
 @Setter
 @Builder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
-public class Reservation extends BaseTimeEntity {
+public class Reservation extends BaseTimeEntity implements GuestInfo {
 
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   private Long id;
 
-  private String name;
-
   private String reservationNo;
 
-  private String accommodationName;
-
-  private String roomName;
+  @Builder.Default
+  @Enumerated(EnumType.STRING)
+  private ReservationStatus status = ReservationStatus.PAYMENT_PENDING;
 
   @Embedded private CheckDate checkDate;
 
   private int numberOfGuests;
 
-  @Enumerated(EnumType.STRING)
-  private PaymentType paymentType;
+  private String guestName;
 
-  private String phoneNumber;
+  private String guestPhone;
 
-  @Enumerated(EnumType.STRING)
-  private ReservationStatus status;
+  @OneToOne(fetch = FetchType.LAZY, mappedBy = "reservation", cascade = CascadeType.ALL)
+  private Payment payment;
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "member_id")
@@ -61,4 +52,51 @@ public class Reservation extends BaseTimeEntity {
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "room_id")
   private Room room;
+
+  public Reservation(Member member, Room room, String reservationNo, GuestInfo guestInfo) {
+    this.member = member;
+    this.room = room;
+    this.reservationNo = reservationNo;
+    this.checkDate = guestInfo.getCheckDate();
+    this.guestName = guestInfo.getGuestName();
+    this.guestPhone = guestInfo.getGuestPhone();
+    this.numberOfGuests = guestInfo.getNumberOfGuests();
+    this.payment = new Payment(room.calcPrice());
+  }
+
+  public Reservation confirm(PaymentResult paymentResult) {
+    payment.approve(paymentResult);
+    status = ReservationStatus.RESERVATION_COMPLETED;
+    return this;
+  }
+
+  public void consumeInventory() {
+    room.calcInventory(checkDate, -1);
+  }
+
+  public void restoreInventory() {
+    room.calcInventory(checkDate, 1);
+  }
+
+  public boolean isInvalidReservation() {
+    if (room.isNotEnoughInventoryAtCheckDate(checkDate)) {
+      log.info("room stock is not enough. payment declined");
+      return true;
+    }
+
+    if (room.isOverMaxOccupancy(numberOfGuests)) {
+      log.info("guest number is over max occupancy. payment declined");
+      return true;
+    }
+
+    return false;
+  }
+
+  public boolean isExpiredPayment() {
+    if (payment.isExpired()) {
+      log.info("payment time out. payment declined");
+      return true;
+    }
+    return false;
+  }
 }

app/src/main/java/com/hotelJava/reservation/domain/ReservationStatus.java

@@ -10,7 +10,8 @@ public enum ReservationStatus {
     RESERVATION_AVAILABLE("예약가능"),
     RESERVATION_COMPLETED("예약완료"),
     RESERVATION_CANCEL("예약취소"),
-    SALES_COMPLETED("판매완료");
+    SALES_COMPLETED("판매완료"),
+    PAYMENT_PENDING("결제대기");
 
     private final String label;
 }