@izara_project/izara-core-generate-service-code 1.0.85 → 1.0.87

package/src/emit/crud/templates/UpdateEndpoint_Main.ejs

@@ -99,6 +99,7 @@ export default async function <%- flowTag %>(
         _izContext.correlationIds?.get(coreConsts.SUBMITTED_BY_USER_ID);
 
       targetIdentifiers = requestParams.targetIdentifiers;
+      delete requestParams.targetIdentifiers;
 
       if (!targetIdentifiers && objectSchema.belongTo?.objectType === 'user' && submittedByUserId) {
         targetIdentifiers = { submittedByUserId };
@@ -113,12 +114,11 @@ export default async function <%- flowTag %>(
         if (!targetIdentifiers.submittedByUserId && submittedByUserId) {
           targetIdentifiers.submittedByUserId = submittedByUserId;
         }
-        requestParams.targetIdentifiers = targetIdentifiers;
       }
 
       _izContext.logger.debug(`[${process.env.iz_serviceTag}:<%- flowTag %>] Identity & Target Context Resolved:`,  {
         submittedByUserId: requestParams.submittedByUserId,
-        targetIdentifiers: requestParams.targetIdentifiers,
+        targetIdentifiers,
         belongTo: objectSchema.belongTo,
         generatedBy: objectSchema.generatedBy
       });
@@ -129,7 +129,38 @@ export default async function <%- flowTag %>(
     }
 
     // ── Build identifiers used by asynchronous processing ────────────────────
-    const identifiers = requestParams.objInstanceFull.identifiers;
+    const identifiers = requestParams.objInstanceFull?.identifiers;
+
+    if (!objectSchema.hasOwnProperty('belongTo')) {
+      if (!targetIdentifiers && identifiers) {
+        targetIdentifiers = { ...identifiers };
+      } else if (targetIdentifiers && identifiers) {
+        for (const [key, value] of Object.entries(identifiers)) {
+          if (targetIdentifiers[key] === undefined && value !== undefined) {
+            targetIdentifiers[key] = value;
+          }
+        }
+      }
+      if (targetIdentifiers) {
+        if (!targetIdentifiers.submittedByUserId && submittedByUserId) {
+          targetIdentifiers.submittedByUserId = submittedByUserId;
+        }
+      }
+    }
+
+    if (targetIdentifiers && identifiers) {
+      for (const [key, value] of Object.entries(identifiers)) {
+        if (
+          targetIdentifiers[key] !== undefined &&
+          value !== undefined &&
+          targetIdentifiers[key] !== value
+        ) {
+          errorsFound.push(
+            `targetIdentifiers.${key} must match objInstanceFull.identifiers.${key}`
+          );
+        }
+      }
+    }
 
     //(<validateBeforeUpdate>)
     //(</validateBeforeUpdate>)
@@ -182,11 +213,13 @@ export default async function <%- flowTag %>(
         },
         parameterGroups,
         {
+          targetIdentifiers,
           rbacObjType: {
             serviceTag: <%- rbacServiceTags.length === 1 ? rbacServiceTags[0] : `{ ${Object.entries(rbacServiceTagMap).map(([k, v]) => `'${k}': ${v}`).join(', ')} }[requestParams.objectType] || process.env.iz_serviceTag` %>
           },
           requestParams: requestParams,
-          nextFlowStepName: '<%- plan?.hasRbacCallback ? `${flowTag}RbacCallback` : `${flowTag}Complete` %>'
+          nextFlowStepName: '<%- plan?.hasRbacCallback ? `${flowTag}RbacCallback` : `${flowTag}Complete` %>',
+          sync: true
         }
       );
 
@@ -195,10 +228,18 @@ export default async function <%- flowTag %>(
         resultPermissionCheck
       );
 
+      if (resultPermissionCheck && resultPermissionCheck.permission !== true) {
+        errorsFound.push('Permission denied');
+        return await <%- flowTag %>LogicalLib(
+          _izContext,
+          requestParams,
+          callingFlowConfig,
+          errorsFound
+        );
+      }
+
       //(<rbacPublish_<%- flowTag %>)
       //(</rbacPublish_<%- flowTag %>)
-
-      return resultPermissionCheck;
     }
     <%_ } _%>