accessrights.jdl: UserRoleAssignments entity*Id required

Merge branch 'jhipster-generated'

.jhipster/Asset.json

@@ -49,7 +49,7 @@
             "otherEntityField": "admissionDocumentDate"
         }
     ],
-    "changelogDate": "20190430154657",
+    "changelogDate": "20190507105335",
     "entityTableName": "asset",
     "dto": "mapstruct",
     "pagination": "infinite-scroll",

.jhipster/Customer.json

@@ -142,7 +142,7 @@
             "relationshipName": "sepamandate"
         }
     ],
-    "changelogDate": "20190430154654",
+    "changelogDate": "20190507105332",
     "entityTableName": "customer",
     "dto": "mapstruct",
     "pagination": "infinite-scroll",

.jhipster/Membership.json

@@ -54,7 +54,7 @@
             "otherEntityField": "prefix"
         }
     ],
-    "changelogDate": "20190430154655",
+    "changelogDate": "20190507105333",
     "entityTableName": "membership",
     "dto": "mapstruct",
     "pagination": "infinite-scroll",

.jhipster/SepaMandate.json

@@ -72,7 +72,7 @@
             "otherEntityField": "prefix"
         }
     ],
-    "changelogDate": "20190430154658",
+    "changelogDate": "20190507105336",
     "entityTableName": "sepa_mandate",
     "dto": "mapstruct",
     "pagination": "infinite-scroll",

.jhipster/Share.json

@@ -49,7 +49,7 @@
             "otherEntityField": "admissionDocumentDate"
         }
     ],
-    "changelogDate": "20190430154656",
+    "changelogDate": "20190507105334",
     "entityTableName": "share",
     "dto": "mapstruct",
     "pagination": "infinite-scroll",

.jhipster/UserRoleAssignment.json

@@ -3,11 +3,19 @@
     "fields": [
         {
             "fieldName": "entityTypeId",
-            "fieldType": "String"
+            "fieldType": "String",
+            "fieldValidateRules": [
+                "required",
+                "maxlength"
+            ],
+            "fieldValidateRulesMaxlength": 32
         },
         {
             "fieldName": "entityObjectId",
-            "fieldType": "Long"
+            "fieldType": "Long",
+            "fieldValidateRules": [
+                "required"
+            ]
         },
         {
             "fieldName": "assignedRole",
@@ -27,7 +35,7 @@
             "otherEntityField": "login"
         }
     ],
-    "changelogDate": "20190430154711",
+    "changelogDate": "20190507105342",
     "entityTableName": "user_role_assignment",
     "dto": "no",
     "pagination": "infinite-scroll",

actually-used-JHipster-workflow.txt

@@ -1,31 +0,0 @@
-
-    git checkout jhipster-generated
-    git pull
-    git tag REAL-HEAD
-    git reset --hard jdl-base
-    git clean -f -d
-    git cherry-pick -n spotless
-    git reset --soft REAL-HEAD
-    git checkout REAL-HEAD src/main/jdl/customer.jdl # AND OTHERS!
-    git tag -d REAL-HEAD
-
-    # MANUAL STEP: Apply changes to the jdl file!
-
-    # (Re-) Importing
-    jhipster import-jdl src/main/jdl/customer.jdl
-    jhipster import-jdl src/main/jdl/accessrights.jdl
-    # AND OTHERS!
-
-    # add @formatter:off to src/main/java/org/hostsharing/hsadminng/config/SecurityConfiguration.java
-    # I will add this change to the commit with the spotless commit to get rid of this.
-
-    gw spotlessApply
-    git add .
-    git commit -m"..."
-
-    # MANUAL STEP:
-    # - if you've renamed any identifiers, use refactoring to rename in master as well BEFORE MERGING!
-
-    # Merge changeset into master branch
-    git checkout master
-    git merge jhipster-generated

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

