@izara_project/izara-core-generate-service-code 1.0.94 → 1.0.96

package/src/emit/custom/customFlowSteps.js

@@ -53,10 +53,19 @@ export async function emitExtTopicStep({ flow, step, flowTag, stepName }) {
     };
   }
 
+  const flowSteps = flow?.flowSteps ?? [];
+  const isLastStep =
+    flowSteps.length > 1 &&
+    flowSteps[flowSteps.length - 1]?.stepName === step?.stepName;
+
   const artifacts = [
     {
       path: `${source}/${mainFileName}.js`,
-      content: await renderStepMain(functionName, _startConfig(flow))
+      content: await renderStepMain(functionName, _startConfig(flow), {
+        flow,
+        flowTag: flow.flowTag,
+        isLastStep
+      })
     }
   ];
   const functions = [];
@@ -107,10 +116,19 @@ export async function emitDsqStep({ flow, step, flowTag, stepName }) {
     stepEvents = step.event;
   }
   const artifacts = [];
+  const flowSteps = flow?.flowSteps ?? [];
+  const isLastStep =
+    flowSteps.length > 1 &&
+    flowSteps[flowSteps.length - 1]?.stepName === step?.stepName;
+
   if (!stepEvents.includes('extTopic')) {
     artifacts.push({
       path: `${source}/${mainFileName}.js`,
-      content: await renderStepMain(functionName, startConfig)
+      content: await renderStepMain(functionName, startConfig, {
+        flow,
+        flowTag: flow.flowTag,
+        isLastStep
+      })
     });
   }
   const functions = [];
@@ -157,7 +175,6 @@ export async function emitOwnTopicRoot(flow, objects) {
     upperCaseFlowTag: tag,
     startConfig: _startConfig(flow)
   };
-  const isRbac = flowHasRbac(flow, objects);
   const ownArtifacts = [
     {
       path: `${source}/${mainFileName}.js`,
@@ -209,46 +226,6 @@ export async function emitOwnTopicRoot(flow, objects) {
     })
   ];
 
-  if (isRbac) {
-    const rbacStep = (flow.flowSteps || []).find(
-      (s) =>
-        typeof s?.stepName === 'string' &&
-        s.stepName.toLowerCase() === 'rbaccallback'
-    );
-    const rbacConfig = rbacStep ? stepConfig(flow, rbacStep) : null;
-    ownArtifacts.push(
-      {
-        path: `${source}/${tag}RbacCallback_Main.js`,
-        content: await renderCustom('FlowEndpointRbacCallback_Main.ejs', {
-          flowTag: flow.flowTag,
-          upperCaseFlowTag: tag,
-          functionName: `${tag}RbacCallbackMain`
-        })
-      },
-      {
-        path: `${source}/${tag}RbacCallback_HdrSqs.js`,
-        content: await renderShared('FlowHandler_HdrSqs.ejs', {
-          flowTag: flow.flowTag,
-          flowStepName: 'RbacCallback',
-          mainFileName: `${tag}RbacCallback_Main`,
-          functionName: `${tag}RbacCallbackMain`,
-          queueName: `${tag}RbacCallbackHdrSqs`,
-          startConfig: rbacConfig
-        })
-      }
-    );
-    ownFunctions.push(
-      renderSqsFunctionYaml({
-        functionName: `${tag}RbacCallbackHdrSqs`,
-        handlerPath: `${handlerRoot}/${tag}RbacCallback_HdrSqs.main`,
-        roleName: customFlowRoleName(flow.flowTag),
-        queueName: `${tag}RbacCallbackHdrSqs`,
-        flowTag: flow.flowTag,
-        flowStepName: 'RbacCallback'
-      })
-    );
-  }
-
   return {
     artifacts: ownArtifacts,
     functions: ownFunctions
@@ -384,8 +361,19 @@ export function storedCacheTableName(flow, objects) {
   );
 }
 
