From 934cc8834e3b7063320922a136b0d25809f7d187 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 15 11월 2021 10:25:01 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/domain/User.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index 679b680..f86c285 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;
@@ -37,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<>();
@@ -62,6 +66,9 @@
@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<>();
// @ManyToOne(targetEntity = Department.class, fetch = FetchType.LAZY)
// @JoinColumn(name="department_id")
@@ -204,6 +211,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<>();
@@ -312,6 +327,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