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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {

package/src/MainLibs/src/Consts.js

@@ -520,8 +520,8 @@ function createDynamoDbComponentByLinks(link, relationshipTag) {
   let identifiersConcatFrom = `${link.from.objType.serviceTag}_${link.from.objType.objectType}__identifiersConcat`
   let identifiersConcatTo = `${link.to.objType.serviceTag}_${link.to.objType.objectType}__identifiersConcat`
 
-  let resourceNameFrom = `${upperCase(link.from.objType.objectType) + upperCase(link.to.objType.objectType)}Relationship`
-  let resourceNameTo = `${upperCase(link.to.objType.objectType) + upperCase(link.from.objType.objectType)}Relationship`
+  let resourceNameFrom = `${upperCase(link.from.objType.objectType) + upperCase(link.to.objType.objectType)}${upperCase(relationshipTag)}`
+  let resourceNameTo = `${upperCase(link.to.objType.objectType) + upperCase(link.from.objType.objectType)}${upperCase(relationshipTag)}`
   return {
     tableNameFrom,
     tableNameTo,

package/src/TemplateManager/src/libs/Consts.js

@@ -370,7 +370,8 @@ const SOURCE_GENERATE_IAM_ROLE = {
 
 const ADD_ON_DATA_STRUCTURE_TYPE = {
   versionedData: "versionedData",
-  attributeTree: "attributeTree"
+  attributeTree: "attributeTree",
+  propertyValue: "propertyValue"
 };
 
 const ATTRIBUTE_TAG = {

package/src/reStructure/TemplateData/externalService/lambdaRole/data.js

@@ -76,8 +76,8 @@ const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas
           const externalLambdaIamRoleGetPresignUrl = await externalLambdaIamRoleUploadS3(_izContext);
           externalLambdaIamRoleGetPresignUrl && externalLambdaIamRoleArray.push(externalLambdaIamRoleGetPresignUrl);
         } else if (event.includes("extTopic")) {
-          const externalSnsPublish = await externalRoleSnsPublish(_izContext, localFlowSchema);
-          externalSnsPublish && externalLambdaIamRoleArray.push(externalSnsPublish);
+          // const externalSnsPublish = await externalRoleSnsPublish(_izContext, localFlowSchema);
+          // externalSnsPublish && externalLambdaIamRoleArray.push(externalSnsPublish);
         }
       }
     }

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

@@ -71,7 +71,7 @@ function createWebSocketConnectYaml(_izContext, srcPath) {
       functionName,
       resourceLocation: SOURCE_PATH.resourceLocationWebSocketMain,
       additionalResourcePermission,
-      roleName: "WebsocketConnect"
+      roleName: "WebsocketMain"
 
     },
     setting: {

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

@@ -63,25 +63,12 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
   if (flowSteps.includes("In")) {
     generatedSnsTopicInForFlowSchema.push(
       {
-        queueName: "Process" + upperCase(topicIn) + upperCase(HANDLER.hdrSqs)
+        queueName: upperCase(topicIn) + "Complete" + upperCase(HANDLER.hdrSqs)
 
       }
     )
   }
 
-
-
-  if (flowSchema.outputTopic) {
-    if (flowSteps.includes("Out")) {
-      let topicOut = `${upperCase(flowSchema.flowTag)}`;
-      defaultDsqQueueDataList.push({
-        queueName: `WebSocketComplete` + upperCase(HANDLER.hdrSqs),
-        subscribeTo: topicOut
-      }
-      )
-    }
-  }
-
   for (let defaultSnsInSqsData of generatedSnsTopicInForFlowSchema) {
     resultsForCreateDefaultSnsInSqs.push({
       templatePath: snsTemplatePath,

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

@@ -0,0 +1,82 @@
+/*
+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, '../../../resourceYaml/sns-out/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, flowSchema, srcPath) {
+  let resultsForCreateDefaultSnsInSqs = [];
+  let flowSteps = Object.keys(flowSchema.flowSteps);
+  const setting = {
+    initialData: "Resources:\n",
+    savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+    saveFileName: SAVE_FILE_NAME.snsOutYaml,
+    fileExtension: ".yml",
+    isAppend: true
+  }
+
+  let topicOut = `${upperCase(flowSchema.flowTag)}`;
+
+  const generatedSnsTopicInForFlowSchema = [];
+  if (flowSteps.includes("Out")) {
+    generatedSnsTopicInForFlowSchema.push(
+      {
+        queueName: upperCase(topicOut) + "Complete"
+
+      }
+    )
+  }
+
+  for (let defaultSnsInSqsData of generatedSnsTopicInForFlowSchema) {
+    resultsForCreateDefaultSnsInSqs.push({
+      templatePath: templatePath,
+      templateData: defaultSnsInSqsData,
+      setting: setting
+    })
+  }
+
+  return resultsForCreateDefaultSnsInSqs;
+}
+
+module.exports = createDataForDefaultSnsInSqs;

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/mainFunction/template.ejs

@@ -86,20 +86,7 @@ module.exports.<%- functionName %> = async (
       <%- include(statusFieldTemplate) %>
     <% } else if (statusType === "storedCache") { %>
       <%- include(storedCacheTemplate, {tableName:tableName,flowSchemaComplete:flowSchemaComplete}) %>
-    <% } else if (statusType === "none") { %>
-
-      let messageObject = requestParams
-
-      // create callingFlow
-      messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-        messageObject,
-        callingFlowSharedLib.addParentCallingFlowConfig(
-          callingFlowConfig,
-          callingFlowSharedLib.createCallingFlowConfig(
-            await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.flowSchemaOwnTopicComplete), {}
-          )
-        )
-      )
+
     <% } else if (statusType === "triggerCache") { %>
       <%- include(triggerCacheTemplate, {
         tableName: tableName,

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaComponent/mainFunction/template.ejs

@@ -91,7 +91,7 @@ module.exports.<%- functionName %> = async (
         callingFlowSharedLib.addParentCallingFlowConfig(
           callingFlowConfig,
           callingFlowSharedLib.createCallingFlowConfig(
-            await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.flowSchemaOwnTopicComplete), {}
+            await lambdaSharedLib.lambdaFunctionName(_izContext, "WebSocketCompleteHdrSqs"), {}
           )
         )
       )

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

@@ -74,13 +74,14 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
 
   if (flowSchema.outputTopic) {
     if (flowSteps.includes("Out")) {
-      let topicOut = `${upperCase(flowSchema.flowTag)}`;
-      defaultDsqQueueDataList.push({
-        queueName: `WebSocketComplete` + upperCase(HANDLER.hdrSqs),
-        subscribeTo: topicOut
+      if (flowSchema.outputTopic) {
+        let topicOut = `${upperCase(flowSchema.flowTag)}Complete`;
+        defaultDsqQueueDataList.push({
+          queueName: `WebSocketComplete` + upperCase(HANDLER.hdrSqs),
+          subscribeTo: topicOut
+        }
+        )
       }
-      )
-
     }
   }
 

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

@@ -48,14 +48,17 @@ function createDataForSnsOut(_izContext, flowSchema, srcPath) {
   let resultsForCreateDefaultSnsInSqs = [];
 
   let generatedSnsTopicOutForFlowSchema = []
+  let flowSteps = Object.keys(flowSchema.flowSteps);
   let topicOut = `${upperCase(flowSchema.flowTag)}`
-  if (flowSchema.outputTopic) {
-    generatedSnsTopicOutForFlowSchema.push(
-      {
-        queueName: upperCase(topicOut)
-      }
-    )
 
+  if (flowSteps.includes("Out")) {
+    if (flowSchema.outputTopic) {
+      generatedSnsTopicOutForFlowSchema.push(
+        {
+          queueName: upperCase(topicOut) + "Complete"
+        }
+      )
+    }
     for (let defaultSnsOutData of generatedSnsTopicOutForFlowSchema) {
       resultsForCreateDefaultSnsInSqs.push({
         templatePath: templatePath,

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');
@@ -114,15 +115,15 @@ const createCreateObjectCompleteHandler = require('./CreateRecordComplete/handle
 const createCreateObjectCompleteMainFunction = require('./CreateRecordComplete/mainFunction/data');
 const createCreateObjectCompleteQueue = require('./CreateRecordComplete/queue/data');// flowSchema Register component //
 
-const createFlowSchemaRegisterHandlerComplete = require('./createRecordByStatusType/complete/handler/data');
-const createFlowSchemaRegisterMainCompleteFunc = require('./createRecordByStatusType/complete/mainFunction/data');
-const createFlowSchemaRegisterHandlerWbsFunc = require('./createRecordByStatusType/wbs/handler/data');
-const createFlowSchemaRegisterMainWbsFunc = require('./createRecordByStatusType/wbs/mainFunction/data');
-const createFlowSchemaRegisterMainCompleteFuncYaml = require('./createRecordByStatusType/complete/functionYaml/data');
-const createFlowSchemaRegisterMainWbsFuncYaml = require('./createRecordByStatusType/wbs/functionYaml/data');
-const createFlowSchemaRegisterSubscribeOutAll = require('./createRecordByStatusType/subscriptionOutAll/data');
-const createFlowSchemaRegisterSnsInSqs = require('./createRecordByStatusType/sns-in/data');
-const createFlowSchemaRegisterDynamoDb = require('./createRecordByStatusType/dynamoDB/register');
+const createFlowSchemaRegisterHandlerComplete = require('./register/complete/handler/data');
+const createFlowSchemaRegisterMainCompleteFunc = require('./register/complete/mainFunction/data');
+const createFlowSchemaRegisterHandlerWbsFunc = require('./register/wbs/handler/data');
+const createFlowSchemaRegisterMainWbsFunc = require('./register/wbs/mainFunction/data');
+const createFlowSchemaRegisterMainCompleteFuncYaml = require('./register/complete/functionYaml/data');
+const createFlowSchemaRegisterMainWbsFuncYaml = require('./register/wbs/functionYaml/data');
+const createFlowSchemaRegisterSubscribeOutAll = require('./register/subscriptionOutAll/data');
+const createFlowSchemaRegisterSnsInSqs = require('./register/sns-in/data');
+const createFlowSchemaRegisterDynamoDb = require('./register/dynamoDB/register');
 
 /**
  * Generates code with templates for different actions
@@ -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);
@@ -302,7 +307,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const flowSchemaOwnTopicFlowStep = [...flowSchemaOwnTopicFlowStepYml, ...flowSchemaOwnTopicFlowStepHandler, ...flowSchemaOwnTopicFlowStepMainFunction]
           // Group the resources
           const ownTopicResources = [
-            ...flowSchemaOwnTopicComponent, ...flowSchemaOwnTopicCompleteComponent, ...flowSchemaOwnTopicEndpointComponent, ...flowSchemaOwnTopicQueue, ...flowSchemaOwnTopicSnsOut, ...flowSchemaOwnTopicFlowStep
+            ...flowSchemaOwnTopicComponent, ...flowSchemaOwnTopicEndpointComponent, ...flowSchemaOwnTopicQueue, ...flowSchemaOwnTopicSnsOut, ...flowSchemaOwnTopicFlowStep
             // ...flowSchemaOwnTopicEndpointCompleteComponent
           ];
 

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');
@@ -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
@@ -79,12 +79,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,8 +92,8 @@ 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.identifiersLibs.identifiersFromIdentifiersConcat(_izContext, objType.objectType, requestParams.identifiersTask),
+          objectType: objType.objectType
         }
       )
 

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/templateBystatusType/statusFieldTemplate.ejs

@@ -19,9 +19,4 @@ let result = await lambda.invokeSync(_izContext,
 
   _izContext.logger.debug("result from createRecordByStatusType", result)
 
-let messageObject = {
-  requestParams: requestParams
-  //(<messageObject>)
-  //(</messageObject>)
-}
 

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

@@ -22,17 +22,3 @@ if (cacheMainStatus !== "process") {
   }
 }
 
-let messageObject = requestParams
-
-//(<beforeSendMessage>)
-//(</beforeSendMessage>)
-// create callingFlow
-messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-  messageObject,
-  callingFlowSharedLib.addParentCallingFlowConfig(
-    callingFlowConfig,
-    callingFlowSharedLib.createCallingFlowConfig(
-      await lambdaSharedLib.lambdaFunctionName(_izContext, "<%- flowSchemaComplete %>"), {}
-    )
-  )
-)

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

@@ -1,5 +1,4 @@
-<% if (triggerType === 'storedCache') { %>
-  let [mustValidate, validateCache] = await triggeredCacheSharedLib.checkTriggeredCache(
+  let [triggerCacheStatus, triggerCache] = await triggeredCacheSharedLib.checkTriggeredCache(
     _izContext,
     <%- tableName %>,
     {
@@ -9,31 +8,13 @@
     //(<triggerCacheConfig>)
     //(</triggerCacheConfig>)
   )
-<% } else if (triggerType === "switch") { %>
-
-<% } %>
 
 //(<afterCheckTriggerCache>)
 //(</afterCheckTriggerCache>)
 
-if (mustValidate !== "process") {
-  if (mustValidate === "error" || mustValidate === "complete") {
+if (triggerCacheStatus !== "process") {
+  if (triggerCacheStatus === "error" || triggerCacheStatus === "complete") {
     //(<afterValidateTriggerCacheStatus>)
     //(</afterValidateTriggerCacheStatus>)
   }
 }
-
-let messageObject = requestParams
-
-//(<beforeSendMessage>)
-//(</beforeSendMessage>)
-// create callingFlow
-messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-  messageObject,
-  callingFlowSharedLib.addParentCallingFlowConfig(
-    callingFlowConfig,
-    callingFlowSharedLib.createCallingFlowConfig(
-      await lambdaSharedLib.lambdaFunctionName(_izContext, "<%- flowSchemaComplete %>"), {}
-    )
-  )
-)

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}/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/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, '../');
 

package/src/reStructure/TemplateData/propertyValueSchema/objectPropertyValueSchema/data.js

@@ -34,18 +34,17 @@ const templatePath = path.join(__dirname, "./templateObjectPropertyValueSchema.e
 const modules = {
   validateAddOnDataStructure: require('../../../libs/ValidateAddOnDataStructure')
 };
-const yaml = require("yaml")
 const objectschemaLocalByPath = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema')
-const Consts = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts')
 // const objectSchemasBySrc = srcPath
 
 
 async function data(_izContext, settings, srcPath) {
 
-  let objectSchema = await objectschemaLocalByPath.getObjSchemaS3(
+  let objectSchema = await objectschemaLocalByPath.getLocalObjectSchemasWithHierarchy(
     _izContext,
-    settings.objType
-  );
+    settings.objType.objectType,
+    path.join(srcPath, "./schemas")
+  ).then(res => res.records[0]);
   _izContext.logger.debug("objectSchema objectSchema::", objectSchema)
 
   if (!objectSchema) {
@@ -55,12 +54,13 @@ async function data(_izContext, settings, srcPath) {
   let propertyValueObjectSchemas = [];
   let createSources = [];
 
-  let objectType = settings.objType.objectType;
+  // let objectType = settings.objType.objectType;
+  let propertyValueTag = settings.propertyValueTag
   // validate only addOnndataStructure is type propertyNode.
 
   if (!objectSchema.hasOwnProperty("addOnDataStructure") || !Array.isArray(objectSchema.addOnDataStructure) || !objectSchema.addOnDataStructure.length) {
-    console.log(`Not have data in addOnDataStructure in objectType:${objectType}`);
-    throw Error(`Not have data in addOnDataStructure in objectType:${objectType}`)
+    console.log(`Not have data in addOnDataStructure in objectType:${objectSchema.objectType}`);
+    throw Error(`Not have data in addOnDataStructure in objectType:${objectSchema.objectType}`)
 
   };
 
@@ -70,26 +70,26 @@ async function data(_izContext, settings, srcPath) {
 
   propertyValueObjectSchemas.push(
     { // {subject}property
-      objectType: objectType + PROPERTYVALUE_TAG.property,
+      objectType: propertyValueTag + PROPERTYVALUE_TAG.property,
       fieldNames: {
-        [objectType + PROPERTYVALUE_TAG.property + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName),
+        [propertyValueTag + PROPERTYVALUE_TAG.property + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName),
       },
       identifiers: [
         {
           type: "identifier",
-          fieldName: objectType + PROPERTYVALUE_TAG.property + "Id"
+          fieldName: propertyValueTag + PROPERTYVALUE_TAG.property + "Id"
         }
       ]
     },
     { // {subject}propertyLabel
-      objectType: objectType + PROPERTYVALUE_TAG.propertyLabel,
+      objectType: propertyValueTag + PROPERTYVALUE_TAG.propertyLabel,
       fieldNames: {
-        [objectType + PROPERTYVALUE_TAG.propertyLabel + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName),
+        [propertyValueTag + PROPERTYVALUE_TAG.propertyLabel + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName),
       },
       identifiers: [
         {
           type: "identifier",
-          fieldName: objectType + PROPERTYVALUE_TAG.propertyLabel + "Id"
+          fieldName: propertyValueTag + PROPERTYVALUE_TAG.propertyLabel + "Id"
         }
       ]
     }

package/src/reStructure/TemplateData/propertyValueSchema/relationshipPropertyValueSchema/data.js

@@ -27,31 +27,39 @@ const {
 } = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts');
 
 const templatePath = path.join(__dirname, "./tempRelationship.ejs");
-const yaml = require("yaml")
 
 const objectschemaLocalByPath = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema')
 
 const { firstLetterUpperCase: upperCase, getLocalServiceTag } = require("../../../../MainLibs/src/Utils");
-const { createBasicRelationshipsProperties } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
-
+const { createBasicRelationshipsProperties } = require('../../../../GenerateCodeLibs/src/GenerateCodeLibs');
+const { ADD_ON_DATA_STRUCTURE_TYPE } = require('../../../../TemplateManager/src/libs/Consts');
 async function data(_izContext, settings, srcPath) {
 
 
-  let objectSchema = await objectschemaLocalByPath.getObjSchemaS3(
+  let objectSchema = await objectschemaLocalByPath.getLocalObjectSchemasWithHierarchy(
     _izContext,
-    settings.objType
-  );
+    settings.objType.objectType,
+    path.join(srcPath, "./schemas")
+  ).then(res => res.records[0]);
 
   if (!objectSchema) {
     throw Error(`Invalid objType:${objTypeString(objType)}, cannot generate attribute tree schema cause objectSchema is not exists`)
   };
 
-
+  // validate addOnData type PropertyValues
+  let addOn = objectSchema.addOnDataStructure.find(addOn => {
+    return addOn.type === ADD_ON_DATA_STRUCTURE_TYPE.propertyValue && objectSchema.objectType === settings.objType.objectType
+  })
+  console.log("addOn in generate Relationship", addOn)
+  if (!addOn) {
+    throw Error(`Invalid objType:${objTypeString(objType)}, not have setting for generate propertyValues`)
+  }
 
   let createSourceRecords = []
   let generateRelationships = createSourceParams(
     _izContext,
     objectSchema,
+    settings,
     srcPath
   );
   createSourceRecords.push(...generateRelationships);
@@ -77,26 +85,28 @@ async function data(_izContext, settings, srcPath) {
 function createSourceParams(
   _izContext,
   objectSchema,
+  settings,
   srcPath
 ) {
   const attributeRelationships = [];
-  const objectType = objectSchema.objectType; // main objectType
+  // const objectType = objectSchema.objectType; // main objectType
+  let propertyValue = settings.propertyValueTag
   const storageResources = objectSchema.storageResources // storageResource from main objectType
   const serviceTag = getLocalServiceTag(srcPath)
 
   attributeRelationships.push(
     { // has{objectType}propertyValue
-      relationshipTag: PREFIX_RELATIONSHIP.has + upperCase(objectType) + PROPERTYVALUE_TAG.property,
+      relationshipTag: PREFIX_RELATIONSHIP.has + upperCase(propertyValue) + PROPERTYVALUE_TAG.property,
       relationshipProperties: createBasicRelationshipsProperties(
         {
           serviceTag: serviceTag,
-          objectType: objectType,
+          objectType: propertyValue,
           linkType: "one",
           requiredOnCreate: false
         },
         {
           serviceTag: serviceTag,
-          objectType: upperCase(objectType) + PROPERTYVALUE_TAG.property,
+          objectType: propertyValue + PROPERTYVALUE_TAG.property,
           linkType: "many",
           requiredOnCreate: true
         },
@@ -106,17 +116,17 @@ function createSourceParams(
     },
     // disabled{objectType}propertyValue
     {
-      relationshipTag: PREFIX_RELATIONSHIP.disabled + upperCase(objectType) + PROPERTYVALUE_TAG.property,
+      relationshipTag: PREFIX_RELATIONSHIP.disabled + upperCase(propertyValue) + PROPERTYVALUE_TAG.property,
       relationshipProperties: createBasicRelationshipsProperties(
         {
           serviceTag: serviceTag,
-          objectType: objectType,
+          objectType: propertyValue,
           linkType: "one",
           requiredOnCreate: false
         },
         {
           serviceTag: serviceTag,
-          objectType: upperCase(objectType) + PROPERTYVALUE_TAG.property,
+          objectType: propertyValue + PROPERTYVALUE_TAG.property,
           linkType: "many",
           requiredOnCreate: true
         },
@@ -126,17 +136,17 @@ function createSourceParams(
     },
 
     { // is{objectType}PropertyLabel
-      relationshipTag: PREFIX_RELATIONSHIP.is + upperCase(objectType) + PROPERTYVALUE_TAG.propertyLabel,
+      relationshipTag: PREFIX_RELATIONSHIP.is + upperCase(propertyValue) + PROPERTYVALUE_TAG.propertyLabel,
       relationshipProperties: createBasicRelationshipsProperties(
         {
           serviceTag: serviceTag,
-          objectType: upperCase(objectType) + PROPERTYVALUE_TAG.property,
+          objectType: propertyValue + PROPERTYVALUE_TAG.property,
           linkType: "many",
           requiredOnCreate: true
         },
         {
           serviceTag: serviceTag,
-          objectType: upperCase(objectType) + PROPERTYVALUE_TAG.propertyLabel,
+          objectType: propertyValue + PROPERTYVALUE_TAG.propertyLabel,
           linkType: "one",
           requiredOnCreate: false
         },

package/src/reStructure/TemplateData/relationshipPerAction/create/action/functionYaml/api/data.js

@@ -83,6 +83,8 @@ 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.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
       ]
     ),
     createIamRole(
@@ -96,7 +98,6 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
       ]
     )
   )
-
   for (const relationship of allObjectRelationships) {
     let [storageType, relationshipTag, links] = checkDynamoTypeRelationship(relationship)
     if (storageType === STORAGE_TYPES.dynamoDB) {

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

@@ -38,7 +38,7 @@ const {
   checkDynamoTypeRelationship,
   createDynamoDbComponentByLinks,
   DYNAMO_RESOURCE
-} = require("../../../../../../../MainLibs/index.js").consts;
+} = require("../../../../../../../MainLibs/src/Consts");
 
 const templatePath = path.join(__dirname, './template.ejs')
 
@@ -81,6 +81,8 @@ 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.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
       ]
     ),
     createIamRole(

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

@@ -83,6 +83,8 @@ 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.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
       ]
     ),
     createIamRole(

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

@@ -65,6 +65,8 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
   let functionName = FUNCTION_NAME.createRel
   let additionalResourcePermission = defaultIamRolePerAction();
 
+  additionalResourcePermission.push(awaitingMultipleStepsRole())
+
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -80,6 +82,8 @@ 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.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
       ]
     ),
     createIamRole(

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/api/data.js

@@ -68,6 +68,8 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
 
   additionalResourcePermission.push(awaitingMultipleStepsRole())
 
+  additionalResourcePermission.push(awaitingMultipleStepsRole())
+
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -83,6 +85,8 @@ 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.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
       ]
     ),
     createIamRole(
@@ -90,7 +94,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]

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

@@ -66,6 +66,8 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
   let functionName = FUNCTION_NAME.deleteRel
   let additionalResourcePermission = defaultIamRolePerAction();
 
+  additionalResourcePermission.push(awaitingMultipleStepsRole())
+
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -81,6 +83,8 @@ 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.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
       ]
     ),
     createIamRole(
@@ -88,13 +92,12 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]
     )
   )
-
   additionalResourcePermission.push(awaitingMultipleStepsRole())
 
   for (const relationship of allObjectRelationships) {

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

@@ -68,6 +68,8 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
 
   additionalResourcePermission.push(awaitingMultipleStepsRole())
 
+  additionalResourcePermission.push(awaitingMultipleStepsRole())
+
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -83,6 +85,8 @@ 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.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
       ]
     ),
     createIamRole(
@@ -90,7 +94,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]

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

@@ -65,6 +65,8 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
   let functionName = FUNCTION_NAME.deleteRel
   let additionalResourcePermission = defaultIamRolePerAction();
 
+  additionalResourcePermission.push(awaitingMultipleStepsRole())
+
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -80,6 +82,8 @@ 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.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
       ]
     ),
     createIamRole(
@@ -87,7 +91,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]

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

@@ -66,6 +66,8 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
   let functionName = FUNCTION_NAME.getRel
   let additionalResourcePermission = defaultIamRolePerAction();
 
+  additionalResourcePermission.push(awaitingMultipleStepsRole())
+
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -81,6 +83,8 @@ 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.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
       ]
     ),
     createIamRole(
@@ -88,13 +92,12 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.getRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]
     )
   )
-
   additionalResourcePermission.push(awaitingMultipleStepsRole())
 
   for (const relationship of allObjectRelationships) {

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

@@ -87,6 +87,8 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
   let functionName = FUNCTION_NAME.updateRel
   let additionalResourcePermission = defaultIamRolePerAction();
 
+  additionalResourcePermission.push(awaitingMultipleStepsRole())
+
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -102,6 +104,8 @@ 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.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
       ]
     ),
     createIamRole(
@@ -109,7 +113,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.updateRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]

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

@@ -24,7 +24,7 @@ const STORAGE_TYPES = {
   graph: "graph"
 }
 const templatePath = path.join(__dirname, './template.ejs')
-const { SOURCE_PATH, SAVE_FILE_NAME, checkDynamoTypeRelationship, createDynamoDbComponentByLinks } = require('../../../../MainLibs').consts
+const { SOURCE_PATH, SAVE_FILE_NAME, checkDynamoTypeRelationship, createDynamoDbComponentByLinks } = require('../../../../MainLibs/src/Consts');
 
 /**
  * create param of crateSouce for FindData And processLogical
@@ -79,7 +79,6 @@ const createDynamoPerRelationshipLink = (_izContext, allObjectRelationships, src
       }
     }
   }
-
   for (let dynamoTablePerLink of dynamoTablePerLinks) {
     resultsForCreateSource.push({
       templatePath: templatePath,

package/src/reStructure/TemplateData/resourceYaml/filterGenerateResource/data.js

@@ -37,18 +37,13 @@ const { NoRetryError } = require("@izara_project/izara-core-library-core");
 async function filterCreateResourceYaml(_izContext, createSourceParams, objSchemaPath) {
   let tableNamesToFilter = new Set();
   const allLocalFlowSchema = await getObjectSchema.getAllLocalFlowSchemas(_izContext, objSchemaPath);
-  for (const flowSchema of allLocalFlowSchema.records) {
+  await Promise.all(allLocalFlowSchema.records.map(async (flowSchema) => {
     if (flowSchema.statusType === "storedCache") {
-      const objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], objSchemaPath).then(res => res.records[0])
-      if (objectSchema) {
-        for (const storageResource of Object.values(objectSchema.storageResources)) {
-          tableNamesToFilter.add(storageResource.tableName);
-        }
-      } else {
-        throw new NoRetryError('not have objectSchema in service to get')
-      }
+      tableNamesToFilter.add(...await getStoredCacheTableFromFlowSchema(_izContext, flowSchema, objSchemaPath))
+    } else if (flowSchema.statusType === "triggerCache" && flowSchema?.triggerType === "storedCache") {
+      tableNamesToFilter.add(...await getStoredCacheTableFromFlowSchema(_izContext, flowSchema, objSchemaPath))
     }
-  }
+  }))
 
   const filteredCreateSourceParams = createSourceParams.filter(
     (result) => !tableNamesToFilter.has(result.templateData.tableName)
@@ -58,4 +53,19 @@ async function filterCreateResourceYaml(_izContext, createSourceParams, objSchem
   return filteredCreateSourceParams
 }
 
-module.exports = filterCreateResourceYaml;
+module.exports = filterCreateResourceYaml;
+
+async function getStoredCacheTableFromFlowSchema(_izContext, flowSchema, objSchemaPath) {
+  let tableNameStoredCache = new Set();
+  const objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], objSchemaPath).then(res => res.records[0])
+  if (objectSchema) {
+    for (const storageResource of Object.values(objectSchema.storageResources)) {
+      if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+        tableNameStoredCache.add(storageResource.tableName);
+      }
+    }
+  } else {
+    throw new NoRetryError('not have objectSchema in service to get')
+  }
+  return tableNameStoredCache;
+}

package/src/reStructure/libs/ValidateAddOnDataStructure.js

@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-const Consts = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts')
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 const { ADD_ON_DATA_STRUCTURE_TYPE } = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts');