@izara_project/izara-market-library-service-schemas 1.0.57 → 1.0.59

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/functionYml/HdrS3/template.ejs

@@ -3,9 +3,6 @@
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
-    - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %>
-        batchSize: 10
     - s3:
         bucket: <%- bucketName %>
         event: s3:ObjectCreated:*

package/src/reStructure/TemplateData/flowSchema/components/upload/relate/S3/data.js

@@ -36,10 +36,13 @@ function data(_izContext, flowSchema, srcPath) {
 
 function createSourceParams(_izContext, flowSchema, srcPath) {
   let bucketName = flowSchema.bucketName
+  let resourceName = bucketName.split("-").join("")
+
   return {
     templatePath: templatePath,
     templateData: {
-      bucketName
+      bucketName,
+      resourceName
     },
     setting: {
       initialData: 'Resources:\n',

package/src/reStructure/TemplateData/flowSchema/components/upload/relate/S3/template.ejs

@@ -1,4 +1,4 @@
-  <%- bucketName %>:
+  <%- resourceName %>:
     Type: AWS::S3::Bucket
     DependsOn:
       - SNSInProcessAfterUploadS3Policy

package/src/reStructure/TemplateData/flowSchema/components/upload/relate/libs/template.ejs

@@ -22,10 +22,7 @@ const lambda = externalRequest.lambda;
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda')
 const { ApiGatewayManagementApiClient, PostToConnectionCommand } = require("@aws-sdk/client-apigatewaymanagementapi");
 const hash = require('@izara_project/izara-shared-core').objectHash;
-<% if (uploadS3) { %>
-  const csv = require('csv-parser');
-  const streamifier = require('streamifier');
-<% } %>
+
 const { NoRetryError,inMemoryCacheLib } = require('@izara_project/izara-core-library-core');
 
 const client = new ApiGatewayManagementApiClient({
@@ -74,43 +71,6 @@ const processStaticLimitWithCache = inMemoryCacheLib(
   }
 )
 
-<% if (uploadS3) { %>
-/**
- *
- * @param {Object} _izContext
- * @param {Object} data - S3 data
- * @returns
- */
-async function isValidCsv(_izContext, data) {
-  _izContext.logger.debug("function checkValidCsv", { data })
-  let errorCheckCsv = [];
-  let validCsv = true;
-  let rowCount = 0;
-  let columnCount = null;
-
-  streamifier.createReadStream(data.Body).pipe(csv()).on('data', (row) => {
-    rowCount++;
-    if (columnCount === null) {
-      columnCount = Object.keys(row).length
-    } else if (Object.keys(row).length !== columnCount) {
-      validCsv = false
-      errorCheckCsv.push(`Row ${rowCount} has inconsistent columns: ${JSON.stringify(row)}`)
-    }
-  })
-    .on('end', () => {
-      if (rowCount === 0) {
-        errorCheckCsv.push("csv file not have data row")
-      } else {
-        _izContext.logger.debug("validCsv")
-      }
-    })
-    .on('error', (error) => {
-      errorCheckCsv.push(`error:: ${error}`)
-    })
-
-  return [validCsv, errorCheckCsv]
-}
-<% } %>
 
 /**
  *
@@ -135,8 +95,5 @@ module.exports = {
   postToConnection,
   processStaticLimit,
   processStaticLimitWithCache,
-  getNestObject,
-  <% if (uploadS3) { %>
-    isValidCsv,
-  <% } %>
+  getNestObject
 }

package/src/reStructure/TemplateData/flowSchema/components/upload/relate/sns-out/data.js

@@ -0,0 +1,75 @@
+/*
+Copyright (C) 2020 Sven Mason <http://izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+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/>.
+*/
+
+'use strict';
+
+const path = require("path")
+
+
+// const {
+//   HANDLER,
+// STORAGE_TYPES
+// } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
+
+
+const STORAGE_TYPES = {
+  dynamoDB: "dynamoDB",
+  graph: "graph"
+}
+
+const templatePath = path.join(__dirname, '../../../../../resourceYaml/sns-out/template.ejs')
+const {
+  utils: { firstLetterUpperCase: upperCase },
+  consts: { SOURCE_PATH, SAVE_FILE_NAME }
+} = require("../../../../../../../MainLibs")
+
+
+/**
+ * create data for template.ejs
+ * return array of defaultSnsOutData
+ * because must create for FindData and ProcessLogical
+ *
+ * @param {Object} _izContext
+ * @param {String} saveFilePath
+ * @returns {Object[]}              - data of multiple defaultSnsOutData
+ */
+
+function createDataForDefaultSnsOut(_izContext, flowSchema, srcPath) {
+  let resultsForCreateDefaultSnsOut = [];
+  const defaultSnsOutDataList = [
+    {
+      queueName: upperCase(flowSchema.flowTag)
+    },
+  ]
+
+  for (let defaultSnsOutData of defaultSnsOutDataList) {
+    resultsForCreateDefaultSnsOut.push({
+      templatePath: templatePath,
+      templateData: defaultSnsOutData,
+      setting: {
+        initialData: "Resources:\n",
+        savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+        saveFileName: SAVE_FILE_NAME.snsOutYaml,
+        fileExtension: ".yml",
+        isAppend: true
+      }
+    })
+  }
+  return resultsForCreateDefaultSnsOut;
+}
+
+module.exports = createDataForDefaultSnsOut;

package/src/reStructure/TemplateData/flowSchema/components/websocket/connect/functionYaml/data.js

@@ -53,7 +53,7 @@ function createWebSocketConnectYaml(_izContext, srcPath) {
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "WebSocketTask")
+        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "UserUploadRecords")
       ]
     ),
     createIamRole(

package/src/reStructure/TemplateData/flowSchema/components/websocket/connect/handler/template.ejs

@@ -28,33 +28,33 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
   const { eventType, connectionId } = event.requestContext
   try {
 
-    let userId = event.queryStringParameters.userId
-    let submitByUserId = event.queryStringParameters.submitByUserId
-    let correlationIds = event._izContext.correlationIds.get(izara.consts.X_CORRELATION_ID)
-
     if (event.requestContext) {
       switch (eventType) {
         case 'CONNECT':
           console.log('Connect websocket')
+
+          let { userId, submittedByUserId } = event.queryStringParameters;
+
           await dynamodbSharedLib.putItem(event._izContext,
-          await dynamodbSharedLib.tableName(event._izContext, "WebSocketTask"),
-          {
-            taskKey: correlationIds,
-            userId: userId,
-            submitByUserId: submitByUserId
-          }
-        )
+            await dynamodbSharedLib.tableName(event._izContext, "UserUploadRecords"),
+            {
+              connectionId: connectionId,
+              userId: userId,
+              submittedByUserId: submittedByUserId,
+              expirationTime: Math.floor(Date.now() / 1000) + 7200 // ttl time milliSecond to second + 2 hour
+            }
+          )
           //(<webSocketConnect>)
           //(</webSocketConnect>)
           break
         case 'DISCONNECT':
           console.log('Websocket are Disconnection')
           await dynamodbSharedLib.deleteItem(event._izContext,
-          await dynamodbSharedLib.tableName(event._izContext, "WebSocketTask"),
-          {
-            taskKey: correlationIds,
-          }
-        )
+            await dynamodbSharedLib.tableName(event._izContext, "UserUploadRecords"),
+            {
+              connectionId: connectionId,
+            }
+          )
           //(<webSocketDisconnect>)
           //(</webSocketDisconnect>)
           break

package/src/reStructure/TemplateData/flowSchema/components/websocket/dynamoDb/ttlDynamoTemplate.ejs

@@ -0,0 +1,32 @@
+  <%- resourceName %>Table:
+    Type: "AWS::DynamoDB::Table"
+    Properties:
+      TableName: ${self:custom.iz_resourcePrefix}<%- tableName %>
+      BillingMode: PAY_PER_REQUEST
+      AttributeDefinitions:
+      <%_ attributes.forEach(attribute => { -%>
+      - AttributeName: <%- attribute['AttributeName'] %>
+        AttributeType: <%- attribute['AttributeType'] %>
+      <%_ }) _%>
+      KeySchema:
+      <%_ attributes.forEach(attribute => { -%>
+      <%_ if (attribute.keyType === 'partitionKey' || attribute.keyType === "identifier") { -%>
+      - AttributeName: <%- attribute["AttributeName"] %>
+        KeyType: HASH
+        <%_ } -%>
+      <%_ if(attribute.keyType === "sortKey") { -%>
+      - AttributeName: <%- attribute["AttributeName"] %>
+        KeyType: RANGE
+        <%_ } -%>
+      <%_ }) _%>
+      TimeToLiveSpecification:
+        AttributeName: expirationTime
+        Enabled: true
+        #<#<%- firstLetterUpperCase(tableName) %>DynamoDbSetting#>
+        #<#/<%- firstLetterUpperCase(tableName) %>DynamoDbSetting#>
+<%_ function firstLetterUpperCase(text){
+return text.charAt(0).toUpperCase() + text.slice(1)
+} _%>
+<%_ function firstLetterLowerCase(str) {
+return str.charAt(0).toLowerCase() + str.slice(1)
+} _%>

package/src/reStructure/TemplateData/flowSchema/components/websocket/dynamoDb/userUploadRecords.js

@@ -0,0 +1,58 @@
+/*
+Copyright (C) 2020 Sven Mason <http://izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+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/>.
+*/
+
+'use strict';
+const path = require('path');
+const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../../../../../MainLibs/src/Consts');
+
+const templatePath = path.join(__dirname, "./ttlDynamoTemplate.ejs")
+
+function data(_izContext, srcPath) {
+  let resultForCreateSources = [];
+  const userUploadRecords = [
+    {
+      tableName: "UserUploadRecords",
+      resourceName: "UserUploadRecords",
+      attributes: [
+        {
+          keyType: "partitionKey",
+          AttributeName: "connectionId",
+          AttributeType: "S"
+        }
+      ]
+    }
+  ];
+
+  for (let userUploadRecord of userUploadRecords) {
+    resultForCreateSources.push(
+      {
+        templatePath: templatePath,
+        templateData: userUploadRecord,
+        setting: {
+          initialData: 'Resources:\n',
+          savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+          saveFileName: SAVE_FILE_NAME.dynamoDbYaml,
+          fileExtension: ".yml",
+          isAppend: true
+        }
+      }
+    )
+  }
+  return resultForCreateSources;
+}
+
+module.exports = data;

package/src/reStructure/TemplateData/flowSchema/externalTopic/Process/handler/template.ejs

@@ -24,15 +24,29 @@ const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
 const recordHandlerSharedLib = require("@izara_project/izara-core-library-record-handler")
 const Logger = require('@izara_project/izara-core-library-logger');
-
+const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const <%- functionName %> = require('./<%- functionName %>_Main')
 
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
+  {
+    type: "object",
+    required: ['body', 'messageAttributes'],
+    properties: {
+      body: {
+        type: 'object',
+      },
+      messageAttributes: {
+        type: 'object'
+      }
+    }
+  }
+));
+
 // validate event properties in body.Message of sqs event
 let perRecordsValidatorSchema = {
   //(<validatorSchema>)
   //(</validatorSchema>)
 }
-middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
 module.exports.main = middleware.wrap(async (event, context, callback) => {
 
@@ -43,6 +57,9 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     // loop each record and send to mainFunction
     await Promise.all(event.Records.map(async record => { // promise.all for map() function
 
+      record = recordHandlerSharedLib.reformatDsqMessage(record._izContext, record);
+      record._izContext.logger.debug('record LambdaFunctionHdrDsq after reform', record);
+
       let passOnProperties = []
       record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
 
@@ -58,6 +75,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       passOnProperties.push(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/reStructure/TemplateData/flowSchema/generateTemplateData.js

@@ -29,21 +29,23 @@ const {
 
 // Core components
 const createWebSocketDynamoDb = require('./components/websocket/dynamoDb/WebSocketTaskData');
+const createUserUploadRecordTable = require('./components/websocket/dynamoDb/userUploadRecords')
 const createReservedDataMainTable = require('./components/websocket/dynamoDb/ReservedTableData');
 const createBucketS3 = require('./components/upload/relate/S3/data');
 const createWebSocketGenerateCodeLibs = require('./components/upload/relate/libs/data');
 const createWebSocketConnectYaml = require('./components/websocket/connect/functionYaml/data')
 const createWebSocketConnectHandler = require('./components/websocket/connect/handler/data')
+const createSnsTopicForUploadS3 = require('./components/upload/relate/sns-out/data')
 // CreateObject components
 const createFunctionYamlCreateObjectWebSocket = require('./components/upload/createObject/functionYaml/data');
 const createHandlerCreateObjectWebSocket = require('./components/upload/createObject/handler/data');
 const createMainFunctionCreateObjectWebSocket = require('./components/upload/createObject/mainFunction/data');
 
 // CreateObjectComplete components
-const createWebSocketCreateObjectCompleteFunctionYaml = require('./components/upload/createObjectComplete/functionYaml/data');
-const createWebSocketCreateObjectCompleteQueue = require('./components/upload/createObjectComplete/sns-sqs/data');
-const createWebSocketCreateObjectCompleteHandler = require('./components/upload/createObjectComplete/handler/data');
-const createWebSocketCreateObjectCompleteMainFunction = require('./components/upload/createObjectComplete/mainFunction/data');
+// const createWebSocketCreateObjectCompleteFunctionYaml = require('./components/upload/createObjectComplete/functionYaml/data');
+// const createWebSocketCreateObjectCompleteQueue = require('./components/upload/createObjectComplete/sns-sqs/data');
+// const createWebSocketCreateObjectCompleteHandler = require('./components/upload/createObjectComplete/handler/data');
+// const createWebSocketCreateObjectCompleteMainFunction = require('./components/upload/createObjectComplete/mainFunction/data');
 
 // PreSign URL components
 const createReservedLimitFunctionYaml = require('./components/upload/preSignUrl/reservedLimit/functionYaml/data');
@@ -72,9 +74,9 @@ const createConfirmAfterUploadS3Queue = require('./components/upload/confirmRese
 // flowSchema ExternalTopic components //
 const createExternalSqsFunctionYaml = require('./externalTopic/Process/functionYaml/data');
 const createExternalSqsHandler = require('./externalTopic/Process/handler/data');
-const createExternalSqsCompleteFunctionYaml = require("./externalTopic/Complete/functionYaml/data");
-const createExternalSqsCompleteHandler = require("./externalTopic/Complete/handler/data");
-const createExternalSqsCompleteMainFunction = require("./externalTopic/Complete/mainFunction/data");
+// const createExternalSqsCompleteFunctionYaml = require("./externalTopic/Complete/functionYaml/data");
+// const createExternalSqsCompleteHandler = require("./externalTopic/Complete/handler/data");
+// const createExternalSqsCompleteMainFunction = require("./externalTopic/Complete/mainFunction/data");
 const createExternalTopicSnsInSqs = require('./externalTopic/sns-in-sqs/data');
 const createExternalTopicSnsOut = require('./externalTopic/sns-out/data')
 
@@ -101,9 +103,9 @@ const createFlowSchemaFlowStepHandler = require('./flowStep/handler/data');
 const createFlowSchemaFlowStepMainFunction = require('./flowStep/mainFunction/data')
 const createFlowSchemaFlowStepSnsIn = require('./flowStep/sns-in/data');
 // flowSchema OwnTopicEndpointComplete component
-const createFlowSchemaOwnTopicEndpointCompleteFuntionYaml = require('./flowSchemaOwnTopic/EndpointComplete/functionYaml/data');
-const createFlowSchemaOwnTopicEndpointCompleteHandler = require('./flowSchemaOwnTopic/EndpointComplete/handler/data');
-const createFlowSchemaOwnTopicEndpointCompleteMainFunction = require('./flowSchemaOwnTopic/EndpointComplete/mainFunction/data');
+// const createFlowSchemaOwnTopicEndpointCompleteFuntionYaml = require('./flowSchemaOwnTopic/EndpointComplete/functionYaml/data');
+// const createFlowSchemaOwnTopicEndpointCompleteHandler = require('./flowSchemaOwnTopic/EndpointComplete/handler/data');
+// const createFlowSchemaOwnTopicEndpointCompleteMainFunction = require('./flowSchemaOwnTopic/EndpointComplete/mainFunction/data');
 
 const createFlowSchemaOwnTopicQueue = require('./flowSchemaOwnTopic/sns-in/data');
 const createFlowSchemaOwnTopicSnsOut = require('./flowSchemaOwnTopic/sns-out/data');
@@ -121,10 +123,10 @@ const createFlowSchemaLambdaSyncHandlerApi = require("./lambdaSync/Api/handler/d
 
 const createAwaitingMultipleStepDynamoDbData = require('./dynamoDb/data');
 // create record status Field Complete
-const createCreateObjectCompleteFunctionYaml = require('./CreateRecordComplete/functionYaml/data');
-const createCreateObjectCompleteHandler = require('./CreateRecordComplete/handler/data');
-const createCreateObjectCompleteMainFunction = require('./CreateRecordComplete/mainFunction/data');
-const createCreateObjectCompleteQueue = require('./CreateRecordComplete/queue/data');// flowSchema Register component //
+// const createCreateObjectCompleteFunctionYaml = require('./CreateRecordComplete/functionYaml/data');
+// const createCreateObjectCompleteHandler = require('./CreateRecordComplete/handler/data');
+// const createCreateObjectCompleteMainFunction = require('./CreateRecordComplete/mainFunction/data');
+// const createCreateObjectCompleteQueue = require('./CreateRecordComplete/queue/data');// flowSchema Register component //
 
 const createFlowSchemaRegisterHandlerComplete = require('./register/complete/handler/data');
 const createFlowSchemaRegisterMainCompleteFunc = require('./register/complete/mainFunction/data');
@@ -178,9 +180,10 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     for (const flowSchema of allLocalFlowSchemas.records) {
       // console.log("flowSchema in Generate TemplateData", flowSchema);
       const webSocketGenerateCodeLibs = createWebSocketGenerateCodeLibs(_izContext, flowSchema, saveFilePath)
+      createSourceParams.push(...webSocketGenerateCodeLibs)
       if (!flowSchema.event.includes("s3")) {
         const flowSchemaEndpointMainFunction = await createFlowSchemaEndpointMainFunction(_izContext, flowSchema, saveFilePath);
-        createSourceParams.push(...webSocketGenerateCodeLibs, ...flowSchemaEndpointMainFunction)
+        createSourceParams.push(...flowSchemaEndpointMainFunction)
       }
 
       // event has [s3, extTopic, ownTopic, eventBridge, lambdaSync]
@@ -188,6 +191,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         if (event.includes("s3")) {
           const reservedDataTable = createReservedDataMainTable(_izContext, saveFilePath);
           const bucketS3 = createBucketS3(_izContext, flowSchema, saveFilePath)
+          const userUploadRecordTable = createUserUploadRecordTable(_izContext, saveFilePath)
 
           const functionYamlCreateObjectWebSocket = createFunctionYamlCreateObjectWebSocket(_izContext, flowSchema, saveFilePath);
           const handlerCreateObjectWebSocket = createHandlerCreateObjectWebSocket(_izContext, flowSchema, saveFilePath);
@@ -199,7 +203,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
           // const webSocketCreateObjectStordCache = createWebSocketCreateObjectStoredCache(_izContext, saveFilePath);
 
-          const reservedLimitFunctionYaml = createReservedLimitFunctionYaml(_izContext, flowSchema, saveFilePath);
+          const reservedLimitFunctionYaml = await createReservedLimitFunctionYaml(_izContext, flowSchema, saveFilePath);
           const reservedLimitHandlerFunction = createReservedLimitHandler(_izContext, flowSchema, saveFilePath);
           const reservedLimitMainFunction = await createReservedLimitMainFunction(_izContext, flowSchema, saveFilePath);
           const reservedLimitQueueName = createReservedLimitQueueName(_izContext, saveFilePath);
@@ -221,6 +225,8 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const confirmReservedAfterUploadMainFunction = createConfirmAfterUploadS3MainFunction(_izContext, flowSchema, saveFilePath);
           const confirmReservedAfterUploadQueue = createConfirmAfterUploadS3Queue(_izContext, saveFilePath);
 
+          const snsTopicOutFlowSchemaUploadS3 = createSnsTopicForUploadS3(_izContext, flowSchema, saveFilePath);
+
           const webSocketFunctions = [
             ...functionYamlCreateObjectWebSocket,
             ...handlerCreateObjectWebSocket,
@@ -275,6 +281,8 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
             ...reservedLimitResources,
             ...processAfterUploadResources,
             ...confirmAfterUploadResources,
+            ...snsTopicOutFlowSchemaUploadS3,
+            ...userUploadRecordTable
           );
 
         } else if (event.includes("extTopic")) {

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/handler/template.ejs

@@ -24,7 +24,7 @@ const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
 const recordHandlerSharedLib = require("@izara_project/izara-core-library-record-handler")
 const Logger = require('@izara_project/izara-core-library-logger');
-
+const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const <%- functionName %> = require('./<%- functionName %>_Main')
 
 // validate event properties in body.Message of sqs event

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/mainFunction/template.ejs

@@ -37,6 +37,8 @@ const { v4: uuidv4 } = require('uuid')
 const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 const consts = require("@izara_project/izara-middleware").consts
 const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
+const { createFlowTypeConcat } = require("@izara_project/izara-core-library-service-schemas").utils
+
 //(<optionalRequire>)
 //(</optionalRequire>)
 /**
@@ -73,59 +75,69 @@ module.exports.<%- functionName %> = async (
       throw new NoRetryError('not have TopicArn for get FlowSchemas')
     }
 
-    let topicName = topicArn.spilt(":")[5].split("_")
+    let topicName = topicArn.split(":")[5].split("_")
+    let flowTag = topicName[2]
 
     let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
-      flowTag: topicName[2],
+      flowTag: flowTag,
       serviceTag: topicName[0]
     })
 
+    if (!flowSchema) {
+      if (requestParams.hasOwnProperty("flowTag")) {
+        flowTag = requestParams.flowTag;
+        flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
+          flowTag: flowTag,
+          serviceTag: process.env.iz_serviceTag
+        })
+      } else {
+        throw new NoRetryError("Could not find flowSchema from topicArn or requestParams.flowTag")
+      }
+    }
+
     //(<createIdentifiersFlow>)
       let identifiers
     //(</createIdentifiersFlow>)
 
-    if (!flowSchema) {
-      throw new NoRetryError("not have flowSchema in S3")
-    }
-
-    let wbsTasks; 
+    let wbsTasks;
+    let taskKey;
     if (flowSchema.statusType === "statusField" || flowSchema.statusType === "storedCache" || flowSchema.statusType === "triggerCache") {
+      taskKey = `${createFlowTypeConcat(_izContext,{flowTag: flowTag, serviceTag: topicName[0]})}${identifiers}`
       wbsTasks = await dynamodbSharedLib.query(
         _izContext,
         await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
         {
-          taskKey: `${createFlowTypeConcat(_izContext,{flowTag: topicName[2],serviceTag: topicName[0]})}${identifiers}`
+          taskKey: taskKey
         }
       )
     } else if (flowSchema.statusType === "none") {
+      taskKey = `${createFlowTypeConcat(_izContext,{flowTag: flowTag, serviceTag: topicName[0]})}${correlationId}`
       wbsTasks = await dynamodbSharedLib.query(
         _izContext,
         await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
         {
-          taskKey: correlationId,
+          taskKey: taskKey
         }
       )
-      }
+    }
 
     if (wbsTasks.Items.length) {
-      await Promise.all(wbsTasks.Items.map(async ({ connectionId }) => {
-        await postToConnection(
-          {
-            message: requestParams
-          },
-          connectionId
-        )
+      await Promise.all(wbsTasks.Items.map(async (wbsTask) => {
+        let postMessage = { message: requestParams }
+
+        //(<beforePostMessage>)
+        //(</beforePostMessage>)
+
+        await postToConnection(postMessage, wbsTask.connectionId)
 
         await dynamodbSharedLib.deleteItem(_izContext,
           await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
           {
-            taskKey: correlationId,
-            connectionId: connectionId
+            taskKey: wbsTask.taskKey,
+            connectionId: wbsTask.connectionId
           }
         )
       }))
-
-
     }
 
   } catch (err) {

package/src/reStructure/TemplateData/perActionComplete/update/mainFunction/template.ejs

@@ -91,9 +91,12 @@ module.exports.updateNodeComplete = async (
               fields: returnValue.queryResult.objInstanceFull.fields
             },
             status: status,
-            errorsFound: errorsFound
+            errorsFound: errorsFound,
           };
 
+          //(<additionalProperties>)
+          //(</additionalProperties>)
+
           updateCompleteMsg = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, updateCompleteMsg);
           _izContext.logger.debug("after addCallingFlow to SnsResponseMessageObject", updateCompleteMsg);
 

package/src/reStructure/TemplateData/processLogical/mainFunction/template.ejs

@@ -315,7 +315,7 @@ module.exports.processLogical = async (
               comparison: comparison,
               callingFlow: callingFlow
             }),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, "InPaginateProcessLogical")
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "InPaginateProcessLogical")
           };
           _izContext.logger.debug('Request params before send to topic InPaginateProcessLogical: ', sentMessageToPaginateProcessLogical);
 
@@ -374,7 +374,7 @@ module.exports.processLogical = async (
               sortKeyFieldName: sortKeyFieldName,
               callingFlow: callingFlow
             }),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, "InPaginateProcessLogical")
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "InPaginateProcessLogical")
           };
           _izContext.logger.debug('Request params before send to topic InPaginateProcessLogical: ', sentMessageToPaginateProcessLogical);
 

package/src/reStructure/TemplateData/resourceYaml/dynamodb/mainResourcePerObjectSchemaData.js

@@ -70,7 +70,7 @@ function dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema, srcPa
         let attributeType;
         if (fieldNameType === 'string') {
           attributeType = "S"
-        } else if (fieldNameType === 'number') {
+        } else if (fieldNameType === 'number' || fieldNameType === "timestamp") {
           attributeType = "N"
         }
         Object.assign(