Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
reg-app
Regapp
Commits
87a7853e
Commit
87a7853e
authored
Oct 01, 2015
by
michael.simon
Browse files
Moving more service methods to dao layer
parent
68cf3a4b
Changes
4
Hide whitespace changes
Inline
Side-by-side
bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/RoleDao.java
View file @
87a7853e
...
...
@@ -48,5 +48,7 @@ public interface RoleDao extends BaseDao<RoleEntity, Long> {
RoleGroupEntity
findRoleGroupEntity
(
GroupEntity
group
,
RoleEntity
role
);
List
<
RoleEntity
>
findByGroups
(
Set
<
GroupEntity
>
groups
);
void
addUserToRole
(
UserEntity
user
,
String
roleName
);
}
bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/jpa/JpaRoleDao.java
View file @
87a7853e
...
...
@@ -41,7 +41,16 @@ public class JpaRoleDao extends JpaBaseDao<RoleEntity, Long> implements RoleDao
public
void
persistUserRole
(
UserRoleEntity
userRole
)
{
em
.
persist
(
userRole
);
}
@Override
public
void
addUserToRole
(
UserEntity
user
,
String
roleName
)
{
RoleEntity
role
=
findByName
(
roleName
);
UserRoleEntity
userRole
=
createNewUserRole
();
userRole
.
setRole
(
role
);
userRole
.
setUser
(
user
);
persistUserRole
(
userRole
);
}
@Override
public
void
addGroupToRole
(
GroupEntity
group
,
RoleEntity
role
)
{
RoleGroupEntity
roleGroup
=
createNewRoleGroup
();
...
...
bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/RoleServiceImpl.java
View file @
87a7853e
...
...
@@ -21,7 +21,6 @@ import edu.kit.scc.webreg.dao.RoleDao;
import
edu.kit.scc.webreg.entity.GroupEntity
;
import
edu.kit.scc.webreg.entity.RoleEntity
;
import
edu.kit.scc.webreg.entity.UserEntity
;
import
edu.kit.scc.webreg.entity.UserRoleEntity
;
import
edu.kit.scc.webreg.service.RoleService
;
@Stateless
...
...
@@ -34,11 +33,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleEntity, Long> implement
@Override
public
void
addUserToRole
(
UserEntity
user
,
String
roleName
)
{
RoleEntity
role
=
dao
.
findByName
(
roleName
);
UserRoleEntity
userRole
=
dao
.
createNewUserRole
();
userRole
.
setRole
(
role
);
userRole
.
setUser
(
user
);
dao
.
persistUserRole
(
userRole
);
dao
.
addUserToRole
(
user
,
roleName
);
}
@Override
...
...
bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserCreateServiceImpl.java
View file @
87a7853e
...
...
@@ -26,6 +26,8 @@ import edu.kit.scc.webreg.audit.UserCreateAuditor;
import
edu.kit.scc.webreg.bootstrap.ApplicationConfig
;
import
edu.kit.scc.webreg.dao.AuditDetailDao
;
import
edu.kit.scc.webreg.dao.AuditEntryDao
;
import
edu.kit.scc.webreg.dao.RoleDao
;
import
edu.kit.scc.webreg.dao.UserDao
;
import
edu.kit.scc.webreg.entity.AuditStatus
;
import
edu.kit.scc.webreg.entity.EventType
;
import
edu.kit.scc.webreg.entity.SamlIdpMetadataEntity
;
...
...
@@ -37,10 +39,8 @@ import edu.kit.scc.webreg.event.EventSubmitter;
import
edu.kit.scc.webreg.event.UserEvent
;
import
edu.kit.scc.webreg.exc.EventSubmitException
;
import
edu.kit.scc.webreg.exc.UserUpdateException
;
import
edu.kit.scc.webreg.service.RoleService
;
import
edu.kit.scc.webreg.service.SerialService
;
import
edu.kit.scc.webreg.service.UserCreateService
;
import
edu.kit.scc.webreg.service.UserService
;
@Stateless
public
class
UserCreateServiceImpl
implements
UserCreateService
{
...
...
@@ -55,13 +55,16 @@ public class UserCreateServiceImpl implements UserCreateService {
private
AuditDetailDao
auditDetailDao
;
@Inject
private
UserService
userService
;
private
UserDao
userDao
;
@Inject
private
UserUpdater
userUpdater
;
@Inject
private
HomeOrgGroupUpdater
homeOrgGroupUpdater
;
@Inject
private
Role
Service
roleService
;
private
Role
Dao
roleDao
;
@Inject
private
SerialService
serialService
;
...
...
@@ -82,7 +85,7 @@ public class UserCreateServiceImpl implements UserCreateService {
logger
.
debug
(
"User {} from {} is being preCreated"
,
persistentId
,
idpEntity
.
getEntityId
());
UserEntity
entity
=
user
Service
.
createNew
();
UserEntity
entity
=
user
Dao
.
createNew
();
entity
.
setIdp
(
idpEntity
);
entity
.
setPersistentIdpId
(
idpEntity
.
getEntityId
());
entity
.
setPersistentSpId
(
spConfigEntity
.
getEntityId
());
...
...
@@ -111,7 +114,7 @@ public class UserCreateServiceImpl implements UserCreateService {
auditor
.
setName
(
getClass
().
getName
()
+
"-UserCreate-Audit"
);
auditor
.
setDetail
(
"Create user "
+
user
.
getEppn
());
user
Service
.
updateUserFromAttribute
(
user
,
attributeMap
,
true
,
auditor
);
user
Updater
.
updateUserFromAttribute
(
user
,
attributeMap
,
true
,
auditor
);
/**
* if user has no uid number yet, generate one
...
...
@@ -133,9 +136,9 @@ public class UserCreateServiceImpl implements UserCreateService {
user
.
setLastStatusChange
(
new
Date
());
}
user
=
user
Service
.
save
(
user
);
user
=
user
Dao
.
persist
(
user
);
role
Service
.
addUserToRole
(
user
,
"User"
);
role
Dao
.
addUserToRole
(
user
,
"User"
);
homeOrgGroupUpdater
.
updateGroupsForUser
(
user
,
attributeMap
,
auditor
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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