generator-jhipster 7.3.1 → 7.4.0

package/generators/entity/index.js

@@ -65,8 +65,6 @@ const SUPPORTED_VALIDATION_RULES = constants.SUPPORTED_VALIDATION_RULES;
 const ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
 const JHIPSTER_CONFIG_DIR = constants.JHIPSTER_CONFIG_DIR;
 
-let useBlueprints;
-
 class EntityGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'argument', ...features });
@@ -148,11 +146,9 @@ class EntityGenerator extends BaseBlueprintGenerator {
       desc: 'Regenerate only a single entity, relationships can be not correctly generated',
       type: Boolean,
     });
+  }
 
-    if (this.options.help) {
-      return;
-    }
-
+  async _postConstruct() {
     const name = _.upperFirst(this.options.name).replace('.json', '');
     this.entityStorage = this.getEntityConfig(name, true);
     this.entityConfig = this.entityStorage.createProxy();
@@ -169,14 +165,15 @@ class EntityGenerator extends BaseBlueprintGenerator {
       configurationFileExists: this.fs.exists(this.destinationPath(filename)),
     };
 
-    this._setupEntityOptions(this, this, this.context);
-    useBlueprints =
-      !this.fromBlueprint &&
-      this.instantiateBlueprints(GENERATOR_ENTITY, {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_ENTITY, {
         entityExisted,
         configExisted,
         arguments: [name],
       });
+    }
+
+    this._setupEntityOptions(this, this, this.context);
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -304,7 +301,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -326,7 +323,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -456,16 +453,16 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
   // Public API method used by the getter and also by Blueprints
   _composing() {
     return {
-      composeEntities() {
+      async composeEntities() {
         // We need to compose with others entities to update relationships.
-        this.composeWithJHipster(
+        await this.composeWithJHipster(
           GENERATOR_ENTITIES,
           {
             entities: this.options.singleEntity ? [this.context.name] : undefined,
@@ -482,7 +479,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get composing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._composing();
   }
 
@@ -520,22 +517,22 @@ class EntityGenerator extends BaseBlueprintGenerator {
         this.configOptions.sharedEntities[this.context.name] = this.context;
       },
 
-      composing() {
+      async composing() {
         if (this.options.skipWriting) return;
         const context = this.context;
         if (!context.skipServer) {
-          this.composeWithJHipster(GENERATOR_ENTITY_SERVER, this.arguments, {
+          await this.composeWithJHipster(GENERATOR_ENTITY_SERVER, this.arguments, {
             context,
           });
         }
 
         if (!context.skipClient || this.jhipsterConfig.applicationType === GATEWAY) {
-          this.composeWithJHipster(GENERATOR_ENTITY_CLIENT, this.arguments, {
+          await this.composeWithJHipster(GENERATOR_ENTITY_CLIENT, this.arguments, {
             context,
             skipInstall: this.options.skipInstall,
           });
           if (this.jhipsterConfig.enableTranslation) {
-            this.composeWithJHipster(GENERATOR_ENTITY_I_18_N, this.arguments, {
+            await this.composeWithJHipster(GENERATOR_ENTITY_I_18_N, this.arguments, {
               context,
               skipInstall: this.options.skipInstall,
             });
@@ -546,7 +543,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -604,7 +601,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get preparingFields() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparingFields();
   }
 
@@ -630,7 +627,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -737,7 +734,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get preparingRelationships() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparingRelationships();
   }
 
@@ -838,7 +835,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -864,7 +861,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -894,7 +891,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get install() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._install();
   }
 
@@ -908,7 +905,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 

package/generators/entity-client/files.js

@@ -478,7 +478,7 @@ function writeFiles() {
 }
 
 function addToMenu() {
-  if (this.skipClient) return;
+  if (this.skipClient || this.clientFrameworkVue) return;
 
   if (!this.embedded) {
     this.addEntityToModule();
@@ -494,17 +494,12 @@ function addToMenu() {
 
 function replaceTranslations() {
   if (this.clientFramework === VUE && !this.enableTranslation) {
+    utils.vueReplaceTranslation(this, [
+      `app/entities/${this.entityFolderName}/${this.entityFileName}.vue`,
+      `app/entities/${this.entityFolderName}/${this.entityFileName}-details.vue`,
+    ]);
     if (!this.readOnly) {
-      utils.vueReplaceTranslation(this, [
-        `app/entities/${this.entityFolderName}/${this.entityFileName}.vue`,
-        `app/entities/${this.entityFolderName}/${this.entityFileName}-update.vue`,
-        `app/entities/${this.entityFolderName}/${this.entityFileName}-details.vue`,
-      ]);
-    } else {
-      utils.vueReplaceTranslation(this, [
-        `app/entities/${this.entityFolderName}/${this.entityFileName}.vue`,
-        `app/entities/${this.entityFolderName}/${this.entityFileName}-details.vue`,
-      ]);
+      utils.vueReplaceTranslation(this, [`app/entities/${this.entityFolderName}/${this.entityFileName}-update.vue`]);
     }
   }
 }

package/generators/entity-client/index.js

@@ -29,16 +29,18 @@ const {
 const { GENERATOR_ENTITY_CLIENT } = require('../generator-list');
 const { POSTGRESQL, MARIADB } = require('../../jdl/jhipster/database-types');
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
 
     this.entity = this.options.context;
     this.jhipsterContext = this.options.jhipsterContext || this.options.context;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITY_CLIENT, { context: this.options.context });
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_ENTITY_CLIENT, { context: this.options.context });
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -51,7 +53,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -84,7 +86,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -143,7 +145,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -166,7 +168,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 

package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs

@@ -40,8 +40,8 @@ _%>
 
 describe('<%= entityClass %> e2e test', () => {
 
-  const <%= entityInstance %>PageUrl = '/<%= entityUrl %>';
-  const <%= entityInstance %>PageUrlPattern = new RegExp('/<%= entityUrl %>(\\?.*)?$');
+  const <%= entityInstance %>PageUrl = '/<%= entityPage %>';
+  const <%= entityInstance %>PageUrlPattern = new RegExp('/<%= entityPage %>(\\?.*)?$');
   const username = Cypress.env('E2E_USERNAME') ?? 'admin';
   const password = Cypress.env('E2E_PASSWORD') ?? 'admin';
   const <%= entityInstance %>Sample = <%- JSON.stringify(generateTestEntity(sampleFields.map(field => field.reference))) %>;
@@ -164,7 +164,7 @@ describe('<%= entityClass %> e2e test', () => {
 
   it('<%= entityClassPlural %> menu should load <%= entityClassPlural %> page', () => {
     cy.visit('/');
-    cy.clickOnEntityMenuItem('<%= entityStateName %>');
+    cy.clickOnEntityMenuItem('<%= entityPage %>');
     cy.wait('@entitiesRequest').then(({ response }) => {
       if (response!.body.length === 0) {
         cy.get(entityTableSelector).should('not.exist');
@@ -186,7 +186,7 @@ describe('<%= entityClass %> e2e test', () => {
 
       it('should load create <%= entityClass %> page', () => {
         cy.get(entityCreateButtonSelector).click({force: true});
-        cy.url().should('match', new RegExp('/<%= entityUrl %>/new$'));
+        cy.url().should('match', new RegExp('/<%= entityPage %>/new$'));
         cy.getEntityCreateUpdateHeading('<%= entityClass %>');
         cy.get(entityCreateSaveButtonSelector).should('exist');
         cy.get(entityCreateCancelButtonSelector).click({force: true});

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs

@@ -278,7 +278,7 @@ _%>
           {<%= _.lowerFirst(fieldType) %>Values.map(<%= _.lowerFirst(fieldType) %> => (
               <option value={<%= _.lowerFirst(fieldType) %>} key={<%= _.lowerFirst(fieldType) %>}>
       <%_ if (enableTranslation) { _%>
-                {translate("<%= enumPrefix %>"+<%= _.lowerFirst(fieldType) %>)}
+                {translate("<%= enumPrefix %>."+<%= _.lowerFirst(fieldType) %>)}
       <%_ } else { _%>
                 {<%= _.lowerFirst(fieldType) %>}
       <%_ } _%>

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs

@@ -21,7 +21,7 @@ import React, { useState, useEffect } from 'react';
 import InfiniteScroll from 'react-infinite-scroller';
 <%_ } _%>
 import { Link, RouteComponentProps } from 'react-router-dom';
-import { Button, <% if (searchEngine) { %>Input, InputGroup, FormGroup, Form,<% } %>Col, Row, Table } from 'reactstrap';
+import { Button, <% if (searchEngine) { %>Input, InputGroup, FormGroup, Form, Row, Col, <% } %>Table } from 'reactstrap';
 import {
   <%_ if (blobFields.length > 0) { _%>
     <%_ if (fieldsContainBlobOrImage) { _%>
@@ -289,7 +289,7 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
       <h2 id="<%= entityFileName %>-heading" data-cy="<%= entityClass %>Heading">
         <Translate contentKey="<%= i18nKeyPrefix %>.home.title"><%= entityClassPluralHumanized %></Translate>
         <div className="d-flex justify-content-end">
-          <Button className="mr-2" color="info" onClick={handleSyncList} disabled={loading}>
+          <Button className="me-2" color="info" onClick={handleSyncList} disabled={loading}>
             <FontAwesomeIcon icon="sync" spin={loading} /> <Translate contentKey="<%= i18nKeyPrefix %>.home.refreshListLabel">Refresh List</Translate>
           </Button>
 <%_ if (!readOnly) { _%>
@@ -446,7 +446,7 @@ _%>
                       </td>
   <%_ } _%>
 <%_ } _%>
-                      <td className="text-right">
+                      <td className="text-end">
                         <div className="btn-group flex-btn-group-container">
                           <Button tag={Link} to={`${match.url}/${<%= entityInstance %>.<%= primaryKey.name %>}`} color="info" size="sm" data-cy="entityDetailsButton">
                             <FontAwesomeIcon icon="eye" /> <span className="d-none d-md-inline" ><Translate contentKey="entity.action.view">View</Translate></span>
@@ -481,15 +481,15 @@ _%>
 <%_ if (!databaseTypeCassandra) { _%>
   <%_ if (paginationPagination) { _%>
         { totalItems ? (<div className={ <%= entityInstance %>List && <%= entityInstance %>List.length > 0 ? '' : 'd-none' }>
-          <Row className="justify-content-center">
+          <div className="justify-content-center d-flex">
             <JhiItemCount
               page={paginationState.activePage}
               total={totalItems}
               itemsPerPage={paginationState.itemsPerPage}
               <% { if (enableTranslation) { %>i18nEnabled<% }} %>
             />
-          </Row>
-          <Row className="justify-content-center">
+          </div>
+          <div className="justify-content-center d-flex">
             <JhiPagination
               activePage={paginationState.activePage}
               onSelect={handlePagination}
@@ -497,7 +497,7 @@ _%>
               itemsPerPage={paginationState.itemsPerPage}
               totalItems={totalItems}
             />
-          </Row>
+          </div>
         </div>) : '' }
   <% } _%>
 <%_ } _%>

package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.component.ts.ejs

@@ -1,5 +1,6 @@
+<%_ if (fieldsContainBlob || paginationInfiniteScroll) { -%>
 import { mixins } from 'vue-class-component';
-
+<%_ } -%>
 import { Component, Vue, Inject } from 'vue-property-decorator';
 import Vue2Filters from 'vue2-filters';
 import { I<%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';

package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.service.ts.ejs

@@ -4,13 +4,9 @@ import buildPaginationQueryOpts from '@/shared/sort/sorts';
 <% } %>
 import { I<%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';
 
-<%_
-const baseApi = (applicationTypeGateway && locals.microserviceName) ? 'services/' + microserviceName.toLowerCase() + '/api/' : 'api/';
-_%>
-
-const baseApiUrl = '<%= baseApi + entityApiUrl %>';
+const baseApiUrl = '<%= entityApi %>api/<%= entityApiUrl %>';
 <%_ if (searchEngine) { _%>
-const baseSearchApiUrl = '<%= baseApi %>_search/<%= entityApiUrl %>?query=';
+const baseSearchApiUrl = '<%= entityApi %>api/_search/<%= entityApiUrl %>?query=';
 <%_ } _%>
 
 export default class <%= entityAngularName %>Service {

package/generators/entity-i18n/index.js

@@ -23,7 +23,6 @@ const { GENERATOR_ENTITY_I_18_N } = require('../generator-list');
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 
 /* constants used throughout */
-let useBlueprints;
 
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -31,8 +30,12 @@ module.exports = class extends BaseBlueprintGenerator {
 
     this.entity = this.options.context;
     this.jhipsterContext = this.options.jhipsterContext || this.options.context;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITY_I_18_N, { context: this.options.context });
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_ENTITY_I_18_N, { context: this.options.context });
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -47,7 +50,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -57,7 +60,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 };

package/generators/entity-server/index.js

@@ -27,7 +27,6 @@ const { SQL } = require('../../jdl/jhipster/database-types');
 const { isReservedTableName } = require('../../jdl/jhipster/reserved-keywords');
 
 /* constants used throughout */
-let useBlueprints;
 
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -36,8 +35,12 @@ module.exports = class extends BaseBlueprintGenerator {
     this.entity = this.options.context;
 
     this.jhipsterContext = this.options.jhipsterContext || this.options.context;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITY_SERVER, { context: this.options.context });
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_ENTITY_SERVER, { context: this.options.context });
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -51,7 +54,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -69,7 +72,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -98,7 +101,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get preparingFields() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparingFields();
   }
 
@@ -165,7 +168,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -178,7 +181,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -192,7 +195,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 

package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs

@@ -20,14 +20,6 @@ package <%= entityAbsolutePackage %>.web.rest;
 
 <%_
 const viaService = !serviceNo;
-
-let manyToManyWithUser = false;
-for (const relationship of relationships) {
-  if (relationship.otherEntityUser && relationship.relationshipManyToMany) {
-    manyToManyWithUser = true;
-    break;
-  }
-}
 _%>
 <%_ if (!dtoMapstruct || serviceNo) { _%>
 import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
@@ -177,17 +169,19 @@ public class <%= entityClass %>Resource {
             throw new BadRequestAlertException("A new <%= entityInstance %> cannot already have an ID", ENTITY_NAME, "idexists");
         }
   <%_ if (saveUserSnapshot) { _%>
-    <%_ if (manyToManyWithUser) { _%>
-        if (<%= instanceName %>.getUsers() != null) {
-            // Save users in case they are new and only exists in gateway
-            userRepository.saveAll(<%= instanceName %>.getUsers());
-        }
-    <%_ } else { _%>
-        if (<%= instanceName %>.getUser() != null) {
-            // Save user in case it's new and only exists in gateway
-            userRepository.save(<%= instanceName %>.getUser());
-        }
-    <%_ } _%>
+    <% for (const userRelationship of relationships.filter(rel => rel.otherEntity.builtInUser)) { %>
+      <%_ if (userRelationship.collection) { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>() != null) { 
+            // Save users in case they are new and only exist in gateway 
+            userRepository.saveAll(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>()); 
+        } 
+      <%_ } else { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>() != null) { 
+            // Save user in case it's new and only exists in gateway 
+            userRepository.save(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>()); 
+        } 
+      <%_ } _%>
+    <% } %>
   <%_ } _%>
   <%_ for (field of primaryKey.fields.filter(f => f.autoGenerateByService)) { _%>
         <%= instanceName %>.set<%= field.fieldNameCapitalized %>(UUID.randomUUID());
@@ -245,17 +239,19 @@ public class <%= entityClass %>Resource {
   <%_ } _%>
 
   <%_ if (saveUserSnapshot) { _%>
-    <%_ if (manyToManyWithUser) { _%>
-        if (<%= instanceName %>.getUsers() != null) {
-            // Save users in case they are new and only exists in gateway
-            userRepository.saveAll(<%= instanceName %>.getUsers());
-        }
-    <%_ } else { _%>
-        if (<%= instanceName %>.getUser() != null) {
-            // Save user in case it's new and only exists in gateway
-            userRepository.save(<%= instanceName %>.getUser());
-        }
-    <%_ } _%>
+    <% for (const userRelationship of relationships.filter(rel => rel.otherEntity.builtInUser)) { %>
+      <%_ if (userRelationship.collection) { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>() != null) { 
+            // Save users in case they are new and only exist in gateway 
+            userRepository.saveAll(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>()); 
+        } 
+      <%_ } else { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>() != null) { 
+            // Save user in case it's new and only exists in gateway 
+            userRepository.save(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>()); 
+        } 
+      <%_ } _%>
+    <% } %>
   <%_ } _%>
 <%- include('/partials/save_template', {asEntity, asDto, viaService: viaService, returnDirectly: false, isUsingMapsId: false, mapsIdAssoc: mapsIdAssoc}); -%>
   <%_ if (!reactive) { _%>
@@ -308,17 +304,19 @@ public class <%= entityClass %>Resource {
   <%_ } _%>
 
   <%_ if (saveUserSnapshot) { _%>
-    <%_ if (manyToManyWithUser) { _%>
-            if (<%= instanceName %>.getUsers() != null) {
-                // Save users in case they are new and only exists in gateway
-                userRepository.saveAll(<%= instanceName %>.getUsers());
-            }
-    <%_ } else { _%>
-            if (<%= instanceName %>.getUser() != null) {
-                // Save user in case it's new and only exists in gateway
-                userRepository.save(<%= instanceName %>.getUser());
-            }
-    <%_ } _%>
+    <% for (const userRelationship of relationships.filter(rel => rel.otherEntity.builtInUser)) { %>
+      <%_ if (userRelationship.collection) { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>() != null) { 
+            // Save users in case they are new and only exist in gateway 
+            userRepository.saveAll(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>()); 
+        } 
+      <%_ } else { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>() != null) { 
+            // Save user in case it's new and only exists in gateway 
+            userRepository.save(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>()); 
+        } 
+      <%_ } _%>
+    <% } %>
   <%_ } _%>
 
             <%- include('../../common/patch_template', {asEntity, asDto, isService: false, viaService: viaService}); -%>