@izara_project/izara-market-library-service-schemas 1.0.28 → 1.0.30

package/src/reStructure/TemplateData/relationshipPerAction/update/action/functionYaml/dsq/data.js

@@ -103,7 +103,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(FUNCTION_NAME.updateRelComplete))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.updateRelComplete) + "_Out")
       ]
     )
   )
@@ -111,20 +111,22 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
   additionalResourcePermission.push(awaitingMultipleStepsRole())
 
   for (const relationship of allObjectRelationships) {
-    let [relationshipTag, links] = checkDynamoTypeRelationship(relationship)
-    for (const link of links) {
-      let dynamoComponent = createDynamoDbComponentByLinks(link, relationshipTag)
-      additionalResourcePermission.push(
-        createIamRole(
-          {
-            [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.updateItem]
-          },
-          [
-            resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameFrom)),
-            resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameTo))
-          ]
+    let [storageType, relationshipTag, links] = checkDynamoTypeRelationship(relationship)
+    if (storageType === STORAGE_TYPES.dynamoDB) {
+      for (const link of links) {
+        let dynamoComponent = createDynamoDbComponentByLinks(link, relationshipTag)
+        additionalResourcePermission.push(
+          createIamRole(
+            {
+              [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.updateItem]
+            },
+            [
+              resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameFrom)),
+              resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameTo))
+            ]
+          )
         )
-      )
+      }
     }
   }
 

package/src/reStructure/TemplateData/relationshipPerAction/update/action/functionYaml/inv/data.js

@@ -96,26 +96,28 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(FUNCTION_NAME.updateRelComplete))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.updateRelComplete) + "_Out")
       ]
     )
   )
 
   for (const relationship of allObjectRelationships) {
-    let [relationshipTag, links] = checkDynamoTypeRelationship(relationship)
-    for (const link of links) {
-      let dynamoComponent = createDynamoDbComponentByLinks(link, relationshipTag)
-      additionalResourcePermission.push(
-        createIamRole(
-          {
-            [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.updateItem]
-          },
-          [
-            resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameFrom)),
-            resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameTo))
-          ]
+    let [storageType, relationshipTag, links] = checkDynamoTypeRelationship(relationship)
+    if (storageType === STORAGE_TYPES.dynamoDB) {
+      for (const link of links) {
+        let dynamoComponent = createDynamoDbComponentByLinks(link, relationshipTag)
+        additionalResourcePermission.push(
+          createIamRole(
+            {
+              [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.updateItem]
+            },
+            [
+              resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameFrom)),
+              resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameTo))
+            ]
+          )
         )
-      )
+      }
     }
   }
 

package/src/reStructure/TemplateData/relationshipPerAction/update/action/functionYaml/sqs/data.js

@@ -59,7 +59,7 @@ const {
   SOURCE_GENERATE_IAM_ROLE,
   checkDynamoTypeRelationship,
   createDynamoDbComponentByLinks,
-} = require("../../../../../../../MainLibs/index.js").consts;
+} = require("../../../../../../../MainLibs/src/Consts.js");
 
 
 const templatePath = path.join(__dirname, './template.ejs')
@@ -104,9 +104,9 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrSqs)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrSqs) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "In" + upperCase(functionName) + upperCase(HANDLER.hdrSqs)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(functionName) + upperCase(HANDLER.hdrSqs)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(FUNCTION_NAME.updateRelComplete))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.updateRelComplete) + "_Out")
       ]
     ),
   )
@@ -114,23 +114,24 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
   additionalResourcePermission.push(awaitingMultipleStepsRole())
 
   for (const relationship of allObjectRelationships) {
-    let [relationshipTag, links] = checkDynamoTypeRelationship(relationship)
-    for (const link of links) {
-      let dynamoComponent = createDynamoDbComponentByLinks(link, relationshipTag)
-      additionalResourcePermission.push(
-        createIamRole(
-          {
-            [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.updateItem]
-          },
-          [
-            resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameFrom)),
-            resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameTo))
-          ]
+    let [storageType, relationshipTag, links] = checkDynamoTypeRelationship(relationship)
+    if (storageType === STORAGE_TYPES.dynamoDB) {
+      for (const link of links) {
+        let dynamoComponent = createDynamoDbComponentByLinks(link, relationshipTag)
+        additionalResourcePermission.push(
+          createIamRole(
+            {
+              [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.updateItem]
+            },
+            [
+              resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameFrom)),
+              resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameTo))
+            ]
+          )
         )
