@izara_project/izara-market-library-service-schemas 1.0.36 → 1.0.38

package/src/reStructure/TemplateData/flowSchema/{externalTopic/sqs → flowSchemaOwnTopic/flowStep}/functionYaml/data.js

@@ -16,11 +16,10 @@ 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 { firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils");
+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 {
   SOURCE_PATH,
   defaultIamRolePerAction,
@@ -33,9 +32,9 @@ const {
   FUNCTION_NAME,
   shortNameHandler,
   externalResourceYaml,
-  SOURCE_GENERATE_IAM_ROLE,
-  SQS_RESOURCE
-} = require("../../../../../../MainLibs/src/Consts");
+  SOURCE_GENERATE_IAM_ROLE
+} = 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");
@@ -46,56 +45,62 @@ const hookTemplate = path.join(__dirname, "./hookTemplate.ejs");
  * @param {Object} objectSchema
  * @return {{templatePath, templateData,setting}}
  */
+
 function data(_izContext, flowSchema, srcPath) {
-  return [createSourceParams(_izContext, flowSchema, srcPath)]
+  let resultCreateSource = [];
+  let flowSteps = Object.keys(flowSchema.flowSteps)
+  let events = flowSchema.event
+  for (const event of events) {
+    if (event === "ownTopic") {
+      if (flowSteps.includes("In") && flowSteps.includes("Out")) {
+        if (flowSteps.length > 2) {
+          for (let i = 2; i < flowSteps.length; i++) {
+            let createSource = createSourceParams(_izContext, flowSchema.flowTag, flowSteps[i], srcPath)
+            createSource && resultCreateSource.push(createSource);
+          }
+        }
+      } else if (flowSteps.includes("In") && !flowSchema.outputTopic) {
+        if (flowSteps.length > 1) {
+          for (let i = 1; i < flowSteps.length; i++) {
+            let createSource = createSourceParams(_izContext, flowSchema.flowTag, flowSteps[i], srcPath)
+            createSource && resultCreateSource.push(createSource);
+          }
+        }
+      }
+    }
+  }
+  return resultCreateSource
 }
 
-function createSourceParams(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.flowSchemaExternalTopic);
+function createSourceParams(_izContext, flowTag, flowStep, srcPath) {
+  let functionName = upperCase(flowTag);
   let handlerType = upperCase(HANDLER.hdrSqs);
-  let externalTopicName = FUNCTION_NAME.flowSchemaExternalTopic + 'Out';
-  let functionConfig = "ExtTopicOut" + upperCase(shortNameHandler(handlerType));
+  let topicIn = upperCase(flowStep);
   let additionalResourcePermission = defaultIamRolePerAction();
-  let flowStepInSplitKey = Object.keys(flowSchema.flowSteps)[0].split("_");
-  // const action = flowSchema.flowTag || 'defaultAction'; // Using flowTag as the action name
-  // const event = resourceNames(RESOURCE_CLASSES.sqs, upperCase(action) + upperCase(handler));
   additionalResourcePermission.push(
     createIamRole(
       {
-        [RESOURCE_CLASSES.sqs]: [
-          SQS_RESOURCE.getQueueAttributes,
-          SQS_RESOURCE.receiveMessage,
-          SQS_RESOURCE.deleteMessage,
+        [RESOURCE_CLASSES.sns]: [
+          SNS_RESOURCE.publish
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sqs, functionName + handlerType),
-        resourceNames(RESOURCE_CLASSES.sqs, functionName + handlerType + "DLQ"),
-        // resourceNames(RESOURCE_CLASSES.sqs, functionName + "Out"),
-        // resourceNames(RESOURCE_CLASSES.sqs, functionName + "OutDLQ"),
+        resourceNames(RESOURCE_CLASSES.sns, topicIn + "_In")
       ]
-    ),
-    // createIamRole(
-    //   {
-    //     [RESOURCE_CLASSES.sns]: [
-    //       SNS_RESOURCE.publish,
-    //     ]
-    //   },
-    //   [
-    //     resourceNames(RESOURCE_CLASSES.sns, flowStepInSplitKey[2] + flowStepInSplitKey[3]),
-    //   ]
-    // )
-  );
+    )
+  )
+
+
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, flowSchema.flowTag, "source/"),
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, upperCase(flowTag) + upperCase(flowStep), "source/"),
       functionName,
       handlerType,