@@ -25,10 +25,13 @@ public class UserRoleAssignment implements Serializable {
     @SequenceGenerator(name = "sequenceGenerator")
     private Long id;
 
-    @Column(name = "entity_type_id")
+    @NotNull
+    @Size(max = 32)
+    @Column(name = "entity_type_id", length = 32, nullable = false)
     private String entityTypeId;
 
-    @Column(name = "entity_object_id")
+    @NotNull
+    @Column(name = "entity_object_id", nullable = false)
     private Long entityObjectId;
 
     @NotNull

src/main/jdl/accessrights.jdl

@@ -12,8 +12,8 @@ enum UserRole {
 }
 
 entity UserRoleAssignment {
-    entityTypeId String,
+    entityTypeId String required maxlength(32),
-    entityObjectId Long,
+    entityObjectId Long required,
     assignedRole UserRole required
 }
 

src/main/resources/config/liquibase/changelog/20190507105332_added_entity_Customer.xml

@@ -14,7 +14,7 @@
     <!--
         Added the entity Customer.
     -->
-    <changeSet id="20190430152136-1" author="jhipster">
+    <changeSet id="20190507105332-1" author="jhipster">
         <createTable tableName="customer">
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>

src/main/resources/config/liquibase/changelog/20190507105333_added_entity_Membership.xml

@@ -14,7 +14,7 @@
     <!--
         Added the entity Membership.
     -->
-    <changeSet id="20190430152137-1" author="jhipster">
+    <changeSet id="20190507105333-1" author="jhipster">
         <createTable tableName="membership">
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>

src/main/resources/config/liquibase/changelog/20190507105333_added_entity_constraints_Membership.xml

@@ -6,7 +6,7 @@
     <!--
         Added the constraints for entity Membership.
     -->
-    <changeSet id="20190430152137-2" author="jhipster">
+    <changeSet id="20190507105333-2" author="jhipster">
         
         <addForeignKeyConstraint baseColumnNames="customer_id"
                                  baseTableName="membership"

src/main/resources/config/liquibase/changelog/20190507105334_added_entity_Share.xml

@@ -14,7 +14,7 @@
     <!--
         Added the entity Share.
     -->
-    <changeSet id="20190430152138-1" author="jhipster">
+    <changeSet id="20190507105334-1" author="jhipster">
         <createTable tableName="share">
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>

src/main/resources/config/liquibase/changelog/20190507105334_added_entity_constraints_Share.xml

@@ -6,7 +6,7 @@
     <!--
         Added the constraints for entity Share.
     -->
-    <changeSet id="20190430152138-2" author="jhipster">
+    <changeSet id="20190507105334-2" author="jhipster">
         
         <addForeignKeyConstraint baseColumnNames="membership_id"
                                  baseTableName="share"

src/main/resources/config/liquibase/changelog/20190507105335_added_entity_Asset.xml

@@ -14,7 +14,7 @@
     <!--
         Added the entity Asset.
     -->
-    <changeSet id="20190430152139-1" author="jhipster">
+    <changeSet id="20190507105335-1" author="jhipster">
         <createTable tableName="asset">
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>

src/main/resources/config/liquibase/changelog/20190507105335_added_entity_constraints_Asset.xml

@@ -6,7 +6,7 @@
     <!--
         Added the constraints for entity Asset.
     -->
-    <changeSet id="20190430152139-2" author="jhipster">
+    <changeSet id="20190507105335-2" author="jhipster">
         
         <addForeignKeyConstraint baseColumnNames="membership_id"
                                  baseTableName="asset"

src/main/resources/config/liquibase/changelog/20190507105336_added_entity_SepaMandate.xml

@@ -14,7 +14,7 @@
     <!--
         Added the entity SepaMandate.
     -->
-    <changeSet id="20190430152140-1" author="jhipster">
+    <changeSet id="20190507105336-1" author="jhipster">
         <createTable tableName="sepa_mandate">
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>

src/main/resources/config/liquibase/changelog/20190507105336_added_entity_constraints_SepaMandate.xml

@@ -6,7 +6,7 @@
     <!--
         Added the constraints for entity SepaMandate.
     -->
-    <changeSet id="20190430152140-2" author="jhipster">
+    <changeSet id="20190507105336-2" author="jhipster">
         
         <addForeignKeyConstraint baseColumnNames="customer_id"
                                  baseTableName="sepa_mandate"

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

@@ -16,17 +16,17 @@
     <!--
         Added the entity UserRoleAssignment.
     -->
-    <changeSet id="20190430154711-1" author="jhipster">
+    <changeSet id="20190507105342-1" author="jhipster">
         <createTable tableName="user_role_assignment">
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
-            <column name="entity_type_id" type="varchar(255)">
+            <column name="entity_type_id" type="varchar(32)">
-                <constraints nullable="true" />
+                <constraints nullable="false" />
             </column>
 
             <column name="entity_object_id" type="bigint">
-                <constraints nullable="true" />
+                <constraints nullable="false" />
             </column>
 
             <column name="assigned_role" type="varchar(255)">

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

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

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

@@ -12,12 +12,32 @@
                 <div class="form-group">
                     <label class="form-control-label" jhiTranslate="hsadminNgApp.userRoleAssignment.entityTypeId" for="field_entityTypeId">Entity Type Id</label>
                     <input type="text" class="form-control" name="entityTypeId" id="field_entityTypeId"
-                        [(ngModel)]="userRoleAssignment.entityTypeId" />
+                        [(ngModel)]="userRoleAssignment.entityTypeId" required maxlength="32"/>
+                    <div [hidden]="!(editForm.controls.entityTypeId?.dirty && editForm.controls.entityTypeId?.invalid)">
+                        <small class="form-text text-danger"
+                        [hidden]="!editForm.controls.entityTypeId?.errors?.required" jhiTranslate="entity.validation.required">
+                        This field is required.
+                        </small>
+                        <small class="form-text text-danger"
+                        [hidden]="!editForm.controls.entityTypeId?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 32 }">
+                        This field cannot be longer than 32 characters.
+                        </small>
+                    </div>
                 </div>
                 <div class="form-group">
                     <label class="form-control-label" jhiTranslate="hsadminNgApp.userRoleAssignment.entityObjectId" for="field_entityObjectId">Entity Object Id</label>
                     <input type="number" class="form-control" name="entityObjectId" id="field_entityObjectId"
-                        [(ngModel)]="userRoleAssignment.entityObjectId" />
+                        [(ngModel)]="userRoleAssignment.entityObjectId" required/>
+                    <div [hidden]="!(editForm.controls.entityObjectId?.dirty && editForm.controls.entityObjectId?.invalid)">
+                        <small class="form-text text-danger"
+                        [hidden]="!editForm.controls.entityObjectId?.errors?.required" jhiTranslate="entity.validation.required">
+                        This field is required.
+                        </small>
+                        <small class="form-text text-danger"
+                            [hidden]="!editForm.controls.entityObjectId?.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>

src/test/java/org/hostsharing/hsadminng/web/rest/UserRoleAssignmentResourceIntTest.java

@@ -156,6 +156,44 @@ public class UserRoleAssignmentResourceIntTest {
         assertThat(userRoleAssignmentList).hasSize(databaseSizeBeforeCreate);
     }
 
+    @Test
+    @Transactional
+    public void checkEntityTypeIdIsRequired() throws Exception {
+        int databaseSizeBeforeTest = userRoleAssignmentRepository.findAll().size();
+        // set the field null
+        userRoleAssignment.setEntityTypeId(null);
+
+        // Create the UserRoleAssignment, which fails.
+
+        restUserRoleAssignmentMockMvc.perform(
+                post("/api/user-role-assignments")
+                        .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                        .content(TestUtil.convertObjectToJsonBytes(userRoleAssignment)))
+                .andExpect(status().isBadRequest());
+
+        List<UserRoleAssignment> userRoleAssignmentList = userRoleAssignmentRepository.findAll();
+        assertThat(userRoleAssignmentList).hasSize(databaseSizeBeforeTest);
+    }
+
+    @Test
+    @Transactional
+    public void checkEntityObjectIdIsRequired() throws Exception {
+        int databaseSizeBeforeTest = userRoleAssignmentRepository.findAll().size();
+        // set the field null
+        userRoleAssignment.setEntityObjectId(null);
+
+        // Create the UserRoleAssignment, which fails.
+
+        restUserRoleAssignmentMockMvc.perform(
+                post("/api/user-role-assignments")
+                        .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                        .content(TestUtil.convertObjectToJsonBytes(userRoleAssignment)))
+                .andExpect(status().isBadRequest());
+
+        List<UserRoleAssignment> userRoleAssignmentList = userRoleAssignmentRepository.findAll();
+        assertThat(userRoleAssignmentList).hasSize(databaseSizeBeforeTest);
+    }
+
     @Test
     @Transactional
     public void checkAssignedRoleIsRequired() throws Exception {