-      )
+      }
     }
   }
-
   return {
     templatePath: templatePath,
     templateData: {

package/src/reStructure/TemplateData/relationshipPerAction/update/action/sns-in-sqs/snsTemplate.ejs

@@ -3,7 +3,7 @@
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message in"
-      TopicName: ${self:custom.iz_resourcePrefix}In<%- queueName %>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_In
 ##===== SNS Subscription
 ##===== [Topic In]
   SubscriptionIn<%- queueName %>:

package/src/reStructure/TemplateData/relationshipPerAction/update/complete/functionYaml/data.js

@@ -80,8 +80,8 @@ function createParamForCreateSource(srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "In" + upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(functionName))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ],
     ))
   additionalResourcePermission.push(awaitingMultipleStepsRole())

package/src/reStructure/TemplateData/relationshipPerAction/update/complete/sns-out/template.ejs

@@ -3,7 +3,7 @@
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message out"
-      TopicName: ${self:custom.iz_resourcePrefix}Out<%- firstLetterUpperCase(queueName) %>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- firstLetterUpperCase(queueName) %>_Out
 
   <%_ function firstLetterUpperCase(text) {
     return text.charAt(0).toUpperCase() + text.slice(1)

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

@@ -146,7 +146,7 @@ const createAwaitingMultipleStepDynamoDbData = (_izContext, srcPath) => {
       }
     });
   }
-  console.log("resultsForCreateSource default dynamo", resultsForCreateSource)
+  // console.log("resultsForCreateSource default dynamo", resultsForCreateSource)
 
   return resultsForCreateSource;
 }

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

@@ -38,43 +38,45 @@ const createDynamoPerRelationshipLink = (_izContext, allObjectRelationships, src
   const dynamoTablePerLinks = [];
 
   for (const relationship of allObjectRelationships) {
-    let [relationshipTag, links] = checkDynamoTypeRelationship(relationship)
-    for (const link of links) {
-      let dynamoComponent = createDynamoDbComponentByLinks(link, relationshipTag)
-      dynamoTablePerLinks.push(
-        {
-          tableName: dynamoComponent.tableNameFrom,
-          resourceName: dynamoComponent.resourceNameFrom,
-          attributes: [
-            {
-              keyType: "partitionKey",
-              AttributeName: dynamoComponent.identifiersConcatFrom,
-              AttributeType: "S"
-            },
-            {
-              keyType: "sortKey",
-              AttributeName: dynamoComponent.identifiersConcatTo,
-              AttributeType: "S"
-            }
-          ]
-        },
-        {
-          tableName: dynamoComponent.tableNameTo,
-          resourceName: dynamoComponent.resourceNameTo,
-          attributes: [
-            {
-              keyType: "partitionKey",
-              AttributeName: dynamoComponent.identifiersConcatTo,
-              AttributeType: "S"
-            },
-            {
-              keyType: "sortKey",
-              AttributeName: dynamoComponent.identifiersConcatFrom,
-              AttributeType: "S"
-            }
-          ]
-        }
-      )
+    let [storageType, relationshipTag, links] = checkDynamoTypeRelationship(relationship)
+    if (storageType === STORAGE_TYPES.dynamoDB) {
+      for (const link of links) {
+        let dynamoComponent = createDynamoDbComponentByLinks(link, relationshipTag)
+        dynamoTablePerLinks.push(
+          {
+            tableName: dynamoComponent.tableNameFrom,
+            resourceName: dynamoComponent.resourceNameFrom,
+            attributes: [
+              {
+                keyType: "partitionKey",
+                AttributeName: dynamoComponent.identifiersConcatFrom,
+                AttributeType: "S"
+              },
+              {
+                keyType: "sortKey",
+                AttributeName: dynamoComponent.identifiersConcatTo,
+                AttributeType: "S"
+              }
+            ]
+          },
+          {
+            tableName: dynamoComponent.tableNameTo,
+            resourceName: dynamoComponent.resourceNameTo,
+            attributes: [
+              {
+                keyType: "partitionKey",
+                AttributeName: dynamoComponent.identifiersConcatTo,
+                AttributeType: "S"
+              },
+              {
+                keyType: "sortKey",
+                AttributeName: dynamoComponent.identifiersConcatFrom,
+                AttributeType: "S"
+              }
+            ]
+          }
+        )
+      }
     }
   }
 
@@ -91,7 +93,7 @@ const createDynamoPerRelationshipLink = (_izContext, allObjectRelationships, src
       }
     });
   }
