Load persisted entity again if there are readonly fields

to return the actual state of the entity and not something set from user side. May break tests now.

Author: OmarHawk

generators/base-application/support/prepare-entity.ts

@@ -599,6 +599,8 @@ function preparePostEntityCommonDerivedPropertiesNotTyped(entity: any) {
     entity.fields.some(field => !field.id && !field.transient) ||
     entity.relationships.some(relationship => !relationship.id && relationship.persistableRelationship);
 
+  entity.hasAnyReadonlyField = entity.fields.some(field => field.readonly && !(field.id && field.autoGenerate));
+
   entity.allReferences
     .filter(reference => reference.relationship?.relatedField)
     .forEach(reference => {

generators/bootstrap-application/generator.spec.ts

@@ -1015,6 +1015,7 @@ describe(`generator - ${generator}`, () => {
   "fieldsContainNoOwnerOneToOne": false,
   "fluentMethods": true,
   "generateFakeData": Any<Function>,
+  "hasAnyReadonlyField": false,
   "hasCyclicRequiredRelationship": false,
   "hasImageField": true,
   "hasRelationshipWithBuiltInUser": false,
@@ -1347,6 +1348,7 @@ describe(`generator - ${generator}`, () => {
   "fieldsContainNoOwnerOneToOne": false,
   "fluentMethods": true,
   "generateFakeData": Any<Function>,
+  "hasAnyReadonlyField": false,
   "hasCyclicRequiredRelationship": false,
   "hasRelationshipWithBuiltInUser": false,
   "i18nAlertHeaderPrefix": "jhipsterApp.entityA",
@@ -1726,6 +1728,7 @@ describe(`generator - ${generator}`, () => {
   "fieldsContainNoOwnerOneToOne": false,
   "fluentMethods": true,
   "generateFakeData": Any<Function>,
+  "hasAnyReadonlyField": false,
   "hasCyclicRequiredRelationship": false,
   "hasRelationshipWithBuiltInUser": false,
   "i18nAlertHeaderPrefix": "jhipsterApp.entityA",

generators/spring-boot/templates/_global_partials_entity_/save_template.ejs

@@ -26,7 +26,10 @@
         <%- mapsIdAssoc.otherEntity.primaryKey.type %> <%- mapsIdAssoc.otherEntityName %>Id = <%- persistInstance %>.get<%- mapsIdAssoc.relationshipNameCapitalized %>().get<%- mapsIdAssoc.otherEntity.primaryKey.nameCapitalized %>();
         <%- mapsIdAssoc.otherEntity.entityInstance %>Repository.findById(<%- mapsIdAssoc.otherEntityName %>Id).ifPresent(<%- persistInstance %>::<%_ if (!fluentMethods) { _%>set<%- mapsIdAssoc.relationshipNameCapitalized %> <%_ } else { _%><%- mapsIdAssoc.relationshipName %><%_ } _%>);
 <%_ } _%>
-        <%- returnDirectly && !searchEngineElasticsearch && !dtoMapstruct ? 'return' : `${persistInstance} =` %> <%- entityInstance %>Repository.save(<%- persistInstance %>);
+        <%- returnDirectly && !hasAnyReadonlyField && !searchEngineElasticsearch && !dtoMapstruct ? 'return' : `${persistInstance} =` %> <%- entityInstance %>Repository.save<% if (hasAnyReadonlyField && databaseType === 'sql') { %>AndFlush<% } %>(<%- persistInstance %>);
+<%_ if (hasAnyReadonlyField) { _%>
+        <%- returnDirectly && !searchEngineElasticsearch && !dtoMapstruct ? 'return' : `${persistInstance} =` %> <%- entityInstance %>Repository.find<% if (implementsEagerLoadApis) { %>OneWithEagerRelationships<% } else { %>ById<% } %>(<%- persistInstance %>.get<%= primaryKey.nameCapitalized %>()).orElseThrow();
+<%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
         <%- entityInstance %>SearchRepository.index(<%- persistInstance %>);
 <%_ } _%>

generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/patch_template.ejs

@@ -51,7 +51,10 @@ _%>
     return existing<%= entityClass %>;
     })
   <%_ } %>
-  .<%= mapOrFlatMap %>(<%= entityInstance %>Repository::save)
+  .<%= mapOrFlatMap %>(<%= entityInstance %>Repository::save<% if (hasAnyReadonlyField && databaseType === 'sql') { %>AndFlush<% } %>)
+  <%_ if (hasAnyReadonlyField) { _%>
+  .<%= mapOrFlatMap %>((persistedInstance) -> <%= entityInstance %>Repository.find<% if (implementsEagerLoadApis) { %>OneWithEagerRelationships<% } else { %>ById<% } %>(persistedInstance.get<%= primaryKey.nameCapitalized %>()).orElseThrow())
+  <%_ } _%>
   <%_ if (searchEngineElasticsearch) { _%>
     .<%= mapOrFlatMap %>(saved<%= entityClass %> -> {
     <%_ if(reactive) { %>