diff --git a/.jhipster/Asset.json b/.jhipster/Asset.json index 1cbaef36..ff8816aa 100644 --- a/.jhipster/Asset.json +++ b/.jhipster/Asset.json @@ -49,7 +49,7 @@ "otherEntityField": "admissionDocumentDate" } ], - "changelogDate": "20190430154657", + "changelogDate": "20190507105335", "entityTableName": "asset", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/Customer.json b/.jhipster/Customer.json index d3b3f02e..97a58c7e 100644 --- a/.jhipster/Customer.json +++ b/.jhipster/Customer.json @@ -142,7 +142,7 @@ "relationshipName": "sepamandate" } ], - "changelogDate": "20190430154654", + "changelogDate": "20190507105332", "entityTableName": "customer", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/Membership.json b/.jhipster/Membership.json index 5f320cec..90797b5b 100644 --- a/.jhipster/Membership.json +++ b/.jhipster/Membership.json @@ -54,7 +54,7 @@ "otherEntityField": "prefix" } ], - "changelogDate": "20190430154655", + "changelogDate": "20190507105333", "entityTableName": "membership", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/SepaMandate.json b/.jhipster/SepaMandate.json index 1a46bf84..5879f6ed 100644 --- a/.jhipster/SepaMandate.json +++ b/.jhipster/SepaMandate.json @@ -72,7 +72,7 @@ "otherEntityField": "prefix" } ], - "changelogDate": "20190430154658", + "changelogDate": "20190507105336", "entityTableName": "sepa_mandate", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/Share.json b/.jhipster/Share.json index ad783fbe..206438bd 100644 --- a/.jhipster/Share.json +++ b/.jhipster/Share.json @@ -49,7 +49,7 @@ "otherEntityField": "admissionDocumentDate" } ], - "changelogDate": "20190430154656", + "changelogDate": "20190507105334", "entityTableName": "share", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/UserRoleAssignment.json b/.jhipster/UserRoleAssignment.json index 81427c6a..493221c3 100644 --- a/.jhipster/UserRoleAssignment.json +++ b/.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", diff --git a/actually-used-JHipster-workflow.txt b/actually-used-JHipster-workflow.txt deleted file mode 100644 index 908f3555..00000000 --- a/actually-used-JHipster-workflow.txt +++ /dev/null @@ -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 diff --git a/src/main/java/org/hostsharing/hsadminng/domain/UserRoleAssignment.java b/src/main/java/org/hostsharing/hsadminng/domain/UserRoleAssignment.java index 8073f6d5..e2021eeb 100644 --- a/src/main/java/org/hostsharing/hsadminng/domain/UserRoleAssignment.java +++ b/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 diff --git a/src/main/jdl/accessrights.jdl b/src/main/jdl/accessrights.jdl index fe1f18ad..cd640ce1 100644 --- a/src/main/jdl/accessrights.jdl +++ b/src/main/jdl/accessrights.jdl @@ -12,8 +12,8 @@ enum UserRole { } entity UserRoleAssignment { - entityTypeId String, - entityObjectId Long, + entityTypeId String required maxlength(32), + entityObjectId Long required, assignedRole UserRole required } diff --git a/src/main/resources/config/liquibase/changelog/20190430152136_added_entity_Customer.xml b/src/main/resources/config/liquibase/changelog/20190507105332_added_entity_Customer.xml similarity index 98% rename from src/main/resources/config/liquibase/changelog/20190430152136_added_entity_Customer.xml rename to src/main/resources/config/liquibase/changelog/20190507105332_added_entity_Customer.xml index e12bbf7e..678deeaa 100644 --- a/src/main/resources/config/liquibase/changelog/20190430152136_added_entity_Customer.xml +++ b/src/main/resources/config/liquibase/changelog/20190507105332_added_entity_Customer.xml @@ -14,7 +14,7 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20190430152137_added_entity_Membership.xml b/src/main/resources/config/liquibase/changelog/20190507105333_added_entity_Membership.xml similarity index 97% rename from src/main/resources/config/liquibase/changelog/20190430152137_added_entity_Membership.xml rename to src/main/resources/config/liquibase/changelog/20190507105333_added_entity_Membership.xml index 3230c5d8..b3f71ecc 100644 --- a/src/main/resources/config/liquibase/changelog/20190430152137_added_entity_Membership.xml +++ b/src/main/resources/config/liquibase/changelog/20190507105333_added_entity_Membership.xml @@ -14,7 +14,7 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20190430152137_added_entity_constraints_Membership.xml b/src/main/resources/config/liquibase/changelog/20190507105333_added_entity_constraints_Membership.xml similarity index 93% rename from src/main/resources/config/liquibase/changelog/20190430152137_added_entity_constraints_Membership.xml rename to src/main/resources/config/liquibase/changelog/20190507105333_added_entity_constraints_Membership.xml index b298dc4f..aa5bb247 100644 --- a/src/main/resources/config/liquibase/changelog/20190430152137_added_entity_constraints_Membership.xml +++ b/src/main/resources/config/liquibase/changelog/20190507105333_added_entity_constraints_Membership.xml @@ -6,7 +6,7 @@ - + - + diff --git a/src/main/resources/config/liquibase/changelog/20190430152138_added_entity_constraints_Share.xml b/src/main/resources/config/liquibase/changelog/20190507105334_added_entity_constraints_Share.xml similarity index 92% rename from src/main/resources/config/liquibase/changelog/20190430152138_added_entity_constraints_Share.xml rename to src/main/resources/config/liquibase/changelog/20190507105334_added_entity_constraints_Share.xml index 625dc8b7..ccfe0ddc 100644 --- a/src/main/resources/config/liquibase/changelog/20190430152138_added_entity_constraints_Share.xml +++ b/src/main/resources/config/liquibase/changelog/20190507105334_added_entity_constraints_Share.xml @@ -6,7 +6,7 @@ - + - + diff --git a/src/main/resources/config/liquibase/changelog/20190430152139_added_entity_constraints_Asset.xml b/src/main/resources/config/liquibase/changelog/20190507105335_added_entity_constraints_Asset.xml similarity index 92% rename from src/main/resources/config/liquibase/changelog/20190430152139_added_entity_constraints_Asset.xml rename to src/main/resources/config/liquibase/changelog/20190507105335_added_entity_constraints_Asset.xml index 79006896..2da4503b 100644 --- a/src/main/resources/config/liquibase/changelog/20190430152139_added_entity_constraints_Asset.xml +++ b/src/main/resources/config/liquibase/changelog/20190507105335_added_entity_constraints_Asset.xml @@ -6,7 +6,7 @@ - + - + diff --git a/src/main/resources/config/liquibase/changelog/20190430152140_added_entity_constraints_SepaMandate.xml b/src/main/resources/config/liquibase/changelog/20190507105336_added_entity_constraints_SepaMandate.xml similarity index 93% rename from src/main/resources/config/liquibase/changelog/20190430152140_added_entity_constraints_SepaMandate.xml rename to src/main/resources/config/liquibase/changelog/20190507105336_added_entity_constraints_SepaMandate.xml index 958ab70e..3975b2bc 100644 --- a/src/main/resources/config/liquibase/changelog/20190430152140_added_entity_constraints_SepaMandate.xml +++ b/src/main/resources/config/liquibase/changelog/20190507105336_added_entity_constraints_SepaMandate.xml @@ -6,7 +6,7 @@ - + - + - - + + - + diff --git a/src/main/resources/config/liquibase/changelog/20190430154711_added_entity_constraints_UserRoleAssignment.xml b/src/main/resources/config/liquibase/changelog/20190507105342_added_entity_constraints_UserRoleAssignment.xml similarity index 93% rename from src/main/resources/config/liquibase/changelog/20190430154711_added_entity_constraints_UserRoleAssignment.xml rename to src/main/resources/config/liquibase/changelog/20190507105342_added_entity_constraints_UserRoleAssignment.xml index bf09debe..1b8a1d14 100644 --- a/src/main/resources/config/liquibase/changelog/20190430154711_added_entity_constraints_UserRoleAssignment.xml +++ b/src/main/resources/config/liquibase/changelog/20190507105342_added_entity_constraints_UserRoleAssignment.xml @@ -6,7 +6,7 @@ - + + [(ngModel)]="userRoleAssignment.entityTypeId" required maxlength="32"/> +
+ + This field is required. + + + This field cannot be longer than 32 characters. + +
+ [(ngModel)]="userRoleAssignment.entityObjectId" required/> +
+ + This field is required. + + + This field should be a number. + +
diff --git a/src/test/java/org/hostsharing/hsadminng/web/rest/UserRoleAssignmentResourceIntTest.java b/src/test/java/org/hostsharing/hsadminng/web/rest/UserRoleAssignmentResourceIntTest.java index 411c375f..12dd6d84 100644 --- a/src/test/java/org/hostsharing/hsadminng/web/rest/UserRoleAssignmentResourceIntTest.java +++ b/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 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 userRoleAssignmentList = userRoleAssignmentRepository.findAll(); + assertThat(userRoleAssignmentList).hasSize(databaseSizeBeforeTest); + } + @Test @Transactional public void checkAssignedRoleIsRequired() throws Exception {