-  console.log("resultsForCreateSource generate per link", resultsForCreateSource)
+  // console.log("resultsForCreateSource generate per link", resultsForCreateSource)
   return resultsForCreateSource;
 }
 

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

@@ -168,7 +168,7 @@ const createSourceDataDynamoDB = (_izContext, objectSchema, srcPath) => {
       }
     });
   }
-  console.log("resultsForCreateSource per objectSchema", resultsForCreateSource)
+  // console.log("resultsForCreateSource per objectSchema", resultsForCreateSource)
 
   return resultsForCreateSource;
 }

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

@@ -56,11 +56,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     if (allObjSchemas && allObjSchemas.records) {
       for (const objectSchema of allObjSchemas.records) {
         try {
-          // Generate resources for each object schema
-          const snsInSqsResources = createSourceSnsAndSqs(_izContext, objectSchema, saveFilePath);
-          const snsOutResources = createDataForCreateSourceSnsOut(_izContext, objectSchema, saveFilePath);
-
-          // Check and create DynamoDB resources
           const [dynamoResources, updatedTableYaml] = checkValidTableYaml(
             _izContext,
             createSourceDataDynamoDB(_izContext, objectSchema, saveFilePath),
@@ -71,7 +66,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           _izContext.logger.debug("dynamoResources: ", dynamoResources);
 
           // Accumulate resources
-          createSourceParams = [...createSourceParams, ...dynamoResources, ...snsInSqsResources, ...snsOutResources];
+          createSourceParams.push(...dynamoResources);
         } catch (schemaError) {
           _izContext.logger.error(`Error processing schema: ${objectSchema?.name || 'unknown'}`, schemaError);
         }
@@ -82,15 +77,14 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     const defaultDynamoDbResources = createDefaultDynamoDb(_izContext, saveFilePath);
     const defaultSnsInSqsResources = createFindDataAndProcessLogicalDefaultSnsInSqs(_izContext, saveFilePath);
     const defaultSnsOutResources = createDefaultSnsOutForFindDataAndProcessLogical(_izContext, saveFilePath);
+    const snsInSqsResources = createSourceSnsAndSqs(_izContext, saveFilePath);
+    const snsOutResources = createDataForCreateSourceSnsOut(_izContext, saveFilePath);
+
 
     const dynamoDbResourcePerRelationshipLink = createDynamoPerRelationshipLink(_izContext, allLocalRelationshipSchema, saveFilePath)
     // Add default resources to parameter list
-    createSourceParams = [
-      ...createSourceParams,
-      ...defaultDynamoDbResources,
-      ...defaultSnsInSqsResources,
-      ...defaultSnsOutResources,
-    ];
+    createSourceParams.push(...defaultDynamoDbResources, ...defaultSnsInSqsResources, ...defaultSnsOutResources, ...snsInSqsResources, ...snsOutResources);
+
 
     if (allLocalRelationshipSchema.length) {
       createSourceParams.push(

package/src/reStructure/TemplateData/resourceYaml/sns-in-sqs/defaultSnsInSqsForFindDataAndProcessLogical.js

@@ -57,7 +57,7 @@ function createDataForDefaultSnsInSqs(_izContext, srcPath) {
     isAppend: true
   }
 
-
+  //  GCTpBasTestInPersonCreate => GCTpBas_Test_PersonCreate_In
   defaultSnsInSqsDataList.push(
     {
       queueName: upperCase(FUNCTION_NAME.findData)

package/src/reStructure/TemplateData/resourceYaml/sns-in-sqs/snsAndSqsPerActionData.js

@@ -26,8 +26,8 @@ const path = require("path")
 // } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 
 
-const { ACTIONS, HANDLER, SOURCE_PATH, DEFAULT_HANDLER_PER_ACTION, SAVE_FILE_NAME } = require('../../../../MainLibs/index.js').consts
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require('../../../../MainLibs/index.js').utils;
+const { ACTIONS, HANDLER, SOURCE_PATH, DEFAULT_HANDLER_PER_ACTION, SAVE_FILE_NAME } = require('../../../../MainLibs/src/Consts.js')
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require('../../../../MainLibs/src/Utils.js');
 const snsTemplatePath = path.join(__dirname, './snsTemplate.ejs')
 const sqsTemplatePath = path.join(__dirname, './sqsTemplate.ejs')
 
@@ -41,20 +41,13 @@ const sqsTemplatePath = path.join(__dirname, './sqsTemplate.ejs')
  * @returns {Object[]}              - data of multiple dynamoDb template
  */
 
-function dataForCreateSnsAndSqsQueueFromObjectSchema(_izContext, objectSchema, srcPath) {
+function dataForCreateSnsAndSqsQueueFromObjectSchema(_izContext) {
   const snsAndSqsDataArray = [];
   for (const action of Object.values(ACTIONS)) {
-    if (objectSchema.overWriteHandlers?.[action]) {
-      for (const handler of objectSchema.overWriteHandlers[action]) {
+    for (const handler of DEFAULT_HANDLER_PER_ACTION[action]) {
+      if (handler === HANDLER.hdrSqs) {
         const snsAndSqsData = {
-          queueName: createQueueNameForSnsAndSqsQueue(_izContext, objectSchema, action, handler, srcPath)
-        }
-        snsAndSqsData.queueName && snsAndSqsDataArray.push(snsAndSqsData);
-      }
-    } else {
-      for (const handler of DEFAULT_HANDLER_PER_ACTION[action]) {
-        const snsAndSqsData = {
-          queueName: createQueueNameForSnsAndSqsQueue(_izContext, objectSchema, action, handler, srcPath)
+          queueName: upperCase(action)
         }
         snsAndSqsData.queueName && snsAndSqsDataArray.push(snsAndSqsData);
       }
@@ -63,46 +56,26 @@ function dataForCreateSnsAndSqsQueueFromObjectSchema(_izContext, objectSchema, s
   return snsAndSqsDataArray
 }
 
-function createQueueNameForSnsAndSqsQueue(_izContext, objectSchema, action, handler) {
-  let objectType = objectSchema.objectType
-  let queueName = upperCase(objectType) + upperCase(action) + upperCase(handler)
-  if (queueName.includes('HdrSqs')) {
-    queueName = upperCase(objectType) + upperCase(action)
-  } else if (queueName.includes('HdrDsq')) {
-    queueName = upperCase(objectType) + upperCase(action) + upperCase(handler)
-  } else {
-    return
-  }
-  return queueName
-}
-
-
-const createSourceSnsAndSqs = (_izContext, objectSchema, srcPath) => {
-  let resultsForCreateSnsAndSqsSource = [];
-  let setting = {
-    initialData: 'Resources:\n',
-    savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
-    saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
-    fileExtension: '.yml',
-    isAppend: true
-  }
-  const snsAndSqsDataList = dataForCreateSnsAndSqsQueueFromObjectSchema(_izContext, objectSchema, srcPath);
+const createSourceSnsAndSqs = (_izContext, srcPath) => {
+  let resultsForCreateSnsAndSqsSource = new Set();
+  const snsAndSqsDataList = dataForCreateSnsAndSqsQueueFromObjectSchema(_izContext, srcPath);
   for (let snsAndSqsData of snsAndSqsDataList) {
-    if (snsAndSqsData.queueName.includes('HdrDsq')) {
-      resultsForCreateSnsAndSqsSource.push({
-        templatePath: sqsTemplatePath,
-        templateData: snsAndSqsData,
-        setting: setting
-      })
-    } else {
-      resultsForCreateSnsAndSqsSource.push({
+    resultsForCreateSnsAndSqsSource.add(
+      {
         templatePath: snsTemplatePath,
         templateData: snsAndSqsData,
-        setting: setting
-      })
-    }
+        setting: {
+          initialData: 'Resources:\n',
+          savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+          saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
+          fileExtension: '.yml',
+          isAppend: true
+        }
+      }
+    )
   }
-  return resultsForCreateSnsAndSqsSource
+  // console.log("resultsForCreateSnsAndSqsSource", resultsForCreateSnsAndSqsSource)
+  return [...resultsForCreateSnsAndSqsSource]
 }
 
 module.exports = createSourceSnsAndSqs

package/src/reStructure/TemplateData/resourceYaml/sns-in-sqs/snsTemplate.ejs

@@ -3,7 +3,7 @@
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message in"
-      TopicName: ${self:custom.iz_resourcePrefix}In<%- queueName %>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_In
 ##===== SNS Subscription
 ##===== [Topic In]
   SubscriptionIn<%- queueName %>:

package/src/reStructure/TemplateData/resourceYaml/sns-out/data.js

@@ -20,7 +20,7 @@ const path = require('path');
 
 const { ACTIONS, HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, firstLetterUpperCase } = require('../../../../MainLibs/src/Utils.js')
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require('../../../../MainLibs/src/Utils.js')
 const { DEFAULT_HANDLER_PER_ACTION, SOURCE_PATH, SAVE_FILE_NAME } = require("../../../../MainLibs/src/Consts.js");
 
 const templatePath = path.join(__dirname, "./template.ejs")
@@ -31,41 +31,25 @@ const templatePath = path.join(__dirname, "./template.ejs")
  *
  * @return {{ templatePath, templateData, setting } }
  */
-function createDataForCreateSourceSnsOut(_izContext, objectSchema, srcPath) {
+function createDataForCreateSourceSnsOut(_izContext) {
   const createSourceArray = [];
   for (const action of Object.values(ACTIONS)) {
-    if (objectSchema.overWriteHandlers?.[action]) {
-      for (const handler of objectSchema.overWriteHandlers[action]) {
+    for (const handler of DEFAULT_HANDLER_PER_ACTION[action]) {
+      if (handler === HANDLER.hdrSqs) {
         const snsOut = {
-          queueName: createQueueName(_izContext, objectSchema, action, handler, srcPath)
-        }
-        snsOut.queueName && createSourceArray.push(snsOut)
-      }
-    } else {
-      for (const handler of DEFAULT_HANDLER_PER_ACTION[action]) {
-        const snsOut = {
-          queueName: createQueueName(_izContext, objectSchema, action, handler, srcPath)
+          queueName: upperCase(action) 
         }
         snsOut.queueName && createSourceArray.push(snsOut)
       }
     }
   }
-  // console.log("createSourceArrayInCreateSourceSnsOut", createSourceArray)
+  // console.log("createSourceArray", createSourceArray)
   return createSourceArray;
 }
 
-function createQueueName(_izContext, objectSchema, action, handler) {
-  let objectType = objectSchema.objectType
-  let queueName = upperCase(objectType) + upperCase(action) + upperCase(handler)
-  if (queueName.includes("HdrSqs")) {
-    queueName = upperCase(objectType) + upperCase(action)
-  } else
-    return
-  return queueName
-}
-function createSourceSnsOut(_izContext, objectSchema, srcPath) {
+function createSourceSnsOut(_izContext, srcPath) {
   let resultsForCreateSnsOut = [];
-  const snsOutDataList = createDataForCreateSourceSnsOut(_izContext, objectSchema, srcPath);
+  const snsOutDataList = createDataForCreateSourceSnsOut(_izContext);
   for (let snsOutData of snsOutDataList) {
     resultsForCreateSnsOut.push(
       {

package/src/reStructure/TemplateData/resourceYaml/sns-out/template.ejs

@@ -3,7 +3,7 @@
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message out"
-      TopicName: ${self:custom.iz_resourcePrefix}Out<%- firstLetterUpperCase(queueName) %>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- firstLetterUpperCase(queueName) %>_Out
 
   <%_ function firstLetterUpperCase(text) {
     return text.charAt(0).toUpperCase() + text.slice(1)

package/src/reStructure/TemplateData/testTemplate/template.ejs

@@ -1,5 +0,0 @@
-module.exports = [
-  {
-    objectType: "<%- objectType %>",
-  }
-]

package/src/reStructure/TemplateData/flowSchema/components/upload/hook/handler/data.js

@@ -1,93 +0,0 @@
-/*
-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 } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { createHookFunction } = require('../../../../../../SourceManager/src/Utils')
-const { FLOW_SCHEMA_HOOK_STATE } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-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, SQS_RESOURCE } = require("../../../../libs/Consts");
-const asyncTemplatePath = path.join(__dirname, "templateAsyncHandler.ejs")
-const syncTemplatePath = path.join(__dirname, "templateSyncHandler.ejs")
-/**
- * receive objectSchema
- * create data for WebScoket handler template
- *
- * @param {Object} objectSchema
- * @return {{templatePath, templateData,setting}}
- */
-
-function data(_izContext, flowSchema, srcPath) {
-  return [createSourceParams(_izContext, flowSchema, srcPath)]
-}
-
-function createSourceParams(_izContext, flowSchema, srcPath) {
-  let hook;
-  let hookFunctionName
-  let handlerType;
-  let queueName;
-  if (flowSchema?.hook) {
-    for (const [hookName, hookProperties] of Object.entries(flowSchema.hook)) {
-      for (const hookFunction of hookProperties.functionList) {
-        if (hookName === FLOW_SCHEMA_HOOK_STATE.beforeCreate) {
-          if (hookFunction.continueFlow === true && hookFunction.event.initialEvent === false) {
-            hook = true
-            hookFunctionName = upperCase(hookFunction.name)
-            handlerType = upperCase(hookFunction.event.handlerType);
-            if (upperCase(handlerType) === upperCase(HANDLER.hdrDsq)) {
-              queueName = hookFunction.event.queueName;
-            } else if (upperCase(handlerType) === upperCase(HANDLER.hdrSqs)) {
-              queueName = hookFunction.event.topicName;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  if (upperCase(handlerType) === upperCase(HANDLER.hdrSqs) || upperCase(handlerType) === upperCase(HANDLER.hdrDsq)) {
-    return {
-      templatePath: asyncTemplatePath,
-      templateData: {
-        hookFunctionName,
-        queueName
-      },
-      setting: {
-        savePath: path.join(srcPath, SOURCE_PATH.generatedCodeWebSocketHook),
-        saveFileName: `${upperCase(hookFunctionName)}_${upperCase(handlerType)}`,
-        fileExtension: ".js",
-        isAppend: false
-      }
-    }
-  } else if (upperCase(handlerType) === upperCase(HANDLER.hdrApi) || upperCase(handlerType) === upperCase(HANDLER.hdrInv)) {
-    return {
-      templatePath: syncTemplatePath,
-      templateData: {
-        hookFunctionName,
-      },
-      setting: {
-        savePath: path.join(srcPath, SOURCE_PATH.generatedCodeWebSocketHook),
-        saveFileName: `${upperCase(hookFunctionName)}_${upperCase(handlerType)}`,
-        fileExtension: ".js",
-        isAppend: false
-      }
-    }
-  }
-}
-
-module.exports = data;