@izara_project/izara-core-generate-service-code 1.0.73 → 1.0.75

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

@@ -19,7 +19,7 @@ import { objectHash as hash } from '@izara_project/izara-shared-core';
 
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
-import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+
 import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
 
 import { sns } from '@izara_project/izara-core-library-external-request';
@@ -36,16 +36,22 @@ const { TOPIC_NAME_GENERATE_CODE, PREFIX } = consts;
 
 export default async function updateRelationshipComplete(
   _izContext,
-  returnValue,
-  status,
-  errorsFound,
-  graphServiceTag,
+  requestParams,
   passBackProperties = {}
   // callingFlowConfig = {}
 ) {
   try {
+    const {
+      returnValue,
+      parentFlowId,
+      status,
+      errorsFound,
+      graphServiceTag
+    } = requestParams;
+
     _izContext.logger.debug('Function:updateRelationshipComplete', {
       returnValue: returnValue,
+      parentFlowId: parentFlowId,
       status: status,
       errorsFound: errorsFound,
       graphServiceTag: graphServiceTag,
@@ -53,120 +59,96 @@ export default async function updateRelationshipComplete(
       // callingFlowConfig: callingFlowConfig
     });
 
-    let linkTypeId;
-    // start create awaitingStepId
-    if (
-      returnValue.requestParams.hasOwnProperty('secondObject') &&
-      Object.values(returnValue.requestParams.secondObject.objType).length > 0
-    ) {
-      linkTypeId = createLinkTypeId(
+    const awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
+      parentFlowId || returnValue?.parentFlowId, // hash id
+      PREFIX.updateRel // prefix, use constant further
+    );
+
+    const pending =
+      await asyncFlowSharedLib.findPendingStepAwaitingMultipleSteps(
         _izContext,
-        returnValue.requestParams.firstObject.objType,
-        returnValue.requestParams.secondObject.objType,
-        returnValue.requestParams.relType,
-        returnValue.requestParams.relationshipDirection
+        awaitingStepId
       );
-    } else {
-      linkTypeId = hash({
-        firstObject: returnValue.requestParams.firstObject.objType,
-        relType: returnValue.requestParams.relType
-      });
-    }
+    _izContext.logger.debug('[UpdateRelationshipComplete] awaiting step', {
+      awaitingStepId,
+      pending
+    });
 
-    let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
-      hash({
-        linkTypeId,
-        relId: returnValue.requestParams.relId,
-        relationshipProperties:
-          returnValue.requestParams.relationshipProperties,
-        graphServiceTag: graphServiceTag
-      }), // hash id
-      PREFIX.updateRel // prefix, use constant further
-    );
+    if (!pending) {
+      _izContext.logger.warn(
+        `No pending step found for awaitingStepId: ${awaitingStepId}`
+      );
+      return { returnValue, status, errorsFound };
+    }
 
-    let updateRelPendingObjects = await dynamodbSharedLib.query(
-      _izContext,
-      await dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
+    const result =
+      await asyncFlowSharedLib.checkAllAwaitingStepsFinishedWithReturnParams(
+        _izContext,
+        pending.pendingStepId,
+        awaitingStepId,
+        errorsFound
+      );
+    _izContext.logger.debug(
+      '[UpdateRelationshipComplete] all awaiting steps result',
       {
-        awaitingStepId: awaitingStepId
+        isComplete: result.isComplete,
+        awaitingStepId,
+        pendingStepId: pending.pendingStepId
       }
     );
-    _izContext.logger.debug(
-      'record of updateRelPendingObjects ::',
-      updateRelPendingObjects
-    );
 
-    await Promise.all(
-      updateRelPendingObjects.Items.map(async ({ pendingStepId }) => {
-        if (
-          await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
-            _izContext,
-            pendingStepId, // task waiting
-            awaitingStepId,
-            errorsFound
-          )
-        ) {
-          _izContext.logger.debug('finished all awaitingStep');
-
-          let updateCompleteMsg = {
-            relId: returnValue.requestParams.relId,
-            relType: returnValue.requestParams.relType,
-            status: status,
-            errorsFound: errorsFound
-            //(<inUpdateCompleteMsg>)
-            //(</inUpdateCompleteMsg>)
-          };
-
-          updateCompleteMsg =
-            callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
-              passBackProperties,
-              updateCompleteMsg
-            );
-          _izContext.logger.debug(
-            'After addCallingFlowToSnsResponseMessageObject',
-            updateCompleteMsg
-          );
-
-          let messageAttributes =
-            callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
-              passBackProperties,
-              {}
-            );
-          _izContext.logger.debug(
-            'After addCallingFlowToSnsResponseMessageAttributes',
-            updateCompleteMsg
-          );
-
-          let sendMessageToOutUpdateRelationshipComplete = {
-            Message: JSON.stringify(updateCompleteMsg),
-            MessageAttributes: sns.createStringMessageAttributes(
-              _izContext,
-              messageAttributes
-            ),
-            TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
-              _izContext,
-              TOPIC_NAME_GENERATE_CODE.outUpdateRelComplete
-            )
-          };
-          _izContext.logger.debug(
-            'Send message to OutUpdateRelationshipComplete :::>',
-            sendMessageToOutUpdateRelationshipComplete
-          );
-          await sns.publishAsync(
-            _izContext,
-            sendMessageToOutUpdateRelationshipComplete
-          );
-        } // check pendingStepId finished
-
-        // remove awaitingMultipleStep after finished
-        await asyncFlowSharedLib.removeAwaitingMultipleStep(
-          _izContext,
-          awaitingStepId,
-          pendingStepId,
-          errorsFound
+    if (result.isComplete) {
+      _izContext.logger.debug('finished all awaitingStep');
+
+      let updateCompleteMsg = {
+        relId: returnValue.requestParams.relId,
+        relType: returnValue.requestParams.relType,
+        status: status,
+        errorsFound: errorsFound
+        //(<inUpdateCompleteMsg>)
+        //(</inUpdateCompleteMsg>)
+      };
+
+      updateCompleteMsg =
+        callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
+          passBackProperties,
+          updateCompleteMsg
         );
-      }) // end per pendingStep
-    );
+      _izContext.logger.debug(
+        'After addCallingFlowToSnsResponseMessageObject',
+        updateCompleteMsg
+      );
+
+      let messageAttributes =
+        callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
+          passBackProperties,
+          {}
+        );
+      _izContext.logger.debug(
+        'After addCallingFlowToSnsResponseMessageAttributes',
+        updateCompleteMsg
+      );
+
+      let sendMessageToOutUpdateRelationshipComplete = {
+        Message: JSON.stringify(updateCompleteMsg),
+        MessageAttributes: sns.createStringMessageAttributes(
+          _izContext,
+          messageAttributes
+        ),
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          TOPIC_NAME_GENERATE_CODE.outUpdateRelComplete
+        )
+      };
+      _izContext.logger.debug(
+        'Send message to OutUpdateRelationshipComplete :::>',
+        sendMessageToOutUpdateRelationshipComplete
+      );
+      await sns.publishAsync(
+        _izContext,
+        sendMessageToOutUpdateRelationshipComplete
+      );
+    } // check isComplete finished
 
     return {
       returnValue,

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

@@ -338,15 +338,6 @@ export default async function updateRelationship(
         return updateCompleteMsg;
       }
 
-      // before create awaitingStepId per graph storageResource
-      const linkTypeId = createLinkTypeId(
-        _izContext,
-        firstObject.objType,
-        secondObject.objType,
-        relType,
-        relationshipDirection
-      );
-
       let usedGraphServiceTag = []; // collect used graph serviceName, use to check duplicate graph serviceName across graph serverTag
       let targetGraphStorageResources = []; // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
       let awaitingStepIds = [];
@@ -360,12 +351,12 @@ export default async function updateRelationship(
           targetGraphStorageResources.push(targetStorageResource);
 
           // awaitingStepId per graphServiceTag
-          awaitingStepIds.push(
-            asyncFlowSharedLib.createAwaitingStepId(
+          awaitingStepIds.push({
+            awaitingStepId: asyncFlowSharedLib.createAwaitingStepId(
               parentFlowId, // hash id
               PREFIX.updateRel // prefix, use constant further
             )
-          );
+          });
         } else if (
           storageResource.storageType === consts.STORAGE_TYPES.dynamoDB
         ) {
@@ -411,12 +402,12 @@ export default async function updateRelationship(
         // save awaiting
         await asyncFlowSharedLib.createAwaitingMultipleSteps(
           _izContext,
-          awaitingStepIds, // awaitingStepIds
           asyncFlowSharedLib.createPendingStepId(
-            // pendingStepId
             _izContext.uniqueRequestId, // hash id
             PREFIX.updateRel // prefix, use constant further
-          )
+          ),
+          awaitingStepIds,
+          {}
         );
 
         // prepare message body

package/src/emit/resource/emitResourceArtifacts.js

@@ -5,6 +5,7 @@ import {
   customFlowRoleName,
   flowDsqSteps,
   flowExtTopicSteps,
+  generatedDsqFlows,
   generatedOwnTopicFlows,
   supportedCustomFlows
 } from '../custom/customFlows.js';
@@ -74,6 +75,12 @@ const SQS_CONSUMER_ACTIONS = [
   'sqs:GetQueueAttributes',
   'sqs:ReceiveMessage'
 ];
+const SQS_DLQ_ACTIONS = [
+  'sqs:DeleteMessage',
+  'sqs:GetQueueAttributes',
+  'sqs:ReceiveMessage',
+  'sqs:SendMessage'
+];
 
 export async function emitResourceArtifacts({
   objects,
@@ -219,6 +226,9 @@ function createResourceState({ objects, relationships, flows }) {
       ...generatedOwnTopicFlows(flows).map((flow) =>
         customFlowRoleName(flow.flowTag)
       ),
+      ...generatedDsqFlows(flows).map((flow) =>
+        customFlowRoleName(flow.flowTag)
+      ),
       ...flowExtTopicSteps(flows).map(({ flow }) =>
         customFlowRoleName(flow.flowTag)
       ),
@@ -255,7 +265,8 @@ function createResourceState({ objects, relationships, flows }) {
   const relationshipTableNames = [...collectTables(relationships).keys()];
   const tableMap = new Map([
     ...collectTables(objects),
-    ...collectTables(relationships)
+    ...collectTables(relationships),
+    ...collectTables(flows)
   ]);
   const externalDynamoTables = objects.flatMap(
     (object) => object.externalDynamoResources ?? []
@@ -496,6 +507,11 @@ function roleStatements(state, roleName) {
     SQS_CONSUMER_ACTIONS,
     queueArns(roleQueueNames(state, roleName))
   );
+  addStatement(
+    statements,
+    SQS_DLQ_ACTIONS,
+    queueArns(roleDlqQueueNames(state, roleName))
+  );
   addStatement(
     statements,
     ['sns:Publish'],
@@ -648,6 +664,14 @@ function roleQueueNames(state, roleName) {
   return queueList;
 }
 
+function roleDlqQueueNames(state, roleName) {
+  const queues = roleQueueNames(state, roleName);
+  if (!Array.isArray(queues) || queues.length === 0) {
+    return [];
+  }
+  return queues.map((q) => (q.endsWith('DLQ') ? q : `${q}DLQ`));
+}
+
 function roleTopicNames(state, roleName) {
   if (roleName === 'ProcFindDataRole') return [];
   if (roleName === 'FlowObjectsRole')

package/src/emit/resource/templates/DynamoDBTable_Yaml.ejs

@@ -18,3 +18,6 @@
       - AttributeName: '<%- sk %>'
         KeyType: 'RANGE'
 <% } %>
+    #<#<%- tableName %>TableSetting#>
+    #<#/<%- tableName %>TableSetting#>
+

package/src/emit/shared/templates/FindData_Main.ejs

@@ -94,7 +94,7 @@ export default async function findData(
       fieldName,
       objType,
       identifiers,
-      null,
+      "",
       overWriteCache,
       callingFlow,
       'error'

package/src/emit/shared/templates/FlowHandler_HdrApi.ejs

@@ -13,7 +13,7 @@ const validatorSchema = {
   type: 'object',
   properties: {
 <%_ startConfig.properties.forEach((prop, index) => { _%>
-    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: { type: '<%- prop.type || 'string' %>' }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
+    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: { type: '<%- prop.type || 'string' %>'<% if (typeof prop.default !== 'undefined') { %>, default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %> }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
 <%_ }) _%>
   },
   required: [<%- startConfig.properties.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]

package/src/emit/shared/templates/FlowHandler_HdrDsq.ejs

@@ -31,7 +31,8 @@ let perRecordsValidatorSchema = {
   properties: {
 <%_ startConfig.properties.forEach((prop, index) => { _%>
     <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: {
-      type: '<%- prop.type || 'string' %>'
+      type: '<%- prop.type || 'string' %>'<% if (typeof prop.default !== 'undefined') { %>,
+      default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %>
     }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
 <%_ }) _%>
   },

package/src/emit/shared/templates/FlowHandler_HdrInv.ejs

@@ -10,7 +10,7 @@ const validatorSchema = {
   type: 'object',
   properties: {
 <%_ startConfig.properties.forEach((prop, index) => { _%>
-    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: { type: '<%- prop.type || 'string' %>' }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
+    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: { type: '<%- prop.type || 'string' %>'<% if (typeof prop.default !== 'undefined') { %>, default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %> }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
 <%_ }) _%>
   },
   required: [<%- startConfig.properties.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]

package/src/emit/shared/templates/FlowHandler_HdrSqs.ejs

@@ -31,7 +31,8 @@ let perRecordsValidatorSchema = {
   properties: {
 <%_ startConfig.properties.forEach((prop, index) => { _%>
     <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: {
-      type: '<%- prop.type || 'string' %>'
+      type: '<%- prop.type || 'string' %>'<% if (typeof prop.default !== 'undefined') { %>,
+      default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %>
     }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
 <%_ }) _%>
   },

package/src/emit/system/emitSystemWebSocketArtifacts.js

@@ -3,6 +3,8 @@ import ejsLib from 'ejs';
 
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
 const SOURCE = 'app/src/generatedCode/SystemFlowSchemas/WebSocketMain/source';
+const REGISTER_SOURCE =
+  'app/src/generatedCode/SystemFlowSchemas/Register/source';
 
 async function _renderSystemTemplate(templateName, data = {}) {
   const templatePath = new URL(templateName, TEMPLATE_URL);
@@ -27,12 +29,32 @@ export async function emitSystemWebSocketArtifacts(
   const webSocketCompleteHdrSqsContent = await _renderSystemTemplate(
     'WebSocketComplete_HdrSqs.ejs'
   );
+  const registerMainContent = await _renderSystemTemplate('Register_Main.ejs');
+  const registerHdrWbsContent = await _renderSystemTemplate(
+    'Register_HdrWbs.ejs'
+  );
+  const registerCompleteMainContent = await _renderSystemTemplate(
+    'RegisterComplete_Main.ejs'
+  );
+  const registerCompleteHdrSqsContent = await _renderSystemTemplate(
+    'RegisterComplete_HdrSqs.ejs',
+    { queueName: 'RegisterComplete' }
+  );
+  const registerCompleteHdrDsqContent = await _renderSystemTemplate(
+    'RegisterComplete_HdrSqs.ejs',
+    { queueName: 'RegisterCompleteDLQ' }
+  );
+
   const webSocketConnectYaml = await _renderSystemTemplate(
     'WebSocketConnect_Yaml.ejs'
   );
   const webSocketCompleteYaml = await _renderSystemTemplate(
     'WebSocketComplete_Yaml.ejs'
   );
+  const registerWbsYaml = await _renderSystemTemplate('RegisterWbs_Yaml.ejs');
+  const registerCompleteYaml = await _renderSystemTemplate(
+    'RegisterComplete_Yaml.ejs'
+  );
 
   return {
     artifacts: [
@@ -47,9 +69,34 @@ export async function emitSystemWebSocketArtifacts(
       {
         path: `${SOURCE}/WebSocketComplete_HdrSqs.js`,
         content: webSocketCompleteHdrSqsContent
+      },
+      {
+        path: `${REGISTER_SOURCE}/Register_Main.js`,
+        content: registerMainContent
+      },
+      {
+        path: `${REGISTER_SOURCE}/Register_HdrWbs.js`,
+        content: registerHdrWbsContent
+      },
+      {
+        path: `${REGISTER_SOURCE}/RegisterComplete_Main.js`,
+        content: registerCompleteMainContent
+      },
+      {
+        path: `${REGISTER_SOURCE}/RegisterComplete_HdrSqs.js`,
+        content: registerCompleteHdrSqsContent
+      },
+      {
+        path: `${REGISTER_SOURCE}/RegisterComplete_HdrDsq.js`,
+        content: registerCompleteHdrDsqContent
       }
     ],
-    functions: [webSocketConnectYaml, webSocketCompleteYaml]
+    functions: [
+      webSocketConnectYaml,
+      webSocketCompleteYaml,
+      registerWbsYaml,
+      registerCompleteYaml
+    ]
   };
 }
 
@@ -57,7 +104,12 @@ export function systemWebSocketManagedPaths() {
   return [
     `${SOURCE}/WebSocketConnect.js`,
     `${SOURCE}/WebSocketComplete_Main.js`,
-    `${SOURCE}/WebSocketComplete_HdrSqs.js`
+    `${SOURCE}/WebSocketComplete_HdrSqs.js`,
+    `${REGISTER_SOURCE}/Register_Main.js`,
+    `${REGISTER_SOURCE}/Register_HdrWbs.js`,
+    `${REGISTER_SOURCE}/RegisterComplete_Main.js`,
+    `${REGISTER_SOURCE}/RegisterComplete_HdrSqs.js`,
+    `${REGISTER_SOURCE}/RegisterComplete_HdrDsq.js`
   ];
 }
 

package/src/emit/system/templates/RegisterComplete_HdrSqs.ejs

@@ -0,0 +1,64 @@
+import { middlewareHandler } from '@izara_project/izara-middleware';
+import Logger from '@izara_project/izara-core-library-logger';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
+import registerCompleteMain from './RegisterComplete_Main.js';
+
+middlewareHandler.setValidatorSchema(
+  recordHandlerSharedLib.baseValidatorSchema()
+);
+let perRecordsValidatorSchema = {};
+
+export const main = middlewareHandler.wrap(async (event, context) => {
+  try {
+    let recordPromises = [];
+
+    await Promise.all(
+      event.Records.map(async (record) => {
+        let passOnProperties = [];
+        record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
+
+        await recordHandlerSharedLib.validateRecord(
+          record,
+          '<%= queueName %>',
+          perRecordsValidatorSchema
+        );
+
+        passOnProperties.push(record.body.TopicArn);
+        passOnProperties.push(record.body.Message);
+        passOnProperties.push(
+          callingFlowSharedLib.addCallingFlowToPassOnProperties(
+            record.body.Message
+          )
+        );
+        record._izContext.logger.debug(
+          'passOnProperties in handler',
+          passOnProperties
+        );
+
+        let recordPromise = recordHandlerSharedLib.recordHandler(
+          record,
+          registerCompleteMain,
+          '<%= queueName %>',
+          passOnProperties
+        );
+        record._izContext.logger.debug('after recordPromise in handler');
+        recordPromises.push(recordPromise);
+      })
+    );
+
+    Logger.debug('before Promise.all(recordPromises) in handler');
+    try {
+      await Promise.all(recordPromises);
+      return event.Records;
+    } catch {
+      Logger.debug(
+        'Promise.all(recordPromises) in handler threw error (at least one record did not resolve)'
+      );
+    }
+    Logger.debug('after Promise.all(recordPromises) in handler');
+  } catch (err) {
+    Logger.error('Unhandled Error, RegisterComplete: ', err);
+    throw err;
+  }
+});