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

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

@@ -71,9 +71,12 @@ const createConfirmAfterUploadS3MainFunction = require('./components/upload/conf
 const createConfirmAfterUploadS3Queue = require('./components/upload/confirmReserved/queue/data');
 
 // flowSchema ExternalTopic components //
-const createExternalSqsFunctionYaml = require('./externalTopic/functionYaml/data');
-const createExternalSqsHandler = require('./externalTopic/handler/data');
-const createExternalSqsMainFunction = require('./externalTopic/mainFunction/data');
+const createExternalSqsFunctionYaml = require('./externalTopic/Process/functionYaml/data');
+const createExternalSqsHandler = require('./externalTopic/Process/handler/data');
+const createExternalSqsMainFunction = require('./externalTopic/Process/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')
 
@@ -83,19 +86,21 @@ const createFlowSchemaOwnTopicHandler = require('./flowSchemaOwnTopic/FlowSchema
 const createFlowSchemaOwnTopicMainFunction = require('./flowSchemaOwnTopic/FlowSchemaComponent/mainFunction/data');
 
 // flowSchema OwnTopicComplete component
-const createFlowSchemaOwnTopicCompleteFunctionYaml = require("./webSocketComplete/functionYaml/data");
-const createFlowSchemaOwnTopicCompleteHandler = require("./webSocketComplete/handler/data");
-const createFlowSchemaOwnTopicCompleteMainFunction = require("./webSocketComplete/mainFunction/data");
-
+const createWebSocketCompleteMainFunctionYaml = require("./webSocketComplete/functionYaml/data");
+const createWebSocketCompleteMainHandler = require("./webSocketComplete/handler/data");
+const createWebSocketCompleteMainMainFunction = require("./webSocketComplete/mainFunction/data");
+const createWebSocketCompleteMainSqs = require('./webSocketComplete/sqs/data');
 // flowSchema OwnTopicEndpoint component
+
 const createFlowSchemaOwnTopicEndpointFuntionYaml = require('./flowSchemaOwnTopic/EndpointComponent/functionYaml/data');
 const createFlowSchemaOwnTopicEndpointHandler = require('./flowSchemaOwnTopic/EndpointComponent/handler/data');
 const createFlowSchemaOwnTopicEndpointMainFunction = require('./flowSchemaOwnTopic/EndpointComponent/mainFunction/data');
 
 // flowSchema OnwTopic flowStep component
-const createFlowScheamOwnTopicFlowStepFunctionYml = require('./flowSchemaOwnTopic/flowStep/functionYaml/data');
-const createFlowSchemaOwnTopicFlowStepHandler = require('./flowSchemaOwnTopic/flowStep/handler/data');
-const createFlowScheamOwnTopicFlowStepMainFunction = require('./flowSchemaOwnTopic/flowStep/mainFunction/data')
+const createFlowSchemaFlowStepFunctionYaml = require('./flowStep/functionYaml/data');
+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');
@@ -132,10 +137,10 @@ const createFlowSchemaRegisterDynamoDb = require('./register/dynamoDB/register')
  * @returns {Array} Array of generated code parameters
  */
 async function generateCodeWithTemplate(_izContext, objSchemaPath) {
-  console.log("objSchemaPath in flowSchema generateTemplateAndData", objSchemaPath);
+  // console.log("objSchemaPath in flowSchema generateTemplateAndData", objSchemaPath);
   try {
     const saveFilePath = join(objSchemaPath, '../');
-    console.log("saveFilePath in flowSchema generateTemplateAndData", saveFilePath)
+    // console.log("saveFilePath in flowSchema generateTemplateAndData", saveFilePath)
     let createSourceParams = [];
     const allLocalFlowSchemas = await getAllLocalFlowSchemas(_izContext, objSchemaPath);
     const allLocalObjectSchemas = await getAllLocalObjectSchemasWithHierarchy(_izContext, objSchemaPath);
@@ -146,24 +151,26 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     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 webSocketCompleteFunctionYaml = createWebSocketCompleteMainFunctionYaml(_izContext, allLocalFlowSchemas, saveFilePath);
+    const webSocketCompleteHandler = createWebSocketCompleteMainHandler(_izContext, saveFilePath);
+    const webSocketCompleteMainFunction = createWebSocketCompleteMainMainFunction(_izContext, saveFilePath);
+    const webSocketCompleteSqs = createWebSocketCompleteMainSqs(_izContext, allLocalFlowSchemas, saveFilePath)
+    const webSocketCompleteComponent = [...webSocketCompleteFunctionYaml, ...webSocketCompleteHandler, ...webSocketCompleteMainFunction, ...webSocketCompleteSqs]
 
     const webSocketResource = [...webSocketTaskTable, ...webSocketConnectYaml, ...webSocketConnectHandler]
     if (allLocalFlowSchemas.records.length) {
       createSourceParams.push(
         ...webSocketResource,
-        ...flowSchemaOwnTopicCompleteComponent
+        ...webSocketCompleteComponent
       )
     }
 
+
     // get flowsteps out form all local object schemas
 
 
     for (const flowSchema of allLocalFlowSchemas.records) {
-      console.log("flowSchema in Generate TemplateData", flowSchema);
+      // console.log("flowSchema in Generate TemplateData", flowSchema);
       const webSocketGenerateCodeLibs = createWebSocketGenerateCodeLibs(_izContext, flowSchema, saveFilePath)
       createSourceParams.push(...webSocketGenerateCodeLibs)
 
@@ -267,13 +274,18 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const externalSqsMainFunction = await createExternalSqsMainFunction(_izContext, flowSchema, saveFilePath);
           const externalTopicSnsInSqs = createExternalTopicSnsInSqs(_izContext, flowSchema, saveFilePath);
           const externalTopicSnsOut = createExternalTopicSnsOut(_izContext, flowSchema, saveFilePath);
+
+          const externalTopicCompleteFunctionYml = createExternalSqsCompleteFunctionYaml(_izContext, flowSchema, saveFilePath);
+          const externalTopicCompleteHandler = createExternalSqsCompleteHandler(_izContext, flowSchema, saveFilePath);
+          const externalTopicCompleteMainFunction = createExternalSqsCompleteMainFunction(_izContext, flowSchema, saveFilePath);
           // Group related resources for better organization
           const externalTopic = [
             ...externalSqsFunctionYaml,
             ...externalSqsHandler,
             ...externalSqsMainFunction,
             ...externalTopicSnsInSqs,
-            ...externalTopicSnsOut
+            ...externalTopicSnsOut,
+            ...externalTopicCompleteFunctionYml, ...externalTopicCompleteHandler, ...externalTopicCompleteMainFunction
           ];
 
           createSourceParams.push(...externalTopic)
@@ -301,14 +313,9 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const flowSchemaOwnTopicQueue = createFlowSchemaOwnTopicQueue(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicSnsOut = createFlowSchemaOwnTopicSnsOut(_izContext, flowSchema, saveFilePath);
 
-          const flowSchemaOwnTopicFlowStepYml = createFlowScheamOwnTopicFlowStepFunctionYml(_izContext, flowSchema, saveFilePath);
-          const flowSchemaOwnTopicFlowStepHandler = createFlowSchemaOwnTopicFlowStepHandler(_izContext, flowSchema, saveFilePath);
-          const flowSchemaOwnTopicFlowStepMainFunction = createFlowScheamOwnTopicFlowStepMainFunction(_izContext, flowSchema, saveFilePath)
-          const flowSchemaOwnTopicFlowStep = [...flowSchemaOwnTopicFlowStepYml, ...flowSchemaOwnTopicFlowStepHandler, ...flowSchemaOwnTopicFlowStepMainFunction]
           // Group the resources
           const ownTopicResources = [
-            ...flowSchemaOwnTopicComponent, ...flowSchemaOwnTopicEndpointComponent, ...flowSchemaOwnTopicQueue, ...flowSchemaOwnTopicSnsOut, ...flowSchemaOwnTopicFlowStep,
-            ...flowSchemaOwnTopicEndpointCompleteComponent
+            ...flowSchemaOwnTopicComponent, ...flowSchemaOwnTopicEndpointComponent, ...flowSchemaOwnTopicQueue, ...flowSchemaOwnTopicSnsOut, ...flowSchemaOwnTopicEndpointCompleteComponent
           ];
 
 
@@ -328,6 +335,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
             ...flowSchemaEventBridgeFunctionYaml
           ];
 
+          // console.log("event eventBridge generated", JSON.stringify(eventBridgeResources, null, 2))
           console.log("event eventBridge generated")
           createSourceParams.push(...eventBridgeResources);
         }
@@ -357,7 +365,14 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         //   createSourceParams.push(...recordCompleteResources);
         // }
       }
+      const flowSchemaFlowStepYml = createFlowSchemaFlowStepFunctionYaml(_izContext, flowSchema, saveFilePath);
+      const flowSchemaFlowStepHandler = createFlowSchemaFlowStepHandler(_izContext, flowSchema, saveFilePath);
+      const flowSchemaFlowStepMainFunction = createFlowSchemaFlowStepMainFunction(_izContext, flowSchema, saveFilePath);
+      const flowSchemaFlowStepSnsIn = createFlowSchemaFlowStepSnsIn(_izContext, flowSchema, saveFilePath);
+      const flowSchemaOwnTopicFlowStep = [...flowSchemaFlowStepYml, ...flowSchemaFlowStepHandler, ...flowSchemaFlowStepMainFunction, ...flowSchemaFlowStepSnsIn]
+      createSourceParams.push(...flowSchemaOwnTopicFlowStep)
     }
+
     if (allLocalFlowSchemas.records.length) {
       console.log("flowSchema Register");
       const flowSchemaRegisterHandlerComplete = createFlowSchemaRegisterHandlerComplete(_izContext, saveFilePath);
@@ -385,6 +400,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       createSourceParams.push(...flowSchemaRegisters);
     }
 
+    // console.log("createSourceParams flowSchema", createSourceParams)
     return createSourceParams;
   } catch (error) {
     _izContext.logger.error('Error generating code with template flowSchema:', error);

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

@@ -52,6 +52,7 @@ function data(_izContext, srcPath) {
   const functionName = upperCase(FUNCTION_NAME.flowSchemaRegister);
   let functionNameConfig = upperCase(functionName) + upperCase(shortNameHandler(handlerType));
   let additionalResourcePermission = defaultIamRolePerAction();
+
   additionalResourcePermission.push(
     createIamRole(
       {

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

@@ -8,6 +8,7 @@
         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/handler/data.js

@@ -42,7 +42,6 @@ function data(_izContext, srcPath) {
       functionName: functionName,
       handler: HANDLER.hdrSqs,
       firstLetterUpperCase: upperCase,
-      roleName: SOURCE_GENERATE_IAM_ROLE.RegisterRole
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.flowSchemaRegister, 'source/'),

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

@@ -98,21 +98,20 @@ module.exports.registerCompleteMain = async (
           objectType: objType.objectType
         }
       )
-
-      for (const [fieldName, fieldNameSetting] of Object.entries(objectSchema.fieldNames)) {
-        if (fieldNameSetting.hasOwnProperty("statusField") && fieldNameSetting.statusField === true) {
-          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, "RegisterRecords"),
-              {
-                identifiersTask: requestParams.identifiersTask,
-                connectionId: connectionId
-              }
-            )
-          } else {
-            if (!result) {
-              await generatedCodeLibs.postToConnection({ message: "not have record" }, connectionId)
+      if (!result) {
+        await generatedCodeLibs.postToConnection({ message: "not have record" }, connectionId)
+      } else {
+        for (const [fieldName, fieldNameSetting] of Object.entries(objectSchema.fieldNames)) {
+          if (fieldNameSetting.hasOwnProperty("statusField") && fieldNameSetting.statusField === true) {
+            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, "RegisterRecords"),
+                {
+                  identifiersTask: requestParams.identifiersTask,
+                  connectionId: connectionId
+                }
+              )
             } else {
               await generatedCodeLibs.postToConnection({ message: result }, connectionId)
             }
@@ -120,7 +119,6 @@ module.exports.registerCompleteMain = async (
         }
       }
     }
-
     // check statusType
     switch (flowSchema.statusType) {
       case "statusField":
@@ -156,12 +154,13 @@ module.exports.registerCompleteMain = async (
           await Promise.all(tasks.Items.map(async (task) => {
             await generatedCodeLibs.postToConnection({ message: task }, task.connectionId)
           }))
+          await generatedCodeLibs.postToConnection({ message: tasks.Items[0] }, connectionId)
         } else {
           await dynamodbSharedLib.putItem(_izContext,
             await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
             {
               identifiersTask: hash(identifier),
-              connecttionId: connectionId
+              connectionId: connectionId
             }
           )
         }

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

@@ -32,29 +32,12 @@ const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, defaultIamRolePerAction, DYN
 const createRegisterTable = (_izContext, srcPath) => {
   let additionalResourcePermission = defaultIamRolePerAction();
   const tableName = "RegisterRecords";
-  additionalResourcePermission.push(
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.dynamoDbTable]: [
-          DYNAMO_RESOURCE.putItem,
-          DYNAMO_RESOURCE.getItem,
-          DYNAMO_RESOURCE.query,
-          DYNAMO_RESOURCE.deleteItem,
-          DYNAMO_RESOURCE.updateItem
-        ]
-      },
-      [
-        resourceNames(RESOURCE_CLASSES.dynamoDbTable, tableName)
-      ]
-    ),
-  );
 
   return [{
     templatePath: templatePath,
     templateData: {
       tableName: tableName,
       resourceName: tableName,
-      roleName: SOURCE_GENERATE_IAM_ROLE.RegisterRole,
       additionalResourcePermission,
       attributes: [
         {

package/src/reStructure/TemplateData/flowSchema/register/sns-in/data.js

@@ -50,7 +50,6 @@ function createDataForSnsIn(_izContext, srcPath) {
     templateData: {
       queueName: upperCase(FUNCTION_NAME.flowSchemaRegister),
       firstLetterUpperCase: upperCase,
-      roleName: SOURCE_GENERATE_IAM_ROLE.RegisterRole,
     },
     setting: {
       initialData: "Resources:\n",

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

@@ -56,9 +56,7 @@ 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[0] + flowSchema.flowTag + "Complete";
+        queueName = upperCase(flowSchema.flowTag);
       }
 
       if (queueName) {

package/src/reStructure/TemplateData/flowSchema/register/subscriptionOutAll/template.ejs

@@ -1,8 +1,8 @@
 ##===== [Topic In]
-  Subscription<%- queueName %>:
+  SubscriptionOut<%- queueName %>:
     Type: AWS::SNS::Subscription
     Properties:
-      TopicArn: !Ref <%- queueName %>
+      TopicArn: !Ref Out<%- queueName %>
       Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- endpoint %>"
       Protocol: "sqs"
 <%_ function firstLetterUpperCase(text){

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

@@ -91,35 +91,6 @@ async function data(_izContext, allLocalFlowSchemas, srcPath) {
     )
   )
 
-  let tableStoredCacheList = new Set();
-  await Promise.all(allLocalFlowSchemas.records.map(async (flowSchema) => {
-    if (flowSchema.statusType === "storedCache") {
-      let objectSchema = await getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], path.join(srcPath, "./schemas")).then(res => res.records[0]);
-      for (const storageResource of Object.values(objectSchema.storageResources)) {
-        if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-          tableStoredCacheList.add(storageResource.tableName);
-        }
-      }
-    }
-  }))
-  if (tableStoredCacheList.size > 0) {
-    let tableNames = [...tableStoredCacheList]
-    additionalResourcePermission.push(
-      createIamRole(
-        {
-          [RESOURCE_CLASSES.dynamoDbTable]: [
-            DYNAMO_RESOURCE.getItem,
-            // DYNAMO_RESOURCE.putItem,
-            // DYNAMO_RESOURCE.query,
-            // DYNAMO_RESOURCE.deleteItem,
-            // DYNAMO_RESOURCE.updateItem
-          ]
-        },
-        tableNames.map(tableName => resourceNames(RESOURCE_CLASSES.dynamoDbTable, tableName))
-      )
-    )
-  }
-
   return [{
     templatePath: templatePath,
     templateData: {

package/src/reStructure/TemplateData/flowSchema/register/wbs/handler/data.js

@@ -50,7 +50,6 @@ function createParamsForCreateSource(_izContext, srcPath) {
       isAsync,
       functionName: functionName,
       firstLetterUpperCase: upperCase,
-      roleName: SOURCE_GENERATE_IAM_ROLE.RegisterRole,
       routeName: FUNCTION_NAME.flowSchemaRegister,
     },
     setting: {

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

@@ -65,11 +65,6 @@ module.exports.main = middlewareHandler.wrap(async (event, context, callback) =>
             //(<additionalParams>)
             //(</additionalParams>)
           )
-          await postToConnection(
-            { message: result },
-            connectionId
-          )
-          return (izara.response.webSocketSuccess());
           break
       }
     } else {

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

@@ -89,20 +89,20 @@ module.exports.registerMain = async (
         }
       )
 
-      for (const [fieldName, fieldNameSetting] of Object.entries(objectSchema.fieldNames)) {
-        if (fieldNameSetting.hasOwnProperty("statusField") && fieldNameSetting.statusField === true) {
-          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, "RegisterRecords"),
-              {
-                identifiersTask: requestParams.identifiersTask,
-                connectionId: connectionId
-              }
-            )
-          } else {
-            if (!result) {
-              await generatedCodeLibs.postToConnection({ message: "not have record" }, connectionId)
+      if (!result) {
+        await generatedCodeLibs.postToConnection({ message: "not have record" }, connectionId)
+      } else {
+        for (const [fieldName, fieldNameSetting] of Object.entries(objectSchema.fieldNames)) {
+          if (fieldNameSetting.hasOwnProperty("statusField") && fieldNameSetting.statusField === true) {
+            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, "RegisterRecords"),
+                {
+                  identifiersTask: requestParams.identifiersTask,
+                  connectionId: connectionId
+                }
+              )
             } else {
               await generatedCodeLibs.postToConnection({ message: result }, connectionId)
             }
@@ -110,7 +110,6 @@ module.exports.registerMain = async (
         }
       }
     }
-
     // Initialize storedCacheData variable that will be used in multiple switch cases
     switch (flowSchema.statusType) {
       case "statusField":
@@ -143,6 +142,8 @@ module.exports.registerMain = async (
           await Promise.all(tasks.Items.map(async (task) => {
             await generatedCodeLibs.postToConnection({ message: task }, task.connectionId)
           }))
+          await generatedCodeLibs.postToConnection({ message: tasks.Items[0] }, connectionId)
+          return tasks.Items[0]
         } else {
           await dynamodbSharedLib.putItem(_izContext,
             await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),

package/src/reStructure/TemplateData/flowSchema/templateBystatusType/triggerCacheTemplate.ejs

@@ -1,6 +1,6 @@
   let [triggerCacheStatus, triggerCache] = await triggeredCacheSharedLib.checkTriggeredCache(
     _izContext,
-    <%- tableName %>,
+    "<%- tableName %>",
     {
       //(<keyValueTriggerCacheTable>)
       //(</keyValueTriggerCacheTable>)
@@ -17,4 +17,10 @@ if (triggerCacheStatus !== "process") {
     //(<afterValidateTriggerCacheStatus>)
     //(</afterValidateTriggerCacheStatus>)
   }
+
+  
+  return {
+    //(<validateTriggerCacheProcessing>)
+    //(</validateTriggerCacheProcessing>)
+  }
 }

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/functionYaml/data.js

@@ -95,7 +95,7 @@ function createSourceParams(_izContext, allLocalFlowSchemas, srcPath) {
       {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.subscribe]
       },
-      allLocalFlowSchemas.records.map(flowSchema => resourceNames(RESOURCE_CLASSES.sns, flowSchema.flowTag + "Complete_Out"))
+      allLocalFlowSchemas.records.map(flowSchema => resourceNames(RESOURCE_CLASSES.sns, flowSchema.flowTag + "_Out"))
     )
   )
 

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

@@ -4,10 +4,11 @@
   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 %> + <%- handlerType %>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>
         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/webSocketComplete/sqs/data.js

@@ -0,0 +1,97 @@
+/*
+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 { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../MainLibs/src/Utils.js");
+const STORAGE_TYPES = {
+  dynamoDB: "dynamoDB",
+  graph: "graph"
+}
+
+const templatePath = path.join(__dirname, './template.ejs');
+
+
+const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../../../../MainLibs/src/Consts.js');
+
+/**
+ * create data for dynamoDbYaml tempalte from objectSchema
+ * return array of dynamoDb data
+ * because one objectSchema can create multiple dynamoDb table
+ *
+ * @param {Object} _izContext
+ * @param {String} saveFilePath
+ * @returns {Object[]}              - data of multiple dynamoDb template
+ */
+
+function createDataForDefaultSnsInSqs(_izContext, allFlowSchema, srcPath) {
+  let resultsForCreateDefaultSnsInSqs = [];
+  let defaultDsqQueueDataList = [];
+  for (const flowSchema of allFlowSchema.records) {
+    if (flowSchema.hasOwnProperty("flowSteps")) {
+
+      let flowSteps = Object.keys(flowSchema.flowSteps);
+      if (flowSteps.length && flowSteps.length > 0) {
+        // console.log("create topic by flowSteps", flowSteps)
+
+
+
+        if (flowSchema.outputTopic) {
+          if (flowSteps.includes("Out")) {
+            if (flowSchema.outputTopic) {
+              let topicOut = `${upperCase(flowSchema.flowTag)}`;
+              defaultDsqQueueDataList.push({
+                queueName: `WebSocketComplete` + upperCase(HANDLER.hdrSqs),
+                subscribeTo: topicOut
+              }
+              )
+
+            }
+          }
+        }
+      }
+    }
+  }
+
+  if (defaultDsqQueueDataList.length) {
+    for (let defaultDsqQueueData of defaultDsqQueueDataList) {
+      resultsForCreateDefaultSnsInSqs.push({
+        templatePath: templatePath,
+        templateData: defaultDsqQueueData,
+        setting: {
+          initialData: "Resources:\n",
+          savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+          saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
+          fileExtension: ".yml",
+          isAppend: true
+        }
+      })
+    }
+  }
+
+  return resultsForCreateDefaultSnsInSqs;
+}
+
+module.exports = createDataForDefaultSnsInSqs;

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

@@ -0,0 +1,52 @@
+<% if (subscribeTo) { %>
+##===== SNS Subscription
+  SubscriptionToOut<%- subscribeTo %>:
+    Type: AWS::SNS::Subscription
+    Properties:
+      TopicArn: !Ref Out<%- subscribeTo %>
+      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>"
+      Protocol: "sqs"
+  <% } %>
+#------- queue ---------
+  <%- queueName %>:
+    Type: "AWS::SQS::Queue"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>
+      RedrivePolicy:
+        deadLetterTargetArn: #!GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>DLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+
+  <%- queueName %>DLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>DLQ
+
+  <%- queueName %>Policy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource: #!GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>
+  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+
+  <%_ 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/perActionComplete/create/yaml/template.ejs

@@ -8,6 +8,7 @@
         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,6 +8,7 @@
         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,6 +8,7 @@
         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#>