@izara_project/izara-core-generate-service-code 1.0.88 → 1.0.89

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

@@ -200,11 +200,15 @@ export default async function <%- flowTag %>(
 
     // ── Optional phase extension point ────────────────────────────────────────
     <%_
+    const allCrudObjectTypes = (objects || []).filter(isCrudObject).map(o => o.objectType);
     const beforeHooksByObjType = (plan?.beforeHooks || []).reduce((acc, hook) => {
-      const key = hook?.objType?.objectType;
-      if (!key) return acc;
-      if (!acc[key]) acc[key] = [];
-      acc[key].push(hook);
+      const targets = (hook?.targetObjectTypes && hook.targetObjectTypes.length > 0)
+        ? hook.targetObjectTypes
+        : allCrudObjectTypes;
+      for (const key of targets) {
+        if (!acc[key]) acc[key] = [];
+        acc[key].push(hook);
+      }
       return acc;
     }, {});
     _%>
@@ -218,6 +222,18 @@ export default async function <%- flowTag %>(
       const lambdaSyncInvResults = [];
       <%_ for (const config of configs.filter(c => c?.generatedCodeConfig?.invocationType === 'lambdaSyncInv' || c?.event?.includes('lambdaSyncInv'))) { _%>
       try {
+        let hookPayload_<%= config.flowTag %> = {
+          objType,
+          objInstanceFull: requestParams.objInstanceFull,
+          identifiers: requestParams.objInstanceFull?.identifiers,
+          fieldNames:
+            requestParams.objInstanceFull?.fields || requestParams.fieldNames,
+          relationships: requestParams.relationships || [],
+          targetIdentifiers,
+          submittedByUserId: requestParams.submittedByUserId
+        };
+        //(<beforeSendHook_<%= config.flowTag %>>)
+        //(</beforeSendHook_<%= config.flowTag %>>)
         const returnValue = await lambda.invokeSync(
           _izContext,
           await lambdaSharedLib.lambdaFunctionName(
@@ -225,15 +241,7 @@ export default async function <%- flowTag %>(
             '<%= config.flowTag %>'
           ),
           {
-            requestParams: {
-              objType,
-              objInstanceFull: requestParams.objInstanceFull,
-              identifiers: requestParams.objInstanceFull?.identifiers,
-              fieldNames: requestParams.objInstanceFull?.fields || requestParams.fieldNames,
-              relationships: requestParams.relationships || [],
-              targetIdentifiers,
-              submittedByUserId: requestParams.submittedByUserId
-            },
+            requestParams: hookPayload_<%= config.flowTag %>,
             callingFlowConfig
           }
         );
@@ -282,17 +290,21 @@ export default async function <%- flowTag %>(
       <%_ if (hasOwnTopic) { _%>
       // ── ownTopic (async — dispatch to before-hook and await callback) ──────────
       <%_ configs.filter(c => c?.generatedCodeConfig?.invocationType === 'ownTopic' || c?.event?.includes('ownTopic')).forEach(config => { _%>
+      let hookPayload_<%= config.flowTag %> = {
+        objType,
+        objInstanceFull: requestParams.objInstanceFull,
+        identifiers: requestParams.objInstanceFull?.identifiers,
+        fieldNames:
+          requestParams.objInstanceFull?.fields || requestParams.fieldNames,
+        relationships: requestParams.relationships || [],
+        targetIdentifiers,
+        submittedByUserId: requestParams.submittedByUserId
+      };
+      //(<beforeSendHook_<%= config.flowTag %>>)
+      //(</beforeSendHook_<%= config.flowTag %>>)
       const hookMsg_<%= config.flowTag %> =
         callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-          {
-            objType,
-            objInstanceFull: requestParams.objInstanceFull,
-            identifiers: requestParams.objInstanceFull?.identifiers,
-            fieldNames: requestParams.objInstanceFull?.fields || requestParams.fieldNames,
-            relationships: requestParams.relationships || [],
-            targetIdentifiers,
-            submittedByUserId: requestParams.submittedByUserId
-          },
+          hookPayload_<%= config.flowTag %>,
           callingFlowSharedLib.addParentCallingFlowConfig(
             callingFlowConfig,
             callingFlowSharedLib.createCallingFlowConfig(

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

@@ -852,12 +852,132 @@ export async function <%- flowTag %>LogicalLib(
 
     // 5. If no graph storage, complete immediately
     if (!hasGraphStorage) {
+      <%_ if (plan?.hasAfterHookSync) { _%>
+      // ── Synchronous After Hooks ──
+      <%_ plan.afterHooks.filter(h => h?.generatedCodeConfig?.invocationType === 'lambdaSyncInv').forEach(hook => { _%>
+      <%_ if (hook.targetObjectTypes && hook.targetObjectTypes.length === 1) { _%>
+      if (objType?.objectType === '<%= hook.targetObjectTypes[0] %>') {
+      <%_ } else if (hook.targetObjectTypes && hook.targetObjectTypes.length > 1) { _%>
+      if (<%- JSON.stringify(hook.targetObjectTypes) %>.includes(objType?.objectType)) {
+      <%_ } _%>
+      try {
+        let hookPayload_<%= hook.flowTag %> = {
+          objType,
+          objInstanceFull: createObjInstanceFullFromParams(
+            updateItem,
+            requestParams
+          ),
+          relationships: requestParams.relationships || [],
+          targetIdentifiers: requestParams.targetIdentifiers,
+          submittedByUserId: requestParams.submittedByUserId
+        };
+        //(<beforeSendHook_<%= hook.flowTag %>>)
+        //(</beforeSendHook_<%= hook.flowTag %>>)
+        const hookResult = await lambda.invokeSync(
+          _izContext,
+          await lambdaSharedLib.lambdaFunctionName(
+            _izContext,
+            '<%= hook.flowTag %>'
+          ),
+          {
+            requestParams: hookPayload_<%= hook.flowTag %>,
+            callingFlowConfig
+          }
+        );
+        if (
+          hookResult?.errorsFound?.length > 0 ||
+          hookResult?.status === 'error'
+        ) {
+          errorsFound.push(
+            ...(hookResult.errorsFound || ['Hook <%= hook.flowTag %> failed'])
+          );
+        }
+      } catch (hookErr) {
+        _izContext.logger.error(
+          '[<%- flowTag %>LogicalLib] Sync hook <%= hook.flowTag %> error:',
+          hookErr
+        );
+        errorsFound.push(hookErr.message || 'Hook <%= hook.flowTag %> failed');
+      }
+      <%_ if (hook.targetObjectTypes && hook.targetObjectTypes.length > 0) { _%>
+      }
+      <%_ } _%>
+      <%_ }) _%>
+      <%_ } _%>
+
+      <%_ if (plan?.hasAfterHookAsync) { _%>
+      // ── Asynchronous After Hooks ──
+      <%_ plan.afterHooks.filter(h => h?.generatedCodeConfig?.invocationType === 'ownTopic').forEach(hook => { _%>
+      <%_ if (hook.targetObjectTypes && hook.targetObjectTypes.length === 1) { _%>
+      if (objType?.objectType === '<%= hook.targetObjectTypes[0] %>') {
+      <%_ } else if (hook.targetObjectTypes && hook.targetObjectTypes.length > 1) { _%>
+      if (<%- JSON.stringify(hook.targetObjectTypes) %>.includes(objType?.objectType)) {
+      <%_ } _%>
+      let hookPayload_<%= hook.flowTag %> = {
+        objType,
+        objInstanceFull: createObjInstanceFullFromParams(
+          updateItem,
+          requestParams
+        ),
+        relationships: requestParams.relationships || [],
+        targetIdentifiers: requestParams.targetIdentifiers,
+        submittedByUserId: requestParams.submittedByUserId
+      };
+      //(<beforeSendHook_<%= hook.flowTag %>>)
+      //(</beforeSendHook_<%= hook.flowTag %>>)
+      const hookMsg_<%= hook.flowTag %> =
+        callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
+          hookPayload_<%= hook.flowTag %>,
+          callingFlowSharedLib.addParentCallingFlowConfig(
+            callingFlowConfig,
+            callingFlowSharedLib.createCallingFlowConfig(
+              await lambdaSharedLib.lambdaFunctionName(
+                _izContext,
+                'UpdateAfterHookCallbackHdrSqs'
+              ),
+              {
+                actionData: {
+                  objType,
+                  objInstanceFull: createObjInstanceFullFromParams(
+                    updateItem,
+                    requestParams
+                  ),
+                  relationships: requestParams.relationships || [],
+                  targetIdentifiers: requestParams.targetIdentifiers,
+                  parentFlowId: requestParams.parentFlowId,
+                  status: 'complete',
+                  errorsFound
+                }
+              }
+            )
+          )
+        );
+
+      await sns.publishAsync(_izContext, {
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          '<%= hook.flowTag %>_In'
+        ),
+        Message: JSON.stringify(hookMsg_<%= hook.flowTag %>),
+        MessageAttributes: sns.createStringMessageAttributes(_izContext, {})
+      });
+      <%_ if (hook.targetObjectTypes && hook.targetObjectTypes.length > 0) { _%>
+      }
+      <%_ } _%>
+      <%_ }) _%>
+      <%_ } else { _%>
       await handleDynamoDbOnlyComplete(_izContext, {
         objType,
         updateItem,
         requestParams,
         callingFlowConfig
       });
+      <%_ } _%>
+    }
+
+    let resultStatus = 'complete';
+    if (errorsFound.length > 0) {
+      resultStatus = 'error';
     }
 
     return {
@@ -866,7 +986,7 @@ export async function <%- flowTag %>LogicalLib(
         objInstanceFull: { identifiers, fields },
         versionedDataIds
       },
-      status: 'complete',
+      status: resultStatus,
       errorsFound
     };
   } catch (err) {

package/src/emit/rbac/emitDynamicRbacFlowSchemas.js

@@ -19,8 +19,14 @@ const RBAC_CORE_FLOW_DEFINITIONS = [
 
 const LIMIT_FLOW_DEFINITIONS = [
   { flowTag: 'ReservedDynamicUsage', event: ['ownTopic'] },
-  { flowTag: 'ConfirmUsage', event: ['ownTopic'] },
-  { flowTag: 'CancelUsage', event: ['ownTopic'] }
+  {
+    flowTag: 'ConfirmUsage',
+    event: ['ownTopic', 'lambdaSyncInv', 'lambdaSyncApi']
+  },
+  {
+    flowTag: 'CancelUsage',
+    event: ['ownTopic', 'lambdaSyncInv', 'lambdaSyncApi']
+  }
 ];
 
 const RBAC_FLOW_DEFINITIONS = [

package/src/emit/rbac/templates/CancelUsage_Main.ejs

@@ -146,20 +146,40 @@ export default async function CancelUsage(_izContext, requestParams) {
       }
     }
 
-    await sns.publishMessage(_izContext, {
-      message: {
-        returnResult: {
-          status: true,
-          uniqueIdentify: usedTimestampId,
-          usedTimestampId,
-          runningTotalReservedId
-        }
-      },
-      TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
-        _izContext,
-        'CancelUsage_Out'
-      )
-    });
+    const returnResult = {
+      status: true,
+      uniqueIdentify: usedTimestampId,
+      usedTimestampId,
+      runningTotalReservedId
+    };
+
+    const eventSourceTag =
+      _izContext.izEventSource?.eventSourceTag ||
+      requestParams?.izEventSource?.eventSourceTag;
+
+    let isSync = false;
+    if (
+      eventSourceTag === 'DirectInvoke' ||
+      eventSourceTag === 'ApiGateway' ||
+      eventSourceTag === 'ApiGatewayV2' ||
+      requestParams?.hasOwnProperty('__context__')
+    ) {
+      isSync = true;
+    }
+
+    if (!isSync) {
+      await sns.publishMessage(_izContext, {
+        message: {
+          returnResult
+        },
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          'CancelUsage_Out'
+        )
+      });
+    }
+
+    return returnResult;
   } catch (error) {
     _izContext.logger.error(`[${process.env.iz_serviceTag}:CancelUsage] error:`, error);
     throw error;

package/src/emit/rbac/templates/ConfirmUsage_Main.ejs

@@ -170,20 +170,40 @@ export default async function ConfirmUsage(_izContext, requestParams) {
       ).catch(() => null);
     }
 
-    await sns.publishMessage(_izContext, {
-      message: {
-        returnResult: {
-          status: true,
-          uniqueIdentify: usedTimestampId,
-          usedTimestampId,
-          runningTotalReservedId
-        }
-      },
-      TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
-        _izContext,
-        'ConfirmUsage_Out'
-      )
-    });
+    const returnResult = {
+      status: true,
+      uniqueIdentify: usedTimestampId,
+      usedTimestampId,
+      runningTotalReservedId
+    };
+
+    const eventSourceTag =
+      _izContext.izEventSource?.eventSourceTag ||
+      requestParams?.izEventSource?.eventSourceTag;
+
+    let isSync = false;
+    if (
+      eventSourceTag === 'DirectInvoke' ||
+      eventSourceTag === 'ApiGateway' ||
+      eventSourceTag === 'ApiGatewayV2' ||
+      requestParams?.hasOwnProperty('__context__')
+    ) {
+      isSync = true;
+    }
+
+    if (!isSync) {
+      await sns.publishMessage(_izContext, {
+        message: {
+          returnResult
+        },
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          'ConfirmUsage_Out'
+        )
+      });
+    }
+
+    return returnResult;
   } catch (error) {
     _izContext.logger.error(`[${process.env.iz_serviceTag}:ConfirmUsage] error:`, error);
     throw error;

package/src/emit/resource/emitResourceArtifacts.js

@@ -958,7 +958,7 @@ function roleTopicNames(state, roleName) {
         }
       }
     }
-    return topics;
+    return [...new Set(topics)];
   }
   if (roleName === 'FlowRelationshipRole') {
     const actions = state.outTopics.filter((topic) =>
@@ -1102,8 +1102,15 @@ function roleExternalLambdaArns(state, roleName) {
     (tag) =>
       `arn:aws:lambda:\${self:custom.iz_region}:\${self:custom.iz_accountId}:function:${tag}\${self:custom.iz_stage}ValidatorRbacHdrInv`
   );
+  if (roleName === 'FlowObjectsRole') {
+    return [
+      `arn:aws:lambda:\${self:custom.iz_region}:\${self:custom.iz_accountId}:function:Rbac\${self:custom.iz_stage}ValidatorRbacHdrInv`,
+      `arn:aws:lambda:\${self:custom.iz_region}:\${self:custom.iz_accountId}:function:Rbac\${self:custom.iz_stage}ConfirmUsageHdrInv`,
+      `arn:aws:lambda:\${self:custom.iz_region}:\${self:custom.iz_accountId}:function:Rbac\${self:custom.iz_stage}CancelUsageHdrInv`,
+      ...extraLambdas
+    ];
+  }
   if (
-    roleName === 'FlowObjectsRole' ||
     roleName === 'FlowRbacRole' ||
     roleName === 'FlowRelationshipRole'
   ) {