From 22a6041e4db073c07dd1ee31f03b188327ea8464 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Sun, 16 Jun 2024 00:26:49 +0900 Subject: [PATCH 01/21] =?UTF-8?q?feat=20:=20show,=20image=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/domain/image-domain/build.gradle | 6 +++ .../main/java/org/example/entity/Image.java | 23 ++++++++++ app/domain/show-domain/build.gradle | 10 +++++ .../main/java/org/example/entity/Show.java | 45 +++++++++++++++++++ .../java/org/example/entity/ShowSearch.java | 23 ++++++++++ .../java/org/example/entity/info/Price.java | 20 +++++++++ .../org/example/entity/info/Ticketing.java | 21 +++++++++ .../org/example/vo/TicketBookingSite.java | 5 +++ settings.gradle | 8 ++++ 9 files changed, 161 insertions(+) create mode 100644 app/domain/image-domain/build.gradle create mode 100644 app/domain/image-domain/src/main/java/org/example/entity/Image.java create mode 100644 app/domain/show-domain/build.gradle create mode 100644 app/domain/show-domain/src/main/java/org/example/entity/Show.java create mode 100644 app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java create mode 100644 app/domain/show-domain/src/main/java/org/example/entity/info/Price.java create mode 100644 app/domain/show-domain/src/main/java/org/example/entity/info/Ticketing.java create mode 100644 app/domain/show-domain/src/main/java/org/example/vo/TicketBookingSite.java diff --git a/app/domain/image-domain/build.gradle b/app/domain/image-domain/build.gradle new file mode 100644 index 00000000..6f232c19 --- /dev/null +++ b/app/domain/image-domain/build.gradle @@ -0,0 +1,6 @@ +bootJar.enabled = false +jar.enabled = true + +dependencies { + implementation project(":app:domain:common-domain") +} diff --git a/app/domain/image-domain/src/main/java/org/example/entity/Image.java b/app/domain/image-domain/src/main/java/org/example/entity/Image.java new file mode 100644 index 00000000..0ceec1b6 --- /dev/null +++ b/app/domain/image-domain/src/main/java/org/example/entity/Image.java @@ -0,0 +1,23 @@ +package org.example.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import java.util.UUID; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_image") +public class Image extends BaseEntity { + + @Column(name = "url", nullable = false) + private String url; + + @Column(name = "show_id", nullable = false) + private UUID showId; + +} diff --git a/app/domain/show-domain/build.gradle b/app/domain/show-domain/build.gradle new file mode 100644 index 00000000..9e3be2c6 --- /dev/null +++ b/app/domain/show-domain/build.gradle @@ -0,0 +1,10 @@ +bootJar.enabled = false +jar.enabled = true + +dependencies { + implementation project(":app:domain:common-domain") + implementation project(":app:domain:image-domain") + + // hypersistence utils + implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.7.6' +} diff --git a/app/domain/show-domain/src/main/java/org/example/entity/Show.java b/app/domain/show-domain/src/main/java/org/example/entity/Show.java new file mode 100644 index 00000000..5ca1f8f1 --- /dev/null +++ b/app/domain/show-domain/src/main/java/org/example/entity/Show.java @@ -0,0 +1,45 @@ +package org.example.entity; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.example.entity.info.Price; +import org.example.entity.info.Ticketing; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_show") +public class Show extends BaseEntity { + + @Column(name = "title", nullable = false) + private String title; + + @Column(name = "content", nullable = false) + private String content; + + @Column(name = "date", nullable = false) + private LocalDate date; + + @Column(name = "location", nullable = false) + private String location; + + @Enumerated + private Price price; + + @Enumerated + private Ticketing ticketing; + + @OneToMany(mappedBy = "app_show", cascade = CascadeType.ALL, orphanRemoval = true) + private List images = new ArrayList<>(); + +} \ No newline at end of file diff --git a/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java b/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java new file mode 100644 index 00000000..07b150e7 --- /dev/null +++ b/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java @@ -0,0 +1,23 @@ +package org.example.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import java.util.UUID; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_show_search") +public class ShowSearch extends BaseEntity { + + @Column(name = "name", nullable = false) + private String artistName; + + @Column(name = "show_id", nullable = false) + private UUID showId; + +} diff --git a/app/domain/show-domain/src/main/java/org/example/entity/info/Price.java b/app/domain/show-domain/src/main/java/org/example/entity/info/Price.java new file mode 100644 index 00000000..1e2f583c --- /dev/null +++ b/app/domain/show-domain/src/main/java/org/example/entity/info/Price.java @@ -0,0 +1,20 @@ +package org.example.entity.info; + +import io.hypersistence.utils.hibernate.type.json.JsonType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import java.util.HashMap; +import java.util.Map; +import org.hibernate.annotations.Type; + +@Embeddable +public class Price { + + @Type(JsonType.class) + @Column(name = "price", columnDefinition = "jsonb", nullable = false) + private Map priceInformation = new HashMap<>(); + + public void savePriceInformation(String seatType, Integer won) { + priceInformation.put(seatType, won); + } +} diff --git a/app/domain/show-domain/src/main/java/org/example/entity/info/Ticketing.java b/app/domain/show-domain/src/main/java/org/example/entity/info/Ticketing.java new file mode 100644 index 00000000..4a08ed25 --- /dev/null +++ b/app/domain/show-domain/src/main/java/org/example/entity/info/Ticketing.java @@ -0,0 +1,21 @@ +package org.example.entity.info; + +import io.hypersistence.utils.hibernate.type.json.JsonType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import java.util.HashMap; +import java.util.Map; +import org.example.vo.TicketBookingSite; +import org.hibernate.annotations.Type; + +@Embeddable +public class Ticketing { + + @Type(JsonType.class) + @Column(name = "ticketing", columnDefinition = "jsonb", nullable = false) + private Map ticketingInformation = new HashMap<>(); + + public void saveTicketingInformation(TicketBookingSite ticketBookingSite, String ticketingSiteUrl) { + ticketingInformation.put(ticketBookingSite, ticketingSiteUrl); + } +} diff --git a/app/domain/show-domain/src/main/java/org/example/vo/TicketBookingSite.java b/app/domain/show-domain/src/main/java/org/example/vo/TicketBookingSite.java new file mode 100644 index 00000000..36e9d59a --- /dev/null +++ b/app/domain/show-domain/src/main/java/org/example/vo/TicketBookingSite.java @@ -0,0 +1,5 @@ +package org.example.vo; + +public enum TicketBookingSite { + YES24, INTERPARK +} diff --git a/settings.gradle b/settings.gradle index cf1fdd70..70b6b105 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,6 +7,14 @@ include(":app") include(":app:domain") include (":app:domain:common-domain") include(":app:domain:user-domain") +include (":app:domain:show-domain") +include (":app:domain:alert-domain") +include ("app:domain:genre-domain") +include ("app:domain:artist-domain") +include ("app:domain:subscribe-artist-domain") +include ("app:domain:subscribe-genre-domain") +include ("app:domain:interest-show-domain") +include (":app:domain:image-domain") include(":app:api") include (":app:api:common-api") From 3766c80ff77633d7f76f7f9fc9b16f6bbc0a8a6f Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Sun, 16 Jun 2024 00:50:14 +0900 Subject: [PATCH 02/21] =?UTF-8?q?refactor=20:=20show=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=ED=8B=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/example/entity/ShowSearch.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java b/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java index 07b150e7..8fd065bd 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java @@ -2,8 +2,10 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; -import java.util.UUID; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -14,10 +16,11 @@ @Table(name = "app_show_search") public class ShowSearch extends BaseEntity { - @Column(name = "name", nullable = false) - private String artistName; + @Column(name = "show_name", nullable = false) + private String showName; - @Column(name = "show_id", nullable = false) - private UUID showId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "show_id") + private Show show; } From 6268274d26f0433aa077f6f3a028e178a4ce7130 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Sun, 16 Jun 2024 00:52:10 +0900 Subject: [PATCH 03/21] =?UTF-8?q?feat=20:=20artist=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/domain/artist-domain/build.gradle | 7 ++++ .../main/java/org/example/entity/Artist.java | 32 +++++++++++++++++++ .../java/org/example/entity/ArtistSearch.java | 25 +++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 app/domain/artist-domain/build.gradle create mode 100644 app/domain/artist-domain/src/main/java/org/example/entity/Artist.java create mode 100644 app/domain/artist-domain/src/main/java/org/example/entity/ArtistSearch.java diff --git a/app/domain/artist-domain/build.gradle b/app/domain/artist-domain/build.gradle new file mode 100644 index 00000000..e2cd0106 --- /dev/null +++ b/app/domain/artist-domain/build.gradle @@ -0,0 +1,7 @@ +bootJar.enabled = false +jar.enabled = true + +dependencies { + implementation project(":app:domain:common-domain") + implementation project(":app:domain:show-domain") +} diff --git a/app/domain/artist-domain/src/main/java/org/example/entity/Artist.java b/app/domain/artist-domain/src/main/java/org/example/entity/Artist.java new file mode 100644 index 00000000..d0c218dd --- /dev/null +++ b/app/domain/artist-domain/src/main/java/org/example/entity/Artist.java @@ -0,0 +1,32 @@ +package org.example.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_artist") +public class Artist extends BaseEntity { + + @Column(name = "english_name", nullable = false) + private String englishName; + + @Column(name = "korean_name", nullable = false) + private String koreanName; + + @Column(name = "country", nullable = false) + private String country; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "show_id") + private Show show; + +} diff --git a/app/domain/artist-domain/src/main/java/org/example/entity/ArtistSearch.java b/app/domain/artist-domain/src/main/java/org/example/entity/ArtistSearch.java new file mode 100644 index 00000000..13325055 --- /dev/null +++ b/app/domain/artist-domain/src/main/java/org/example/entity/ArtistSearch.java @@ -0,0 +1,25 @@ +package org.example.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_artist_search") +public class ArtistSearch extends BaseEntity { + + @Column(name = "artist_name", nullable = false) + private String artistName; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "artist_id") + private Artist artist; +} From 451b57b69e52243c36c9b6bc8ca303d05025a301 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Sun, 16 Jun 2024 00:57:22 +0900 Subject: [PATCH 04/21] =?UTF-8?q?feat=20:=20SubscribeArtist=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subscribe-artist-domain/build.gradle | 6 +++++ .../org/example/entity/SubscribeArtist.java | 24 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 app/domain/subscribe-artist-domain/build.gradle create mode 100644 app/domain/subscribe-artist-domain/src/main/java/org/example/entity/SubscribeArtist.java diff --git a/app/domain/subscribe-artist-domain/build.gradle b/app/domain/subscribe-artist-domain/build.gradle new file mode 100644 index 00000000..6f232c19 --- /dev/null +++ b/app/domain/subscribe-artist-domain/build.gradle @@ -0,0 +1,6 @@ +bootJar.enabled = false +jar.enabled = true + +dependencies { + implementation project(":app:domain:common-domain") +} diff --git a/app/domain/subscribe-artist-domain/src/main/java/org/example/entity/SubscribeArtist.java b/app/domain/subscribe-artist-domain/src/main/java/org/example/entity/SubscribeArtist.java new file mode 100644 index 00000000..18740e77 --- /dev/null +++ b/app/domain/subscribe-artist-domain/src/main/java/org/example/entity/SubscribeArtist.java @@ -0,0 +1,24 @@ +package org.example.entity; + + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import java.util.UUID; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_subscribe_artist") +public class SubscribeArtist extends BaseEntity { + + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(name = "artist_id", nullable = false) + private UUID artistId; + +} From a4e235a7af95e827345d40180f9c9a79d6d8395e Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Sun, 16 Jun 2024 01:50:12 +0900 Subject: [PATCH 05/21] =?UTF-8?q?feat=20:=20Genre=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/domain/genre-domain/build.gradle | 7 +++++ .../main/java/org/example/entity/Genre.java | 26 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 app/domain/genre-domain/build.gradle create mode 100644 app/domain/genre-domain/src/main/java/org/example/entity/Genre.java diff --git a/app/domain/genre-domain/build.gradle b/app/domain/genre-domain/build.gradle new file mode 100644 index 00000000..e2cd0106 --- /dev/null +++ b/app/domain/genre-domain/build.gradle @@ -0,0 +1,7 @@ +bootJar.enabled = false +jar.enabled = true + +dependencies { + implementation project(":app:domain:common-domain") + implementation project(":app:domain:show-domain") +} diff --git a/app/domain/genre-domain/src/main/java/org/example/entity/Genre.java b/app/domain/genre-domain/src/main/java/org/example/entity/Genre.java new file mode 100644 index 00000000..0e1df6ba --- /dev/null +++ b/app/domain/genre-domain/src/main/java/org/example/entity/Genre.java @@ -0,0 +1,26 @@ +package org.example.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_genre") +public class Genre extends BaseEntity { + + @Column(name = "name", nullable = false) + private String name; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "show_id") + private Show show; + +} From 5b8b500b2d2d6d7760495e3a8af5c3bd996a3490 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Sun, 16 Jun 2024 01:55:17 +0900 Subject: [PATCH 06/21] =?UTF-8?q?feat=20:=20SubscribeGenre=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subscribe-genre-domain/build.gradle | 6 +++++ .../org/example/entity/SubscribeGenre.java | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 app/domain/subscribe-genre-domain/build.gradle create mode 100644 app/domain/subscribe-genre-domain/src/main/java/org/example/entity/SubscribeGenre.java diff --git a/app/domain/subscribe-genre-domain/build.gradle b/app/domain/subscribe-genre-domain/build.gradle new file mode 100644 index 00000000..6f232c19 --- /dev/null +++ b/app/domain/subscribe-genre-domain/build.gradle @@ -0,0 +1,6 @@ +bootJar.enabled = false +jar.enabled = true + +dependencies { + implementation project(":app:domain:common-domain") +} diff --git a/app/domain/subscribe-genre-domain/src/main/java/org/example/entity/SubscribeGenre.java b/app/domain/subscribe-genre-domain/src/main/java/org/example/entity/SubscribeGenre.java new file mode 100644 index 00000000..b1612821 --- /dev/null +++ b/app/domain/subscribe-genre-domain/src/main/java/org/example/entity/SubscribeGenre.java @@ -0,0 +1,23 @@ +package org.example.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import java.util.UUID; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_subscribe_genre") +public class SubscribeGenre extends BaseEntity { + + + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(name = "genre_id", nullable = false) + private UUID genreId; +} From d44cd996cb9266ac74d15147405a0fbf547e3fb3 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Sun, 16 Jun 2024 01:58:58 +0900 Subject: [PATCH 07/21] =?UTF-8?q?feat=20:=20InterestShow=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/domain/interest-show-domain/build.gradle | 6 +++++ .../java/org/example/entity/InterestShow.java | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 app/domain/interest-show-domain/build.gradle create mode 100644 app/domain/interest-show-domain/src/main/java/org/example/entity/InterestShow.java diff --git a/app/domain/interest-show-domain/build.gradle b/app/domain/interest-show-domain/build.gradle new file mode 100644 index 00000000..6f232c19 --- /dev/null +++ b/app/domain/interest-show-domain/build.gradle @@ -0,0 +1,6 @@ +bootJar.enabled = false +jar.enabled = true + +dependencies { + implementation project(":app:domain:common-domain") +} diff --git a/app/domain/interest-show-domain/src/main/java/org/example/entity/InterestShow.java b/app/domain/interest-show-domain/src/main/java/org/example/entity/InterestShow.java new file mode 100644 index 00000000..edd81e2e --- /dev/null +++ b/app/domain/interest-show-domain/src/main/java/org/example/entity/InterestShow.java @@ -0,0 +1,23 @@ +package org.example.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import java.util.UUID; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_interest_show") +public class InterestShow extends BaseEntity { + + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(name = "show_id", nullable = false) + private UUID showId; + +} From 31232e848298a2b1a623a9866b0c57616bc68413 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Sun, 16 Jun 2024 02:04:51 +0900 Subject: [PATCH 08/21] =?UTF-8?q?feat=20:=20TicketingAlert=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/domain/ticket-alert-domain/build.gradle | 6 ++++ .../org/example/entity/TicketingAlert.java | 29 +++++++++++++++++++ settings.gradle | 2 +- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 app/domain/ticket-alert-domain/build.gradle create mode 100644 app/domain/ticket-alert-domain/src/main/java/org/example/entity/TicketingAlert.java diff --git a/app/domain/ticket-alert-domain/build.gradle b/app/domain/ticket-alert-domain/build.gradle new file mode 100644 index 00000000..6f232c19 --- /dev/null +++ b/app/domain/ticket-alert-domain/build.gradle @@ -0,0 +1,6 @@ +bootJar.enabled = false +jar.enabled = true + +dependencies { + implementation project(":app:domain:common-domain") +} diff --git a/app/domain/ticket-alert-domain/src/main/java/org/example/entity/TicketingAlert.java b/app/domain/ticket-alert-domain/src/main/java/org/example/entity/TicketingAlert.java new file mode 100644 index 00000000..74bdd365 --- /dev/null +++ b/app/domain/ticket-alert-domain/src/main/java/org/example/entity/TicketingAlert.java @@ -0,0 +1,29 @@ +package org.example.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import java.time.LocalDateTime; +import java.util.UUID; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_ticketing_alert") +public class TicketingAlert extends BaseEntity { + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "date", nullable = false) + private LocalDateTime localDateTime; + + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(name = "show_id", nullable = false) + private UUID showId; +} diff --git a/settings.gradle b/settings.gradle index 70b6b105..bebb4a52 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,7 @@ include(":app:domain") include (":app:domain:common-domain") include(":app:domain:user-domain") include (":app:domain:show-domain") -include (":app:domain:alert-domain") +include (":app:domain:ticket-alert-domain") include ("app:domain:genre-domain") include ("app:domain:artist-domain") include ("app:domain:subscribe-artist-domain") From 4cd88fca59f47595dbb77b621173619968ddd635 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Tue, 18 Jun 2024 13:52:21 +0900 Subject: [PATCH 09/21] =?UTF-8?q?refactor=20:=20User,=20Show=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=EC=9C=BC=EB=A1=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/domain/artist-domain/build.gradle | 7 ------- app/domain/genre-domain/build.gradle | 7 ------- app/domain/image-domain/build.gradle | 6 ------ app/domain/interest-show-domain/build.gradle | 6 ------ app/domain/show-domain/build.gradle | 1 - .../src/main/java/org/example/entity/Artist.java | 0 .../src/main/java/org/example/entity/ArtistSearch.java | 0 .../src/main/java/org/example/entity/Genre.java | 0 .../src/main/java/org/example/entity/Image.java | 0 app/domain/subscribe-artist-domain/build.gradle | 6 ------ app/domain/subscribe-genre-domain/build.gradle | 6 ------ app/domain/ticket-alert-domain/build.gradle | 6 ------ .../src/main/java/org/example/entity/InterestShow.java | 0 .../src/main/java/org/example/entity/SubscribeArtist.java | 0 .../src/main/java/org/example/entity/SubscribeGenre.java | 0 .../src/main/java/org/example/entity/TicketingAlert.java | 0 settings.gradle | 7 ------- 17 files changed, 52 deletions(-) delete mode 100644 app/domain/artist-domain/build.gradle delete mode 100644 app/domain/genre-domain/build.gradle delete mode 100644 app/domain/image-domain/build.gradle delete mode 100644 app/domain/interest-show-domain/build.gradle rename app/domain/{artist-domain => show-domain}/src/main/java/org/example/entity/Artist.java (100%) rename app/domain/{artist-domain => show-domain}/src/main/java/org/example/entity/ArtistSearch.java (100%) rename app/domain/{genre-domain => show-domain}/src/main/java/org/example/entity/Genre.java (100%) rename app/domain/{image-domain => show-domain}/src/main/java/org/example/entity/Image.java (100%) delete mode 100644 app/domain/subscribe-artist-domain/build.gradle delete mode 100644 app/domain/subscribe-genre-domain/build.gradle delete mode 100644 app/domain/ticket-alert-domain/build.gradle rename app/domain/{interest-show-domain => user-domain}/src/main/java/org/example/entity/InterestShow.java (100%) rename app/domain/{subscribe-artist-domain => user-domain}/src/main/java/org/example/entity/SubscribeArtist.java (100%) rename app/domain/{subscribe-genre-domain => user-domain}/src/main/java/org/example/entity/SubscribeGenre.java (100%) rename app/domain/{ticket-alert-domain => user-domain}/src/main/java/org/example/entity/TicketingAlert.java (100%) diff --git a/app/domain/artist-domain/build.gradle b/app/domain/artist-domain/build.gradle deleted file mode 100644 index e2cd0106..00000000 --- a/app/domain/artist-domain/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -bootJar.enabled = false -jar.enabled = true - -dependencies { - implementation project(":app:domain:common-domain") - implementation project(":app:domain:show-domain") -} diff --git a/app/domain/genre-domain/build.gradle b/app/domain/genre-domain/build.gradle deleted file mode 100644 index e2cd0106..00000000 --- a/app/domain/genre-domain/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -bootJar.enabled = false -jar.enabled = true - -dependencies { - implementation project(":app:domain:common-domain") - implementation project(":app:domain:show-domain") -} diff --git a/app/domain/image-domain/build.gradle b/app/domain/image-domain/build.gradle deleted file mode 100644 index 6f232c19..00000000 --- a/app/domain/image-domain/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -bootJar.enabled = false -jar.enabled = true - -dependencies { - implementation project(":app:domain:common-domain") -} diff --git a/app/domain/interest-show-domain/build.gradle b/app/domain/interest-show-domain/build.gradle deleted file mode 100644 index 6f232c19..00000000 --- a/app/domain/interest-show-domain/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -bootJar.enabled = false -jar.enabled = true - -dependencies { - implementation project(":app:domain:common-domain") -} diff --git a/app/domain/show-domain/build.gradle b/app/domain/show-domain/build.gradle index 9e3be2c6..113bb5b1 100644 --- a/app/domain/show-domain/build.gradle +++ b/app/domain/show-domain/build.gradle @@ -3,7 +3,6 @@ jar.enabled = true dependencies { implementation project(":app:domain:common-domain") - implementation project(":app:domain:image-domain") // hypersistence utils implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.7.6' diff --git a/app/domain/artist-domain/src/main/java/org/example/entity/Artist.java b/app/domain/show-domain/src/main/java/org/example/entity/Artist.java similarity index 100% rename from app/domain/artist-domain/src/main/java/org/example/entity/Artist.java rename to app/domain/show-domain/src/main/java/org/example/entity/Artist.java diff --git a/app/domain/artist-domain/src/main/java/org/example/entity/ArtistSearch.java b/app/domain/show-domain/src/main/java/org/example/entity/ArtistSearch.java similarity index 100% rename from app/domain/artist-domain/src/main/java/org/example/entity/ArtistSearch.java rename to app/domain/show-domain/src/main/java/org/example/entity/ArtistSearch.java diff --git a/app/domain/genre-domain/src/main/java/org/example/entity/Genre.java b/app/domain/show-domain/src/main/java/org/example/entity/Genre.java similarity index 100% rename from app/domain/genre-domain/src/main/java/org/example/entity/Genre.java rename to app/domain/show-domain/src/main/java/org/example/entity/Genre.java diff --git a/app/domain/image-domain/src/main/java/org/example/entity/Image.java b/app/domain/show-domain/src/main/java/org/example/entity/Image.java similarity index 100% rename from app/domain/image-domain/src/main/java/org/example/entity/Image.java rename to app/domain/show-domain/src/main/java/org/example/entity/Image.java diff --git a/app/domain/subscribe-artist-domain/build.gradle b/app/domain/subscribe-artist-domain/build.gradle deleted file mode 100644 index 6f232c19..00000000 --- a/app/domain/subscribe-artist-domain/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -bootJar.enabled = false -jar.enabled = true - -dependencies { - implementation project(":app:domain:common-domain") -} diff --git a/app/domain/subscribe-genre-domain/build.gradle b/app/domain/subscribe-genre-domain/build.gradle deleted file mode 100644 index 6f232c19..00000000 --- a/app/domain/subscribe-genre-domain/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -bootJar.enabled = false -jar.enabled = true - -dependencies { - implementation project(":app:domain:common-domain") -} diff --git a/app/domain/ticket-alert-domain/build.gradle b/app/domain/ticket-alert-domain/build.gradle deleted file mode 100644 index 6f232c19..00000000 --- a/app/domain/ticket-alert-domain/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -bootJar.enabled = false -jar.enabled = true - -dependencies { - implementation project(":app:domain:common-domain") -} diff --git a/app/domain/interest-show-domain/src/main/java/org/example/entity/InterestShow.java b/app/domain/user-domain/src/main/java/org/example/entity/InterestShow.java similarity index 100% rename from app/domain/interest-show-domain/src/main/java/org/example/entity/InterestShow.java rename to app/domain/user-domain/src/main/java/org/example/entity/InterestShow.java diff --git a/app/domain/subscribe-artist-domain/src/main/java/org/example/entity/SubscribeArtist.java b/app/domain/user-domain/src/main/java/org/example/entity/SubscribeArtist.java similarity index 100% rename from app/domain/subscribe-artist-domain/src/main/java/org/example/entity/SubscribeArtist.java rename to app/domain/user-domain/src/main/java/org/example/entity/SubscribeArtist.java diff --git a/app/domain/subscribe-genre-domain/src/main/java/org/example/entity/SubscribeGenre.java b/app/domain/user-domain/src/main/java/org/example/entity/SubscribeGenre.java similarity index 100% rename from app/domain/subscribe-genre-domain/src/main/java/org/example/entity/SubscribeGenre.java rename to app/domain/user-domain/src/main/java/org/example/entity/SubscribeGenre.java diff --git a/app/domain/ticket-alert-domain/src/main/java/org/example/entity/TicketingAlert.java b/app/domain/user-domain/src/main/java/org/example/entity/TicketingAlert.java similarity index 100% rename from app/domain/ticket-alert-domain/src/main/java/org/example/entity/TicketingAlert.java rename to app/domain/user-domain/src/main/java/org/example/entity/TicketingAlert.java diff --git a/settings.gradle b/settings.gradle index bebb4a52..7239040f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,13 +8,6 @@ include(":app:domain") include (":app:domain:common-domain") include(":app:domain:user-domain") include (":app:domain:show-domain") -include (":app:domain:ticket-alert-domain") -include ("app:domain:genre-domain") -include ("app:domain:artist-domain") -include ("app:domain:subscribe-artist-domain") -include ("app:domain:subscribe-genre-domain") -include ("app:domain:interest-show-domain") -include (":app:domain:image-domain") include(":app:api") include (":app:api:common-api") From 1dc7d445b1f6d99828586d5fc228edafc5f8af95 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Tue, 18 Jun 2024 13:57:34 +0900 Subject: [PATCH 10/21] =?UTF-8?q?refactor=20:=20TicketingAlert=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EC=98=88=EC=95=BD=20=EC=8B=9C=EA=B0=84=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/entity/TicketingAlert.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/domain/user-domain/src/main/java/org/example/entity/TicketingAlert.java b/app/domain/user-domain/src/main/java/org/example/entity/TicketingAlert.java index 74bdd365..759db7a2 100644 --- a/app/domain/user-domain/src/main/java/org/example/entity/TicketingAlert.java +++ b/app/domain/user-domain/src/main/java/org/example/entity/TicketingAlert.java @@ -18,8 +18,8 @@ public class TicketingAlert extends BaseEntity { @Column(name = "name", nullable = false) private String name; - @Column(name = "date", nullable = false) - private LocalDateTime localDateTime; + @Column(name = "schedule_alert_time", nullable = false) + private LocalDateTime scheduleAlertTime; @Column(name = "user_id", nullable = false) private UUID userId; From 236cfe0fac037471eb87a157f091ccfee0566cd3 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Tue, 18 Jun 2024 14:05:25 +0900 Subject: [PATCH 11/21] =?UTF-8?q?refactor=20:=20=EC=A2=8C=EC=84=9D=20?= =?UTF-8?q?=EB=B3=84=20=EA=B0=80=EA=B2=A9=20=ED=95=84=EB=93=9C=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/entity/Show.java | 4 ++-- .../example/entity/info/{Price.java => SeatPrice.java} | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename app/domain/show-domain/src/main/java/org/example/entity/info/{Price.java => SeatPrice.java} (62%) diff --git a/app/domain/show-domain/src/main/java/org/example/entity/Show.java b/app/domain/show-domain/src/main/java/org/example/entity/Show.java index 5ca1f8f1..9a01793f 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/Show.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/Show.java @@ -12,7 +12,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; -import org.example.entity.info.Price; +import org.example.entity.info.SeatPrice; import org.example.entity.info.Ticketing; @Entity @@ -34,7 +34,7 @@ public class Show extends BaseEntity { private String location; @Enumerated - private Price price; + private SeatPrice seatPrice; @Enumerated private Ticketing ticketing; diff --git a/app/domain/show-domain/src/main/java/org/example/entity/info/Price.java b/app/domain/show-domain/src/main/java/org/example/entity/info/SeatPrice.java similarity index 62% rename from app/domain/show-domain/src/main/java/org/example/entity/info/Price.java rename to app/domain/show-domain/src/main/java/org/example/entity/info/SeatPrice.java index 1e2f583c..024391b2 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/info/Price.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/info/SeatPrice.java @@ -8,13 +8,13 @@ import org.hibernate.annotations.Type; @Embeddable -public class Price { +public class SeatPrice { @Type(JsonType.class) - @Column(name = "price", columnDefinition = "jsonb", nullable = false) + @Column(name = "seat_price", columnDefinition = "jsonb", nullable = false) private Map priceInformation = new HashMap<>(); - public void savePriceInformation(String seatType, Integer won) { - priceInformation.put(seatType, won); + public void savePriceInformation(String seatType, Integer price) { + priceInformation.put(seatType, price); } } From 4ae22f303aa8f7b57eecb49a4cd95d3722e80c8c Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Tue, 18 Jun 2024 14:06:50 +0900 Subject: [PATCH 12/21] =?UTF-8?q?refactor=20:=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=EC=9A=A9=20=ED=85=8C=EC=9D=B4=EB=B8=94=20name=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=EB=AA=85=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/entity/ArtistSearch.java | 4 ++-- .../src/main/java/org/example/entity/ShowSearch.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/domain/show-domain/src/main/java/org/example/entity/ArtistSearch.java b/app/domain/show-domain/src/main/java/org/example/entity/ArtistSearch.java index 13325055..7e7d7a37 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/ArtistSearch.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/ArtistSearch.java @@ -16,8 +16,8 @@ @Table(name = "app_artist_search") public class ArtistSearch extends BaseEntity { - @Column(name = "artist_name", nullable = false) - private String artistName; + @Column(name = "name", nullable = false) + private String name; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "artist_id") diff --git a/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java b/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java index 8fd065bd..74c76c4f 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java @@ -16,8 +16,8 @@ @Table(name = "app_show_search") public class ShowSearch extends BaseEntity { - @Column(name = "show_name", nullable = false) - private String showName; + @Column(name = "name", nullable = false) + private String name; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "show_id") From a15f35ff1f4b31295e1b58132e418753223111f9 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Tue, 18 Jun 2024 14:11:33 +0900 Subject: [PATCH 13/21] =?UTF-8?q?refactor=20:=20ShowGenre,=20ShowArtist=20?= =?UTF-8?q?=EC=A4=91=EA=B0=84=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/example/entity/ShowArtist.java | 22 ++++++++++++++++++ .../java/org/example/entity/ShowGenre.java | 23 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 app/domain/show-domain/src/main/java/org/example/entity/ShowArtist.java create mode 100644 app/domain/show-domain/src/main/java/org/example/entity/ShowGenre.java diff --git a/app/domain/show-domain/src/main/java/org/example/entity/ShowArtist.java b/app/domain/show-domain/src/main/java/org/example/entity/ShowArtist.java new file mode 100644 index 00000000..551d0e96 --- /dev/null +++ b/app/domain/show-domain/src/main/java/org/example/entity/ShowArtist.java @@ -0,0 +1,22 @@ +package org.example.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import java.util.UUID; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_show_artist") +public class ShowArtist extends BaseEntity { + + @Column(name = "show_id", nullable = false) + private UUID showId; + + @Column(name = "artist_id", nullable = false) + private UUID artistId; +} diff --git a/app/domain/show-domain/src/main/java/org/example/entity/ShowGenre.java b/app/domain/show-domain/src/main/java/org/example/entity/ShowGenre.java new file mode 100644 index 00000000..49841565 --- /dev/null +++ b/app/domain/show-domain/src/main/java/org/example/entity/ShowGenre.java @@ -0,0 +1,23 @@ +package org.example.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import java.util.UUID; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "app_show_genre") +public class ShowGenre extends BaseEntity { + + @Column(name = "show_id", nullable = false) + private UUID showId; + + @Column(name = "genre_id", nullable = false) + private UUID genreId; + +} \ No newline at end of file From ebdf4e4ea976073988329a93fcf3865166cc4d9c Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Tue, 18 Jun 2024 14:17:44 +0900 Subject: [PATCH 14/21] =?UTF-8?q?refactor=20:=20showImage=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../show-domain/src/main/java/org/example/entity/Show.java | 2 +- .../java/org/example/entity/{Image.java => ShowImage.java} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename app/domain/show-domain/src/main/java/org/example/entity/{Image.java => ShowImage.java} (85%) diff --git a/app/domain/show-domain/src/main/java/org/example/entity/Show.java b/app/domain/show-domain/src/main/java/org/example/entity/Show.java index 9a01793f..e319b262 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/Show.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/Show.java @@ -40,6 +40,6 @@ public class Show extends BaseEntity { private Ticketing ticketing; @OneToMany(mappedBy = "app_show", cascade = CascadeType.ALL, orphanRemoval = true) - private List images = new ArrayList<>(); + private List images = new ArrayList<>(); } \ No newline at end of file diff --git a/app/domain/show-domain/src/main/java/org/example/entity/Image.java b/app/domain/show-domain/src/main/java/org/example/entity/ShowImage.java similarity index 85% rename from app/domain/show-domain/src/main/java/org/example/entity/Image.java rename to app/domain/show-domain/src/main/java/org/example/entity/ShowImage.java index 0ceec1b6..67acb959 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/Image.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/ShowImage.java @@ -11,8 +11,8 @@ @Entity @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) -@Table(name = "app_image") -public class Image extends BaseEntity { +@Table(name = "app_show_image") +public class ShowImage extends BaseEntity { @Column(name = "url", nullable = false) private String url; From 8e0cf3ae1237a20ae5a46e83794e0c7a9b0b74e9 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Tue, 18 Jun 2024 14:22:15 +0900 Subject: [PATCH 15/21] =?UTF-8?q?refactor=20:=20show=20=EB=AA=A8=EB=93=88?= =?UTF-8?q?=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/example/entity/{ => artist}/Artist.java | 4 +++- .../java/org/example/entity/{ => artist}/ArtistSearch.java | 3 ++- .../main/java/org/example/entity/{ => genre}/Genre.java | 4 +++- .../src/main/java/org/example/entity/{ => show}/Show.java | 7 ++++--- .../java/org/example/entity/{ => show}/ShowArtist.java | 3 ++- .../main/java/org/example/entity/{ => show}/ShowGenre.java | 3 ++- .../main/java/org/example/entity/{ => show}/ShowImage.java | 3 ++- .../java/org/example/entity/{ => show}/ShowSearch.java | 3 ++- .../java/org/example/entity/{ => show}/info/SeatPrice.java | 2 +- .../java/org/example/entity/{ => show}/info/Ticketing.java | 7 +++++-- 10 files changed, 26 insertions(+), 13 deletions(-) rename app/domain/show-domain/src/main/java/org/example/entity/{ => artist}/Artist.java (87%) rename app/domain/show-domain/src/main/java/org/example/entity/{ => artist}/ArtistSearch.java (89%) rename app/domain/show-domain/src/main/java/org/example/entity/{ => genre}/Genre.java (84%) rename app/domain/show-domain/src/main/java/org/example/entity/{ => show}/Show.java (86%) rename app/domain/show-domain/src/main/java/org/example/entity/{ => show}/ShowArtist.java (87%) rename app/domain/show-domain/src/main/java/org/example/entity/{ => show}/ShowGenre.java (87%) rename app/domain/show-domain/src/main/java/org/example/entity/{ => show}/ShowImage.java (87%) rename app/domain/show-domain/src/main/java/org/example/entity/{ => show}/ShowSearch.java (89%) rename app/domain/show-domain/src/main/java/org/example/entity/{ => show}/info/SeatPrice.java (93%) rename app/domain/show-domain/src/main/java/org/example/entity/{ => show}/info/Ticketing.java (77%) diff --git a/app/domain/show-domain/src/main/java/org/example/entity/Artist.java b/app/domain/show-domain/src/main/java/org/example/entity/artist/Artist.java similarity index 87% rename from app/domain/show-domain/src/main/java/org/example/entity/Artist.java rename to app/domain/show-domain/src/main/java/org/example/entity/artist/Artist.java index d0c218dd..b58971ba 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/Artist.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/artist/Artist.java @@ -1,4 +1,4 @@ -package org.example.entity; +package org.example.entity.artist; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -9,6 +9,8 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import org.example.entity.BaseEntity; +import org.example.entity.show.Show; @Entity @Getter diff --git a/app/domain/show-domain/src/main/java/org/example/entity/ArtistSearch.java b/app/domain/show-domain/src/main/java/org/example/entity/artist/ArtistSearch.java similarity index 89% rename from app/domain/show-domain/src/main/java/org/example/entity/ArtistSearch.java rename to app/domain/show-domain/src/main/java/org/example/entity/artist/ArtistSearch.java index 7e7d7a37..08f46671 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/ArtistSearch.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/artist/ArtistSearch.java @@ -1,4 +1,4 @@ -package org.example.entity; +package org.example.entity.artist; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -9,6 +9,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import org.example.entity.BaseEntity; @Entity @Getter diff --git a/app/domain/show-domain/src/main/java/org/example/entity/Genre.java b/app/domain/show-domain/src/main/java/org/example/entity/genre/Genre.java similarity index 84% rename from app/domain/show-domain/src/main/java/org/example/entity/Genre.java rename to app/domain/show-domain/src/main/java/org/example/entity/genre/Genre.java index 0e1df6ba..ade7b6e5 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/Genre.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/genre/Genre.java @@ -1,4 +1,4 @@ -package org.example.entity; +package org.example.entity.genre; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -9,6 +9,8 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import org.example.entity.BaseEntity; +import org.example.entity.show.Show; @Entity @Getter diff --git a/app/domain/show-domain/src/main/java/org/example/entity/Show.java b/app/domain/show-domain/src/main/java/org/example/entity/show/Show.java similarity index 86% rename from app/domain/show-domain/src/main/java/org/example/entity/Show.java rename to app/domain/show-domain/src/main/java/org/example/entity/show/Show.java index e319b262..90f04603 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/Show.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/show/Show.java @@ -1,4 +1,4 @@ -package org.example.entity; +package org.example.entity.show; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; @@ -12,8 +12,9 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; -import org.example.entity.info.SeatPrice; -import org.example.entity.info.Ticketing; +import org.example.entity.BaseEntity; +import org.example.entity.show.info.SeatPrice; +import org.example.entity.show.info.Ticketing; @Entity @Getter diff --git a/app/domain/show-domain/src/main/java/org/example/entity/ShowArtist.java b/app/domain/show-domain/src/main/java/org/example/entity/show/ShowArtist.java similarity index 87% rename from app/domain/show-domain/src/main/java/org/example/entity/ShowArtist.java rename to app/domain/show-domain/src/main/java/org/example/entity/show/ShowArtist.java index 551d0e96..1faedf8e 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/ShowArtist.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/show/ShowArtist.java @@ -1,4 +1,4 @@ -package org.example.entity; +package org.example.entity.show; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -7,6 +7,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import org.example.entity.BaseEntity; @Entity @Getter diff --git a/app/domain/show-domain/src/main/java/org/example/entity/ShowGenre.java b/app/domain/show-domain/src/main/java/org/example/entity/show/ShowGenre.java similarity index 87% rename from app/domain/show-domain/src/main/java/org/example/entity/ShowGenre.java rename to app/domain/show-domain/src/main/java/org/example/entity/show/ShowGenre.java index 49841565..aaf74717 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/ShowGenre.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/show/ShowGenre.java @@ -1,4 +1,4 @@ -package org.example.entity; +package org.example.entity.show; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -7,6 +7,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import org.example.entity.BaseEntity; @Entity @Getter diff --git a/app/domain/show-domain/src/main/java/org/example/entity/ShowImage.java b/app/domain/show-domain/src/main/java/org/example/entity/show/ShowImage.java similarity index 87% rename from app/domain/show-domain/src/main/java/org/example/entity/ShowImage.java rename to app/domain/show-domain/src/main/java/org/example/entity/show/ShowImage.java index 67acb959..a905a443 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/ShowImage.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/show/ShowImage.java @@ -1,4 +1,4 @@ -package org.example.entity; +package org.example.entity.show; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -7,6 +7,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import org.example.entity.BaseEntity; @Entity @Getter diff --git a/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java b/app/domain/show-domain/src/main/java/org/example/entity/show/ShowSearch.java similarity index 89% rename from app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java rename to app/domain/show-domain/src/main/java/org/example/entity/show/ShowSearch.java index 74c76c4f..c7e3f923 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/ShowSearch.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/show/ShowSearch.java @@ -1,4 +1,4 @@ -package org.example.entity; +package org.example.entity.show; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -9,6 +9,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import org.example.entity.BaseEntity; @Entity @Getter diff --git a/app/domain/show-domain/src/main/java/org/example/entity/info/SeatPrice.java b/app/domain/show-domain/src/main/java/org/example/entity/show/info/SeatPrice.java similarity index 93% rename from app/domain/show-domain/src/main/java/org/example/entity/info/SeatPrice.java rename to app/domain/show-domain/src/main/java/org/example/entity/show/info/SeatPrice.java index 024391b2..e3094ade 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/info/SeatPrice.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/show/info/SeatPrice.java @@ -1,4 +1,4 @@ -package org.example.entity.info; +package org.example.entity.show.info; import io.hypersistence.utils.hibernate.type.json.JsonType; import jakarta.persistence.Column; diff --git a/app/domain/show-domain/src/main/java/org/example/entity/info/Ticketing.java b/app/domain/show-domain/src/main/java/org/example/entity/show/info/Ticketing.java similarity index 77% rename from app/domain/show-domain/src/main/java/org/example/entity/info/Ticketing.java rename to app/domain/show-domain/src/main/java/org/example/entity/show/info/Ticketing.java index 4a08ed25..eadc1c7c 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/info/Ticketing.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/show/info/Ticketing.java @@ -1,4 +1,4 @@ -package org.example.entity.info; +package org.example.entity.show.info; import io.hypersistence.utils.hibernate.type.json.JsonType; import jakarta.persistence.Column; @@ -15,7 +15,10 @@ public class Ticketing { @Column(name = "ticketing", columnDefinition = "jsonb", nullable = false) private Map ticketingInformation = new HashMap<>(); - public void saveTicketingInformation(TicketBookingSite ticketBookingSite, String ticketingSiteUrl) { + public void saveTicketingInformation( + TicketBookingSite ticketBookingSite, + String ticketingSiteUrl + ) { ticketingInformation.put(ticketBookingSite, ticketingSiteUrl); } } From ac1ec4ded497f9555a4f9f9cca8f5ec119358b71 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Tue, 18 Jun 2024 14:29:27 +0900 Subject: [PATCH 16/21] =?UTF-8?q?refactor=20:=20User=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=ED=8B=B0=20=ED=95=84=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dto/request/LoginApiRequest.java | 12 ++++++------ .../service/dto/request/LoginServiceRequest.java | 6 +++--- .../main/java/org/example/entity/SubscribeGenre.java | 1 - .../src/main/java/org/example/entity/User.java | 8 ++++---- ...alCredentials.java => SocialLoginCredential.java} | 8 ++++---- 5 files changed, 17 insertions(+), 18 deletions(-) rename app/domain/user-domain/src/main/java/org/example/entity/credential/{SocialCredentials.java => SocialLoginCredential.java} (68%) diff --git a/app/api/user-api/src/main/java/org/example/controller/dto/request/LoginApiRequest.java b/app/api/user-api/src/main/java/org/example/controller/dto/request/LoginApiRequest.java index 5397e520..c60612ea 100644 --- a/app/api/user-api/src/main/java/org/example/controller/dto/request/LoginApiRequest.java +++ b/app/api/user-api/src/main/java/org/example/controller/dto/request/LoginApiRequest.java @@ -5,7 +5,7 @@ import org.example.entity.credential.GoogleSocialCredential; import org.example.entity.credential.KakaoSocialCredential; import org.example.entity.credential.SocialCredential; -import org.example.entity.credential.SocialCredentials; +import org.example.entity.credential.SocialLoginCredential; import org.example.service.dto.request.LoginServiceRequest; import org.example.vo.SocialLoginType; @@ -19,14 +19,14 @@ public record LoginApiRequest( public LoginServiceRequest toLoginServiceRequest() { return LoginServiceRequest.builder() - .socialCredentials(socialCredentials()) + .socialLoginCredential(socialLoginCredential()) .build(); } - private SocialCredentials socialCredentials() { - SocialCredentials socialCredentials = new SocialCredentials(); - socialCredentials.saveCredentials(socialLoginType, socialCredential()); - return socialCredentials; + private SocialLoginCredential socialLoginCredential() { + SocialLoginCredential socialLoginCredential = new SocialLoginCredential(); + socialLoginCredential.saveCredentials(socialLoginType, socialCredential()); + return socialLoginCredential; } private SocialCredential socialCredential() { diff --git a/app/api/user-api/src/main/java/org/example/service/dto/request/LoginServiceRequest.java b/app/api/user-api/src/main/java/org/example/service/dto/request/LoginServiceRequest.java index c6731401..2dd9e7cf 100644 --- a/app/api/user-api/src/main/java/org/example/service/dto/request/LoginServiceRequest.java +++ b/app/api/user-api/src/main/java/org/example/service/dto/request/LoginServiceRequest.java @@ -2,16 +2,16 @@ import lombok.Builder; import org.example.entity.User; -import org.example.entity.credential.SocialCredentials; +import org.example.entity.credential.SocialLoginCredential; @Builder public record LoginServiceRequest( - SocialCredentials socialCredentials + SocialLoginCredential socialLoginCredential ) { public User toUser() { return User.builder() - .socialCredentials(socialCredentials) + .socialLoginCredential(socialLoginCredential) .build(); } } diff --git a/app/domain/user-domain/src/main/java/org/example/entity/SubscribeGenre.java b/app/domain/user-domain/src/main/java/org/example/entity/SubscribeGenre.java index b1612821..f3f426d1 100644 --- a/app/domain/user-domain/src/main/java/org/example/entity/SubscribeGenre.java +++ b/app/domain/user-domain/src/main/java/org/example/entity/SubscribeGenre.java @@ -14,7 +14,6 @@ @Table(name = "app_subscribe_genre") public class SubscribeGenre extends BaseEntity { - @Column(name = "user_id", nullable = false) private UUID userId; diff --git a/app/domain/user-domain/src/main/java/org/example/entity/User.java b/app/domain/user-domain/src/main/java/org/example/entity/User.java index 872788b5..78c10f0c 100644 --- a/app/domain/user-domain/src/main/java/org/example/entity/User.java +++ b/app/domain/user-domain/src/main/java/org/example/entity/User.java @@ -11,7 +11,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.example.entity.credential.SocialCredentials; +import org.example.entity.credential.SocialLoginCredential; import org.example.vo.UserGender; import org.example.vo.UserRole; @@ -31,7 +31,7 @@ public class User extends BaseEntity { private String fcmToken; @Embedded - private SocialCredentials socialCredentials; + private SocialLoginCredential socialLoginCredential; @Column(name = "gender", nullable = false) @Enumerated(value = EnumType.STRING) @@ -43,9 +43,9 @@ public class User extends BaseEntity { @Builder private User( - SocialCredentials socialCredentials + SocialLoginCredential socialLoginCredential ) { - this.socialCredentials = socialCredentials; + this.socialLoginCredential = socialLoginCredential; this.userRole = UserRole.USER; } } \ No newline at end of file diff --git a/app/domain/user-domain/src/main/java/org/example/entity/credential/SocialCredentials.java b/app/domain/user-domain/src/main/java/org/example/entity/credential/SocialLoginCredential.java similarity index 68% rename from app/domain/user-domain/src/main/java/org/example/entity/credential/SocialCredentials.java rename to app/domain/user-domain/src/main/java/org/example/entity/credential/SocialLoginCredential.java index 8a045bcc..2c1a5da4 100644 --- a/app/domain/user-domain/src/main/java/org/example/entity/credential/SocialCredentials.java +++ b/app/domain/user-domain/src/main/java/org/example/entity/credential/SocialLoginCredential.java @@ -9,13 +9,13 @@ import org.hibernate.annotations.Type; @Embeddable -public class SocialCredentials { +public class SocialLoginCredential { @Type(JsonType.class) - @Column(name = "social_credentials", columnDefinition = "jsonb", nullable = false) - private Map socialLoginTypeCredentials = new HashMap<>(); + @Column(name = "social_login_credential", columnDefinition = "jsonb", nullable = false) + private Map socialLoginTypeCredential = new HashMap<>(); public void saveCredentials(SocialLoginType socialLoginType, SocialCredential socialCredential) { - socialLoginTypeCredentials.put(socialLoginType, socialCredential); + socialLoginTypeCredential.put(socialLoginType, socialCredential); } } From cd535cd9d05cd501885e63edd2fc12a63d6ac277 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Tue, 18 Jun 2024 14:30:20 +0900 Subject: [PATCH 17/21] =?UTF-8?q?refactor=20:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=A9=A4=EB=B2=84?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-api/src/main/java/org/example/filter/JWTFilter.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/api/common-api/src/main/java/org/example/filter/JWTFilter.java b/app/api/common-api/src/main/java/org/example/filter/JWTFilter.java index a6a65152..4fdf865e 100644 --- a/app/api/common-api/src/main/java/org/example/filter/JWTFilter.java +++ b/app/api/common-api/src/main/java/org/example/filter/JWTFilter.java @@ -13,7 +13,6 @@ import org.example.security.dto.AuthenticatedUser; import org.example.security.dto.TokenParam; import org.example.security.dto.UserParam; -import org.example.security.token.JWTGenerator; import org.example.security.token.JWTHandler; import org.example.security.token.RefreshTokenProcessor; import org.example.security.vo.TokenError; @@ -28,7 +27,6 @@ public class JWTFilter extends OncePerRequestFilter { private final JWTHandler jwtHandler; - private final JWTGenerator jwtGenerator; private final RefreshTokenProcessor refreshTokenProcessor; private final TokenRepository tokenRepository; From f059b15cd78c50284e77571debb1f302d091901e Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Thu, 20 Jun 2024 12:31:04 +0900 Subject: [PATCH 18/21] =?UTF-8?q?refactor=20:=20Artist,=20Genre=20?= =?UTF-8?q?=EC=9D=98=EB=AF=B8=20=EC=97=86=EB=8A=94=20=EA=B4=80=EA=B3=84=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/entity/artist/Artist.java | 8 -------- .../src/main/java/org/example/entity/genre/Genre.java | 8 -------- 2 files changed, 16 deletions(-) diff --git a/app/domain/show-domain/src/main/java/org/example/entity/artist/Artist.java b/app/domain/show-domain/src/main/java/org/example/entity/artist/Artist.java index b58971ba..8341edf4 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/artist/Artist.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/artist/Artist.java @@ -2,15 +2,11 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; import org.example.entity.BaseEntity; -import org.example.entity.show.Show; @Entity @Getter @@ -27,8 +23,4 @@ public class Artist extends BaseEntity { @Column(name = "country", nullable = false) private String country; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "show_id") - private Show show; - } diff --git a/app/domain/show-domain/src/main/java/org/example/entity/genre/Genre.java b/app/domain/show-domain/src/main/java/org/example/entity/genre/Genre.java index ade7b6e5..a5f49dbd 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/genre/Genre.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/genre/Genre.java @@ -2,15 +2,11 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; import org.example.entity.BaseEntity; -import org.example.entity.show.Show; @Entity @Getter @@ -21,8 +17,4 @@ public class Genre extends BaseEntity { @Column(name = "name", nullable = false) private String name; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "show_id") - private Show show; - } From 8b84aefc0830a0c3637a608f17c4207f403341fb Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Thu, 20 Jun 2024 12:32:03 +0900 Subject: [PATCH 19/21] =?UTF-8?q?refactor=20:=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=ED=95=84=EB=93=9C=EB=AA=85=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/entity/TicketingAlert.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/domain/user-domain/src/main/java/org/example/entity/TicketingAlert.java b/app/domain/user-domain/src/main/java/org/example/entity/TicketingAlert.java index 759db7a2..43f6b6ea 100644 --- a/app/domain/user-domain/src/main/java/org/example/entity/TicketingAlert.java +++ b/app/domain/user-domain/src/main/java/org/example/entity/TicketingAlert.java @@ -19,7 +19,7 @@ public class TicketingAlert extends BaseEntity { private String name; @Column(name = "schedule_alert_time", nullable = false) - private LocalDateTime scheduleAlertTime; + private LocalDateTime alertTime; @Column(name = "user_id", nullable = false) private UUID userId; From c78a7f66736981adb76b91263b4b750b04136280 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Fri, 21 Jun 2024 00:39:26 +0900 Subject: [PATCH 20/21] =?UTF-8?q?refactor=20:=20Show=20image=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/example/entity/show/Show.java | 11 +++------ .../org/example/entity/show/ShowImage.java | 24 ------------------- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 app/domain/show-domain/src/main/java/org/example/entity/show/ShowImage.java diff --git a/app/domain/show-domain/src/main/java/org/example/entity/show/Show.java b/app/domain/show-domain/src/main/java/org/example/entity/show/Show.java index 90f04603..41d56813 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/show/Show.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/show/Show.java @@ -1,14 +1,10 @@ package org.example.entity.show; -import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Enumerated; -import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -34,13 +30,12 @@ public class Show extends BaseEntity { @Column(name = "location", nullable = false) private String location; + @Column(name = "image", nullable = false) + private String image; + @Enumerated private SeatPrice seatPrice; @Enumerated private Ticketing ticketing; - - @OneToMany(mappedBy = "app_show", cascade = CascadeType.ALL, orphanRemoval = true) - private List images = new ArrayList<>(); - } \ No newline at end of file diff --git a/app/domain/show-domain/src/main/java/org/example/entity/show/ShowImage.java b/app/domain/show-domain/src/main/java/org/example/entity/show/ShowImage.java deleted file mode 100644 index a905a443..00000000 --- a/app/domain/show-domain/src/main/java/org/example/entity/show/ShowImage.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.example.entity.show; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import java.util.UUID; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; -import org.example.entity.BaseEntity; - -@Entity -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@Table(name = "app_show_image") -public class ShowImage extends BaseEntity { - - @Column(name = "url", nullable = false) - private String url; - - @Column(name = "show_id", nullable = false) - private UUID showId; - -} From 8491094878da0ee8e16dd5df5d7b507218e6e3d1 Mon Sep 17 00:00:00 2001 From: GaBaljaintheroom Date: Fri, 21 Jun 2024 01:10:17 +0900 Subject: [PATCH 21/21] =?UTF-8?q?refactor=20:=20Ticketing=20Map=20?= =?UTF-8?q?=ED=82=A4=20=ED=83=80=EC=9E=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/example/entity/show/info/Ticketing.java | 5 ++--- .../src/main/java/org/example/vo/TicketBookingSite.java | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 app/domain/show-domain/src/main/java/org/example/vo/TicketBookingSite.java diff --git a/app/domain/show-domain/src/main/java/org/example/entity/show/info/Ticketing.java b/app/domain/show-domain/src/main/java/org/example/entity/show/info/Ticketing.java index eadc1c7c..6751e69d 100644 --- a/app/domain/show-domain/src/main/java/org/example/entity/show/info/Ticketing.java +++ b/app/domain/show-domain/src/main/java/org/example/entity/show/info/Ticketing.java @@ -5,7 +5,6 @@ import jakarta.persistence.Embeddable; import java.util.HashMap; import java.util.Map; -import org.example.vo.TicketBookingSite; import org.hibernate.annotations.Type; @Embeddable @@ -13,10 +12,10 @@ public class Ticketing { @Type(JsonType.class) @Column(name = "ticketing", columnDefinition = "jsonb", nullable = false) - private Map ticketingInformation = new HashMap<>(); + private Map ticketingInformation = new HashMap<>(); public void saveTicketingInformation( - TicketBookingSite ticketBookingSite, + String ticketBookingSite, String ticketingSiteUrl ) { ticketingInformation.put(ticketBookingSite, ticketingSiteUrl); diff --git a/app/domain/show-domain/src/main/java/org/example/vo/TicketBookingSite.java b/app/domain/show-domain/src/main/java/org/example/vo/TicketBookingSite.java deleted file mode 100644 index 36e9d59a..00000000 --- a/app/domain/show-domain/src/main/java/org/example/vo/TicketBookingSite.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.example.vo; - -public enum TicketBookingSite { - YES24, INTERPARK -}