Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
reg-app
Regapp
Commits
60c5d336
Commit
60c5d336
authored
Dec 15, 2020
by
michael.simon
Browse files
Change identity to user to no cascading and do it manually
This is really slow with cascading sometimes
parent
1dddc065
Changes
3
Hide whitespace changes
Inline
Side-by-side
bwreg-jpa/src/main/java/edu/kit/scc/webreg/entity/identity/IdentityEntity.java
View file @
60c5d336
...
...
@@ -12,7 +12,6 @@ package edu.kit.scc.webreg.entity.identity;
import
java.util.Set
;
import
javax.persistence.CascadeType
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.JoinColumn
;
...
...
@@ -35,8 +34,7 @@ public class IdentityEntity extends AbstractBaseEntity {
@Column
(
name
=
"twofa_user_name"
,
length
=
512
)
private
String
twoFaUserName
;
@OneToMany
(
targetEntity
=
UserEntity
.
class
,
mappedBy
=
"identity"
,
cascade
=
CascadeType
.
ALL
)
@OneToMany
(
targetEntity
=
UserEntity
.
class
,
mappedBy
=
"identity"
)
private
Set
<
UserEntity
>
users
;
@OneToMany
(
targetEntity
=
IdentityUserPreferenceEntity
.
class
,
mappedBy
=
"identity"
)
...
...
bwreg-service/src/main/java/edu/kit/scc/webreg/service/identity/IdentityServiceImpl.java
View file @
60c5d336
...
...
@@ -91,6 +91,8 @@ public class IdentityServiceImpl extends BaseServiceImpl<IdentityEntity, Long> i
id
.
setTwoFaUserName
(
user
.
getEppn
());
else
id
.
setTwoFaUserName
(
UUID
.
randomUUID
().
toString
());
logger
.
info
(
"Add missing 2fa userId {} and 2fa username {}"
,
id
.
getTwoFaUserId
(),
id
.
getTwoFaUserName
());
}
}
else
{
...
...
bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserDeleteServiceImpl.java
View file @
60c5d336
...
...
@@ -86,7 +86,9 @@ public class UserDeleteServiceImpl implements UserDeleteService {
logger
.
info
(
"Delete all personal user data for identity {}"
,
identity
.
getId
());
identity
=
identityDao
.
merge
(
identity
);
for
(
UserEntity
user
:
identity
.
getUsers
())
{
List
<
UserEntity
>
userList
=
userDao
.
findByIdentity
(
identity
);
for
(
UserEntity
user
:
userList
)
{
logger
.
info
(
"Delete all personal user data for user {}"
,
user
.
getId
());
UserDeleteAuditor
auditor
=
new
UserDeleteAuditor
(
auditEntryDao
,
auditDetailDao
,
appConfig
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment