From cc869e4f0c0dc594b2244fb4540ab56edfd2602a Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 29 11월 2021 15:07:12 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/domain/User.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index 326836d..d3efd00 100644
--- a/src/main/java/kr/wisestone/owl/domain/User.java
+++ b/src/main/java/kr/wisestone/owl/domain/User.java
@@ -19,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;
@@ -29,7 +32,6 @@
private String phone;
private String profile;
private String awsKey;
-// private Long departmentId;
@Enumerated(EnumType.STRING)
private SocialType socialType;
private Long lastWorkspaceId;
@@ -38,6 +40,7 @@
private String reservationNotifyTime; // �씠硫붿씪 �븣由� �떆媛� �삁�젙
private String language;
private String licensekey;
+ private String insertType = User.INSERT_TYPE_NORMAL;
@OneToMany(mappedBy = "user", cascade = {CascadeType.ALL}, orphanRemoval = true)
private Set<SystemRoleUser> systemRoleUsers = new HashSet<>();
@@ -64,10 +67,8 @@
@JoinColumn(name="level_id")
private UserLevel userLevel;
- @ManyToOne(targetEntity = DepartmentManage.class, fetch = FetchType.LAZY)
- @JoinColumn(name="department_id")
- private DepartmentManage departmentManage;
-
+ @OneToMany(mappedBy = "user", cascade = {CascadeType.ALL}, orphanRemoval = true)
+ private Set<ApiToken> apiTokens = new HashSet<>();
public User() {
}
@@ -76,14 +77,6 @@
this.id = id;
this.name = name;
this.account = account;
- }
-
- public DepartmentManage getDepartmentManage() {
- return departmentManage;
- }
-
- public void setDepartmentManage(DepartmentManage departmentManage) {
- this.departmentManage = departmentManage;
}
public UserLevel getUserLevel() {
@@ -214,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<>();
@@ -322,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