Skip to content

Commit e228cce

Browse files
authored
Merge pull request #22 from FitTheMan/feature/#21
2 parents b608511 + e8ea730 commit e228cce

File tree

5 files changed

+22
-4
lines changed

5 files changed

+22
-4
lines changed

src/main/java/com/ftm/server/entity/entities/BeautyProduct.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import lombok.Builder;
77
import lombok.Getter;
88
import lombok.NoArgsConstructor;
9+
import org.hibernate.annotations.JdbcTypeCode;
10+
import org.hibernate.type.SqlTypes;
911

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

2325
@Enumerated(EnumType.STRING)
24-
@Column(name = "beauty_product_category")
26+
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
27+
@Column(name = "beauty_product_category", columnDefinition = "beauty_product_category")
2528
private BeautyProductCategory beautyProductCategory;
2629

2730
private String brand;

src/main/java/com/ftm/server/entity/entities/GroomingTestQuestion.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import lombok.Builder;
77
import lombok.Getter;
88
import lombok.NoArgsConstructor;
9+
import org.hibernate.annotations.JdbcTypeCode;
10+
import org.hibernate.type.SqlTypes;
911

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

1921
@Enumerated(EnumType.STRING)
20-
@Column(nullable = false)
22+
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
23+
@Column(nullable = false, name = "grooming_category", columnDefinition = "grooming_category")
2124
private GroomingCategory groomingCategory;
2225

2326
@Column(nullable = false)

src/main/java/com/ftm/server/entity/entities/GroomingTestResult.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public class GroomingTestResult extends BaseEntity {
2121
private User user;
2222

2323
@ManyToOne(fetch = FetchType.LAZY)
24-
@JoinColumn(name = "grommig_test_answer_id")
24+
@JoinColumn(name = "grooming_test_answer_id")
2525
private GroomingTestAnswer groomingTestAnswer;
2626

2727
@ManyToOne(fetch = FetchType.LAZY)
28-
@JoinColumn(name = "grommig_test_question_id")
28+
@JoinColumn(name = "grooming_test_question_id")
2929
private GroomingTestQuestion groomingTestQuestion;
3030

3131
@Builder(access = AccessLevel.PRIVATE)

src/main/java/com/ftm/server/entity/entities/Post.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
import lombok.Builder;
1111
import lombok.Getter;
1212
import lombok.NoArgsConstructor;
13+
import org.hibernate.annotations.JdbcTypeCode;
1314
import org.hibernate.annotations.Type;
15+
import org.hibernate.type.SqlTypes;
1416

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

3537
@Enumerated(EnumType.STRING)
38+
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
39+
@Column(nullable = false, name = "grooming_category", columnDefinition = "grooming_category")
3640
private GroomingCategory groomingCategory;
3741

3842
@Type(

src/main/java/com/ftm/server/entity/entities/User.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import lombok.Builder;
1313
import lombok.Getter;
1414
import lombok.NoArgsConstructor;
15+
import org.hibernate.annotations.JdbcTypeCode;
1516
import org.hibernate.annotations.Type;
17+
import org.hibernate.type.SqlTypes;
1618

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

36+
@Column(name = "age_group", columnDefinition = "age_group")
3437
@Enumerated(EnumType.STRING)
38+
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
3539
private AgeGroup ageGroup;
3640

3741
@Enumerated(EnumType.STRING)
42+
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
43+
@Column(name = "social_provider", columnDefinition = "social_provider")
3844
private SocialProvider socialProvider;
3945

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

5056
@Enumerated(EnumType.STRING)
57+
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
58+
@Column(name = "role", columnDefinition = "role")
5159
private UserRole role;
5260

5361
@Type(

0 commit comments

Comments
 (0)