From e7c0ff25749d77b25fdad019861c1a5a444b21dd Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 26 11월 2021 00:36:48 +0900
Subject: [PATCH] 언어팩 수정, 간단한 오류 수정 [프론트]

---
 src/main/java/kr/wisestone/owl/domain/User.java |   48 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index a0e43bb..d3efd00 100644
--- a/src/main/java/kr/wisestone/owl/domain/User.java
+++ b/src/main/java/kr/wisestone/owl/domain/User.java
@@ -1,7 +1,6 @@
 package kr.wisestone.owl.domain;
 
 import kr.wisestone.owl.domain.enumType.SocialType;
-import kr.wisestone.owl.util.CommonUtil;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import javax.persistence.*;
@@ -20,6 +19,9 @@
     public static final String DEFAULT_RESERVATION_NOTIFY_TIME = "09:00";    //  湲곕낯 �씠硫붿씪 �븣由� �삁�젙 �떆媛�
     public static final String DEFAULT_LANGUAGE = "ko"; //  湲곕낯 �뼵�뼱
 
+    public static final String INSERT_TYPE_NORMAL = "N";    // 異붽� ���엯(�씪諛�)
+    public static final String INSERT_TYPE_API = "A";       // 異붽� ���엯(API)
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -37,8 +39,8 @@
     private Date lastLoginDate;
     private String reservationNotifyTime;   //  �씠硫붿씪 �븣由� �떆媛� �삁�젙
     private String language;
-    private Integer permission;
     private String licensekey;
+    private String insertType = User.INSERT_TYPE_NORMAL;
 
     @OneToMany(mappedBy = "user", cascade = {CascadeType.ALL}, orphanRemoval = true)
     private Set<SystemRoleUser> systemRoleUsers = new HashSet<>();
@@ -61,6 +63,13 @@
     @OneToMany(mappedBy = "user", cascade = {CascadeType.ALL}, orphanRemoval = true)
     private Set<IssueTableConfig> issueTableConfigs = new HashSet<>();
 
+    @ManyToOne(targetEntity = UserLevel.class, fetch = FetchType.LAZY)
+    @JoinColumn(name="level_id")
+    private UserLevel userLevel;
+
+    @OneToMany(mappedBy = "user", cascade = {CascadeType.ALL}, orphanRemoval = true)
+    private Set<ApiToken> apiTokens = new HashSet<>();
+
     public User() {
     }
 
@@ -69,6 +78,15 @@
         this.name = name;
         this.account = account;
     }
+
+    public UserLevel getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(UserLevel userLevel) {
+        this.userLevel = userLevel;
+    }
+
 
     public Long getId() {
         return id;
@@ -189,6 +207,14 @@
         this.projectRoleUsers = projectRoleUsers;
     }
 
+    public String getInsertType() {
+        return insertType;
+    }
+
+    public void setInsertType(String insertType) {
+        this.insertType = insertType;
+    }
+
     public void addProjectRole(ProjectRole projectRole) {
         if (this.projectRoleUsers == null) {
             this.projectRoleUsers = new HashSet<>();
@@ -279,13 +305,15 @@
         this.language = language;
     }
 
+
     public Integer getPermission() {
-        return permission;
+        return this.userLevel.getPermission();
     }
 
-    public void setPermission(Integer permission) {
-        this.permission = permission;
-    }
+    // wyu - TEST
+//    public void setPermission(Integer permission) {
+//        this.userLevel.setPermission(permission);
+//    }
 
     public String getLicensekey() {
         return licensekey;
@@ -295,6 +323,14 @@
         this.licensekey = licensekey;
     }
 
+    public Set<ApiToken> getApiTokens() {
+        return apiTokens;
+    }
+
+    public void setApiTokens(Set<ApiToken> apiTokens) {
+        this.apiTokens = apiTokens;
+    }
+
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         // TODO Auto-generated method stub

--
Gitblit v1.8.0