@izara_project/izara-core-generate-service-code 1.0.24 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "description": "Code for locally generating per service files",
   "author": "Sven Mason <thebarbariansven@gmail.com>",
   "license": "AGPL-3.0-or-later",

package/src/generateCode/generateFlowSchema/event/eventBridgeComponent/handler/inv/template.ejs

@@ -41,7 +41,9 @@ export const main = middlewareHandler.wrap(async (event, context) => {
     return await <%- functionName %> Main(
       event._izContext, // correlationId/logger/integrationTestDetail/uniqueRequestId
       event,
-      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
+      callingFlowSharedLib.addCallingFlowToPassOnProperties(event),
+      //(<additionalParams>)
+      //(</additionalParams>)
     );
 
   } catch (err) {

package/src/generateCode/generateFlowSchema/event/extTopicComponent/process/handler/template.ejs

@@ -65,10 +65,10 @@ export const main = middleware.wrap(async (event, context) => {
       );
 
       // add argument (to invoke lambda) to passOnProperties[]
-      passOnProperties.push(record.body.Message)
+      passOnProperties.push(record.body.Message);
+      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       //(<additionalParams>)
       //(</additionalParams>)
-      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)

package/src/generateCode/generateFlowSchema/event/lambdaSyncApiComponent/handler/template.ejs

@@ -15,8 +15,6 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-
 const RBAC_TARGET_ID = process.env.iz_rbacTargetIdUser // iz_rbacTargetIdUser | iz_rbacDeliveryMethodId
 
 import { middlewareHandler as middleware } from "@izara_project/izara-middleware";
@@ -66,9 +64,9 @@ export const main = middleware.wrap(async (event, context, callback) => {
     let lambdaFunctionResponse = await <%- functionName %>.<%- functionName %>(
       event._izContext,       // correlationId/logger/integrationTestDetail/uniqueRequestId/userId
       event.body,
+      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
       //(<additionalParams>)
       //(</additionalParams>)
-      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
     );
 
     // return error to client

package/src/generateCode/generateFlowSchema/event/lambdaSyncInvComponent/handler/template.ejs

@@ -40,9 +40,9 @@ export const main = middleware.wrap(async (event, context, callback) => {
     return await <%- functionName %>.<%- functionName %>(
       event._izContext, // correlationId/logger/integrationTestDetail/uniqueRequestId
       event,
+      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
       //(<additionalParams>)
       //(</additionalParams>)
-      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
     );
 
   } catch (err) {

package/src/generateCode/generateFlowSchema/event/ownTopicComponent/endpointComponent/handler/DsqHandlerTemplate.ejs

@@ -69,10 +69,10 @@ export const main = middleware.wrap(async (event, context) => {
       );
 
       // add argument (to invoke lambda) to passOnProperties[]
-      passOnProperties.push(record.body.Message)
+      passOnProperties.push(record.body.Message);
+      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       //(<additionalParams>)
       //(</additionalParams>)
-      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)

package/src/generateCode/generateFlowSchema/event/ownTopicComponent/endpointComponent/handler/SqsHandlerTemplate.ejs

@@ -51,10 +51,10 @@ export const main = middleware.wrap(async (event, context) => {
       );
 
       // add argument (to invoke lambda) to passOnProperties[]
-      passOnProperties.push(record.body.Message)
+      passOnProperties.push(record.body.Message);
+      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       //(<additionalParams>)
       //(</additionalParams>)
-      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)

package/src/generateCode/generateFlowSchema/event/s3Component/flowSchemaMainFunction/template.ejs

@@ -55,9 +55,9 @@ import storedCacheSharedLib from '@izara_project/izara-core-library-stored-cache
 export default async function <%- functionName %> (
   _izContext,
   requestParams,
+  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
-  callingFlowConfig = {},
 ) {
 
   try {

package/src/generateCode/generateFlowSchema/flowSchemaMainFunction/template.ejs

@@ -56,9 +56,9 @@ import storedCacheSharedLib from '@izara_project/izara-core-library-stored-cache
 export default async function <%- functionName %> (
   _izContext,
   requestParams,
+  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
-  callingFlowConfig = {},
 ) {
 
   try {

package/src/generateCode/generateSchema/actionEndpointCompleteComponent/create/mainFunction/template.ejs

@@ -225,7 +225,7 @@ export default async function createObjectComplete(
     await Promise.all(
       recordAwaitingSteps.Items.map(async ({ pendingStepId }) => {
         if (
-          await asyncFlowSharedLib.checkAllAwaitingStepsFinishedWithError(
+          await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
             _izContext,
             pendingStepId,
             awaitingStepId,

package/src/generateCode/generateSchema/actionEndpointCompleteComponent/update/mainFunction/template.ejs

@@ -153,7 +153,7 @@ export default async function updateNodeComplete(
     await Promise.all(
       updateNodePendingObjects.Items.map(async ({ pendingStepId }) => {
         if (
-          await asyncFlowSharedLib.checkAllAwaitingStepsFinishedWithError(
+          await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
             _izContext,
             pendingStepId,
             awaitingStepId,

package/src/generateCode/generateSchema/actionEndpointComponent/mainFunction/beforeLogical/template.ejs

@@ -76,8 +76,7 @@ import { <%= action %>MainLogical } from './<%= functionName %>_Main.js';
       }
       <%_ } _%>
     }
-
-    console.debug('identifiers:::: ', identifiers);
+    _izContext.logger.debug('identifiers:::: ', identifiers);
 
     // ── Verify + remove awaitingStep ──────────────────────────────────────────
     const awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
@@ -90,9 +89,12 @@ import { <%= action %>MainLogical } from './<%= functionName %>_Main.js';
       `beforeLogical_${requestParams.returnRequestParams.objectType}`
     );
 
-    _izContext.logger.debug('createBeforeLogicalMain: checking awaitingStep', { awaitingStepId, pendingStepId });
+    _izContext.logger.debug('createBeforeLogicalMain: checking awaitingStep', {
+      awaitingStepId,
+      pendingStepId
+    });
 
-    const [allComplete, collectedAttributes] =
+    const [allComplete, collectedAttributes, errorsFound] =
       await asyncFlowSharedLib.syncAndCheckStepsCompletion(
         _izContext,
         pendingStepId,
@@ -103,6 +105,12 @@ import { <%= action %>MainLogical } from './<%= functionName %>_Main.js';
         }
       );
 
+    _izContext.logger.debug('validate step::: ', {
+      allComplete,
+      collectedAttributes,
+      errorsFound
+    });
+
     if (allComplete === false) {
       _izContext.logger.debug(
         'createBeforeLogicalMain: pendingStepId not completed',
@@ -130,13 +138,13 @@ import { <%= action %>MainLogical } from './<%= functionName %>_Main.js';
     //(<beforeLogicalMain>)
     //(</beforeLogicalMain>)
 
-    return await <%- action %>MainLogical(
+    return await createMainLogical(
       _izContext,
       requestParams.returnRequestParams,
       callingFlowConfig,
+      errorsFound,
       beforeLogicalResults
     );
-
   } catch (err) {
     throw err;
   }

package/src/generateCode/generateSchema/actionEndpointComponent/mainFunction/create/main/template.ejs

@@ -60,6 +60,7 @@ const PREFIX = {
   _izContext,
   requestParams,
   callingFlowConfig = {},
+  errorsFound = [],
   beforeLogicalResults = {}
 ) {
   try {
@@ -69,7 +70,9 @@ const PREFIX = {
       beforeLogicalResults
     });
 
-    const errorsFound = [];
+    //(<beforeCreateMainLogical>)
+    //(</beforeCreateMainLogical>)
+
     const objType = createObjType(requestParams.objectType);
 
     // ── Load schema ───────────────────────────────────────────────────────────
@@ -443,6 +446,14 @@ export default async function createMain(
     errorsFound.push(...errors);
     _izContext.logger.debug('errorsFound::', errorsFound);
 
+    if (errorsFound.length > 0)
+    return await createMainLogical(
+      _izContext,
+      requestParams,
+      callingFlowConfig,
+      errorsFound
+    );
+
     // ── Validate fieldNames ───────────────────────────────────────────────────
     const objInstanceFull = { identifiers: {}, fields: {} };
 
@@ -468,7 +479,6 @@ export default async function createMain(
     }
 
     // ── beforeLogical phase check ─────────────────────────────────────────────
-    //(<beforeLogical>)
     <%_
     const groupedByObjType = generatedCodeConfig
       .filter(c => c.codeHookTag === 'beforeLogical')
@@ -504,6 +514,9 @@ export default async function createMain(
 
         <%_ } _%>
 
+        //(<afterBeforeLogical_<%= objectType %>>)
+        //(</afterBeforeLogical_<%= objectType %>>)
+
       <%_ if (hasOwnTopic) { _%>
       // ── ownTopic (async — create awaitingSteps and then publish) ──────────────
       const awaitingMultipleStepIds = [];
@@ -565,6 +578,9 @@ export default async function createMain(
         )
       );
 
+      //(<beforePublish_<%= objectType %>>)
+      //(</beforePublish_<%= objectType %>>)
+
       for (const recordMsg of recordMsgs) {
         const messageAttributes = sns.createStringMessageAttributes(
           _izContext,
@@ -604,7 +620,9 @@ export default async function createMain(
       <%_ } _%>
     }
     <%_ }) _%>
-    //(</beforeLogical>)
+
+    //(<beforeCreateMainLogical>)
+    //(</beforeCreateMainLogical>)
 
     // ── No beforeLogical → proceed directly to logical ────────────────────────
     return await createMainLogical(

package/src/generateCode/generateSchema/actionEndpointComponent/mainFunction/delete/main/template.ejs

@@ -49,12 +49,15 @@ export async function deleteMainLogical(
   _izContext,
   requestParams,
   callingFlowConfig = {},
+  errorsFound = [],
   beforeLogicalResults = {}
 ) {
   try {
     _izContext.logger.debug('deleteMainLogical:', { requestParams, callingFlowConfig, beforeLogicalResults });
 
-    const errorsFound = [];
+    //(<beforeDeleteMainLogical>)
+    //(</beforeDeleteMainLogical>)
+
     const objType = createObjType(requestParams.objectType);
 
     // ── Load schema ───────────────────────────────────────────────────────────
@@ -159,6 +162,9 @@ export default async function deleteMain(
     const errorsFound = [];
     const objType = createObjType(requestParams.objectType);
 
+    //(<beforeDelete>)
+    //(</beforeDelete>)
+
     // ── Load schema ───────────────────────────────────────────────────────────
     const objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, objType);
     _izContext.logger.debug('objectSchema', objectSchema);
@@ -177,8 +183,15 @@ export default async function deleteMain(
     // ── Build identifiers (used for hash in beforeLogical) ──────────────────
     const identifiers = requestParams.identifiers;
 
+    if (errorsFound.length > 0)
+    return await createMainLogical(
+      _izContext,
+      requestParams,
+      callingFlowConfig,
+      errorsFound
+    );
+
     // ── beforeLogical phase check ─────────────────────────────────────────────
-    //(<beforeLogical>)
     <%_
     const groupedByObjType = generatedCodeConfig
       .filter(c => c.codeHookTag === 'beforeLogical')
@@ -211,9 +224,11 @@ export default async function deleteMain(
           // lambdaSyncInv <%= config.flowTag %>
           <%_ }) _%>
         ]);
-
         <%_ } _%>
 
+        //(<afterBeforeLogical_<%= objectType %>>)
+        //(</afterBeforeLogical_<%= objectType %>>)
+
         <%_ if (hasOwnTopic) { _%>
         // ── ownTopic (async — create awaitingSteps and then publish) ──────────
         const awaitingMultipleStepIds = [];
@@ -275,6 +290,9 @@ export default async function deleteMain(
           )
         );
 
+        //(<beforePublish_<%= objectType %>>)
+        //(</beforePublish_<%= objectType %>>)
+
         for (const recordMsg of recordMsgs) {
           const messageAttributes = sns.createStringMessageAttributes(
             _izContext,
@@ -314,7 +332,9 @@ export default async function deleteMain(
         <%_ } _%>
       }
     <%_ }) _%>
-    //(</beforeLogical>)
+
+    //(<beforeDeleteMainLogical>)
+    //(</beforeDeleteMainLogical>)
 
     // ── No beforeLogical → proceed directly to logical ────────────────────────
     return await deleteMainLogical(

package/src/generateCode/generateSchema/actionEndpointComponent/mainFunction/update/main/template.ejs

@@ -53,17 +53,20 @@ export async function updateMainLogical(
   _izContext,
   requestParams,
   callingFlowConfig = {},
+  errorsFound = [],
   beforeLogicalResults = {}
 ) {
   try {
     _izContext.logger.debug('updateMainLogical:', { requestParams, callingFlowConfig, beforeLogicalResults });
 
+    //(<beforeUpdateMainLogical>)
+    //(</beforeUpdateMainLogical>)
+
     // ── Settings ──────────────────────────────────────────────────────────────
     const settings = requestParams.additionalParams?.settings ?? {};
     const returnSystemFieldsName = settings.returnSystemFieldsName === true;
     const returnOldData          = settings.returnOldData === true;
 
-    const errorsFound      = [];
     const objType          = createObjType(requestParams.objectType);
     const identifiers      = requestParams.objInstanceFull.identifiers;
     const fields           = requestParams.objInstanceFull.fields;
@@ -311,9 +314,20 @@ export default async function updateMain(
 
     // ── Build identifiers (used for hash in beforeLogical) ──────────────────
     const identifiers = requestParams.objInstanceFull.identifiers;
+    const errorsFound  = [];
+
+    //(<validateBeforeUpdate>)
+    //(</validateBeforeUpdate>)
+
+    if (errorsFound.length > 0)
+    return await createMainLogical(
+      _izContext,
+      requestParams,
+      callingFlowConfig,
+      errorsFound
+    );
 
     // ── beforeLogical phase check ─────────────────────────────────────────────
-    //(<beforeLogical>)
     <%_
     const groupedByObjType = generatedCodeConfig
       .filter(c => c.codeHookTag === 'beforeLogical')
@@ -346,9 +360,11 @@ export default async function updateMain(
           // lambdaSyncInv <%= config.flowTag %>
           <%_ }) _%>
         ]);
-
         <%_ } _%>
 
+        //(<afterBeforeLogical_<%= objectType %>>)
+        //(</afterBeforeLogical_<%= objectType %>>)
+
         <%_ if (hasOwnTopic) { _%>
         // ── ownTopic (async — create awaitingSteps and then publish) ──────────
         const awaitingMultipleStepIds = [];
@@ -410,6 +426,9 @@ export default async function updateMain(
           )
         );
 
+        //(<beforePublish_<%= objectType %>>)
+        //(</beforePublish_<%= objectType %>>)
+
         for (const recordMsg of recordMsgs) {
           const messageAttributes = sns.createStringMessageAttributes(
             _izContext,
@@ -449,7 +468,9 @@ export default async function updateMain(
         <%_ } _%>
       }
     <%_ }) _%>
-    //(</beforeLogical>)
+
+    //(<beforeUpdateMainLogical>)
+    //(</beforeUpdateMainLogical>)
 
     // ── No beforeLogical → proceed directly to logical ────────────────────────
     return await updateMainLogical(

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/complete/mainFunction/template.ejs

@@ -75,7 +75,7 @@ export default async function updateRelationshipComplete(
       hash({
         linkTypeId,
         relId: returnValue.requestParams.relId,
-        relationshipProperties: returnValue.requestParams.updatePropertiesParam,
+        relationshipProperties: returnValue.requestParams.relationshipProperties
         graphServiceTag: graphServiceTag
       }), // hash id
       PREFIX.updateRel // prefix, use constant further