Merge pull request #103 from MEME-UMC/add/#102

[Add ] BaseEntity 추가 / 예약 중복 예외 처리
MEME-UMC · Feb 5, 2024 · daca9fc · daca9fc
2 parents 22aff71 + 933cb03
commit daca9fc
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 13 deletions.
diff --git a/src/main/java/umc/meme/shop/domain/artist/controller/ArtistController.java b/src/main/java/umc/meme/shop/domain/artist/controller/ArtistController.java
@@ -28,6 +28,7 @@ public ApiResponse getArtistProfile(@PathVariable Long artistId){
     }
 
     //temp method for Artist create
+    @Operation(summary = "temp 아티스트 생성(프론트랑 상관X)")
     @PostMapping("/artist")
     public ApiResponse createArtist(@RequestBody ArtistProfileDto profileDto){
         artistService.createArtist(profileDto);

diff --git a/src/main/java/umc/meme/shop/domain/common/BaseEntity.java b/src/main/java/umc/meme/shop/domain/common/BaseEntity.java
@@ -0,0 +1,23 @@
+package umc.meme.shop.domain.common;
+
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+@Getter
+public abstract class BaseEntity {
+
+    @CreatedDate
+    private LocalDateTime createdAt;
+
+    @LastModifiedDate
+    private LocalDateTime updatedAt;
+}
diff --git a/src/main/java/umc/meme/shop/domain/favorite/entity/FavoriteArtist.java b/src/main/java/umc/meme/shop/domain/favorite/entity/FavoriteArtist.java
@@ -5,14 +5,15 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import umc.meme.shop.domain.common.BaseEntity;
 import umc.meme.shop.domain.model.entity.Model;
 
 @Builder
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-public class FavoriteArtist {
+public class FavoriteArtist extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

diff --git a/src/main/java/umc/meme/shop/domain/favorite/entity/FavoritePortfolio.java b/src/main/java/umc/meme/shop/domain/favorite/entity/FavoritePortfolio.java
@@ -1,10 +1,12 @@
 package umc.meme.shop.domain.favorite.entity;
 
+import com.fasterxml.jackson.databind.ser.Serializers;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import umc.meme.shop.domain.common.BaseEntity;
 import umc.meme.shop.domain.portfolio.entity.Portfolio;
 import umc.meme.shop.domain.user.User;
 
@@ -13,7 +15,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-public class FavoritePortfolio {
+public class FavoritePortfolio extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

diff --git a/src/main/java/umc/meme/shop/domain/model/controller/ModelController.java b/src/main/java/umc/meme/shop/domain/model/controller/ModelController.java
@@ -20,6 +20,7 @@ public class ModelController {
     private final ModelService modelService;
 
     /**temp model create method**/
+    @Operation(summary = "temp 모델 생성(프론트랑 상관X)")
     @PostMapping("/model")
     public ApiResponse createModel(@RequestBody ModelProfileDto profileDto){
         modelService.createModel(profileDto);

diff --git a/src/main/java/umc/meme/shop/domain/mypage/entity/Inquiry.java b/src/main/java/umc/meme/shop/domain/mypage/entity/Inquiry.java
@@ -5,6 +5,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import umc.meme.shop.domain.common.BaseEntity;
 import umc.meme.shop.domain.mypage.dto.request.MypageInquiryDto;
 import umc.meme.shop.domain.user.User;
 import umc.meme.shop.domain.user.UserRepository;
@@ -14,7 +15,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-public class Inquiry {
+public class Inquiry extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "inquiry_id")

diff --git a/src/main/java/umc/meme/shop/domain/portfolio/entity/Portfolio.java b/src/main/java/umc/meme/shop/domain/portfolio/entity/Portfolio.java
@@ -6,6 +6,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import umc.meme.shop.domain.artist.entity.Artist;
+import umc.meme.shop.domain.common.BaseEntity;
 import umc.meme.shop.domain.portfolio.dto.request.UpdatePortfolioDto;
 import umc.meme.shop.global.enums.Category;
 import umc.meme.shop.domain.review.entity.Review;
@@ -18,7 +19,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-public class Portfolio {
+public class Portfolio extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "portfolio_id")

diff --git a/src/main/java/umc/meme/shop/domain/portfolio/entity/PortfolioImg.java b/src/main/java/umc/meme/shop/domain/portfolio/entity/PortfolioImg.java
@@ -2,15 +2,16 @@
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
+import umc.meme.shop.domain.common.BaseEntity;
 
-@Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-public class PortfolioImg {
+@Getter @Setter
+public class PortfolioImg extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long portfolioImgId;

diff --git a/src/main/java/umc/meme/shop/domain/reservation/entity/Reservation.java b/src/main/java/umc/meme/shop/domain/reservation/entity/Reservation.java
@@ -5,6 +5,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import umc.meme.shop.domain.common.BaseEntity;
 import umc.meme.shop.domain.portfolio.entity.Portfolio;
 import umc.meme.shop.global.enums.Status;
 import umc.meme.shop.domain.user.User;
@@ -19,7 +20,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-public class Reservation {
+public class Reservation extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

diff --git a/src/main/java/umc/meme/shop/domain/reservation/repository/ReservationRepository.java b/src/main/java/umc/meme/shop/domain/reservation/repository/ReservationRepository.java
@@ -6,6 +6,7 @@
 import org.springframework.data.repository.query.Param;
 import umc.meme.shop.domain.artist.entity.Artist;
 import umc.meme.shop.domain.model.entity.Model;
+import umc.meme.shop.domain.portfolio.entity.Portfolio;
 import umc.meme.shop.domain.reservation.entity.Reservation;
 
 import java.util.List;
@@ -21,6 +22,7 @@ public interface ReservationRepository extends JpaRepository<Reservation, Long>
     @Query("SELECT r FROM Reservation r JOIN r.model m WHERE r.reservationId = :reservationId AND m.userId = :modelId")
     Optional<Reservation> findByReservationIdAndModelId(@Param("reservationId") Long reservationId, @Param("modelId") Long modelId);
 
+    List<Reservation> findByModelAndPortfolio(Model model, Portfolio portfolio);
 }
 
 
diff --git a/src/main/java/umc/meme/shop/domain/reservation/service/ReservationService.java b/src/main/java/umc/meme/shop/domain/reservation/service/ReservationService.java
@@ -87,6 +87,14 @@ public ReservationCompleteDto createReservation(ReservationRequestDto reservatio
             throw new GlobalException(ErrorStatus.NOT_ALLOW_OVER_ONE_RESERVATION);
         }
 
+        //예약 중복 처리
+        List<Reservation> reservationList = reservationRepository.findByModelAndPortfolio(model, portfolio);
+        for(int i=0; i<reservationList.size(); i++){
+            if(reservationList.get(i).getReservationDayOfWeekAndTime().equals(reservationDto.getReservationDayOfWeekAndTime())){
+                throw new GlobalException(ErrorStatus.NOT_ALLOW_DUPLICATED_RESERVATION);
+            }
+        }
+
         Reservation reservation = Reservation.builder()
                 .model(model)
                 .portfolio(portfolio)

diff --git a/src/main/java/umc/meme/shop/domain/review/entity/Review.java b/src/main/java/umc/meme/shop/domain/review/entity/Review.java
@@ -5,6 +5,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import umc.meme.shop.domain.common.BaseEntity;
 import umc.meme.shop.domain.portfolio.entity.Portfolio;
 import umc.meme.shop.domain.user.User;
 
@@ -15,7 +16,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-public class Review {
+public class Review extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long reviewId;

diff --git a/src/main/java/umc/meme/shop/domain/review/entity/ReviewImg.java b/src/main/java/umc/meme/shop/domain/review/entity/ReviewImg.java
@@ -2,15 +2,16 @@
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
+import umc.meme.shop.domain.common.BaseEntity;
 
-@Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-public class ReviewImg {
+@Getter @Setter
+public class ReviewImg extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long reviewImgId;

diff --git a/src/main/java/umc/meme/shop/domain/review/service/ReviewService.java b/src/main/java/umc/meme/shop/domain/review/service/ReviewService.java
@@ -76,7 +76,6 @@ public void createReview(ReviewDto reviewDto){
         for (ReviewImg reviewImg : reviewImgList) {
             reviewImg.setReview(review);
             review.getReviewImgList().add(reviewImg);
-
         }
 
         portfolio.updateReviewList(review);

diff --git a/src/main/java/umc/meme/shop/domain/user/User.java b/src/main/java/umc/meme/shop/domain/user/User.java
@@ -5,9 +5,13 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import umc.meme.shop.domain.common.BaseEntity;
 import umc.meme.shop.global.enums.Gender;
 import umc.meme.shop.domain.mypage.entity.Inquiry;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import umc.meme.shop.global.enums.Provider;
 
@@ -39,6 +43,12 @@ public class User {
     @Column(nullable = false, length = 40)
     protected String email;
 
+    @CreatedDate
+    private LocalDateTime createdAt;
+
+    @LastModifiedDate
+    private LocalDateTime updatedAt;
+
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
     protected List<Inquiry> inquiryList;
 

diff --git a/src/main/java/umc/meme/shop/global/ErrorStatus.java b/src/main/java/umc/meme/shop/global/ErrorStatus.java
@@ -50,6 +50,7 @@ public enum ErrorStatus {
     //reservation
     ALREADY_CHANGE_STATUS(400, "이미 예약 상태가 변경되었습니다."),
     INVALID_CHANGE_STATUS(400, "이미 완료된 예약은 취소할 수 없습니다."),
+    NOT_ALLOW_DUPLICATED_RESERVATION(400, "중복된 예약 시간입니다."),
 
     NOT_ALLOW_OVER_ONE_RESERVATION(400,"한 번에 하나의 예약만 가능합니다." ),
     INVALID_CHANGE_COMPLETE(400,"취소된 예약을 완료 상태로 변경할 수 없습니다." ),