-      functionNameConfig: functionConfig,
-      roleName: SOURCE_GENERATE_IAM_ROLE.ExternalTopicRole,
-      externalTopicName,
       additionalResourcePermission,
+      functionNameConfig: upperCase(flowStep) + upperCase(shortNameHandler(handlerType)),
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic,
+      queueName: topicIn + handlerType
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/flowStep/functionYaml/template.ejs

@@ -0,0 +1,20 @@
+<%_ const join = require('path').join; _%>
+<%- firstLetterUpperCase(functionNameConfig) %>:
+  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}<%- 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#>
+<%_ 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/flowSchemaOwnTopic/flowStep/handler/data.js

@@ -0,0 +1,80 @@
+/*
+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 { 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 templatePath = path.join(__dirname, "template.ejs")
+
+/**
+ * receive objectSchema
+ * create data for WebScoket handler template
+ *
+ * @param {Object} objectSchema
+ * @return {{templatePath, templateData,setting}}
+ */
+
+
+function data(_izContext, flowSchema, srcPath) {
+  let resultCreateParam = [];
+  let flowSteps = Object.keys(flowSchema.flowSteps);
+  let events = flowSchema.event;
+  for (const event of events) {
+    if (event === "ownTopic") {
+      if (flowSteps.includes("In") && flowSteps.includes("Out")) {
+        if (flowSteps.length > 2) {
+          for (let i = 2; i < flowSteps.length; i++) {
+            let createSource = createParamsForCreateSource(_izContext, upperCase(flowSchema.flowTag), upperCase(flowSteps[i]), srcPath);
+            createSource && resultCreateParam.push(createSource)
+          }
+        }
+      } else if (flowSteps.includes("In") && !flowSchema.outputTopic) {
+        if (flowSteps.length > 1) {
+          for (let i = 1; i < flowSteps.length; i++) {
+            let createSource = createParamsForCreateSource(_izContext, upperCase(flowSchema.flowTag), upperCase(flowSteps[i]), srcPath);
+            createSource && resultCreateParam.push(createSource)
+          }
+        }
+      }
+    }
+  }
+
+  return resultCreateParam
+}
+
+function createParamsForCreateSource(_izContext, flowTag, flowStep, srcPath) {
+  let functionName = upperCase(flowStep)
+  let handlerType = upperCase(HANDLER.hdrSqs)
+  let queueName = upperCase(flowStep) + handlerType
+  return {
+    templatePath: templatePath,
+    templateData: {
+      functionName,
+      handlerType,
+      queueName
+    },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowTag, "source/"),
+      saveFileName: `${flowStep}_${handlerType}`,
+      fileExtension: ".js",
+      isAppend: false
+    }
+  }
+}
+module.exports = data

package/src/reStructure/TemplateData/flowSchema/{externalTopic/sqs → flowSchemaOwnTopic/flowStep}/handler/template.ejs

@@ -20,63 +20,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // const AWS = require('aws-sdk');
 // const sqs = new AWS.SQS({ apiVersion: '2012-11-05' });
 
-const { middlewareHandler } = require("@izara_project/izara-middleware");
+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 { <%- functionMain %> } =require('./<%- firstLetterUpperCase(fileName) %>.js')
+const <%- functionName %> = require('./<%- functionName %>_Main')
 
 // validate event properties in body.Message of sqs event
