@izara_project/izara-market-library-service-schemas 1.0.53 → 1.0.54

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

@@ -31,8 +31,6 @@ const STORAGE_TYPES = {
   graph: "graph"
 }
 
-const snsTemplatePath = path.join(__dirname, '../../../resourceYaml/sns-in-sqs/snsTemplate.ejs');
-const subscriptionSqsTemplatePath = path.join(__dirname, './sqsTemplate.ejs');
 const template = path.join(__dirname, "./template.ejs") // !! <----- Add here
 
 const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../../../../MainLibs/src/Consts.js');
@@ -69,19 +67,17 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
     )
   }
 
-  resultsForCreateDefaultSnsInSqs.push({ 
-    templatePath: template,
-    templateData: {
-      queueName: upperCase(flowSchema.flowTag) + "CompleteHdrSqs",
-    },
-    setting: setting
-  })
-
-
+  if (flowSteps.includes("Out") && flowSchema.outputTopic === true) {
+    generatedSnsTopicInForFlowSchema.push(
+      {
+        queueName: upperCase(flowSchema.flowTag) + "Complete" + upperCase(HANDLER.hdrSqs)
+      }
+    )
+  }
 
   for (let defaultSnsInSqsData of generatedSnsTopicInForFlowSchema) {
     resultsForCreateDefaultSnsInSqs.push({
-      templatePath: snsTemplatePath,
+      templatePath: template,
       templateData: defaultSnsInSqsData,
       setting: setting
     })

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

@@ -18,14 +18,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 const path = require('path');
 const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryError
-const { SOURCE_PATH, FUNCTION_NAME, HANDLER } = require('../../../../../../MainLibs/src/Consts');
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils")
+const { SOURCE_PATH, FUNCTION_NAME, HANDLER } = require('../../../../MainLibs/src/Consts');
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils")
 const templatePath = path.join(__dirname, "template.ejs");
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 const { STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
-const statusFieldTemplate = path.join(__dirname, "../../../templateBystatusType/statusFieldTemplate.ejs")
-const storedCacheTemplate = path.join(__dirname, "../../../templateBystatusType/storedCacheTemplate.ejs")
-const triggerCacheTemplate = path.join(__dirname, "../../../templateBystatusType/triggerCacheTemplate.ejs")
+const statusFieldTemplate = path.join(__dirname, "../templateByStatusType/statusFieldTemplate.ejs")
+const storedCacheTemplate = path.join(__dirname, "../templateByStatusType/storedCacheTemplate.ejs")
+const triggerCacheTemplate = path.join(__dirname, "../templateByStatusType/triggerCacheTemplate.ejs")
 
 /**
  * receive objectSchema

package/src/reStructure/TemplateData/flowSchema/{flowSchemaOwnTopic/EndpointComponent/mainFunction → flowSchemaMainFunction}/template.ejs

@@ -18,29 +18,25 @@ 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/src/GetObjectSchema');
-
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const sqsSharedLib = require('@izara_project/izara-core-library-sqs');
 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 triggeredCacheSharedLib = require('@izara_project/izara-core-library-trigger-cache')
 const externalRequest = require('@izara_project/izara-core-library-external-request');
 const sns = externalRequest.sns
 const sqs = externalRequest.sqs
 const lambda = externalRequest.lambda
-const { postToConnection } = require("../../../libs/source/GenerateCodeLibs");
-const utils = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Utils')
 const NoRetryError = require('@izara_project/izara-core-library-core').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')
-const consts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
+<% if (statusType === "triggerCache") { -%>
+const triggeredCacheSharedLib = require('@izara_project/izara-core-library-trigger-cache')
+<% } else if (statusType === "statusField") { -%>
 const { createFieldNamesFromRequestParamsByObjectSchema } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs.js')
+<% } else if (statusType === "storedCache") { -%>
+const storedCacheSharedLib = require('@izara_project/izara-core-library-stored-cache')
+<% } %>
 //(<optionalRequire>)
 //(</optionalRequire>)
 /**
@@ -63,7 +59,7 @@ module.exports.<%- functionName %> = async (
   requestParams,
   //(<additionalParams>)
   //(</additionalParams>)
-    callingFlowConfig = {},
+  callingFlowConfig = {},
 ) => {
 
   try {
@@ -87,7 +83,6 @@ module.exports.<%- functionName %> = async (
         }) %>
     <% } %>
 
-
     //(<endpointHook>)
     //(</endpointHook>)
 

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/functionYaml/data.js

@@ -59,6 +59,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   let additionalResourcePermission = defaultIamRolePerAction();
   let route = upperCase(flowSchema.flowTag);
   let queueName = upperCase(flowSchema.flowTag) + handlerType;
+
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -69,14 +70,6 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
         resourceNames(RESOURCE_CLASSES.sqs, queueName + "DLQ")
       ]
     ),
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.lambda]: Object.values(LAMBDA_RESOURCE)
-      },
-      [
-        resourceNames(RESOURCE_CLASSES.lambda, 'CreateHdrInv')
-      ]
-    ),
   )
 
   if (flowSchema.statusType === "storedCache") {
@@ -102,6 +95,17 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
           tableName => resourceNames(RESOURCE_CLASSES.dynamoDbTable, tableName))
       )
     )
+  } else if (flowSchema.statusType === "statusField") {
+    additionalResourcePermission.push(
+      createIamRole(
+        {
+          [RESOURCE_CLASSES.lambda]: Object.values(LAMBDA_RESOURCE)
+        },
+        [
+          resourceNames(RESOURCE_CLASSES.lambda, 'CreateHdrInv')
+        ]
+      )
+    )
   }
 
   return {

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

@@ -24,11 +24,14 @@ 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 callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const <%- functionName %> = require('./<%- functionName %>_Main')
 
 // validate event properties in body.Message of sqs event
-let perRecordsValidatorSchema = {}
+let perRecordsValidatorSchema = {
+  //(<validatorSchema>)
+  //(</validatorSchema>)
+}
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
 module.exports.main = middleware.wrap(async (event, context, callback) => {
@@ -55,6 +58,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       passOnProperties.push(record.body.Message)
       //(<additionalParams>)
       //(</additionalParams>)
+      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaComponent/functionYaml/data.js

@@ -98,7 +98,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, flowSchema.flowTag, "source/"),
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, upperCase(flowSchema.flowTag), "source/"),
       functionName,
       handlerType,
       additionalResourcePermission,

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

@@ -61,9 +61,9 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
           await <%- functionName %>.<%- functionName %>(
             event._izContext,
             eventParams,
-            callingFlowSharedLib.addCallingFlowToPassOnProperties(callingFlow)
             //(<additionalParams>)
             //(</additionalParams>)
+            callingFlowSharedLib.addCallingFlowToPassOnProperties(callingFlow)
           )
 
           break

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

@@ -55,9 +55,9 @@ const { postToConnection } = require('../../../libs/source/GenerateCodeLibs')
 module.exports.<%- functionName %> = async (
   _izContext,
   requestParams,
-  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
+  callingFlowConfig = {},
 ) => {
 
   try {

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

@@ -87,7 +87,7 @@ function createSourceParams(_izContext, flowTag, flowStep, srcPath) {
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, topicIn + "_In")
+        resourceNames(RESOURCE_CLASSES.sns, topicIn)
       ]
     ),
     createIamRole(

package/src/reStructure/TemplateData/flowSchema/flowStep/handler/template.ejs

@@ -28,7 +28,10 @@ const Logger = require('@izara_project/izara-core-library-logger');
 const <%- functionName %> = require('./<%- functionName %>_Main')
 
 // validate event properties in body.Message of sqs event
-let perRecordsValidatorSchema = {}
+let perRecordsValidatorSchema = {
+  //(<validatorSchema>)
+  //(</validatorSchema>)
+}
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
 module.exports.main = middleware.wrap(async (event, context, callback) => {
@@ -53,6 +56,9 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
 
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message)
+      //(<additionalParams>)
+      //(</additionalParams>)
+      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)

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

@@ -73,8 +73,8 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createParamsForCreateSource(_izContext, flowTag, flowStep, srcPath) {
-  let functionName = upperCase(flowTag)
-  let topicArn = `${upperCase(flowStep)}_In`
+  let functionName = upperCase(flowStep)
+  let topicArn = `${upperCase(flowStep)}`
 
   return {
     templatePath: templatePath,

package/src/reStructure/TemplateData/flowSchema/flowStep/mainFunction/template.ejs

@@ -26,15 +26,10 @@ 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 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 { postToConnection } = require('../../../libs/source/GenerateCodeLibs')
+
 //(<optionalRequire>)
 //(</optionalRequire>)
 /**
@@ -55,9 +50,9 @@ const { postToConnection } = require('../../../libs/source/GenerateCodeLibs')
 module.exports.<%- functionName %> = async (
   _izContext,
   requestParams,
-  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
+  callingFlowConfig = {},
 ) => {
 
   try {

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

@@ -72,17 +72,18 @@ const createConfirmAfterUploadS3Queue = require('./components/upload/confirmRese
 // flowSchema ExternalTopic components //
 const createExternalSqsFunctionYaml = require('./externalTopic/Process/functionYaml/data');
 const createExternalSqsHandler = require('./externalTopic/Process/handler/data');
-const createExternalSqsMainFunction = require('./externalTopic/Process/mainFunction/data');
 const createExternalSqsCompleteFunctionYaml = require("./externalTopic/Complete/functionYaml/data");
 const createExternalSqsCompleteHandler = require("./externalTopic/Complete/handler/data");
 const createExternalSqsCompleteMainFunction = require("./externalTopic/Complete/mainFunction/data");
 const createExternalTopicSnsInSqs = require('./externalTopic/sns-in-sqs/data');
 const createExternalTopicSnsOut = require('./externalTopic/sns-out/data')
 
+const createFlowSchemaEndpointMainFunction = require('./flowSchemaMainFunction/data');
+
 // flowSchema OwnTopic component
+const createFlowSchemaOwnTopicMainFunction = require('./flowSchemaOwnTopic/FlowSchemaComponent/mainFunction/data');
 const createFlowSchemaOwnTopicFunctionYaml = require('./flowSchemaOwnTopic/FlowSchemaComponent/functionYaml/data');
 const createFlowSchemaOwnTopicHandler = require('./flowSchemaOwnTopic/FlowSchemaComponent/handler/data');
-const createFlowSchemaOwnTopicMainFunction = require('./flowSchemaOwnTopic/FlowSchemaComponent/mainFunction/data');
 
 // flowSchema OwnTopicComplete component
 const createWebSocketCompleteMainFunctionYaml = require("./webSocketComplete/functionYaml/data");
@@ -93,7 +94,6 @@ const createWebSocketCompleteMainSqs = require('./webSocketComplete/sqs/data');
 
 const createFlowSchemaOwnTopicEndpointFunctionYaml = require('./flowSchemaOwnTopic/EndpointComponent/functionYaml/data');
 const createFlowSchemaOwnTopicEndpointHandler = require('./flowSchemaOwnTopic/EndpointComponent/handler/data');
-const createFlowSchemaOwnTopicEndpointMainFunction = require('./flowSchemaOwnTopic/EndpointComponent/mainFunction/data');
 
 // flowSchema OnwTopic flowStep component
 const createFlowSchemaFlowStepFunctionYaml = require('./flowStep/functionYaml/data');
@@ -115,15 +115,13 @@ const createFlowSchemaEventBridgeMainFunction = require('./eventBridge/mainFunct
 // flowSchema lambdaSync components
 const createFlowSchemaLambdaSyncFunctionYamlInv = require('./lambdaSync/Inv/functionYaml/data');
 const createFlowSchemaLambdaSyncHandlerInv = require('./lambdaSync/Inv/handler/data');
-const createFlowSchemaLambdaSyncMainFunctionInv = require('./lambdaSync/Inv/mainFunction/data');
 
 const createFlowSchemaLambdaSyncFunctionYamlApi = require("./lambdaSync/Api/functionYaml/data");
 const createFlowSchemaLambdaSyncHandlerApi = require("./lambdaSync/Api/handler/data");
-const createFlowSchemaLambdaSyncMainFunctionApi = require("./lambdaSync/Api/mainFunction/data")
 
 const createAwaitingMultipleStepDynamoDbData = require('./dynamoDb/data');
 // create record status Field Complete
-const createCreateObjectCompleteFuntionYaml = require('./CreateRecordComplete/functionYaml/data');
+const createCreateObjectCompleteFunctionYaml = require('./CreateRecordComplete/functionYaml/data');
 const createCreateObjectCompleteHandler = require('./CreateRecordComplete/handler/data');
 const createCreateObjectCompleteMainFunction = require('./CreateRecordComplete/mainFunction/data');
 const createCreateObjectCompleteQueue = require('./CreateRecordComplete/queue/data');// flowSchema Register component //
@@ -180,7 +178,8 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     for (const flowSchema of allLocalFlowSchemas.records) {
       // console.log("flowSchema in Generate TemplateData", flowSchema);
       const webSocketGenerateCodeLibs = createWebSocketGenerateCodeLibs(_izContext, flowSchema, saveFilePath)
-      createSourceParams.push(...webSocketGenerateCodeLibs)
+      const flowSchemaEndpointMainFunction = await createFlowSchemaEndpointMainFunction(_izContext, flowSchema, saveFilePath);
+      createSourceParams.push(...webSocketGenerateCodeLibs, ...flowSchemaEndpointMainFunction)
 
       // event has [s3, extTopic, ownTopic, eventBridge, lambdaSync]
       for (const event of flowSchema.event) {
@@ -280,7 +279,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           // ** External Topic ** //
           const externalSqsFunctionYaml = await createExternalSqsFunctionYaml(_izContext, flowSchema, saveFilePath);
           const externalSqsHandler = await createExternalSqsHandler(_izContext, flowSchema, saveFilePath);
-          const externalSqsMainFunction = await createExternalSqsMainFunction(_izContext, flowSchema, saveFilePath);
+          // const externalSqsMainFunction = await createExternalSqsMainFunction(_izContext, flowSchema, saveFilePath);
           const externalTopicSnsInSqs = createExternalTopicSnsInSqs(_izContext, flowSchema, saveFilePath);
           const externalTopicSnsOut = createExternalTopicSnsOut(_izContext, flowSchema, saveFilePath);
 
@@ -291,14 +290,14 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const externalTopic = [
             ...externalSqsFunctionYaml,
             ...externalSqsHandler,
-            ...externalSqsMainFunction,
+            // ...externalSqsMainFunction,
             ...externalTopicSnsInSqs,
             ...externalTopicSnsOut,
             // ...externalTopicCompleteFunctionYml, ...externalTopicCompleteHandler, ...externalTopicCompleteMainFunction
           ];
 
           createSourceParams.push(...externalTopic)
-
+          console.log("flowSchema external topic generated")
         } else if (event.includes("ownTopic")) {
 
           // flowSchema OwnTopic components
@@ -310,8 +309,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           // flowSchemaOwnTopic Endpoint
           const flowSchemaOwnTopicEndpointFunctionYaml = await createFlowSchemaOwnTopicEndpointFunctionYaml(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicEndpointHandler = createFlowSchemaOwnTopicEndpointHandler(_izContext, flowSchema, saveFilePath);
-          const flowSchemaOwnTopicEndpointMainFunction = await createFlowSchemaOwnTopicEndpointMainFunction(_izContext, flowSchema, saveFilePath);
-          const flowSchemaOwnTopicEndpointComponent = [...flowSchemaOwnTopicEndpointFunctionYaml, ...flowSchemaOwnTopicEndpointHandler, ...flowSchemaOwnTopicEndpointMainFunction]
+          const flowSchemaOwnTopicEndpointComponent = [...flowSchemaOwnTopicEndpointFunctionYaml, ...flowSchemaOwnTopicEndpointHandler]
 
           // flowSchemaOwnTopic EndpointComplete
           // const flowSchemaOwnTopicEndpointCompleteFuntionYaml = createFlowSchemaOwnTopicEndpointCompleteFuntionYaml(_izContext, flowSchema, saveFilePath);
@@ -350,14 +348,14 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         } else if (event.includes("lambdaSyncInv")) {
           const flowSchemaLambdaSyncFunctionYamlInv = createFlowSchemaLambdaSyncFunctionYamlInv(_izContext, flowSchema, saveFilePath);
           const flowSchemaLambdaSyncHandlerInv = createFlowSchemaLambdaSyncHandlerInv(_izContext, flowSchema, saveFilePath);
-          const flowSchemaLambdaSyncMainFunctionInv = createFlowSchemaLambdaSyncMainFunctionInv(_izContext, flowSchema, saveFilePath);
+          // const flowSchemaLambdaSyncMainFunctionInv = createFlowSchemaLambdaSyncMainFunctionInv(_izContext, flowSchema, saveFilePath);
 
 
           // Group the resources
           const lambdaSyncInvResources = [
             flowSchemaLambdaSyncFunctionYamlInv,
             flowSchemaLambdaSyncHandlerInv,
-            flowSchemaLambdaSyncMainFunctionInv,
+            // flowSchemaLambdaSyncMainFunctionInv,
           ];
 
           console.log("event lambdaSyncInv generated")
@@ -366,12 +364,10 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         } else if (event.includes("lambdaSyncApi")) {
           const flowSchemaLambdaSyncFunctionYamlApi = createFlowSchemaLambdaSyncFunctionYamlApi(_izContext, flowSchema, saveFilePath);
           const flowSchemaLambdaSyncHandlerApi = createFlowSchemaLambdaSyncHandlerApi(_izContext, flowSchema, saveFilePath);
-          const flowSchemaLambdaSyncMainFunctionApi = createFlowSchemaLambdaSyncMainFunctionApi(_izContext, flowSchema, saveFilePath);
 
           const lambdaSyncApiResources = [
             flowSchemaLambdaSyncFunctionYamlApi,
             flowSchemaLambdaSyncHandlerApi,
-            flowSchemaLambdaSyncMainFunctionApi
           ];
           createSourceParams.push(...lambdaSyncApiResources)
           console.log("event lambdaSyncApi generated")

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Api/functionYaml/data.js

@@ -52,7 +52,7 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createSourceParamsApi(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(flowSchema.flowTag)
+  let functionName = "Process" + upperCase(flowSchema.flowTag)
   let handlerType = upperCase(HANDLER.hdrApi)
   let additionalResourcePermission = defaultIamRolePerAction();
 

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Api/functionYaml/template.ejs

@@ -3,12 +3,18 @@
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`) %>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
-    - http:
-        path: <%- firstLetterUpperCase(functionName) %>
+    - httpApi:
+        path: /<%- firstLetterLowerCase(functionName) %>/
         method: <%- event %>
-        cors: true
-        #<#<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>Authorizer#>
-        #<#/<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>Authorizer#>
+        authorizer: authorizerServiceSchema
+        #<#<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
+        #<#/<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
+    - httpApi:
+        path: /<%- firstLetterLowerCase(functionName) %>/{targetUserId}
+        method: <%- event %>
+        authorizer: authorizerServiceSchema
+        #<#<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>
+        #<#/<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>
   role: <%- firstLetterUpperCase(roleName) _%>Role
     #<#<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>IamRole#>
     #<#/<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>IamRole#>

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Api/handler/data.js

@@ -36,7 +36,7 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createSourceParamsApi(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(flowSchema.flowTag)
+  let functionName = "Process" + upperCase(flowSchema.flowTag)
   let handlerType = upperCase(HANDLER.hdrApi)
 
   return {

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Api/handler/template.ejs

@@ -22,25 +22,28 @@ const RBAC_TARGET_ID = process.env.iz_rbacTargetIdUser // iz_rbacTargetIdUser |
 const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
 const <%- functionName %> = require('./<%- functionName %>_Main')
-
-// validate event params in middlewware before into function.
-let validatorSchema = {};
+const callingFlowSharedLib = require("@izara_project/izara-core-library-calling-flow")
+// validate event params in middleware before into function.
+let validatorSchema = {
+  //(<validatorSchema>)
+  //(</validatorSchema>)
+};
 // NOTE: not sure about remap_when_flatten and remove_when_flatten function of api still require for validate or not? Tam(19-Nov) -- Yes
 
 // for auth userLevel
-if (process.env.iz_rbacTargetIdUser) {
-  validatorSchema.required.push('pathParameters');
-  validatorSchema.properties.pathParameters = {
-    additionalProperties: false,
-    type: ['object', 'boolean'],
-    required: [process.env.iz_rbacTargetIdUser],
-    properties: {
-    }
-  };
-  validatorSchema.properties.pathParameters.properties[process.env.iz_rbacTargetIdUser] = {
-    type: 'string'
-  };
-}
+// if (process.env.iz_rbacTargetIdUser) {
+//  validatorSchema["required"] = ['pathParameters'];
+//  validatorSchema.properties.pathParameters = {
+//    additionalProperties: false,
+//    type: ['object', 'boolean'],
+//    required: [process.env.iz_rbacTargetIdUser],
+//    properties: {
+//    }
+//  };
+//  validatorSchema.properties.pathParameters.properties[process.env.iz_rbacTargetIdUser] = {
+//    type: 'string'
+//  };
+//}
 // If not have Authorizer set setMiddlewareSettings.
 middleware.setValidatorSchema(validatorSchema, { noAuthorizer: true })
 
@@ -53,16 +56,17 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
   try {
 
     // for targetUserId
-    let targetUserId = null
-    if (process.env.iz_rbacTargetIdUser) {
-      targetUserId = event.pathParameters[process.env.iz_rbacTargetIdUser]
-    }
+    // let targetUserId = null
+    // if (process.env.iz_rbacTargetIdUser) {
+    //  targetUserId = event.pathParameters[process.env.iz_rbacTargetIdUser]
+    // }
     // invoke LambdaFunction
-    let lambdaFunctionResponse = await <%- functionName %>.<%- functionName %>Main(
+    let lambdaFunctionResponse = await <%- functionName %>.<%- functionName %>(
       event._izContext,       // correlationId/logger/integrationTestDetail/uniqueRequestId/userId
       event.body,
-      event._izContext.userId, // send userId last element
-      targetUserId
+      //(<additionalParams>)
+      //(</additionalParams>)
+      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
     );
 
     // return error to client

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Inv/functionYaml/data.js

@@ -53,7 +53,7 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createSourceParamsInvoke(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(flowSchema.flowTag)
+  let functionName = "Process" + upperCase(flowSchema.flowTag)
   let handlerType = upperCase(HANDLER.hdrInv)
   let additionalResourcePermission = defaultIamRolePerAction();
 

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Inv/handler/data.js

@@ -36,7 +36,7 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createSourceParamsInvoke(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(flowSchema.flowTag)
+  let functionName = "Process" + upperCase(flowSchema.flowTag)
   let handlerType = upperCase(HANDLER.hdrInv)
 
   return {

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Inv/handler/template.ejs

@@ -21,11 +21,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // const sqs = new AWS.SQS({ apiVersion: '2012-11-05' });
 
 const middleware = require("@izara_project/izara-middleware").middlewareHandler;
-
+const callingFlowSharedLib = require("@izara_project/izara-core-library-calling-flow")
 const <%- functionName %> = require('./<%- functionName %>_Main')
 
 // validate event params in middleware before into function.
-const validatorSchema = {};
+const validatorSchema = {
+  //(<validatorSchema>)
+  //(</validatorSchema>)
+};
 middleware.setValidatorSchema(validatorSchema)
 
 module.exports.main = middleware.wrap(async (event, context, callback) => {
@@ -35,9 +38,12 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
   try {
 
     // invoke LambdaFunction
-    return await <%- functionName %>.<%- functionName %>Main(
+    return await <%- functionName %>.<%- functionName %>(
       event._izContext, // correlationId/logger/integrationTestDetail/uniqueRequestId
-      event
+      event,
+      //(<additionalParams>)
+      //(</additionalParams>)
+      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
     );
 
   } catch (err) {

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

@@ -96,7 +96,6 @@ function createSourceParams(_izContext, allLocalFlowSchemas, srcPath) {
   for (const flowSchema of allLocalFlowSchemas.records) {
     console.log("flowSchema", flowSchema)
     if (flowSchema.event.includes("ownTopic") || flowSchema.event.includes("extTopic")) {
-      console.log("this is topic")
       additionalResourcePermission.push(
         createIamRole(
           {

package/src/reStructure/TemplateData/relationshipPerAction/create/action/mainFunction/template.ejs

@@ -299,7 +299,15 @@ module.exports.createRelationship = async (
         // awaitingStepId per graphServiceTag
         awaitingStepIds.push(
           asyncFlowSharedLib.createAwaitingStepId(
-            hash({ linkTypeId, relationshipProperties, graphServiceTag: targetStorageResource.graphServiceTag }), // hash id
+            hash({
+              linkTypeId,
+              relationshipProperties,
+              graphServiceTag: targetStorageResource.graphServiceTag,
+              callingFlowProperties: callingFlowConfig.callingFlowProperties || {},
+              firstObject: firstObject,
+              secondObject: secondObject,
+              relType: relType,
+            }), // hash id
             PREFIX.createRel // prefix, use constant further
           )
         );

package/src/reStructure/TemplateData/relationshipPerAction/create/complete/mainFunction/template.ejs

@@ -68,7 +68,11 @@ module.exports.createRelationshipComplete = async (
       hash({
         linkTypeId,
         relationshipProperties: returnValue.requestParams.relationshipProperties,
-        graphServiceTag: graphServiceTag
+        graphServiceTag: graphServiceTag,
+        callingFlowProperties: passBackProperties.passBackProperties.parentPassBackProperties.callingFlowProperties || {},
+        firstObject: returnValue.requestParams.firstObject,
+        secondObject: returnValue.requestParams.secondObject,
+        relType: returnValue.requestParams.relType,
       }), // hash id
       PREFIX.createRel // prefix, use constant further
     )