-export async function renderStepMain(functionName, startConfig = null) {
-  return renderCustom('FlowStep_Main.ejs', { functionName, startConfig });
+export async function renderStepMain(
+  functionName,
+  startConfig = null,
+  options = {}
+) {
+  const { flow, flowTag, isLastStep } = options;
+  return renderCustom('FlowStep_Main.ejs', {
+    functionName,
+    startConfig,
+    flow,
+    flowTag: flowTag || flow?.flowTag,
+    isLastStep: Boolean(isLastStep)
+  });
 }
 
 export function renderMain(functionName) {

package/src/emit/custom/emitCustomFlowApplicationArtifacts.js

@@ -5,8 +5,7 @@ import {
   generatedDsqFlows,
   generatedOwnTopicFlows,
   supportedCustomFlows,
-  upperFirst,
-  flowHasRbac
+  upperFirst
 } from './customFlows.js';
 import {
   customFlowApplicationManagedPaths,
@@ -19,11 +18,9 @@ import {
   emitDsqStep,
   emitOwnTopicRoot,
   renderEndpointMain,
-  stepConfig,
   _startConfig
 } from './customFlowSteps.js';
 import {
-  renderCustom,
   renderShared,
   renderDsq
 } from './customFlowTemplates.js';
@@ -101,49 +98,6 @@ async function emitFlow(flow, objects) {
   }
   const functions = [];
 
-  const isRbac = flowHasRbac(flow, objects);
-  if (isRbac && !flow.event.includes('ownTopic')) {
-    const rbacStep = (flow.flowSteps || []).find(
-      (s) =>
-        typeof s?.stepName === 'string' &&
-        s.stepName.toLowerCase() === 'rbaccallback'
-    );
-    let rbacConfig = null;
-    if (rbacStep) {
-      rbacConfig = stepConfig(flow, rbacStep);
-    }
-    artifacts.push(
-      {
-        path: `${source}/${tag}RbacCallback_Main.js`,
-        content: await renderCustom('FlowEndpointRbacCallback_Main.ejs', {
-          flowTag: flow.flowTag,
-          upperCaseFlowTag: tag,
-          functionName: `${tag}RbacCallbackMain`
-        })
-      },
-      {
-        path: `${source}/${tag}RbacCallback_HdrSqs.js`,
-        content: await renderShared('FlowHandler_HdrSqs.ejs', {
-          flowTag: flow.flowTag,
-          flowStepName: 'RbacCallback',
-          mainFileName: `${tag}RbacCallback_Main`,
-          functionName: `${tag}RbacCallbackMain`,
-          queueName: `${tag}RbacCallbackHdrSqs`,
-          startConfig: rbacConfig
-        })
-      }
-    );
-    functions.push(
-      renderSqsFunctionYaml({
-        functionName: `${tag}RbacCallbackHdrSqs`,
-        handlerPath: `${handlerRoot}/${tag}RbacCallback_HdrSqs.main`,
-        roleName: customFlowRoleName(flow.flowTag),
-        queueName: `${tag}RbacCallbackHdrSqs`,
-        flowTag: flow.flowTag,
-        flowStepName: 'RbacCallback'
-      })
-    );
-  }
 
   if (flow.event.includes('extTopic') && !flow.event.includes('ownTopic')) {
     artifacts.push({

package/src/emit/custom/templates/FlowEndpoint_Main.ejs

@@ -26,6 +26,9 @@ import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 <% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { %>
 import storedCacheSharedLib from '@izara_project/izara-core-library-stored-cache';
 <% } %>
+<% if (typeof flow !== 'undefined' && flow.statusType === 'statusField') { %>
+import statusFieldSharedLib from '@izara_project/izara-core-library-status-field';
+<% } %>
 <% if (typeof flow !== 'undefined' && flow.statusType === 'triggerCache') { %>
 import { triggeredCacheSharedLibV2 } from '@izara_project/izara-core-library-trigger-cache';
 <% } %>
@@ -69,13 +72,48 @@ export default async function <%- typeof functionName !== 'undefined' ? function
   //(</additionalParams>)
 ) {
   try {
-    _izContext.logger.debug(`[${process.env.iz_serviceTag}:<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>] _izContext:`, _izContext);
-    _izContext.logger.debug(`[${process.env.iz_serviceTag}:<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>] requestParams:`, requestParams);
-    _izContext.logger.debug(
-      `[${process.env.iz_serviceTag}:<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>] callingFlowConfig:`,
+    _izContext.logger.debug('[<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>] started', {
+      requestParams,
       callingFlowConfig
+    });
+
+<% if (typeof flow !== 'undefined' && flow.statusType === 'statusField') { -%>
+
+    //(<beforeCheckedStatusField>)
+    //(</beforeCheckedStatusField>)
+
+    let [status, flowStatusFieldRecord] = await statusFieldSharedLib.checkStatusField(
+      _izContext,
+      {
+        flowTag: '<%= flowTag %>',
+        serviceTag: process.env.iz_serviceTag
+      },
+      {
+        //(<identifiers>)
+        //(</identifiers>)
+      },
+      //(<overwriteUniqueRequestId>)
+      //(</overwriteUniqueRequestId>)
+    );
+
+    _izContext.logger.debug(
+      `[${process.env.iz_serviceTag}:<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>] checkStatusField result:`,
+      { status, flowStatusFieldRecord }
     );
 
+    //(<afterCheckStatusField>)
+    //(</afterCheckStatusField>)
+
+    if (status !== 'process') {
+      if (status === 'error' || status === 'complete') {
+        //(<afterValidateStatusField>)
+        //(</afterValidateStatusField>)
+      }
+
+      //(<checkStatusFieldHook>)
+      //(</checkStatusFieldHook>)
+    }
+<% } -%>
 <% if (typeof flow !== 'undefined' && flow.statusType === 'triggerCache') { -%>
 
     //(<beforeCheckTriggeredCache>)
@@ -182,7 +220,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
       }
     }
 <% } -%>
-<% if (typeof flow !== 'undefined' && flow.isRbac && !flow.generatedCodeConfig) { -%>
+<% if (typeof flow !== 'undefined' && flow.isRbac && !flow.generatedCodeConfig && flow.initiateBy !== 'systemNoUser') { -%>
 
     const { checkRbacPermission } =
       await import('@izara_project/izara-authorization');
@@ -200,7 +238,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
           serviceTag: '<%- (typeof rbacServiceTag !== "undefined" && rbacServiceTag) ? rbacServiceTag : ((flow.objType?.belongTo ? (Array.isArray(flow.objType.belongTo) ? flow.objType.belongTo[0]?.serviceTag : flow.objType.belongTo?.serviceTag) : null) || flow.serviceTag || (flow.objType ? flow.objType.serviceTag : "")) %>'
         },
         requestParams: typeof requestParams !== 'undefined' ? requestParams : {},
-        nextFlowStepName: '<%- upperCaseFlowTag %>RbacCallback'
+        sync: true
       }
     );
 
@@ -217,6 +255,30 @@ export default async function <%- typeof functionName !== 'undefined' ? function
 
     //(<endpointHook>)
     //(</endpointHook>)
+<% if (typeof flow !== 'undefined' && flow.statusType === 'statusField' && (!flow.flowSteps || flow.flowSteps.length <= 1)) { -%>
+
+    //(<beforeCompleteStatusField>)
+    //(</beforeCompleteStatusField>)
+
+    await statusFieldSharedLib.completeStatusField(
+      _izContext,
+      {
+        flowTag: '<%= flowTag %>',
+        serviceTag: process.env.iz_serviceTag
+      },
+      {
+        //(<identifiers>)
+        //(</identifiers>)
+      },
+      //(<statusField>)
+      //(</statusField>)
+      //(<errorFounds>)
+      //(</errorFounds>)
+    );
+
+    //(<afterCompleteStatusField>)
+    //(</afterCompleteStatusField>)
+<% } -%>
 <% } -%>
 
   } catch (err) {

package/src/emit/custom/templates/FlowStep_Main.ejs

@@ -16,6 +16,9 @@ along with this program. If not, see
 <http: //www.gnu.org/licenses />.
 */
 import { identifierUuid } from '@izara_project/izara-shared-core';
+<% if (typeof flow !== 'undefined' && flow.statusType === 'statusField' && typeof isLastStep !== 'undefined' && isLastStep) { %>
+import statusFieldSharedLib from '@izara_project/izara-core-library-status-field';
+<% } %>
 
 //(<optionalRequire>)
 //(</optionalRequire>)
@@ -51,6 +54,30 @@ export default async function <%= functionName %>(
 
     //(<hookCode>)
     //(</hookCode>)
+<% if (typeof flow !== 'undefined' && flow.statusType === 'statusField' && typeof isLastStep !== 'undefined' && isLastStep) { -%>
+
+    //(<beforeCompleteStatusField>)
+    //(</beforeCompleteStatusField>)
+
+    await statusFieldSharedLib.completeStatusField(
+      _izContext,
+      {
+        flowTag: '<%= flowTag %>',
+        serviceTag: process.env.iz_serviceTag
+      },
+      {
+        //(<identifiers>)
+        //(</identifiers>)
+      },
+      //(<statusField>)
+      //(</statusField>)
+      //(<errorFounds>)
+      //(</errorFounds>)
+    );
+
+    //(<afterCompleteStatusField>)
+    //(</afterCompleteStatusField>)
+<% } -%>
   } catch (err) {
     _izContext.logger.error(`[${process.env.iz_serviceTag}:<%= functionName %>] error:`, err);
     throw err;

package/src/emit/relationship/templates/ChangeRelationship_Main.ejs

@@ -84,15 +84,15 @@ export default async function <%- functionName %>(
       firstObject,
       secondObject,
       oldRelTypeAndDirection,
-      newRelType
-      //(<requestParamCreateRel>)
-      //(</requestParamCreateRel>)
+      newRelType,
+      //(<requestParamChangeRel>)
+      //(</requestParamChangeRel>)
     } = requestParams;
 
     let foundErrors = [];
     const parentFlowId = identifierUuid();
     //(<beforeValidateChangeRel>)
-    //(</beforeValidateChangeRel>).
+    //(</beforeValidateChangeRel>)
     // validate object and identifiers
     async function validateIdentifiersExists(
       _izContext,
@@ -443,7 +443,7 @@ export default async function <%- functionName %>(
         newRelType,
         originTimestamp,
         changedByUserId,
-        parentFlowId
+        parentFlowId,
         //(<messageBodyChangeRel>)
         //(</messageBodyChangeRel>)
 
@@ -461,15 +461,15 @@ export default async function <%- functionName %>(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.changeRelationshipComplete
                     ),
-                    //(</callingFlowProperties>)
+                    //(<callingFlowProperties>)
                     {
                       graphServiceTag: storageResource.graphServiceTag
                     }
+                    //(</callingFlowProperties>)
                   )
                 )
               );

package/src/emit/relationship/templates/CreateRelationship_Main.ejs

@@ -83,7 +83,7 @@ export default async function createRelationship(
       relationshipDirection,
       relationshipProperties,
       deepPathConditional,
-      settings = {}
+      settings = {},
       //(<requestParamCreateRel>)
       //(</requestParamCreateRel>)
     } = requestParams;
@@ -93,7 +93,7 @@ export default async function createRelationship(
     let foundErrors = [];
     const parentFlowId = identifierUuid();
     //(<beforeValidateCreateRel>)
-    //(</beforeValidateCreateRel>).
+    //(</beforeValidateCreateRel>)
     // validate object and identifiers
     async function validateIdentifiersExists(
       _izContext,
@@ -465,7 +465,7 @@ export default async function createRelationship(
         relationshipProperties,
         deepPathConditional: deepPathConditional || [],
         parentFlowId,
-        settings: { createOnConditionalFail: createOnConditionalFail }
+        settings: { createOnConditionalFail: createOnConditionalFail },
         //(<inCreateRelMessageBodyCreateRel>)
         //(</inCreateRelMessageBodyCreateRel>)
 
@@ -483,15 +483,15 @@ export default async function createRelationship(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.createRelComplete
                     ),
-                    //(</callingFlowProperties>)
+                    //(<callingFlowProperties>)
                     {
                       graphServiceTag: storageResource.graphServiceTag
                     }
+                    //(</callingFlowProperties>)
                   )
                 )
               );

package/src/emit/relationship/templates/DeleteRelationship_Main.ejs

@@ -81,7 +81,7 @@ export default async function deleteRelationship(
       secondObject,
       relType,
       relId,
-      relationshipDirection
+      relationshipDirection,
       //(<requestParamDeleteRel>)
       //(</requestParamDeleteRel>)
     } = requestParams;
@@ -346,7 +346,7 @@ export default async function deleteRelationship(
         relType: relType,
         relId: relId,
         relationshipDirection: relationshipDirection,
-        parentFlowId: parentFlowId
+        parentFlowId: parentFlowId,
         //(<inDeleteRelMessageBody>)
         //(</inDeleteRelMessageBody>)
       };
@@ -362,11 +362,11 @@ export default async function deleteRelationship(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.deleteRelComplete
                     ),
+                    //(<callingFlowProperties>)
                     {}
                     //(</callingFlowProperties>)
                   )

package/src/emit/relationship/templates/GetRelationship_Main.ejs

@@ -79,7 +79,7 @@ export default async function getRelationship(
       secondObject,
       relType,
       relId,
-      relationshipDirection
+      relationshipDirection,
       //(<requestParamGetRel>)
       //(</requestParamGetRel>)
     } = requestParams;

package/src/emit/relationship/templates/MoveRelationship_Main.ejs

@@ -87,7 +87,7 @@ export default async function moveRelationship(
       relType,
       relationshipDirection,
       relationshipProperties,
-      moveObject
+      moveObject,
       //(<requestParamMoveRel>)
       //(</requestParamMoveRel>)
     } = requestParams;
@@ -96,7 +96,7 @@ export default async function moveRelationship(
     let foundErrors = [];
 
     //(<beforeValidateMoveRel>)
-    //(</beforeValidateMoveRel>).
+    //(</beforeValidateMoveRel>)
     // validate object and identifiers
     async function validateIdentifiersExists(
       _izContext,
@@ -428,7 +428,7 @@ export default async function moveRelationship(
         relationshipDirection,
         relationshipProperties,
         moveObject,
-        parentFlowId: parentFlowId
+        parentFlowId: parentFlowId,
         //(<messageBodyMoveRel>)
         //(</messageBodyMoveRel>)
 
@@ -446,15 +446,15 @@ export default async function moveRelationship(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.moveRelationshipComplete
                     ),
-                    //(</callingFlowProperties>)
+                    //(<callingFlowProperties>)
                     {
                       graphServiceTag: storageResource.graphServiceTag
                     }
+                    //(</callingFlowProperties>)
                   )
                 )
               );

package/src/emit/relationship/templates/UpdateRelationship_Main.ejs

@@ -83,7 +83,7 @@ export default async function updateRelationship(
       relType,
       relId,
       relationshipProperties,
-      relationshipDirection
+      relationshipDirection,
       //(<requestParamUpdateRel>)
       //(</requestParamUpdateRel>)
     } = requestParams;
@@ -292,7 +292,7 @@ export default async function updateRelationship(
           relationshipDirection,
           status: 'error',
           foundErrors: foundErrors,
-          parentFlowId: parentFlowId
+          parentFlowId: parentFlowId,
           //(<inUpdateCompleteMsgUpdateRel>)
           //(</inUpdateCompleteMsgUpdateRel>)
         };
@@ -422,7 +422,7 @@ export default async function updateRelationship(
           relType: relType,
           relationshipProperties,
           relationshipDirection,
-          parentFlowId
+          parentFlowId,
           //(<inUpdateRelMessageBodyUpdateRel>)
           //(</inUpdateRelMessageBodyUpdateRel>)
         };
@@ -438,15 +438,15 @@ export default async function updateRelationship(
                     callingFlowConfig, // receive parent callingFlowConfig.
                     callingFlowSharedLib.createCallingFlowConfig(
                       // callingFlow own service
-                      //(<callingFlowProperties>)
                       await lambdaSharedLib.lambdaFunctionName(
                         _izContext,
                         TOPIC_NAME_GENERATE_CODE.updateRelComplete
                       ),
-                      //(</callingFlowProperties>)
+                      //(<callingFlowProperties>)
                       {
                         graphServiceTag: storageResource.graphServiceTag
                       }
+                      //(</callingFlowProperties>)
                     )
                   )
                 );

package/src/emit/resource/iamResourceArtifacts.js

@@ -3,8 +3,7 @@ import { CRUD_ACTIONS } from '../crud/crudActionPlan.js';
 import {
   customFlowRoleName,
   flowDsqSteps,
-  flowExtTopicSteps,
-  flowHasRbac
+  flowExtTopicSteps
 } from '../custom/customFlows.js';
 import {
   RELATIONSHIP_ACTIONS,
@@ -338,9 +337,6 @@ export function roleQueueNames(state, roleName) {
   if (includesEvent(flow, 'dsq')) {
     queueList.push(`${tag}HdrDsq`);
   }
-  if (flowHasRbac(flow, state.objects)) {
-    queueList.push(`${tag}RbacCallbackHdrSqs`);
-  }
   queueList.push(
     ...flowExtTopicSteps([flow]).map(
       ({ flowTag, stepName }) => `${flowTag}${stepName}HdrSqs`

package/src/emit/resource/resourceState.js

@@ -4,8 +4,7 @@ import {
   flowExtTopicSteps,
   generatedDsqFlows,
   generatedOwnTopicFlows,
-  supportedCustomFlows,
-  flowHasRbac
+  supportedCustomFlows
 } from '../custom/customFlows.js';
 import { hasSystemWebSocket } from '../system/emitSystemWebSocketArtifacts.js';
 import { rbacFlowTag } from '../rbac/rbacFlowTag.js';
@@ -146,7 +145,7 @@ export function createResourceState({ objects, relationships, flows }) {
   const customSqsQueues = [
     ...flows
       .filter((flow) => includesEvent(flow, 'extTopic'))
-      .map((flow) => `Process${upperFirst(flow.flowTag)}HdrSqs`),
+      .map((flow) => `${upperFirst(flow.flowTag)}HdrSqs`),
     ...flows
       .filter(
         (flow) =>
@@ -159,12 +158,7 @@ export function createResourceState({ objects, relationships, flows }) {
   for (const { flowTag, stepName } of flowExtTopicSteps(flows)) {
     customSqsQueues.push(`${flowTag}${stepName}HdrSqs`);
   }
-  for (const flow of flows) {
-    if (flowHasRbac(flow, objects)) {
-      const tag = upperFirst(flow.flowTag);
-      customSqsQueues.push(`${tag}RbacCallbackHdrSqs`);
-    }
-  }
+
   for (const flow of flows.filter((flow) => includesEvent(flow, 's3'))) {
     const tag = upperFirst(flow.flowTag);
     customSqsQueues.push(`${tag}CreatePreSignUrlHdrSqs`);