-middlewareHandler.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
-// set schema for record.body.Message
-const perRecordsValidatorSchema = {}
-//   type: "object",
-//   required: ['param1', 'param2', 'param3', 'param4',],
-//   properties: {
-//     param1: {
-//       type: 'object',
-//       default: {}
-//     },
-//     param2: {
-//       type: 'string',
-//       default: true,
-//       pattern: "^[a-zA-Z0-9_-]+$",
-//     },
-//     param3: {
-//       type: 'array',
-//       items: { // items in array
-//         type: "object", // string
-//         properties: {
-//           "c": {
-//             type: "string"
-//           },
-//           "d": {
-//             type: "number"
-//           }
-//         },
-//       }
-//     },
-//     param4: {
-//       type: 'number',
-//     }
-//   }
-// };
-
-// set schema for record.body.MessageAttributes
-// const messageAttributeValidatorSchema = {
-//   type: "object",
-//   required: ['msgAtrrParam1', 'msgAtrrParam2'],
-//   properties: {
-//     msgAtrrParam1: {
-//       type: "string"
-//     },
-//     msgAtrrParam2: {
-//       type: "object"
-//     }
-//   }
-// };
-
-module.exports.main = middlewareHandler.wrap(async (event, context, callback) => {
+let perRecordsValidatorSchema = {}
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+
+module.exports.main = middleware.wrap(async (event, context, callback) => {
 
   try {
 
@@ -90,9 +45,9 @@ module.exports.main = middlewareHandler.wrap(async (event, context, callback) =>
 
       //validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
-        record,                             // one record will send to mainFunction
-        "<%- firstLetterUpperCase(queueName) %>",                   // queue name that need to retry or send to dlq
-        perRecordsValidatorSchema,          // schema for record.Message
+        record, // one record will send to mainFunction
+        "<%- queueName %>", // queue name that need to retry or send to dlq
+        perRecordsValidatorSchema, // schema for record.Message
         // messageAttributeValidatorSchema   // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
       );
 
@@ -102,10 +57,10 @@ module.exports.main = middlewareHandler.wrap(async (event, context, callback) =>
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
       let recordPromise = recordHandlerSharedLib.recordHandler(
-        record,                         // one record will send to mainFunction
-        <%- functionMain %>,  // mainFunction that need to invoke.
-        '<%- firstLetterUpperCase(queueName) %>',               // queue name that need to retry or send to dlq
-        passOnProperties,               // all parameters that mainFunction needed.
+        record, // one record will send to mainFunction
+        <%- functionName %>.<%- functionName %>, // mainFunction that need to invoke.
+        "<%- queueName %>", // queue name that need to retry or send to dlq
+        passOnProperties, // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');
       recordPromises.push(recordPromise); // push promise to recordPromises
@@ -119,12 +74,12 @@ module.exports.main = middlewareHandler.wrap(async (event, context, callback) =>
       return event.Records // return all for local testing
 
     } catch {
-      Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did no resolve');
+      Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did no resolve)');
     }
     Logger.debug('after Promise.all(recordPromises) in handler');
 
   } catch (err) {
-    Logger.error('Unhandled Error, <%- functionMain%>: ', err);
+    Logger.error('Unhandled Error, LambdaFunctionHdrSqs: ', err);
     throw (err);
   }
 });

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/flowStep/mainFunction/data.js

@@ -0,0 +1,92 @@
+/*
+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 { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
+const {
+  SOURCE_PATH,
+  defaultIamRolePerAction,
+  createIamRole,
+  RESOURCE_CLASSES,
+  SNS_RESOURCE,
+  resourceNames,
+  DYNAMO_RESOURCE,
+  SAVE_FILE_NAME,
+  FUNCTION_NAME,
+  shortNameHandler,
+  externalResourceYaml,
+  SOURCE_GENERATE_IAM_ROLE
+} = require('../../../../../../MainLibs/src/Consts');
+const templatePath = path.join(__dirname, "template.ejs");
+
+
+/**
+ * receive objectSchema
+ * create data for WebScoket handler template
+ *
+ * @param {Object} objectSchema
+ * @return {{templatePath, templateData,setting}}
+ */
+
+
+function data(_izContext, flowSchema, srcPath) {
+  let resultCreateSource = [];
+  let flowSteps = Object.keys(flowSchema.flowSteps)
+  let events = flowSchema.event
+  for (const event of events) {
+    if (event === "ownTopic") {
+      if (flowSteps.includes("In") && flowSteps.includes("Out")) {
+        if (flowSteps.length > 2) {
+          for (let i = 2; i < flowSteps.length; i++) {
+            let createSource = createParamsForCreateSource(_izContext, flowSchema.flowTag, flowSteps[i], srcPath)
+            createSource && resultCreateSource.push(createSource);
+          }
+        }
+      } else if (flowSteps.includes("In") && !flowSchema.outputTopic) {
+        if (flowSteps.length > 1) {
+          for (let i = 1; i < flowSteps.length; i++) {
+            let createSource = createParamsForCreateSource(_izContext, flowSchema.flowTag, flowSteps[i], srcPath)
+            createSource && resultCreateSource.push(createSource);
+          }
+        }
+      }
+    }
+  }
+  return resultCreateSource
+}
+
+function createParamsForCreateSource(_izContext, flowTag, flowStep, srcPath) {
+  let functionName = upperCase(flowTag)
+  let topicArn = `${upperCase(flowStep)}_In`
+
+  return {
+    templatePath: templatePath,
+    templateData: {
+      topicArn,
+      functionName
+    },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowTag, "source/"),
+      saveFileName: `${upperCase(flowStep)}_Main`,
+      fileExtension: ".js",
+      isAppend: false
+    }
+  }
+};
+
+module.exports = data

package/src/reStructure/TemplateData/flowSchema/{externalTopic/websocket → flowSchemaOwnTopic/flowStep}/mainFunction/template.ejs

@@ -18,26 +18,25 @@ along with this program. If not, see
 
 'use strict';
 
-const hash = require("object-hash");
-const { getObjectSchema } = require('@izara_project/izara-core-library-service-schemas');
+const hash = require('@izara_project/izara-shared-core').objectHash;
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
-
+const storedCacheSharedLib = require('@izara_project/izara-core-library-stored-cache')
 const externalRequest = require('@izara_project/izara-core-library-external-request');
 const sns = externalRequest.sns
 
 const utils = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Utils')
 const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryError
-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')
-<% if (statusType === "statusField") { %>
-const { createFieldNamesFromRequestParamsByObjectSchema } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
-<% } %>
+const { postToConnection } = require('../../../libs/source/GenerateCodeLibs')
+//(<optionalRequire>)
+//(</optionalRequire>)
 /**
  *
  *
@@ -53,7 +52,7 @@ const { createFieldNamesFromRequestParamsByObjectSchema } = require('@izara_proj
  * @returns {object} description of return value
  */
 
-module.exports.<%- externalTopicMain %> = async (
+module.exports.<%- functionName %> = async (
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -62,13 +61,12 @@ module.exports.<%- externalTopicMain %> = async (
 ) => {
 
   try {
-      let sendMessageToCreateEndpoint = {
-        Message: JSON.stringify(requestParams),
-        TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, '<%- topicName %>', '<%- serviceTag%>')
-      }
-      _izContext.logger.debug("sendMessageToCreateEndpoint", sendMessageToCreateEndpoint);
-      await sns.publishAsync(_izContext, sendMessageToCreateEndpoint);
+    _izContext.logger.debug("<%- functionName %> _izContext", _izContext)
+    _izContext.logger.debug("<%- functionName %> requestParams", requestParams)
+    _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
+    //(<hookCode>)
+    //(</hookCode>)
 
   } catch (err) {
     _izContext.logger.error('error WebSocketInvoke: ', err)

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

@@ -32,7 +32,8 @@ const STORAGE_TYPES = {
 }
 
 const snsTemplatePath = path.join(__dirname, '../../../resourceYaml/sns-in-sqs/snsTemplate.ejs');
-const sqsTemplatePath = path.join(__dirname, './sqsTemplate.ejs');
+const subscriptionSqsTemplatePath = path.join(__dirname, './sqsTemplate.ejs');
+
 const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../../../../MainLibs/src/Consts.js');
 
 /**
@@ -47,7 +48,8 @@ const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../.
 
 function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
   let resultsForCreateDefaultSnsInSqs = [];
-
+  let flowSteps = Object.keys(flowSchema.flowSteps);
+  // console.log("create topic by flowSteps", flowSteps)
   const setting = {
     initialData: "Resources:\n",
     savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
@@ -56,20 +58,43 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
     isAppend: true
   }
 
-  //  GCTpBasTestInPersonCreate => GCTpBas_Test_PersonCreate_In
-  let flowSteps = Object.keys(flowSchema.flowSteps)
-  let flowStepsIn = flowSteps[0];
-  let flowStepOut = flowSteps[1];
-  let splitFlowStepsIn = flowStepsIn.split("_");
-  let splitFlowStepsOut = flowStepOut.split("_")
-  let topicIn = splitFlowStepsIn[3]
-  let topicOut = splitFlowStepsOut[3]
-  const generatedSnsTopicInForFlowSchema = [
-    {
-      queueName: upperCase(topicIn),
-    },
-  ];
+  let topicIn = `${upperCase(flowSchema.flowTag)}`;
+
+  const generatedSnsTopicInForFlowSchema = [];
+  if (flowSteps.includes("In")) {
+    generatedSnsTopicInForFlowSchema.push(
+      {
+        queueName: "Process" + upperCase(topicIn)
+      }
+    )
+  }
+
+
+  let defaultDsqQueueDataList = [];
+
+  if (flowSchema.outputTopic) {
+    if (flowSteps.includes("Out")) {
+      let topicOut = `${upperCase(flowSchema.flowTag)}`;
+      defaultDsqQueueDataList.push({
+        queueName: `WebSocketComplete` + upperCase(HANDLER.hdrSqs),
+        subscribeTo: topicOut
+      }
+      )
+
+    }
+  }
 
+  if (flowSteps.includes("In") && flowSteps.includes("Out")) {
+    if (flowSteps.length > 2) {
+      for (let i = 2; i < flowSteps.length; i++) {
+        generatedSnsTopicInForFlowSchema.push(
+          {
+            queueName: upperCase(flowSteps[i])
+          }
+        )
+      }
+    }
+  }
 
   for (let defaultSnsInSqsData of generatedSnsTopicInForFlowSchema) {
     resultsForCreateDefaultSnsInSqs.push({
@@ -79,23 +104,16 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
     })
   }
 
-  let defaultDsqQueueDataList = [
-    {
-      queueName: `${upperCase(flowSchema.flowTag)}Complete` + upperCase(HANDLER.hdrSqs),
-      subscribeTo: topicOut
+  if (defaultDsqQueueDataList.length) {
+    for (let defaultDsqQueueData of defaultDsqQueueDataList) {
+      resultsForCreateDefaultSnsInSqs.push({
+        templatePath: subscriptionSqsTemplatePath,
+        templateData: defaultDsqQueueData,
+        setting: setting
+      })
     }
-  ]
-  for (let defaultDsqQueueData of defaultDsqQueueDataList) {
-    resultsForCreateDefaultSnsInSqs.push({
-      templatePath: sqsTemplatePath,
-      templateData: defaultDsqQueueData,
-      setting: setting
-    })
   }
-  // console.log({
-  //   resultsForCreateDefaultSnsInSqs: JSON.stringify(resultsForCreateDefaultSnsInSqs, null, 2
-  //   )
-  // })
+
   return resultsForCreateDefaultSnsInSqs;
 }
 

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/sns-out/data.js

@@ -47,31 +47,28 @@ const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../.
 function createDataForSnsOut(_izContext, flowSchema, srcPath) {
   let resultsForCreateDefaultSnsInSqs = [];
 
-  //  GCTpBasTestInPersonCreate => GCTpBas_Test_PersonCreate_In
-  let flowSteps = Object.keys(flowSchema.flowSteps)
-  let flowStepsOut = flowSteps[0];
-  let splitFlowStepsIn = flowStepsOut.split("_");
-  let topicOut = splitFlowStepsIn[3]
-  const generatedSnsTopicOutForFlowSchema = [
-    {
-      queueName: upperCase(topicOut)
-    }
-  ];
-
-
-  for (let defaultSnsOutData of generatedSnsTopicOutForFlowSchema) {
-    resultsForCreateDefaultSnsInSqs.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
+  let generatedSnsTopicOutForFlowSchema = []
+  let topicOut = `${upperCase(flowSchema.flowTag)}`
+  if (flowSchema.outputTopic) {
+    generatedSnsTopicOutForFlowSchema.push(
+      {
+        queueName: upperCase(topicOut)
       }
-
-    })
+    )
+
+    for (let defaultSnsOutData of generatedSnsTopicOutForFlowSchema) {
+      resultsForCreateDefaultSnsInSqs.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 resultsForCreateDefaultSnsInSqs;