Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.type.SqlTypes;

@Entity
@Table(name = "beauty_product")
Expand All @@ -21,7 +23,8 @@ public class BeautyProduct extends BaseEntity {
private String productImageLink;

@Enumerated(EnumType.STRING)
@Column(name = "beauty_product_category")
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(name = "beauty_product_category", columnDefinition = "beauty_product_category")
private BeautyProductCategory beautyProductCategory;

private String brand;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.type.SqlTypes;

@Entity
@Table(name = "grooming_test_question")
Expand All @@ -17,7 +19,8 @@ public class GroomingTestQuestion extends BaseEntity {
private Long id;

@Enumerated(EnumType.STRING)
@Column(nullable = false)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(nullable = false, name = "grooming_category", columnDefinition = "grooming_category")
private GroomingCategory groomingCategory;

@Column(nullable = false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ public class GroomingTestResult extends BaseEntity {
private User user;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "grommig_test_answer_id")
@JoinColumn(name = "grooming_test_answer_id")
private GroomingTestAnswer groomingTestAnswer;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "grommig_test_question_id")
@JoinColumn(name = "grooming_test_question_id")
private GroomingTestQuestion groomingTestQuestion;

@Builder(access = AccessLevel.PRIVATE)
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ftm/server/entity/entities/Post.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.annotations.Type;
import org.hibernate.type.SqlTypes;

@Entity
@Table(name = "post")
Expand All @@ -33,6 +35,8 @@ public class Post extends BaseEntity {
private String content;

@Enumerated(EnumType.STRING)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(nullable = false, name = "grooming_category", columnDefinition = "grooming_category")
private GroomingCategory groomingCategory;

@Type(
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/ftm/server/entity/entities/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.annotations.Type;
import org.hibernate.type.SqlTypes;

@Entity
@Table(name = "users")
Expand All @@ -31,10 +33,14 @@ public class User extends BaseEntity {
@Column(nullable = false, unique = true)
private String nickname;

@Column(name = "age_group", columnDefinition = "age_group")
@Enumerated(EnumType.STRING)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
private AgeGroup ageGroup;

@Enumerated(EnumType.STRING)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(name = "social_provider", columnDefinition = "social_provider")
private SocialProvider socialProvider;

@Column(unique = true)
Expand All @@ -48,6 +54,8 @@ public class User extends BaseEntity {
private GroomingLevel groomingLevel;

@Enumerated(EnumType.STRING)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(name = "role", columnDefinition = "role")
private UserRole role;

@Type(
Expand Down