removing duplicate userId from entity UserRoleAssignment

(it comes implicitly through the relationship)

src/main/java/org/hostsharing/hsadminng/domain/UserRoleAssignment.java

@@ -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() + "'" +
                 "}";
     }

src/main/java/org/hostsharing/hsadminng/service/UserRoleAssignmentQueryService.java

@@ -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));

src/main/java/org/hostsharing/hsadminng/service/dto/UserRoleAssignmentCriteria.java

@@ -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 + ", " : "") +
                 "}";

src/main/jdl/accessrights.jdl

@@ -14,7 +14,6 @@ enum UserRole {
 entity UserRoleAssignment {
     entityTypeId String,
     entityObjectId Long,
-    userId Long required,
     assignedRole UserRole required
 }
 

src/main/resources/config/liquibase/changelog/20190430154711_added_entity_UserRoleAssignment.xml

@@ -16,7 +16,7 @@
     <!--
         Added the entity UserRoleAssignment.
     -->
-    <changeSet id="20190430152204-1" author="jhipster">
+    <changeSet id="20190430154711-1" author="jhipster">
         <createTable tableName="user_role_assignment">
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>
@@ -29,10 +29,6 @@
                 <constraints nullable="true" />
             </column>
 
-            <column name="user_id" type="bigint">
-                <constraints nullable="false" />
-            </column>
-
             <column name="assigned_role" type="varchar(255)">
                 <constraints nullable="false" />
             </column>

src/main/resources/config/liquibase/changelog/20190430154711_added_entity_constraints_UserRoleAssignment.xml

@@ -6,7 +6,7 @@
     <!--
         Added the constraints for entity UserRoleAssignment.
     -->
-    <changeSet id="20190430152204-2" author="jhipster">
+    <changeSet id="20190430154711-2" author="jhipster">
         
         <addForeignKeyConstraint baseColumnNames="user_id"
                                  baseTableName="user_role_assignment"

src/main/resources/config/liquibase/master.xml

@@ -10,13 +10,13 @@
     <include file="config/liquibase/changelog/20190430152138_added_entity_Share.xml" relativeToChangelogFile="false"/>
     <include file="config/liquibase/changelog/20190430152139_added_entity_Asset.xml" relativeToChangelogFile="false"/>
     <include file="config/liquibase/changelog/20190430152140_added_entity_SepaMandate.xml" relativeToChangelogFile="false"/>
-    <include file="config/liquibase/changelog/20190430152204_added_entity_UserRoleAssignment.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20190430154711_added_entity_UserRoleAssignment.xml" relativeToChangelogFile="false"/>
     <!-- jhipster-needle-liquibase-add-changelog - JHipster will add liquibase changelogs here -->
     <include file="config/liquibase/changelog/20190430152137_added_entity_constraints_Membership.xml" relativeToChangelogFile="false"/>
     <include file="config/liquibase/changelog/20190430152138_added_entity_constraints_Share.xml" relativeToChangelogFile="false"/>
     <include file="config/liquibase/changelog/20190430152139_added_entity_constraints_Asset.xml" relativeToChangelogFile="false"/>
     <include file="config/liquibase/changelog/20190430152140_added_entity_constraints_SepaMandate.xml" relativeToChangelogFile="false"/>
-    <include file="config/liquibase/changelog/20190430152204_added_entity_constraints_UserRoleAssignment.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20190430154711_added_entity_constraints_UserRoleAssignment.xml" relativeToChangelogFile="false"/>
     <!-- jhipster-needle-liquibase-add-constraints-changelog - JHipster will add liquibase constraints changelogs here -->
 
     <!-- sample data -->

src/main/webapp/app/entities/user-role-assignment/user-role-assignment-detail.component.html

@@ -13,10 +13,6 @@
                 <dd>
                     <span>{{userRoleAssignment.entityObjectId}}</span>
                 </dd>
-                <dt><span jhiTranslate="hsadminNgApp.userRoleAssignment.userId">User Id</span></dt>
-                <dd>
-                    <span>{{userRoleAssignment.userId}}</span>
-                </dd>
                 <dt><span jhiTranslate="hsadminNgApp.userRoleAssignment.assignedRole">Assigned Role</span></dt>
                 <dd>
                     <span jhiTranslate="{{'hsadminNgApp.UserRole.' + userRoleAssignment.assignedRole}}">{{userRoleAssignment.assignedRole}}</span>

src/main/webapp/app/entities/user-role-assignment/user-role-assignment-update.component.html

@@ -19,21 +19,6 @@
                     <input type="number" class="form-control" name="entityObjectId" id="field_entityObjectId"
                         [(ngModel)]="userRoleAssignment.entityObjectId" />
                 </div>
-                <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="hsadminNgApp.userRoleAssignment.userId" for="field_userId">User Id</label>
-                    <input type="number" class="form-control" name="userId" id="field_userId"
-                        [(ngModel)]="userRoleAssignment.userId" required/>
-                    <div [hidden]="!(editForm.controls.userId?.dirty && editForm.controls.userId?.invalid)">
-                        <small class="form-text text-danger"
-                        [hidden]="!editForm.controls.userId?.errors?.required" jhiTranslate="entity.validation.required">
-                        This field is required.
-                        </small>
-                        <small class="form-text text-danger"
-                            [hidden]="!editForm.controls.userId?.errors?.number" jhiTranslate="entity.validation.number">
-                            This field should be a number.
-                        </small>
-                    </div>
-                </div>
                 <div class="form-group">
                     <label class="form-control-label" jhiTranslate="hsadminNgApp.userRoleAssignment.assignedRole" for="field_assignedRole">Assigned Role</label>
                     <select class="form-control" name="assignedRole" [(ngModel)]="userRoleAssignment.assignedRole" id="field_assignedRole"  required>

src/main/webapp/app/entities/user-role-assignment/user-role-assignment.component.html

@@ -17,7 +17,6 @@
             <th jhiSortBy="id"><span jhiTranslate="global.field.id">ID</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="entityTypeId"><span jhiTranslate="hsadminNgApp.userRoleAssignment.entityTypeId">Entity Type Id</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="entityObjectId"><span jhiTranslate="hsadminNgApp.userRoleAssignment.entityObjectId">Entity Object Id</span> <fa-icon [icon]="'sort'"></fa-icon></th>
-            <th jhiSortBy="userId"><span jhiTranslate="hsadminNgApp.userRoleAssignment.userId">User Id</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="assignedRole"><span jhiTranslate="hsadminNgApp.userRoleAssignment.assignedRole">Assigned Role</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="user.login"><span jhiTranslate="hsadminNgApp.userRoleAssignment.user">User</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th></th>
@@ -28,7 +27,6 @@
                 <td><a [routerLink]="['/user-role-assignment', userRoleAssignment.id, 'view' ]">{{userRoleAssignment.id}}</a></td>
                 <td>{{userRoleAssignment.entityTypeId}}</td>
                 <td>{{userRoleAssignment.entityObjectId}}</td>
-                <td>{{userRoleAssignment.userId}}</td>
                 <td jhiTranslate="{{'hsadminNgApp.UserRole.' + userRoleAssignment.assignedRole}}">{{userRoleAssignment.assignedRole}}</td>
                 <td>
                     {{userRoleAssignment.user?.login}}

src/main/webapp/app/shared/model/user-role-assignment.model.ts

@@ -14,7 +14,6 @@ export interface IUserRoleAssignment {
     id?: number;
     entityTypeId?: string;
     entityObjectId?: number;
-    userId?: number;
     assignedRole?: UserRole;
     user?: IUser;
 }
@@ -24,7 +23,6 @@ export class UserRoleAssignment implements IUserRoleAssignment {
         public id?: number,
         public entityTypeId?: string,
         public entityObjectId?: number,
-        public userId?: number,
         public assignedRole?: UserRole,
         public user?: IUser
     ) {}

src/main/webapp/i18n/de/userRoleAssignment.json

@@ -17,7 +17,6 @@
             },
             "entityTypeId": "Entity Type Id",
             "entityObjectId": "Entity Object Id",
-            "userId": "User Id",
             "assignedRole": "Assigned Role",
             "user": "User"
         }

src/main/webapp/i18n/en/userRoleAssignment.json

@@ -17,7 +17,6 @@
             },
             "entityTypeId": "Entity Type Id",
             "entityObjectId": "Entity Object Id",
-            "userId": "User Id",
             "assignedRole": "Assigned Role",
             "user": "User"
         }