refactor [#42] erd festivalTimes 테이블 추가

src/main/java/org/sopt/confeti/domain/festival/Festival.java

@@ -48,6 +48,9 @@ public class Festival {
     @Column(length = 250)
     private String festivalReservationBgPath;
 
+    @Column(length = 250)
+    private String festivalLogoPath;
+
     @Column(nullable = false)
     private LocalDateTime reserveAt;
 
@@ -72,7 +75,6 @@ public class Festival {
     @OneToMany(mappedBy = "festival", cascade = CascadeType.REMOVE)
     private List<FestivalFavorite> festivalFavorites = new ArrayList<>();
 
-
     @OneToMany(mappedBy = "festival", cascade = CascadeType.REMOVE)
     private List<TimetableFestival> timetableFestivals = new ArrayList<>();
 
@@ -112,6 +114,10 @@ public String getFestivalPosterPath() {
         return festivalPosterPath;
     }
 
+    public String getFestivalLogoPath() {
+        return festivalLogoPath;
+    }
+
     public LocalDateTime getReserveAt() {
         return reserveAt;
     }

src/main/java/org/sopt/confeti/domain/festivalartist/FestivalArtist.java

@@ -4,6 +4,7 @@
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.sopt.confeti.domain.festivalstage.FestivalStage;
+import org.sopt.confeti.domain.festivaltime.FestivalTime;
 import org.sopt.confeti.domain.usertimetable.UserTimetable;
 
 import java.time.LocalDateTime;
@@ -19,25 +20,12 @@ public class FestivalArtist {
     @Column(name = "festival_artist_id")
     private Long id;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name="festival_stage_id", nullable=false)
-    private FestivalStage festivalStage;
-
     @Column(length = 100, nullable = false)
     private String artistId;
 
-    @Column(nullable = false)
-    private LocalDateTime startAt;
-
-    @Column(nullable = false)
-    private LocalDateTime endAt;
-
-    @OneToMany(mappedBy = "festivalArtist", cascade = CascadeType.REMOVE)
-    private List<UserTimetable> timetables = new ArrayList<>();
-
-    public FestivalStage getFestivalStage() {
-        return festivalStage;
-    }
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name="festival_time_id", nullable=false)
+    private FestivalTime festivalTime;
 
     public Long getId() {
         return id;
@@ -47,15 +35,7 @@ public String getArtistId() {
         return artistId;
     }
 
-    public LocalDateTime getStartAt() {
-        return startAt;
-    }
-
-    public LocalDateTime getEndAt() {
-        return endAt;
-    }
-
-    public List<UserTimetable> getTimetables() {
-        return timetables;
+    public FestivalTime getFestivalTime() {
+        return festivalTime;
     }
 }

src/main/java/org/sopt/confeti/domain/festivalstage/FestivalStage.java

@@ -5,6 +5,7 @@
 import lombok.NoArgsConstructor;
 import org.sopt.confeti.domain.festivalartist.FestivalArtist;
 import org.sopt.confeti.domain.festivaldate.FestivalDate;
+import org.sopt.confeti.domain.festivaltime.FestivalTime;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,7 +30,7 @@ public class FestivalStage {
     private int order;
 
     @OneToMany(mappedBy = "festivalStage", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<FestivalArtist> artists = new ArrayList<>();
+    private List<FestivalTime> times = new ArrayList<>();
 
     public Long getId() {
         return id;
@@ -47,7 +48,7 @@ public int getOrder() {
         return order;
     }
 
-    public List<FestivalArtist> getArtists() {
-        return artists;
+    public List<FestivalTime> getTimes() {
+        return times;
     }
 }

src/main/java/org/sopt/confeti/domain/festivaltime/FestivalTime.java

@@ -0,0 +1,62 @@
+package org.sopt.confeti.domain.festivaltime;
+
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.sopt.confeti.domain.festivalartist.FestivalArtist;
+import org.sopt.confeti.domain.festivalstage.FestivalStage;
+import org.sopt.confeti.domain.usertimetable.UserTimetable;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name="festival_times")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class FestivalTime {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="festival_time_id")
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name="festival_stage_id", nullable = false)
+    private FestivalStage festivalStage;
+
+    @Column(nullable = false)
+    private LocalDateTime startAt;
+
+    @Column(nullable = false)
+    private LocalDateTime endAt;
+
+    @OneToMany(mappedBy = "userTimetable", cascade = CascadeType.REMOVE)
+    private List<UserTimetable> timetables = new ArrayList<>();
+
+    @OneToMany(mappedBy = "festivalArtist", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<FestivalArtist> artists = new ArrayList<>();
+
+    public Long getId() {
+        return id;
+    }
+
+    public FestivalStage getFestivalStage() {
+        return festivalStage;
+    }
+
+    public LocalDateTime getStartAt() {
+        return startAt;
+    }
+
+    public LocalDateTime getEndAt() {
+        return endAt;
+    }
+
+    public List<UserTimetable> getTimetables() {
+        return timetables;
+    }
+
+    public List<FestivalArtist> getArtists() {
+        return artists;
+    }
+}

src/main/java/org/sopt/confeti/domain/festivaltime/infra/repository/FestivalTimeRepository.java

@@ -0,0 +1,7 @@
+package org.sopt.confeti.domain.festivaltime.infra.repository;
+
+import org.sopt.confeti.domain.festivaltime.FestivalTime;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface FestivalTimeRepository extends JpaRepository<FestivalTime, Long> {
+}

src/main/java/org/sopt/confeti/domain/usertimetable/UserTimetable.java

@@ -4,7 +4,7 @@
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.NoArgsConstructor;
-import org.sopt.confeti.domain.festivalartist.FestivalArtist;
+import org.sopt.confeti.domain.festivaltime.FestivalTime;
 import org.sopt.confeti.domain.user.User;
 
 @Entity
@@ -21,8 +21,8 @@ public class UserTimetable {
     private User user;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name="festival_artist_id")
-    private FestivalArtist festivalArtist;
+    @JoinColumn(name="festival_time_id")
+    private FestivalTime festivalTime;
 
     @Column(nullable = false)
     private boolean isSelected;
@@ -35,25 +35,25 @@ public User getUser() {
         return user;
     }
 
-    public FestivalArtist getFestivalArtist() {
-        return festivalArtist;
+    public FestivalTime getFestivalTime() {
+        return festivalTime;
     }
 
     public boolean isSelected() {
         return isSelected;
     }
 
     @Builder
-    public UserTimetable(User user, FestivalArtist festivalArtist, boolean isSelected) {
+    public UserTimetable(User user, FestivalTime festivalTime, boolean isSelected) {
         this.user = user;
-        this.festivalArtist = festivalArtist;
+        this.festivalTime = festivalTime;
         this.isSelected = isSelected;
     }
 
-    public static UserTimetable create(User user, FestivalArtist festivalArtist, boolean isSelected) {
+    public static UserTimetable create(User user, FestivalTime festivalTime, boolean isSelected) {
         return UserTimetable.builder()
                 .user(user)
-                .festivalArtist(festivalArtist)
+                .festivalTime(festivalTime)
                 .isSelected(isSelected)
                 .build();
     }