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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.89",
+  "version": "1.0.91",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {

package/src/emit/crud/emitDynamicCrudFlowSchemas.js

@@ -175,7 +175,7 @@ function _createDynamicFlow(action, plan, serviceTag = '', initiateBy = 'user')
         'returnValue',
         'parentFlowId',
         'status',
-        'errorsFound',
+        'foundErrors',
         'graphServiceTag'
       ],
       messageAttributes: MESSAGE_ATTRIBUTES
@@ -210,7 +210,7 @@ function _createDynamicFlow(action, plan, serviceTag = '', initiateBy = 'user')
             'returnValue',
             'parentFlowId',
             'status',
-            'errorsFound',
+            'foundErrors',
             'graphServiceTag'
           ]
         : [],

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

@@ -49,12 +49,12 @@ export default async function CreateAfterHookCallbackMain(
 
     const {
       status,
-      errorsFound = [],
+      foundErrors = [],
       returnValue,
       parentFlowId
     } = requestParams;
 
-    const mergedErrors = Array.isArray(errorsFound) ? [...errorsFound] : [];
+    const mergedErrors = Array.isArray(foundErrors) ? [...foundErrors] : [];
     if (status === 'error' && mergedErrors.length === 0) {
       mergedErrors.push('AfterHook execution reported error');
     }
@@ -78,13 +78,13 @@ export default async function CreateAfterHookCallbackMain(
         targetIdentifiers: requestParams?.targetIdentifiers,
         parentFlowId: parentFlowId || returnValue?.parentFlowId,
         status: mergedErrors.length > 0 ? 'error' : 'complete',
-        errorsFound: mergedErrors
+        foundErrors: mergedErrors
       };
 
     if (quotaKeys) {
       await forwardToQuotaConfirmation(_izContext, {
         status: mergedErrors.length > 0 ? 'error' : 'complete',
-        errorsFound: mergedErrors,
+        foundErrors: mergedErrors,
         quotaKeys,
         actionData,
         callingFlowConfig
@@ -97,7 +97,7 @@ export default async function CreateAfterHookCallbackMain(
       const completionPayload = {
         ...actionData,
         status: mergedErrors.length > 0 ? 'error' : 'complete',
-        errorsFound: mergedErrors
+        foundErrors: mergedErrors
       };
       await sns.publishAsync(_izContext, {
         TopicArn: topicArn,
@@ -112,7 +112,7 @@ export default async function CreateAfterHookCallbackMain(
     return {
       returnValue,
       status: mergedErrors.length > 0 ? 'error' : 'complete',
-      errorsFound: mergedErrors
+      foundErrors: mergedErrors
     };
   } catch (error) {
     _izContext.logger.error('[CreateAfterHookCallback] error:', error);

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

@@ -45,12 +45,12 @@ export default async function <%- upperCaseFlowTag %>BeforeHookCallbackMain(
 
     const {
       status,
-      errorsFound = [],
+      foundErrors = [],
       returnValue,
       parentFlowId
     } = requestParams;
 
-    const mergedErrors = Array.isArray(errorsFound) ? [...errorsFound] : [];
+    const mergedErrors = Array.isArray(foundErrors) ? [...foundErrors] : [];
     if (status === 'error' && mergedErrors.length === 0) {
       mergedErrors.push('BeforeHook execution reported error');
     }
@@ -82,7 +82,7 @@ export default async function <%- upperCaseFlowTag %>BeforeHookCallbackMain(
         },
         requestParams: originalRequestParams || {},
         callingFlowConfig,
-        errorsFound: mergedErrors
+        foundErrors: mergedErrors
       });
     }
 

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

@@ -1,8 +1,12 @@
 import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
-import { sns } from '@izara_project/izara-core-library-external-request';
+import {
+  sns,
+  lambda
+} from '@izara_project/izara-core-library-external-request';
 import { consts } from '@izara_project/izara-core-library-service-schemas';
 import { NoRetryError } from '@izara_project/izara-core-library-core';
 
@@ -19,29 +23,29 @@ function empty(value) {
   );
 }
 
-function validateInput(returnValue, status, graphServiceTag, errorsFound) {
+function validateInput(returnValue, status, graphServiceTag, foundErrors) {
   if (!returnValue?.queryResult)
-    errorsFound.push(
+    foundErrors.push(
       'message is not have property queryResult, should be not happen'
     );
   if (!returnValue?.requestParams?.objType)
-    errorsFound.push(
+    foundErrors.push(
       'message is not have property objType, should be not happen'
     );
   if (!returnValue?.requestParams?.objInstanceFull)
-    errorsFound.push(
+    foundErrors.push(
       'message is not have property objInstance, should be not objInstance'
     );
-  if (status === 'error' && errorsFound.length === 0)
-    errorsFound.push(
-      '[invalid]status is error not have errorsFound form graphService'
+  if (status === 'error' && foundErrors.length === 0)
+    foundErrors.push(
+      '[invalid]status is error not have foundErrors form graphService'
     );
-  if (status === 'complete' && errorsFound.length > 0)
-    errorsFound.push(
-      '[Invalid] status is complete should be not have errorsFound'
+  if (status === 'complete' && foundErrors.length > 0)
+    foundErrors.push(
+      '[Invalid] status is complete should be not have foundErrors'
     );
   if (graphServiceTag == null)
-    errorsFound.push('[Invalid] graphServerTag is not empty string');
+    foundErrors.push('[Invalid] graphServerTag is not empty string');
 }
 
 export default async function CreateComplete(
@@ -58,14 +62,14 @@ export default async function CreateComplete(
     const {
       returnValue,
       status,
-      errorsFound = [],
+      foundErrors = [],
       graphServiceTag,
       parentFlowId
     } = requestParams;
     if (empty(returnValue?.requestParams))
       throw new NoRetryError('message not an object');
-    validateInput(returnValue, status, graphServiceTag, errorsFound);
-    if (errorsFound.length > 0) errorsFound.push(errorsFound.join(','));
+    validateInput(returnValue, status, graphServiceTag, foundErrors);
+    if (foundErrors.length > 0) foundErrors.push(foundErrors.join(','));
 
     const awaitingStepId = await asyncFlowSharedLib.createAwaitingStepId(
       parentFlowId,
@@ -84,14 +88,14 @@ export default async function CreateComplete(
       _izContext.logger.warn(
         `No pending step found for awaitingStepId: ${awaitingStepId}`
       );
-      return { returnValue, status, errorsFound };
+      return { returnValue, status, foundErrors };
     }
     const result =
       await asyncFlowSharedLib.checkAllAwaitingStepsFinishedWithReturnParams(
         _izContext,
         pending.pendingStepId,
         awaitingStepId,
-        errorsFound
+        foundErrors
       );
     _izContext.logger.debug(
       '[CreateComplete] all awaiting steps result',
@@ -142,18 +146,138 @@ export default async function CreateComplete(
       const callingFlowConfig =
         result?.additionalAttributes?.callingFlowConfig ||
         passBackProperties;
+      const actionData = {
+        objType: returnValue.requestParams.objType,
+        objInstanceFull: node.objInstanceFull,
+        relationships: node.relationships,
+        parentFlowId: parentFlowId || returnValue?.parentFlowId,
+        existsNode,
+        status,
+        foundErrors
+      };
+
+      <%_ if (plan?.hasAfterHookSync) { _%>
+      // ── Synchronous After Hooks ──
+      <%_ plan.afterHooks.filter(h => h?.generatedCodeConfig?.invocationType === 'lambdaSyncInv').forEach(hook => { _%>
+      <%_ if (hook.targetObjectTypes && hook.targetObjectTypes.length === 1) { _%>
+      if (returnValue.requestParams?.objType?.objectType === '<%= hook.targetObjectTypes[0] %>') {
+      <%_ } else if (hook.targetObjectTypes && hook.targetObjectTypes.length > 1) { _%>
+      if (<%- JSON.stringify(hook.targetObjectTypes) %>.includes(returnValue.requestParams?.objType?.objectType)) {
+      <%_ } _%>
+      try {
+        let hookPayload_<%= hook.flowTag %> = {
+          objType: returnValue.requestParams.objType,
+          objInstanceFull: node.objInstanceFull,
+          relationships: node.relationships || [],
+          targetIdentifiers: requestParams.targetIdentifiers,
+          submittedByUserId: returnValue?.requestParams?.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?.foundErrors?.length > 0 || hookResult?.status === 'error') {
+          foundErrors.push(...(hookResult.foundErrors || ['Hook <%= hook.flowTag %> failed']));
+        }
+      } catch (hookErr) {
+        _izContext.logger.error('[CreateComplete] Sync hook <%= hook.flowTag %> error:', hookErr);
+        foundErrors.push(hookErr.message || 'Hook <%= hook.flowTag %> failed');
+      }
+      <%_ if (hook.targetObjectTypes && hook.targetObjectTypes.length > 0) { _%>
+      }
+      <%_ } _%>
+      <%_ }) _%>
+      <%_ } _%>
+
+      <%_ if (plan?.hasAfterHookAsync) { _%>
+      // ── Asynchronous After Hooks ──
+      let afterHookDispatched = false;
+      <%_ plan.afterHooks.filter(h => h?.generatedCodeConfig?.invocationType === 'ownTopic').forEach(hook => { _%>
+      <%_ if (hook.targetObjectTypes && hook.targetObjectTypes.length === 1) { _%>
+      if (returnValue.requestParams?.objType?.objectType === '<%= hook.targetObjectTypes[0] %>') {
+      <%_ } else if (hook.targetObjectTypes && hook.targetObjectTypes.length > 1) { _%>
+      if (<%- JSON.stringify(hook.targetObjectTypes) %>.includes(returnValue.requestParams?.objType?.objectType)) {
+      <%_ } _%>
+        afterHookDispatched = true;
+        let hookPayload_<%= hook.flowTag %> = {
+          objType: returnValue.requestParams.objType,
+          objInstanceFull: node.objInstanceFull,
+          relationships: node.relationships || [],
+          targetIdentifiers: requestParams.targetIdentifiers,
+          submittedByUserId: returnValue?.requestParams?.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,
+                'CreateAfterHookCallbackHdrSqs'
+              ),
+              {
+                actionData
+              }
+            )
+          )
+        );
+
+        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) { _%>
+      }
+      <%_ } _%>
+      <%_ }) _%>
+      if (!afterHookDispatched) {
+        const message =
+          callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
+            callingFlowConfig,
+            actionData
+          );
+        const messageAttributes =
+          callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
+            callingFlowConfig,
+            {}
+          );
+        const topicArn = snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          TOPIC_NAME_GENERATE_CODE.outCreateNodeComplete
+        );
+        _izContext.logger.debug('[CreateComplete] publishing to SNS', {
+          TopicArn: topicArn,
+          message
+        });
+        await sns.publishAsync(_izContext, {
+          Message: JSON.stringify(message),
+          MessageAttributes: sns.createStringMessageAttributes(
+            _izContext,
+            messageAttributes
+          ),
+          TopicArn: topicArn
+        });
+      }
+      <%_ } else { _%>
       const message =
         callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
           callingFlowConfig,
-          {
-            objType: returnValue.requestParams.objType,
-            objInstanceFull: node.objInstanceFull,
-            relationships: node.relationships,
-            parentFlowId: parentFlowId || returnValue?.parentFlowId,
-            existsNode,
-            status,
-            errorsFound
-          }
+          actionData
         );
       const messageAttributes =
         callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
@@ -176,6 +300,7 @@ export default async function CreateComplete(
         ),
         TopicArn: topicArn
       });
+      <%_ } _%>
       //(<afterSendMessage>)
       //(</afterSendMessage>)
     }
@@ -183,9 +308,9 @@ export default async function CreateComplete(
       _izContext,
       awaitingStepId,
       pending.pendingStepId,
-      errorsFound
+      foundErrors
     );
-    return { returnValue, status, errorsFound };
+    return { returnValue, status, foundErrors };
   } catch (error) {
     _izContext.logger.error('[CreateComplete] error:', error);
     throw error;

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

@@ -76,11 +76,11 @@ export default async function <%- flowTag %>(
       }
     );
 
-    const errorsFound = [];
+    const foundErrors = [];
 
     // Step 1: Resolve Schema & Identity
     const { objType, objectSchema } =
-      await resolveSchemaAndIdentity(_izContext, requestParams, errorsFound);
+      await resolveSchemaAndIdentity(_izContext, requestParams, foundErrors);
 
     //(<beforeQuery>)
     //(</beforeQuery>)
@@ -90,27 +90,27 @@ export default async function <%- flowTag %>(
       _izContext,
       requestParams,
       objectSchema,
-      errorsFound
+      foundErrors
     );
 
-    if (errorsFound.length > 0) {
+    if (foundErrors.length > 0) {
       return await <%- flowTag %>LogicalLib(
         _izContext,
         requestParams,
         callingFlowConfig,
-        errorsFound
+        foundErrors
       );
     }
 
     // Step 3: Validate FieldNames
-    validateFieldNames(_izContext, requestParams, objectSchemas, errorsFound);
+    validateFieldNames(_izContext, requestParams, objectSchemas, foundErrors);
 
-    if (errorsFound.length > 0) {
+    if (foundErrors.length > 0) {
       return await <%- flowTag %>LogicalLib(
         _izContext,
         requestParams,
         callingFlowConfig,
-        errorsFound
+        foundErrors
       );
     }
 
@@ -178,12 +178,12 @@ export default async function <%- flowTag %>(
       );
 
       if (resultPermissionCheck && resultPermissionCheck.permission !== true) {
-        errorsFound.push('Permission denied');
+        foundErrors.push('Permission denied');
         return await <%- flowTag %>LogicalLib(
           _izContext,
           requestParams,
           callingFlowConfig,
-          errorsFound
+          foundErrors
         );
       }
 
@@ -240,10 +240,10 @@ export default async function <%- flowTag %>(
           flowTag: '<%= config.flowTag %>',
           returnValue
         });
-        if (returnValue?.errorsFound?.length > 0) {
-          errorsFound.push(...returnValue.errorsFound);
+        if (returnValue?.foundErrors?.length > 0) {
+          foundErrors.push(...returnValue.foundErrors);
         } else if (returnValue?.status === 'error') {
-          errorsFound.push('Error from <%= config.flowTag %>');
+          foundErrors.push('Error from <%= config.flowTag %>');
         } else {
           if (returnValue?.fieldNames && requestParams?.fieldNames) {
             Object.assign(requestParams.fieldNames, returnValue.fieldNames);
@@ -257,16 +257,16 @@ export default async function <%- flowTag %>(
           '[<%- flowTag %>] Sync hook <%= config.flowTag %> error:',
           hookErr
         );
-        errorsFound.push(hookErr.message || 'Hook <%= config.flowTag %> failed');
+        foundErrors.push(hookErr.message || 'Hook <%= config.flowTag %> failed');
       }
       <%_ } _%>
 
-      if (errorsFound.length > 0) {
+      if (foundErrors.length > 0) {
         return await <%- flowTag %>LogicalLib(
           _izContext,
           requestParams,
           callingFlowConfig,
-          errorsFound
+          foundErrors
         );
       }
       <%_ } _%>
@@ -346,7 +346,7 @@ export default async function <%- flowTag %>(
         _izContext,
         requestParams,
         callingFlowConfig,
-        errorsFound
+        foundErrors
       );
       <%_ } _%>
     }
@@ -359,7 +359,7 @@ export default async function <%- flowTag %>(
       _izContext,
       requestParams,
       callingFlowConfig,
-      errorsFound
+      foundErrors
     );
   } catch (err) {
     _izContext.logger.error(