Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BE] chore: Spring Boot 3.2.5 버전 업그레이드 (#989) #990

Merged
merged 1 commit into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions backend/src/main/java/com/festago/stage/domain/Stage.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ public class Stage extends BaseTimeEntity {
@OneToMany(mappedBy = "stage", fetch = FetchType.LAZY)
private List<Ticket> tickets = new ArrayList<>();

@OneToMany(fetch = FetchType.LAZY, mappedBy = "stageId")
private List<StageArtist> artists = new ArrayList<>();

public Stage(LocalDateTime startTime, LocalDateTime ticketOpenTime, Festival festival) {
this(null, startTime, ticketOpenTime, festival);
}
Expand Down
2 changes: 2 additions & 0 deletions backend/src/main/java/com/festago/ticket/domain/Ticket.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -38,6 +39,7 @@ public class MemberTicket extends BaseTimeEntity {

@NotNull
@Enumerated(EnumType.STRING)
@Column(columnDefinition = "varchar")
private EntryState entryState = EntryState.BEFORE_ENTRY;

@NotNull
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -31,6 +32,7 @@ public class UploadFile implements Persistable<UUID> {
private UUID id;

@Enumerated(EnumType.STRING)
@Column(columnDefinition = "varchar")
private UploadStatus status;

private long size;
Expand All @@ -39,11 +41,13 @@ public class UploadFile implements Persistable<UUID> {
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;
Expand Down
Loading