fix: ci 에러 수정 (#17)

depromeet · Jan 6, 2024 · d76ac8b · d76ac8b
1 parent dbb7adc
commit d76ac8b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/src/main/java/net/teumteum/user/domain/OAuth.java b/src/main/java/net/teumteum/user/domain/OAuth.java
@@ -19,6 +19,6 @@ public class OAuth {
     private String oauthId;
 
     @Enumerated(EnumType.STRING)
-    @Column(name = "provider_type", nullable = false)
+    @Column(name = "authenticated", nullable = false)
     private Authenticated authenticated;
 }
diff --git a/src/main/java/net/teumteum/user/domain/User.java b/src/main/java/net/teumteum/user/domain/User.java
@@ -1,27 +1,18 @@
 package net.teumteum.user.domain;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Embedded;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.PrePersist;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import net.teumteum.core.entity.TimeBaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.util.Assert;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 @Getter
 @Entity(name = "users")
 @NoArgsConstructor
@@ -50,7 +41,7 @@ public class User extends TimeBaseEntity {
     private OAuth oauth;
 
     @Enumerated(EnumType.STRING)
-    @Column(name = "role", nullable = false)
+    @Column(name = "role_type", nullable = false)
     private RoleType roleType;
 
     @Embedded

diff --git a/src/main/resources/db/migration/V1__create_users.sql b/src/main/resources/db/migration/V1__create_users.sql
@@ -7,8 +7,9 @@ create table if not exists users(
   birth varchar(10),
   name varchar(10),
   goal varchar(50),
-  authenticated varchar(255),
-  oauth_authenticate_info varchar(255) unique,
+  oauth_id varchar(255) not null, unique,
+  authenticated varchar(255) not null,
+  role_type varchar(255) not null
   city varchar(255),
   detail_job_class varchar(255),
   job_class varchar(255),