Merge pull request #148 from ShallWeProject/feat/147-Reservation

[feat] 예약 등록 구현 방식을 변경한다.

src/main/java/com/shallwe/domain/memoryphoto/dto/MemoryPhotoDetailRes.java

@@ -15,7 +15,9 @@
 @Builder
 public class MemoryPhotoDetailRes {
 
-    private LocalDateTime date;
+    private String date;
+
+    private String time;
 
     private String experienceGiftTitle;
 
@@ -25,7 +27,8 @@ public class MemoryPhotoDetailRes {
 
     public static MemoryPhotoDetailRes toDto(Reservation reservation) {
         return MemoryPhotoDetailRes.builder()
-                .date(reservation.getDate())
+                .date(reservation.getDate().toString())
+                .time(reservation.getTime().toString())
                 .experienceGiftTitle(reservation.getExperienceGift().getTitle())
                 .experienceGiftSubTitle(reservation.getExperienceGift().getSubtitle().getTitle())
                 .memoryPhotoImages(reservation.getMemoryPhotos().stream()

src/main/java/com/shallwe/domain/reservation/application/ReservationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.shallwe.domain.reservation.application;
 
 import com.shallwe.domain.common.Status;
+import com.shallwe.domain.experiencegift.domain.ExperienceGift;
 import com.shallwe.domain.experiencegift.exception.ExperienceGiftNotFoundException;
 import com.shallwe.domain.experiencegift.domain.repository.ExperienceGiftRepository;
 import com.shallwe.domain.reservation.domain.Reservation;
@@ -10,9 +11,9 @@
 import com.shallwe.domain.reservation.dto.ReservationResponse;
 import com.shallwe.domain.reservation.dto.UpdateReservationReq;
 import com.shallwe.domain.reservation.exception.InvalidReservationException;
-import com.shallwe.domain.reservation.exception.InvalidUserException;
-import com.shallwe.domain.user.domain.repository.UserRepository;
-import com.shallwe.domain.user.exception.InvalidPhoneNumberException;
+import com.shallwe.domain.shopowner.domain.ShopOwner;
+import com.shallwe.domain.shopowner.domain.repository.ShopOwnerRepository;
+import com.shallwe.domain.shopowner.exception.InvalidShopOwnerException;
 import com.shallwe.global.config.security.token.UserPrincipal;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -27,40 +28,39 @@
 public class ReservationServiceImpl {
 
     private final ReservationRepository reservationRepository;
-    private final UserRepository userRepository;
     private final ExperienceGiftRepository experienceGiftRepository;
+    private final ShopOwnerRepository shopOwnerRepository;
 
-    private ReservationResponse getReservation(Long id) {
-        return reservationRepository.findById(id).map(ReservationResponse::toDto).orElseThrow(InvalidReservationException::new);
-    }
 
     @Transactional
-    public ReservationResponse addReservation( ReservationRequest reservationRequest,  UserPrincipal userPrincipal) {
-        Reservation reservation = ReservationRequest.toEntity(
-                reservationRequest,
-                userRepository.findById(userPrincipal.getId())
-                        .orElseThrow(InvalidUserException::new),
-                userRepository.findByPhoneNumber(reservationRequest.getPhoneNumber())
-                        .orElseThrow(InvalidPhoneNumberException::new),
-                experienceGiftRepository.findByExperienceGiftId(reservationRequest.getExperienceGiftId())
-                        .orElseThrow(ExperienceGiftNotFoundException::new));
-
-        Reservation savedReservation = reservationRepository.save(reservation);
-        return ReservationResponse.toDto(savedReservation);
+    public List<ReservationResponse> addOwnerReservation(ReservationRequest reservationRequest,UserPrincipal userPrincipal) {
+        ExperienceGift experienceGift = experienceGiftRepository.findByExperienceGiftId(reservationRequest.getExperienceGiftId())
+            .orElseThrow(ExperienceGiftNotFoundException::new);
+
+        ShopOwner owner = shopOwnerRepository.findById(reservationRequest.getOwnerId())
+            .orElseThrow(InvalidShopOwnerException::new);
+
+        List<Reservation> reservations = ReservationRequest.toEntityForOwner(reservationRequest, experienceGift, owner);
+        return reservations.stream()
+            .map(reservationRepository::save)
+            .map(ReservationResponse::toDtoOwner)
+            .collect(Collectors.toList());
     }
 
+
+
     public List<ReservationResponse> findUserReservation(UserPrincipal userPrincipal) {
         return reservationRepository.findAllBySenderId(userPrincipal.getId())
-                .stream().map(ReservationResponse::toDto).collect(Collectors.toList());
+                .stream().map(ReservationResponse::toDtoUser).collect(Collectors.toList());
     }
 
     public List<ReservationResponse> getAllReservation() {
-        return reservationRepository.findAll().stream().map(ReservationResponse::toDto).collect(Collectors.toList());
+        return reservationRepository.findAll().stream().map(ReservationResponse::toDtoUser).collect(Collectors.toList());
     }
     //추가
     public List<ReservationResponse> getCurrentGiftReservation(Long giftId){
         experienceGiftRepository.findById(giftId).orElseThrow(ExperienceGiftNotFoundException::new);
-        return reservationRepository.findByExperienceGift_Id(giftId).stream().map(ReservationResponse::toDto).collect(Collectors.toList());
+        return reservationRepository.findByExperienceGift_Id(giftId).stream().map(ReservationResponse::toDtoUser).collect(Collectors.toList());
     }
 
     @Transactional
@@ -74,7 +74,7 @@ public ReservationResponse updateReservation(UpdateReservationReq updateReq, Use
                 reservation -> {reservation.updateReservation(updateReq);
                 return reservationRepository.save(reservation);}
         ).orElseThrow(InvalidReservationException::new);*/
-        return ReservationResponse.toDto(updateReservation);
+        return ReservationResponse.toDtoUser(updateReservation);
     }
 
     @Transactional

src/main/java/com/shallwe/domain/reservation/domain/Reservation.java

@@ -5,12 +5,16 @@
 import com.shallwe.domain.experiencegift.domain.ExperienceGift;
 import com.shallwe.domain.memoryphoto.domain.MemoryPhoto;
 import com.shallwe.domain.reservation.dto.UpdateReservationReq;
+import com.shallwe.domain.shopowner.domain.ShopOwner;
 import com.shallwe.domain.user.domain.User;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import java.time.LocalTime;
 import lombok.*;
 import org.hibernate.annotations.Where;
 
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -29,15 +33,29 @@ public class Reservation extends BaseEntity {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "experience_gift_id")
+    @Schema(description = "선물 ID")
+    @NotBlank
     private ExperienceGift experienceGift;
 
+    @ManyToOne
+    @JoinColumn(name = "owner_id")
+    @Schema(description = "사장ID")
+    @NotBlank
+    private ShopOwner owner;
+
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "sender_id")
+    @Schema(description = "보내는이 ID")
     private User sender;
 
     private Long persons;
 
-    private LocalDateTime date;
+    @Schema(description = "예약 날짜, YYYY-DD-MM ")
+    private LocalDate date;
+
+    @Schema(description = "예약 시간, HH:MM")
+    private LocalTime time;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "receiver_id")
@@ -50,6 +68,7 @@ public class Reservation extends BaseEntity {
     private String invitationComment;
 
     @Enumerated(EnumType.STRING)
+    @Schema(description = "예약 상태", allowableValues = {"CANCLED","BOOKED","COMPLETED","WAITING","USING"})
     private ReservationStatus reservationStatus;
 
     @OneToMany(mappedBy = "reservation")
@@ -58,10 +77,18 @@ public class Reservation extends BaseEntity {
     public void updateReservation(UpdateReservationReq updateReq) {
         this.persons = Optional.ofNullable(updateReq.getPersons()).orElse(this.persons);
         this.date = Optional.ofNullable(updateReq.getDate()).orElse(this.date);
+        this.time = Optional.ofNullable(updateReq.getTime()).orElse(this.time);
         this.receiver = Optional.ofNullable(updateReq.getReceiver()).orElse(this.getReceiver());
         this.phoneNumber = Optional.ofNullable(updateReq.getPhone_number()).orElse(this.phoneNumber);
         this.invitationImg = Optional.ofNullable(updateReq.getInvitation_img()).orElse(this.invitationImg);
         this.invitationComment = Optional.ofNullable(updateReq.getInvitation_comment()).orElse(this.invitationComment);
     }
 
+    public void updateStatus(ReservationStatus status){
+        this.reservationStatus = status;
+    }
+
+    public int getHour(){
+        return time.getHour();
+    }
 }

src/main/java/com/shallwe/domain/reservation/domain/repository/ReservationRepository.java

@@ -28,6 +28,9 @@ public interface ReservationRepository extends JpaRepository<Reservation, Long>
     @Query("SELECT r FROM Reservation r WHERE r.experienceGift.experienceGiftId = :giftId")
     List<Reservation> findByExperienceGift_Id(@Param("giftId")Long giftId);
 
+    @Query("SELECT r FROM Reservation r WHERE r.experienceGift.experienceGiftId = :giftId and r.status = :BOOKED")
+    List<Reservation> findAllByExperienceGift_IdAndStatus(@Param("giftId")Long giftID);
+
 
     @EntityGraph(attributePaths = {"memoryPhotos"})
     List<Reservation> findAllByDateAndPhoneNumber(LocalDateTime date, String phoneNumber);

src/main/java/com/shallwe/domain/reservation/dto/ReservationRequest.java

@@ -3,47 +3,83 @@
 import com.shallwe.domain.experiencegift.domain.ExperienceGift;
 import com.shallwe.domain.reservation.domain.Reservation;
 import com.shallwe.domain.reservation.domain.ReservationStatus;
-import com.shallwe.domain.user.domain.User;
+import com.shallwe.domain.shopowner.domain.ShopOwner;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import lombok.*;
 
-import java.time.LocalDateTime;
-
 import static com.shallwe.domain.reservation.domain.ReservationStatus.BOOKED;
-
+import static com.shallwe.domain.reservation.domain.ReservationStatus.WAITING;
 
 
 @Data
+@NoArgsConstructor
 public class ReservationRequest {
 
-    private Long experienceGiftId;
-    private Long persons;
-    private LocalDateTime date;
-    private String receiverName;
-    private String phoneNumber;
-    private String imageKey;
-    private String invitationComment;
-    private ReservationStatus reservationStatus;
-
-    public static Reservation toEntity(final ReservationRequest reservationRequest,  User sender,  User receiver,ExperienceGift experienceGift) {
-        System.out.println("receiver = " + receiver);
-        try {
-            Reservation toEntity = Reservation.builder()
-                    .experienceGift(experienceGift)
-                    .sender(sender)
-                    .persons(reservationRequest.getPersons())
-                    .date(reservationRequest.getDate())
-                    .receiver(receiver)
-                    .phoneNumber(reservationRequest.getPhoneNumber())
-                    .invitationImg(reservationRequest.getImageKey())
-                    .invitationComment(reservationRequest.getInvitationComment())
-                    .reservationStatus(BOOKED)
-                    .build();
-            return toEntity;
-        } catch (Exception e) {
-            System.err.println("예외 발생: " + e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
+  private Long experienceGiftId;
+  private Long persons;
+  private Long ownerId;
+  private Map<LocalDate, List<LocalTime>> dateTimeMap;
+  private String phoneNumber;
+  private String imageKey;
+  private String invitationComment;
+  private ReservationStatus reservationStatus;
+
+  public static List<Reservation> toEntityForUser(final ReservationRequest reservationRequest,
+      ExperienceGift experienceGift, ShopOwner owner) {
+    List<Reservation> reservations = new ArrayList<>();
+
+    for (Map.Entry<LocalDate, List<LocalTime>> entry : reservationRequest.getDateTimeMap()
+        .entrySet()) {
+      LocalDate date = entry.getKey();
+      List<LocalTime> times = entry.getValue();
+
+      for (LocalTime time : times) {
+        Reservation toEntity = Reservation.builder()
+            .experienceGift(experienceGift)
+            .persons(reservationRequest.getPersons())
+            .date(date)
+            .time(time)
+            .owner(owner)
+            .phoneNumber(reservationRequest.getPhoneNumber())
+            .invitationImg(reservationRequest.getImageKey())
+            .invitationComment(reservationRequest.getInvitationComment())
+            .reservationStatus(BOOKED)
+            .build();
+
+        reservations.add(toEntity);
+      }
     }
+    return reservations;
+  }
+
+  public static List<Reservation> toEntityForOwner(ReservationRequest reservationRequest,
+      ExperienceGift experienceGift,ShopOwner owner) {
+    List<Reservation> reservations = new ArrayList<>();
+
+    for (Map.Entry<LocalDate, List<LocalTime>> entry : reservationRequest.getDateTimeMap()
+        .entrySet()) {
+      LocalDate date = entry.getKey();
+      List<LocalTime> times = entry.getValue();
+
+      for (LocalTime time : times) {
+        Reservation toEntity = Reservation.builder()
+            .experienceGift(experienceGift)
+            .date(date)
+            .time(time)
+            .owner(owner)
+            .reservationStatus(WAITING)
+            .build();
+
+        reservations.add(toEntity);
+      }
+    }
+
+    return reservations;
+  }
+
 }