hostsharing/hs.hsadmin.ng
1
0
Fork 0
Code Activity

cate userId from entity UserRoleAssignment

Browse Source 
(it comes implicitly through the relationship)
This commit is contained in:
Michael Hoennig
2019-04-30 17:58:56 +02:00
parent 084c12d2c4
commit 3c89878c21
23 changed files with 44 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/hostsharing/hsadminng/domain/UserRoleAssignment.java
View File

@ -31,10 +31,6 @@ public class UserRoleAssignment implements Serializable {
@Column(name = "entity_object_id")
private Long entityObjectId;
@NotNull
@Column(name = "user_id", nullable = false)
private Long userId;
@NotNull
@Enumerated(EnumType.STRING)
@Column(name = "assigned_role", nullable = false)
@ -79,19 +75,6 @@ public class UserRoleAssignment implements Serializable {
this.entityObjectId = entityObjectId;
}
public Long getUserId() {
return userId;
}
public UserRoleAssignment userId(Long userId) {
this.userId = userId;
return this;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public UserRole getAssignedRole() {
return assignedRole;
}
@ -145,7 +128,6 @@ public class UserRoleAssignment implements Serializable {
"id=" + getId() +
", entityTypeId='" + getEntityTypeId() + "'" +
", entityObjectId=" + getEntityObjectId() +
", userId=" + getUserId() +
", assignedRole='" + getAssignedRole() + "'" +
"}";
}

3
src/main/java/org/hostsharing/hsadminng/service/UserRoleAssignmentQueryService.java
View File

@ -96,9 +96,6 @@ public class UserRoleAssignmentQueryService extends QueryService<UserRoleAssignm
specification = specification
.and(buildRangeSpecification(criteria.getEntityObjectId(), UserRoleAssignment_.entityObjectId));
}
if (criteria.getUserId() != null) {
specification = specification.and(buildRangeSpecification(criteria.getUserId(), UserRoleAssignment_.userId));
}
if (criteria.getAssignedRole() != null) {
specification = specification
.and(buildSpecification(criteria.getAssignedRole(), UserRoleAssignment_.assignedRole));

13
src/main/java/org/hostsharing/hsadminng/service/dto/UserRoleAssignmentCriteria.java
View File

@ -34,8 +34,6 @@ public class UserRoleAssignmentCriteria implements Serializable {
private LongFilter entityObjectId;
private LongFilter userId;
private UserRoleFilter assignedRole;
private LongFilter userId;
@ -64,14 +62,6 @@ public class UserRoleAssignmentCriteria implements Serializable {
this.entityObjectId = entityObjectId;
}
public LongFilter getUserId() {
return userId;
}
public void setUserId(LongFilter userId) {
this.userId = userId;
}
public UserRoleFilter getAssignedRole() {
return assignedRole;
}
@ -100,7 +90,6 @@ public class UserRoleAssignmentCriteria implements Serializable {
return Objects.equals(id, that.id) &&
Objects.equals(entityTypeId, that.entityTypeId) &&
Objects.equals(entityObjectId, that.entityObjectId) &&
Objects.equals(userId, that.userId) &&
Objects.equals(assignedRole, that.assignedRole) &&
Objects.equals(userId, that.userId);
}
@ -111,7 +100,6 @@ public class UserRoleAssignmentCriteria implements Serializable {
id,
entityTypeId,
entityObjectId,
userId,
assignedRole,
userId);
}
@ -122,7 +110,6 @@ public class UserRoleAssignmentCriteria implements Serializable {
(id != null ? "id=" + id + ", " : "") +
(entityTypeId != null ? "entityTypeId=" + entityTypeId + ", " : "") +
(entityObjectId != null ? "entityObjectId=" + entityObjectId + ", " : "") +
(userId != null ? "userId=" + userId + ", " : "") +
(assignedRole != null ? "assignedRole=" + assignedRole + ", " : "") +
(userId != null ? "userId=" + userId + ", " : "") +
"}";