From 3c89878c2115789216aaf78f3f4eab14caf79511 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Tue, 30 Apr 2019 17:58:56 +0200 Subject: [PATCH] cate userId from entity UserRoleAssignment (it comes implicitly through the relationship) --- .jhipster/Asset.json | 2 +- .jhipster/Customer.json | 2 +- .jhipster/Membership.json | 2 +- .jhipster/SepaMandate.json | 2 +- .jhipster/Share.json | 2 +- .jhipster/UserRoleAssignment.json | 9 +- actually-used-JHipster-workflow.txt | 31 ++++++ .../hsadminng/domain/UserRoleAssignment.java | 18 ---- .../UserRoleAssignmentQueryService.java | 3 - .../dto/UserRoleAssignmentCriteria.java | 13 --- src/main/jdl/accessrights.jdl | 1 - ...54711_added_entity_UserRoleAssignment.xml} | 6 +- ...entity_constraints_UserRoleAssignment.xml} | 2 +- .../resources/config/liquibase/master.xml | 4 +- ...user-role-assignment-detail.component.html | 4 - ...user-role-assignment-update.component.html | 15 --- .../user-role-assignment.component.html | 2 - .../model/user-role-assignment.model.ts | 2 - .../webapp/i18n/de/userRoleAssignment.json | 1 - .../webapp/i18n/en/userRoleAssignment.json | 1 - .../web/rest/CustomerResourceIntTest.java | 4 +- .../UserRoleAssignmentResourceIntTest.java | 94 ------------------- .../user-role-assignment.service.spec.ts | 4 +- 23 files changed, 44 insertions(+), 180 deletions(-) create mode 100644 actually-used-JHipster-workflow.txt rename src/main/resources/config/liquibase/changelog/{20190430152204_added_entity_UserRoleAssignment.xml => 20190430154711_added_entity_UserRoleAssignment.xml} (91%) rename src/main/resources/config/liquibase/changelog/{20190430152204_added_entity_constraints_UserRoleAssignment.xml => 20190430154711_added_entity_constraints_UserRoleAssignment.xml} (93%) diff --git a/.jhipster/Asset.json b/.jhipster/Asset.json index 2fe0d88c..1cbaef36 100644 --- a/.jhipster/Asset.json +++ b/.jhipster/Asset.json @@ -49,7 +49,7 @@ "otherEntityField": "admissionDocumentDate" } ], - "changelogDate": "20190430152139", + "changelogDate": "20190430154657", "entityTableName": "asset", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/Customer.json b/.jhipster/Customer.json index ee92a803..d3b3f02e 100644 --- a/.jhipster/Customer.json +++ b/.jhipster/Customer.json @@ -142,7 +142,7 @@ "relationshipName": "sepamandate" } ], - "changelogDate": "20190430152136", + "changelogDate": "20190430154654", "entityTableName": "customer", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/Membership.json b/.jhipster/Membership.json index ff3f80e8..5f320cec 100644 --- a/.jhipster/Membership.json +++ b/.jhipster/Membership.json @@ -54,7 +54,7 @@ "otherEntityField": "prefix" } ], - "changelogDate": "20190430152137", + "changelogDate": "20190430154655", "entityTableName": "membership", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/SepaMandate.json b/.jhipster/SepaMandate.json index 5ef7a2f8..1a46bf84 100644 --- a/.jhipster/SepaMandate.json +++ b/.jhipster/SepaMandate.json @@ -72,7 +72,7 @@ "otherEntityField": "prefix" } ], - "changelogDate": "20190430152140", + "changelogDate": "20190430154658", "entityTableName": "sepa_mandate", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/Share.json b/.jhipster/Share.json index 0d92e505..ad783fbe 100644 --- a/.jhipster/Share.json +++ b/.jhipster/Share.json @@ -49,7 +49,7 @@ "otherEntityField": "admissionDocumentDate" } ], - "changelogDate": "20190430152138", + "changelogDate": "20190430154656", "entityTableName": "share", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/UserRoleAssignment.json b/.jhipster/UserRoleAssignment.json index 92062630..81427c6a 100644 --- a/.jhipster/UserRoleAssignment.json +++ b/.jhipster/UserRoleAssignment.json @@ -9,13 +9,6 @@ "fieldName": "entityObjectId", "fieldType": "Long" }, - { - "fieldName": "userId", - "fieldType": "Long", - "fieldValidateRules": [ - "required" - ] - }, { "fieldName": "assignedRole", "fieldType": "UserRole", @@ -34,7 +27,7 @@ "otherEntityField": "login" } ], - "changelogDate": "20190430152204", + "changelogDate": "20190430154711", "entityTableName": "user_role_assignment", "dto": "no", "pagination": "infinite-scroll", diff --git a/actually-used-JHipster-workflow.txt b/actually-used-JHipster-workflow.txt new file mode 100644 index 00000000..908f3555 --- /dev/null +++ b/actually-used-JHipster-workflow.txt @@ -0,0 +1,31 @@ + + 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 44803a00..8073f6d5 100644 --- a/src/main/java/org/hostsharing/hsadminng/domain/UserRoleAssignment.java +++ b/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() + "'" + "}"; } diff --git a/src/main/java/org/hostsharing/hsadminng/service/UserRoleAssignmentQueryService.java b/src/main/java/org/hostsharing/hsadminng/service/UserRoleAssignmentQueryService.java index bdf4ec4a..19d7d780 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/UserRoleAssignmentQueryService.java +++ b/src/main/java/org/hostsharing/hsadminng/service/UserRoleAssignmentQueryService.java @@ -96,9 +96,6 @@ public class UserRoleAssignmentQueryService extends QueryService - + @@ -29,10 +29,6 @@ - - - - diff --git a/src/main/resources/config/liquibase/changelog/20190430152204_added_entity_constraints_UserRoleAssignment.xml b/src/main/resources/config/liquibase/changelog/20190430154711_added_entity_constraints_UserRoleAssignment.xml similarity index 93% rename from src/main/resources/config/liquibase/changelog/20190430152204_added_entity_constraints_UserRoleAssignment.xml rename to src/main/resources/config/liquibase/changelog/20190430154711_added_entity_constraints_UserRoleAssignment.xml index 6fbd98d5..bf09debe 100644 --- a/src/main/resources/config/liquibase/changelog/20190430152204_added_entity_constraints_UserRoleAssignment.xml +++ b/src/main/resources/config/liquibase/changelog/20190430154711_added_entity_constraints_UserRoleAssignment.xml @@ -6,7 +6,7 @@ - + - + - + diff --git a/src/main/webapp/app/entities/user-role-assignment/user-role-assignment-detail.component.html b/src/main/webapp/app/entities/user-role-assignment/user-role-assignment-detail.component.html index 151047a0..d94896cf 100644 --- a/src/main/webapp/app/entities/user-role-assignment/user-role-assignment-detail.component.html +++ b/src/main/webapp/app/entities/user-role-assignment/user-role-assignment-detail.component.html @@ -13,10 +13,6 @@
{{userRoleAssignment.entityObjectId}}
-
User Id
-
- {{userRoleAssignment.userId}} -
Assigned Role
{{userRoleAssignment.assignedRole}} diff --git a/src/main/webapp/app/entities/user-role-assignment/user-role-assignment-update.component.html b/src/main/webapp/app/entities/user-role-assignment/user-role-assignment-update.component.html index 1162073e..c8e3b023 100644 --- a/src/main/webapp/app/entities/user-role-assignment/user-role-assignment-update.component.html +++ b/src/main/webapp/app/entities/user-role-assignment/user-role-assignment-update.component.html @@ -19,21 +19,6 @@ -
- - -
- - This field is required. - - - This field should be a number. - -
-