@izara_project/izara-market-library-service-schemas 1.0.39 → 1.0.41

package/src/reStructure/TemplateData/flowSchema/generateTemplateData.js

@@ -75,6 +75,7 @@ const createExternalSqsFunctionYaml = require('./externalTopic/functionYaml/data
 const createExternalSqsHandler = require('./externalTopic/handler/data');
 const createExternalSqsMainFunction = require('./externalTopic/mainFunction/data');
 const createExternalTopicSnsInSqs = require('./externalTopic/sns-in-sqs/data');
+const createExternalTopicSnsOut = require('./externalTopic/sns-out/data')
 
 // flowSchema OwnTopic component
 const createFlowSchemaOwnTopicFunctionYaml = require('./flowSchemaOwnTopic/FlowSchemaComponent/functionYaml/data');
@@ -82,9 +83,9 @@ const createFlowSchemaOwnTopicHandler = require('./flowSchemaOwnTopic/FlowSchema
 const createFlowSchemaOwnTopicMainFunction = require('./flowSchemaOwnTopic/FlowSchemaComponent/mainFunction/data');
 
 // flowSchema OwnTopicComplete component
-const createFlowSchemaOwnTopicCompleteFunctionYaml = require("./flowSchemaOwnTopic/webSocketComplete/functionYaml/data");
-const createFlowSchemaOwnTopicCompleteHandler = require("./flowSchemaOwnTopic/webSocketComplete/handler/data");
-const createFlowSchemaOwnTopicCompleteMainFunction = require("./flowSchemaOwnTopic/webSocketComplete/mainFunction/data");
+const createFlowSchemaOwnTopicCompleteFunctionYaml = require("./webSocketComplete/functionYaml/data");
+const createFlowSchemaOwnTopicCompleteHandler = require("./webSocketComplete/handler/data");
+const createFlowSchemaOwnTopicCompleteMainFunction = require("./webSocketComplete/mainFunction/data");
 
 // flowSchema OwnTopicEndpoint component
 const createFlowSchemaOwnTopicEndpointFuntionYaml = require('./flowSchemaOwnTopic/EndpointComponent/functionYaml/data');
@@ -144,10 +145,17 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     const webSocketConnectYaml = createWebSocketConnectYaml(_izContext, saveFilePath);
     const webSocketConnectHandler = createWebSocketConnectHandler(_izContext, saveFilePath);
 
+    // flowSchema OwnTopic Complete component
+    const flowSchemaOwnTopicCompleteFunctionYaml = createFlowSchemaOwnTopicCompleteFunctionYaml(_izContext, allLocalFlowSchemas, saveFilePath);
+    const flowSchemaOwnTopicCompleteHandler = createFlowSchemaOwnTopicCompleteHandler(_izContext, saveFilePath);
+    const flowSchemaOwnTopicCompleteMainFunction = createFlowSchemaOwnTopicCompleteMainFunction(_izContext, saveFilePath);
+    const flowSchemaOwnTopicCompleteComponent = [...flowSchemaOwnTopicCompleteFunctionYaml, ...flowSchemaOwnTopicCompleteHandler, ...flowSchemaOwnTopicCompleteMainFunction]
+
     const webSocketResource = [...webSocketTaskTable, ...webSocketConnectYaml, ...webSocketConnectHandler]
     if (allLocalFlowSchemas.records.length) {
       createSourceParams.push(
         ...webSocketResource,
+        ...flowSchemaOwnTopicCompleteComponent
       )
     }
 
@@ -258,13 +266,14 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const externalSqsHandler = await createExternalSqsHandler(_izContext, flowSchema, saveFilePath);
           const externalSqsMainFunction = await createExternalSqsMainFunction(_izContext, flowSchema, saveFilePath);
           const externalTopicSnsInSqs = createExternalTopicSnsInSqs(_izContext, flowSchema, saveFilePath);
-
+          const externalTopicSnsOut = createExternalTopicSnsOut(_izContext, flowSchema, saveFilePath);
           // Group related resources for better organization
           const externalTopic = [
             ...externalSqsFunctionYaml,
             ...externalSqsHandler,
             ...externalSqsMainFunction,
-            ...externalTopicSnsInSqs
+            ...externalTopicSnsInSqs,
+            ...externalTopicSnsOut
           ];
 
           createSourceParams.push(...externalTopic)
@@ -276,11 +285,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const flowSchemaOwnTopicHandler = createFlowSchemaOwnTopicHandler(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicMainFunction = await createFlowSchemaOwnTopicMainFunction(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicComponent = [...flowSchemaOwnTopicFunctionYaml, ...flowSchemaOwnTopicHandler, ...flowSchemaOwnTopicMainFunction]
-          // flowSchema OwnTopic Complete component
-          const flowSchemaOwnTopicCompleteFunctionYaml = createFlowSchemaOwnTopicCompleteFunctionYaml(_izContext, saveFilePath);
-          const flowSchemaOwnTopicCompleteHandler = createFlowSchemaOwnTopicCompleteHandler(_izContext, flowSchema, saveFilePath);
-          const flowSchemaOwnTopicCompleteMainFunction = createFlowSchemaOwnTopicCompleteMainFunction(_izContext, flowSchema, saveFilePath);
-          const flowSchemaOwnTopicCompleteComponent = [...flowSchemaOwnTopicCompleteFunctionYaml, ...flowSchemaOwnTopicCompleteHandler, ...flowSchemaOwnTopicCompleteMainFunction]
+
           // flowSchemaOwnTopic Endpoint
           const flowSchemaOwnTopicEndpointFuntionYaml = await createFlowSchemaOwnTopicEndpointFuntionYaml(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicEndpointHandler = createFlowSchemaOwnTopicEndpointHandler(_izContext, flowSchema, saveFilePath);
@@ -288,10 +293,10 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const flowSchemaOwnTopicEndpointComponent = [...flowSchemaOwnTopicEndpointFuntionYaml, ...flowSchemaOwnTopicEndpointHandler, ...flowSchemaOwnTopicEndpointMainFunction]
 
           // flowSchemaOwnTopic EndpointComplete
-          // const flowSchemaOwnTopicEndpointCompleteFuntionYaml = createFlowSchemaOwnTopicEndpointCompleteFuntionYaml(_izContext, flowSchema, saveFilePath);
-          // const flowSchemaOwnTopicEndpointCompleteHandler = createFlowSchemaOwnTopicEndpointCompleteHandler(_izContext, flowSchema, saveFilePath);
-          // const flowSchemaOwnTopicEndpointCompleteMainFunction = createFlowSchemaOwnTopicEndpointCompleteMainFunction(_izContext, flowSchema, saveFilePath);
-          // const flowSchemaOwnTopicEndpointCompleteComponent = [...flowSchemaOwnTopicEndpointCompleteFuntionYaml, ...flowSchemaOwnTopicEndpointCompleteHandler, ...flowSchemaOwnTopicEndpointCompleteMainFunction];
+          const flowSchemaOwnTopicEndpointCompleteFuntionYaml = createFlowSchemaOwnTopicEndpointCompleteFuntionYaml(_izContext, flowSchema, saveFilePath);
+          const flowSchemaOwnTopicEndpointCompleteHandler = createFlowSchemaOwnTopicEndpointCompleteHandler(_izContext, flowSchema, saveFilePath);
+          const flowSchemaOwnTopicEndpointCompleteMainFunction = createFlowSchemaOwnTopicEndpointCompleteMainFunction(_izContext, flowSchema, saveFilePath);
+          const flowSchemaOwnTopicEndpointCompleteComponent = [...flowSchemaOwnTopicEndpointCompleteFuntionYaml, ...flowSchemaOwnTopicEndpointCompleteHandler, ...flowSchemaOwnTopicEndpointCompleteMainFunction];
 
           const flowSchemaOwnTopicQueue = createFlowSchemaOwnTopicQueue(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicSnsOut = createFlowSchemaOwnTopicSnsOut(_izContext, flowSchema, saveFilePath);
@@ -302,8 +307,8 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const flowSchemaOwnTopicFlowStep = [...flowSchemaOwnTopicFlowStepYml, ...flowSchemaOwnTopicFlowStepHandler, ...flowSchemaOwnTopicFlowStepMainFunction]
           // Group the resources
           const ownTopicResources = [
-            ...flowSchemaOwnTopicComponent, ...flowSchemaOwnTopicCompleteComponent, ...flowSchemaOwnTopicEndpointComponent, ...flowSchemaOwnTopicQueue, ...flowSchemaOwnTopicSnsOut, ...flowSchemaOwnTopicFlowStep
-            // ...flowSchemaOwnTopicEndpointCompleteComponent
+            ...flowSchemaOwnTopicComponent, ...flowSchemaOwnTopicEndpointComponent, ...flowSchemaOwnTopicQueue, ...flowSchemaOwnTopicSnsOut, ...flowSchemaOwnTopicFlowStep,
+            ...flowSchemaOwnTopicEndpointCompleteComponent
           ];
 
 

package/src/reStructure/TemplateData/flowSchema/register/complete/functionYaml/data.js

@@ -76,7 +76,8 @@ function data(_izContext, srcPath) {
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "WebSocketTask")
+        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "WebSocketTask"),
+        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "RegisterRecords ")
       ]
     ),
     createIamRole(

package/src/reStructure/TemplateData/flowSchema/register/complete/functionYaml/template.ejs

@@ -8,7 +8,6 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
-          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
   #<#<%- functionName %><%- handlerType %>IamRole#>
   #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/flowSchema/register/complete/mainFunction/template.ejs

@@ -19,7 +19,7 @@ along with this program. If not, see
 'use strict';
 
 const hash = require('@izara_project/izara-shared-core').objectHash;
-const { getObjectSchema } = require('@izara_project/izara-core-library-service-schemas');
+const { getObjectSchema, identifiersObject } = require('@izara_project/izara-core-library-service-schemas');
 
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
@@ -29,7 +29,7 @@ const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
 
 const externalRequest = require('@izara_project/izara-core-library-external-request');
 const sns = externalRequest.sns
-const { postToConnection } = require("../../../libs/source/GenerateCodeLibs");
+const generatedCodeLibs = require("../../../libs/source/GenerateCodeLibs");
 
 const utils = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Utils')
 const { NoRetryError } = require('@izara_project/izara-core-library-core')
@@ -37,7 +37,7 @@ const { v4: uuidv4 } = require('uuid')
 const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 // const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
 const { generateCodeLibs: { consts: TOPIC_NAME_GENERATE_CODE } } = require('@izara_project/izara-market-library-service-schemas')
-
+const consts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
 /**
  * description of function.
  * @param {Object} _izContext
@@ -61,6 +61,8 @@ module.exports.registerCompleteMain = async (
     _izContext.logger.debug("WebSocketInvoke requestParams", requestParams)
     _izContext.logger.debug("WebSocketInvoke callingFlowConfig", callingFlowConfig)
 
+    let connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID);
+
     // getflowSchema by using send topic name
     // ! didn't got topicName from requestParams complete endpoint must send flowTag with identifiersTask
 
@@ -79,12 +81,12 @@ module.exports.registerCompleteMain = async (
 
     let correlationId = _izContext.correlationIds.get(consts.X_CORRELATION_ID);
 
-    const getResult = async (objectType) => {
+    const getResult = async (objType) => {
       const objectSchema = await getObjectSchema.getObjSchemaS3WithCache(
         _izContext,
         {
-          objectType: objectType,
-          serviceTag: process.env.iz_serviceTag,
+          objectType: objType.objectType,
+          serviceTag: objType.serviceTag
         })
 
       _izContext.logger.debug("==> objectSchema", objectSchema)
@@ -92,27 +94,27 @@ module.exports.registerCompleteMain = async (
       const result = await externalRequest.lambda.invokeSync(_izContext,
         await lambdaSharedLib.lambdaFunctionName(_izContext, "GetHdrInv"),
         {
-          identifiers: identifiersLibs.identifiersFromIdentifiersConcat(_izContext, objectType, requestParams.identifiersTask),
-          objectType: objectType
+          identifiers: await identifiersObject.identifiersFromIdentifiersConcat(_izContext, objType, requestParams.identifiersTask),
+          objectType: objType.objectType
         }
       )
 
       for (const [fieldName, fieldNameSetting] of Object.entries(objectSchema.fieldNames)) {
         if (fieldNameSetting.hasOwnProperty("statusField") && fieldNameSetting.statusField === true) {
-          if (fieldName[result] !== "complete" || fieldName[result] !== "error") {
+          if (result.fields[fieldName] !== "complete" && result.fields[fieldName] !== "error") {
             // if status is not complete or error will save data into table
             await dynamodbSharedLib.putItem(_izContext,
-              await dynamodbSharedLib.tableName(_izContext, "RegisterRecord"),
+              await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
               {
                 identifiersTask: requestParams.identifiersTask,
-                connecttionId: connecttionId
+                connectionId: connectionId
               }
             )
           } else {
             if (!result) {
-              await generatedCodeLibs.postToConnection({ message: "not have record" }, connecttionId)
+              await generatedCodeLibs.postToConnection({ message: "not have record" }, connectionId)
             } else {
-              await generatedCodeLibs.postToConnection({ message: result }, connecttionId)
+              await generatedCodeLibs.postToConnection({ message: result }, connectionId)
             }
           }
         }
@@ -122,18 +124,20 @@ module.exports.registerCompleteMain = async (
     // check statusType
     switch (flowSchema.statusType) {
       case "statusField":
-        await getResult(flowSchema.objType.objectType);
+        await getResult(flowSchema.objType);
         break;
       case "storedCache":
-        await getResult(flowSchema.objType.objectType);
+        await getResult(flowSchema.objType);
         break;
 
       case "none":
 
         let identifier = {};
-        if (requestParams.hasOwnProperty("identifiersField") && Array.isArray(requestParams.identifierisField)) {
-          for (const fieldNames of requestParams.identifierisField) {
-            Object.assign(identifier, { [fieldNames]: requestParams[fieldNames] })
+        if (requestParams.hasOwnProperty("identifiersField") && Array.isArray(requestParams.identifiersField)) {
+          for (const fieldNames of requestParams.identifiersField) {
+            Object.assign(identifier, {
+              [fieldNames]: requestParams[fieldNames]
+            })
           }
           identifier = identifier;
         } else {
@@ -142,27 +146,28 @@ module.exports.registerCompleteMain = async (
 
         // get task before putItem
         let tasks = await dynamodbSharedLib.query(_izContext,
-          await dynamodbSharedLib.tableName(_izContext, "ResgisterRecords"),
+          await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
           {
             identifiersTask: hash(identifier)
           }
         )
-        if (tasks && tasks.length > 0) {
+
+        if (tasks.Items && tasks.Items.length > 0) {
           await Promise.all(tasks.Items.map(async (task) => {
-            await generatedCodeLibs.postToConnection({ message: task }, task.connecttionId)
+            await generatedCodeLibs.postToConnection({ message: task }, task.connectionId)
           }))
         } else {
           await dynamodbSharedLib.putItem(_izContext,
             await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
             {
               identifiersTask: hash(identifier),
-              connecttionId: connecttionId
+              connecttionId: connectionId
             }
           )
         }
         break
       default:
-        throw new NoRetryError(`statusType not found ${getFlowSchema.statusType}`)
+        throw new NoRetryError(`statusType not found ${flowSchema.statusType}`)
     }
 
   } catch (err) {

package/src/reStructure/TemplateData/flowSchema/register/dynamoDB/register.js

@@ -59,7 +59,7 @@ const createRegisterTable = (_izContext, srcPath) => {
       attributes: [
         {
           keyType: "partitionKey",
-          AttributeName: "identifierTask",
+          AttributeName: "identifiersTask",
           AttributeType: "S"
         },
         {

package/src/reStructure/TemplateData/flowSchema/register/subscriptionOutAll/data.js

@@ -57,7 +57,8 @@ function createDataForSubscriptionOutAll(_izContext, allLocalFlowSchemas, srcPat
       let queueName;
       if (flowSchema.outputTopic) {
         let flowStepOut = Object.keys(flowSchema.flowSteps)[1].split("_")
-        queueName = flowStepOut[3] + flowStepOut[2]
+        // queueName = flowStepOut[3] + flowStepOut[2]
+        queueName = flowStepOut[0] + flowSchema.flowTag + "Complete";
       }
 
       if (queueName) {

package/src/reStructure/TemplateData/flowSchema/register/wbs/handler/template.ejs

@@ -26,6 +26,7 @@ const hash = require('@izara_project/izara-shared-core').objectHash;
 // const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 const { postToConnection } = require("../../../libs/source/GenerateCodeLibs");
 const { <%- functionName%>Main } = require("./<%- firstLetterUpperCase(functionName) %>_Main");
+const izara = require("@izara_project/izara-middleware");
 
 module.exports.main = middlewareHandler.wrap(async (event, context, callback) => {
 
@@ -68,6 +69,7 @@ module.exports.main = middlewareHandler.wrap(async (event, context, callback) =>
             { message: result },
             connectionId
           )
+          return (izara.response.webSocketSuccess());
           break
       }
     } else {
@@ -75,11 +77,12 @@ module.exports.main = middlewareHandler.wrap(async (event, context, callback) =>
       // await postMessage({ message: event.message }, connId);
       await postToConnection({ message: event.message }, connId);
     }
+    return izara.response.webSocketSuccess()
   } catch (err) {
     const connId = event.requestContext.connectionId
     event._izContext.logger.error('Error, WebSocket: ', err);
-    // await sendErrorMessage({ message: err.message }, connId);
     await postToConnection({ message: err.message }, connId);
+    return (izara.response.failure(err));
   }
 });
 <%_ const join = require('path').join _%>

package/src/reStructure/TemplateData/flowSchema/register/wbs/mainFunction/template.ejs

@@ -19,7 +19,7 @@ along with this program. If not, see
 'use strict';
 
 const hash = require('@izara_project/izara-shared-core').objectHash;
-const { getObjectSchema } = require('@izara_project/izara-core-library-service-schemas');
+const { getObjectSchema, identifiersObject } = require('@izara_project/izara-core-library-service-schemas');
 
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
@@ -59,7 +59,7 @@ module.exports.registerMain = async (
   //(</additionalParams>)
 ) => {
   try {
-    let connecttionId = _izContext.correlationIds.get(consts.CONNECTION_ID)
+    let connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID)
     // receive flowTag and identifiers
     let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
       flowTag: requestParams.flowTag,
@@ -71,12 +71,12 @@ module.exports.registerMain = async (
       throw new NoRetryError(`flowTag not found ${requestParams.flowTag}`)
     }
 
-    const getResult = async (objectType) => {
+    const getResult = async (objType) => {
       const objectSchema = await getObjectSchema.getObjSchemaS3WithCache(
         _izContext,
         {
-          objectType: objectType,
-          serviceTag: process.env.iz_serviceTag,
+          objectType: objType.objectType,
+          serviceTag: objType.serviceTag,
         })
 
       _izContext.logger.debug("==> objectSchema", objectSchema)
@@ -84,27 +84,27 @@ module.exports.registerMain = async (
       const result = await externalRequest.lambda.invokeSync(_izContext,
         await lambdaSharedLib.lambdaFunctionName(_izContext, "GetHdrInv"),
         {
-          identifiers: identifiersLibs.identifiersFromIdentifiersConcat(_izContext, objectType, requestParams.identifiersTask),
-          objectType: objectType
+          identifiers: await identifiersObject.identifiersFromIdentifiersConcat(_izContext, objType, requestParams.identifiersTask),
+          objectType: objType.objectType
         }
       )
 
       for (const [fieldName, fieldNameSetting] of Object.entries(objectSchema.fieldNames)) {
         if (fieldNameSetting.hasOwnProperty("statusField") && fieldNameSetting.statusField === true) {
-          if (fieldName[result] !== "complete" || fieldName[result] !== "error") {
+          if (result.fields[fieldName] !== "complete" && result.fields[fieldName] !== "error") {
             // if status is not complete or error will save data into table
             await dynamodbSharedLib.putItem(_izContext,
-              await dynamodbSharedLib.tableName(_izContext, "RegisterRecord"),
+              await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
               {
                 identifiersTask: requestParams.identifiersTask,
-                connecttionId: connecttionId
+                connectionId: connectionId
               }
             )
           } else {
             if (!result) {
-              await generatedCodeLibs.postToConnection({ message: "not have record" }, connecttionId)
+              await generatedCodeLibs.postToConnection({ message: "not have record" }, connectionId)
             } else {
-              await generatedCodeLibs.postToConnection({ message: result }, connecttionId)
+              await generatedCodeLibs.postToConnection({ message: result }, connectionId)
             }
           }
         }
@@ -114,16 +114,18 @@ module.exports.registerMain = async (
     // Initialize storedCacheData variable that will be used in multiple switch cases
     switch (flowSchema.statusType) {
       case "statusField":
-        await getResult(flowSchema.objType.objectType)
+        await getResult(flowSchema.objType)
         break;
       case "storedCache":
-        await getResult(flowSchema.objType.objectType)
+        await getResult(flowSchema.objType)
         break;
       case "none":
         let identifier = {};
-        if (requestParams.hasOwnProperty("identifiersField") && Array.isArray(requestParams.identifierisField)) {
-          for (const fieldNames of requestParams.identifierisField) {
-            Object.assign(identifier, { [fieldNames]: requestParams[fieldNames] })
+        if (requestParams.hasOwnProperty("identifiersField") && Array.isArray(requestParams.identifiersField)) {
+          for (const fieldNames of requestParams.identifiersField) {
+            Object.assign(identifier, {
+              [fieldNames]: requestParams[fieldNames]
+            })
           }
           identifier = identifier;
         } else {
@@ -132,21 +134,21 @@ module.exports.registerMain = async (
 
         // get task before putItem
         let tasks = await dynamodbSharedLib.query(_izContext,
-          await dynamodbSharedLib.tableName(_izContext, "ResgisterRecords"),
+          await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
           {
             identifiersTask: hash(identifier)
           }
         )
-        if (tasks && tasks.length > 0) {
+        if (tasks.Items && tasks.Items.length > 0) {
           await Promise.all(tasks.Items.map(async (task) => {
-            await generatedCodeLibs.postToConnection({ message: task }, task.connecttionId)
+            await generatedCodeLibs.postToConnection({ message: task }, task.connectionId)
           }))
         } else {
           await dynamodbSharedLib.putItem(_izContext,
             await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
             {
               identifiersTask: hash(identifier),
-              connecttionId: connecttionId
+              connectionId: connectionId
             }
           )
         }

package/src/reStructure/TemplateData/flowSchema/{flowSchemaOwnTopic/webSocketComplete → webSocketComplete}/functionYaml/data.js

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const path = require('path');
 
 const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
+const { firstLetterUpperCase: upperCase } = require('../../../../../MainLibs/src/Utils')
 const {
   SOURCE_PATH,
   defaultIamRolePerAction,
@@ -34,8 +34,8 @@ const {
   externalResourceYaml,
   SOURCE_GENERATE_IAM_ROLE,
   SQS_RESOURCE
-} = require('../../../../../../MainLibs/src/Consts');
-const { TOPIC_NAME_GENERATE_CODE } = require('../../../../../../GenerateCodeLibs/src/Consts');
+} = require('../../../../../MainLibs/src/Consts');
+const { TOPIC_NAME_GENERATE_CODE } = require('../../../../../GenerateCodeLibs/src/Consts');
 
 const templatePath = path.join(__dirname, "template.ejs");
 const hookTemplate = path.join(__dirname, "./hookTemplate.ejs");
@@ -47,11 +47,11 @@ const hookTemplate = path.join(__dirname, "./hookTemplate.ejs");
  * @return {{templatePath, templateData,setting}}
  */
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, allLocalFlowSchemas, srcPath) {
+  return [createSourceParams(_izContext, allLocalFlowSchemas, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, allLocalFlowSchemas, srcPath) {
   let functionName = "WebSocketComplete"
   let handlerType = upperCase(HANDLER.hdrSqs)
   let additionalResourcePermission = defaultIamRolePerAction();
@@ -90,6 +90,12 @@ function createSourceParams(_izContext, srcPath) {
         resourceNames(RESOURCE_CLASSES.sqs, queueName),
         resourceNames(RESOURCE_CLASSES.sqs, queueName + "DLQ")
       ]
+    ),
+    createIamRole(
+      {
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.subscribe]
+      },
+      allLocalFlowSchemas.records.map(flowSchema => resourceNames(RESOURCE_CLASSES.sns, flowSchema.flowTag + "Complete_Out"))
     )
   )
 
@@ -102,7 +108,7 @@ function createSourceParams(_izContext, srcPath) {
       handlerType,
       additionalResourcePermission,
       functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
-      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic,
+      roleName: "WebSocketMain",
       queueName: queueName
     },
     setting: {

package/src/reStructure/TemplateData/flowSchema/{flowSchemaOwnTopic/webSocketComplete → webSocketComplete}/functionYaml/template.ejs

@@ -4,11 +4,10 @@
   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}<%- queueName %>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %> + <%- handlerType %>
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
-          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/flowSchema/{flowSchemaOwnTopic/webSocketComplete → webSocketComplete}/handler/data.js

@@ -17,9 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 const path = require('path');
-const { FLOW_SCHEMA_HOOK_STATE, HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { SOURCE_PATH, FUNCTION_NAME } = require('../../../../../../MainLibs/src/Consts');
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils")
+const { HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+const { firstLetterUpperCase: upperCase } = require('../../../../../MainLibs/src/Utils')
+const { SOURCE_PATH } = require('../../../../../MainLibs/src/Consts');
 const templatePath = path.join(__dirname, "template.ejs")
 
 /**
@@ -31,11 +31,11 @@ const templatePath = path.join(__dirname, "template.ejs")
  */
 
 
-function data(_izContext, flowSchema, srcPath) {
-  return [createParamsForCreateSource(_izContext, flowSchema, srcPath)]
+function data(_izContext, srcPath) {
+  return [createParamsForCreateSource(_izContext, srcPath)]
 }
 
-function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
+function createParamsForCreateSource(_izContext, srcPath) {
   let functionName = "WebSocketComplete"
   let handlerType = upperCase(HANDLER.hdrSqs)
   let queueName = upperCase(functionName) + upperCase(handlerType);

package/src/reStructure/TemplateData/flowSchema/{flowSchemaOwnTopic/webSocketComplete → webSocketComplete}/mainFunction/data.js

@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 const path = require('path');
 
-const { SOURCE_PATH, FUNCTION_NAME } = require('../../../../../../MainLibs/src/Consts');
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils")
+const { HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+const { SOURCE_PATH } = require('../../../../../MainLibs/src/Consts');
 const templatePath = path.join(__dirname, "template.ejs");
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema')
 
@@ -32,11 +32,11 @@ const getObjectSchema = require('@izara_project/izara-core-library-service-schem
  */
 
 
-function data(_izContext, flowSchema, srcPath) {
-  return [createParamsForCreateSource(_izContext, flowSchema, srcPath)]
+function data(_izContext, srcPath) {
+  return [createParamsForCreateSource(_izContext, srcPath)]
 }
 
-function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
+function createParamsForCreateSource(_izContext, srcPath) {
   let functionName = "WebSocketComplete"
   return {
     templatePath: templatePath,

package/src/reStructure/TemplateData/generateRole/createSharedResource.js

@@ -118,7 +118,7 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
       handlerType: [],
       resources: {}
     },
-    "WebsocketConnect": {
+    "WebSocketMain": {
       handlerType: [],
       resources: {}
     },
@@ -233,11 +233,11 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
         templateData.additionalResourcePermission,
         groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.ExternalTopicRole].resources
       )
-    } else if (templateData?.roleName?.includes("WebsocketConnect")) {
-      groupedByObjectType["WebsocketConnect"].handlerType.push(templateData);
+    } else if (templateData?.roleName?.includes("WebSocketMain")) {
+      groupedByObjectType["WebSocketMain"].handlerType.push(templateData);
       processResourcePermissions(
         templateData.additionalResourcePermission,
-        groupedByObjectType["WebsocketConnect"].resources
+        groupedByObjectType["WebSocketMain"].resources
       )
     } else if (templateData?.roleName?.includes(SOURCE_GENERATE_IAM_ROLE.EventBridge)) {
       groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.EventBridge].handlerType.push(templateData);

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

@@ -127,6 +127,7 @@ module.exports.createObjectComplete = async (
               identifiers: returnValue.objInstanceFull.identifiers,
               fields: returnValue.objInstanceFull.fields
             },
+            relationships: returnValue.relationships,
             status: status,
             errorsFound: errorsFound
           }

package/src/reStructure/TemplateData/perActionComplete/create/yaml/template.ejs

@@ -8,7 +8,6 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
-          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/perActionComplete/delete/yaml/template.ejs

@@ -8,7 +8,6 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
-          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/perActionComplete/get/yaml/template.ejs

@@ -8,7 +8,6 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
-          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

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

@@ -8,7 +8,6 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
-          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/propertyValueSchema/generateTemplateData.js

@@ -34,6 +34,7 @@ const modules = {
  */
 async function generateCodeWithTemplate(_izContext, objSchemaPath, settings) {
   try {
+    console.log("settings generateCodeWithTemplate", settings)
     let allCreateSource = [];
     const srcPath = join(objSchemaPath, '../');