From dd1051a7ad8420eb6955006538bdc21ea3a4e7d2 Mon Sep 17 00:00:00 2001 From: Seokjin Jeon Date: Thu, 23 May 2024 00:28:40 +0900 Subject: [PATCH] =?UTF-8?q?[BE]=20chore:=20Spring=20Boot=203.2.5=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=97=85=EA=B7=B8=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EB=93=9C=20(#989)=20(#990)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chore: Spring Boot 3.2.5 버전 업그레이드 --- backend/build.gradle.kts | 2 +- .../src/main/java/com/festago/bookmark/domain/Bookmark.java | 2 +- backend/src/main/java/com/festago/member/domain/Member.java | 2 +- backend/src/main/java/com/festago/school/domain/School.java | 1 + .../main/java/com/festago/socialmedia/domain/SocialMedia.java | 4 ++-- backend/src/main/java/com/festago/stage/domain/Stage.java | 3 +++ backend/src/main/java/com/festago/ticket/domain/Ticket.java | 2 ++ .../main/java/com/festago/ticketing/domain/MemberTicket.java | 3 +++ .../src/main/java/com/festago/upload/domain/UploadFile.java | 4 ++++ 9 files changed, 18 insertions(+), 5 deletions(-) diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts index ccfe6bd7b..4378375fc 100644 --- a/backend/build.gradle.kts +++ b/backend/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("org.springframework.boot") version "3.1.4" + id("org.springframework.boot") version "3.2.5" id("io.spring.dependency-management") version "1.1.0" } diff --git a/backend/src/main/java/com/festago/bookmark/domain/Bookmark.java b/backend/src/main/java/com/festago/bookmark/domain/Bookmark.java index 765808dd4..ad6d22502 100644 --- a/backend/src/main/java/com/festago/bookmark/domain/Bookmark.java +++ b/backend/src/main/java/com/festago/bookmark/domain/Bookmark.java @@ -29,7 +29,7 @@ public class Bookmark extends BaseTimeEntity { private Long id; @Enumerated(EnumType.STRING) - @Column(name = "bookmark_type") + @Column(name = "bookmark_type", columnDefinition = "varchar") private BookmarkType bookmarkType; @Column(name = "resource_id") diff --git a/backend/src/main/java/com/festago/member/domain/Member.java b/backend/src/main/java/com/festago/member/domain/Member.java index 6e3907892..a8c96cd05 100644 --- a/backend/src/main/java/com/festago/member/domain/Member.java +++ b/backend/src/main/java/com/festago/member/domain/Member.java @@ -52,7 +52,7 @@ public class Member extends BaseTimeEntity { @NotNull @Enumerated(value = EnumType.STRING) - @Column(name = "social_type") + @Column(name = "social_type", columnDefinition = "varchar") private SocialType socialType; @NotNull diff --git a/backend/src/main/java/com/festago/school/domain/School.java b/backend/src/main/java/com/festago/school/domain/School.java index be28f3f4d..91a4f8040 100644 --- a/backend/src/main/java/com/festago/school/domain/School.java +++ b/backend/src/main/java/com/festago/school/domain/School.java @@ -42,6 +42,7 @@ public class School extends BaseTimeEntity { private String backgroundUrl; @Enumerated(EnumType.STRING) + @Column(columnDefinition = "varchar") private SchoolRegion region; public School(String domain, String name, String logoUrl, String backgroundUrl, SchoolRegion region) { diff --git a/backend/src/main/java/com/festago/socialmedia/domain/SocialMedia.java b/backend/src/main/java/com/festago/socialmedia/domain/SocialMedia.java index 5d3b39aca..2ae3bbdf7 100644 --- a/backend/src/main/java/com/festago/socialmedia/domain/SocialMedia.java +++ b/backend/src/main/java/com/festago/socialmedia/domain/SocialMedia.java @@ -35,11 +35,11 @@ public class SocialMedia extends BaseTimeEntity { private Long ownerId; @Enumerated(EnumType.STRING) - @Column(name = "owner_type") + @Column(name = "owner_type", columnDefinition = "varchar") private OwnerType ownerType; @Enumerated(EnumType.STRING) - @Column(name = "media_type") + @Column(name = "media_type", columnDefinition = "varchar") private SocialMediaType mediaType; private String name; diff --git a/backend/src/main/java/com/festago/stage/domain/Stage.java b/backend/src/main/java/com/festago/stage/domain/Stage.java index a60facbaa..9578e1270 100644 --- a/backend/src/main/java/com/festago/stage/domain/Stage.java +++ b/backend/src/main/java/com/festago/stage/domain/Stage.java @@ -41,6 +41,9 @@ public class Stage extends BaseTimeEntity { @OneToMany(mappedBy = "stage", fetch = FetchType.LAZY) private List tickets = new ArrayList<>(); + @OneToMany(fetch = FetchType.LAZY, mappedBy = "stageId") + private List artists = new ArrayList<>(); + public Stage(LocalDateTime startTime, LocalDateTime ticketOpenTime, Festival festival) { this(null, startTime, ticketOpenTime, festival); } diff --git a/backend/src/main/java/com/festago/ticket/domain/Ticket.java b/backend/src/main/java/com/festago/ticket/domain/Ticket.java index ae25cf4c4..ec2628939 100644 --- a/backend/src/main/java/com/festago/ticket/domain/Ticket.java +++ b/backend/src/main/java/com/festago/ticket/domain/Ticket.java @@ -7,6 +7,7 @@ import com.festago.school.domain.School; import com.festago.stage.domain.Stage; import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -46,6 +47,7 @@ public class Ticket extends BaseTimeEntity { @NotNull @Enumerated(EnumType.STRING) + @Column(columnDefinition = "varchar") private TicketType ticketType; @OneToOne(mappedBy = "ticket", optional = false, fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) diff --git a/backend/src/main/java/com/festago/ticketing/domain/MemberTicket.java b/backend/src/main/java/com/festago/ticketing/domain/MemberTicket.java index d5febc1eb..303387a78 100644 --- a/backend/src/main/java/com/festago/ticketing/domain/MemberTicket.java +++ b/backend/src/main/java/com/festago/ticketing/domain/MemberTicket.java @@ -10,6 +10,7 @@ import com.festago.ticket.domain.Ticket; import com.festago.ticket.domain.TicketReserveInfo; import com.festago.ticket.domain.TicketType; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -38,6 +39,7 @@ public class MemberTicket extends BaseTimeEntity { @NotNull @Enumerated(EnumType.STRING) + @Column(columnDefinition = "varchar") private EntryState entryState = EntryState.BEFORE_ENTRY; @NotNull @@ -56,6 +58,7 @@ public class MemberTicket extends BaseTimeEntity { @NotNull @Enumerated(EnumType.STRING) + @Column(columnDefinition = "varchar") private TicketType ticketType; public MemberTicket(Member owner, Stage stage, int number, LocalDateTime entryTime, TicketType ticketType) { diff --git a/backend/src/main/java/com/festago/upload/domain/UploadFile.java b/backend/src/main/java/com/festago/upload/domain/UploadFile.java index eae75de31..d63d61e0b 100644 --- a/backend/src/main/java/com/festago/upload/domain/UploadFile.java +++ b/backend/src/main/java/com/festago/upload/domain/UploadFile.java @@ -2,6 +2,7 @@ import com.festago.common.util.Validator; import jakarta.annotation.Nonnull; +import jakarta.persistence.Column; import jakarta.persistence.Convert; import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; @@ -31,6 +32,7 @@ public class UploadFile implements Persistable { private UUID id; @Enumerated(EnumType.STRING) + @Column(columnDefinition = "varchar") private UploadStatus status; private long size; @@ -39,11 +41,13 @@ public class UploadFile implements Persistable { private URI location; @Enumerated(EnumType.STRING) + @Column(columnDefinition = "varchar") private FileExtension extension; private Long ownerId; @Enumerated(EnumType.STRING) + @Column(columnDefinition = "varchar") private FileOwnerType ownerType; private LocalDateTime createdAt;