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

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,10 @@ 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)
+      if (!flowSchema.event.includes("s3")) {
+        const flowSchemaEndpointMainFunction = await createFlowSchemaEndpointMainFunction(_izContext, flowSchema, saveFilePath);
+        createSourceParams.push(...webSocketGenerateCodeLibs, ...flowSchemaEndpointMainFunction)
+      }
 
       // event has [s3, extTopic, ownTopic, eventBridge, lambdaSync]
       for (const event of flowSchema.event) {
@@ -191,10 +192,10 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const functionYamlCreateObjectWebSocket = createFunctionYamlCreateObjectWebSocket(_izContext, flowSchema, saveFilePath);
           const handlerCreateObjectWebSocket = createHandlerCreateObjectWebSocket(_izContext, flowSchema, saveFilePath);
           const mainFunctionCreateObjectWebSocket = await createMainFunctionCreateObjectWebSocket(_izContext, flowSchema, saveFilePath);
-          const webSocketCreateObjectCompleteFunctionYaml = createWebSocketCreateObjectCompleteFunctionYaml(_izContext, flowSchema, saveFilePath);
-          const webSocketCreateObjectCompleteQueue = createWebSocketCreateObjectCompleteQueue(_izContext, saveFilePath);
-          const webSocketCreateObjectCompleteMainFunction = createWebSocketCreateObjectCompleteMainFunction(_izContext, flowSchema, saveFilePath)
-          const webSocketCreateObjectCompleteHandler = createWebSocketCreateObjectCompleteHandler(_izContext, flowSchema, saveFilePath);
+          // const webSocketCreateObjectCompleteFunctionYaml = createWebSocketCreateObjectCompleteFunctionYaml(_izContext, flowSchema, saveFilePath);
+          // const webSocketCreateObjectCompleteQueue = createWebSocketCreateObjectCompleteQueue(_izContext, saveFilePath);
+          // const webSocketCreateObjectCompleteMainFunction = createWebSocketCreateObjectCompleteMainFunction(_izContext, flowSchema, saveFilePath)
+          // const webSocketCreateObjectCompleteHandler = createWebSocketCreateObjectCompleteHandler(_izContext, flowSchema, saveFilePath);
 
           // const webSocketCreateObjectStordCache = createWebSocketCreateObjectStoredCache(_izContext, saveFilePath);
 
@@ -224,10 +225,10 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
             ...functionYamlCreateObjectWebSocket,
             ...handlerCreateObjectWebSocket,
             ...mainFunctionCreateObjectWebSocket,
-            ...webSocketCreateObjectCompleteFunctionYaml,
-            ...webSocketCreateObjectCompleteQueue,
-            ...webSocketCreateObjectCompleteMainFunction,
-            ...webSocketCreateObjectCompleteHandler
+            // ...webSocketCreateObjectCompleteFunctionYaml,
+            // ...webSocketCreateObjectCompleteQueue,
+            // ...webSocketCreateObjectCompleteMainFunction,
+            // ...webSocketCreateObjectCompleteHandler
           ];
 
           const getPreSignUrlResources = [
@@ -280,7 +281,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 +292,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 +311,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 +350,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 +366,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

@@ -16,7 +16,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
+
 const path = require('path');
+const fs = require('fs');
+const yaml = require('yaml');
 
 const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
@@ -52,10 +55,15 @@ 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();
 
+  const configPath = path.join(srcPath, '../../config/serverless.config.yml');
+  const serverlessConfig = fs.readFileSync(configPath, 'utf8');
+  const config = yaml.parse(serverlessConfig);
+  const serviceTag = config.main_config.iz_serviceTag;
+
   return {
     templatePath: templatePath,
     templateData: {
@@ -65,7 +73,8 @@ function createSourceParamsApi(_izContext, flowSchema, srcPath) {
       additionalResourcePermission,
       functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
       roleName: upperCase(flowSchema.flowTag),
-      event: "post"
+      event: "post",
+      serviceTag: serviceTag
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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: /<%- serviceTag %>/<%- firstLetterLowerCase(functionName) %>/<%- 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: /<%- serviceTag %>/<%- firstLetterLowerCase(functionName) %>/<%- 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/{templateBystatusType → templateByStatusType}/storedCacheTemplate.ejs

@@ -5,6 +5,9 @@ let [ cacheMainStatus, cacheMain, cacheExist ] = await storedCacheSharedLib.chec
     //(<keyValueStoredCacheTable>)
     //(</keyValueStoredCacheTable>)
   },
+  //(<additionalAttributesWhenCreateStoredCache>)
+  //(</additionalAttributesWhenCreateStoredCache>),
+  createFlowTypeConcat(_izContext,{flowTag: "<%- flowTag %>", serviceTag: process.env.iz_serviceTag}),
   //(<storedCacheConfig>)
   //(</storedCacheConfig>)
 )

package/src/reStructure/TemplateData/flowSchema/{templateBystatusType → templateByStatusType}/triggerCacheTemplate.ejs

@@ -5,6 +5,9 @@
       //(<keyValueTriggerCacheTable>)
       //(</keyValueTriggerCacheTable>)
     },
+    //(<additionalAttributesWhenCreateTriggerCache>)
+    //(</additionalAttributesWhenCreateTriggerCache>)
+    createFlowTypeConcat(_izContext,{flowTag: "<%- flowTag %>", serviceTag: process.env.iz_serviceTag}),
     //(<triggerCacheConfig>)
     //(</triggerCacheConfig>)
   )

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/perActionEndpoint/yaml/api/data.js

@@ -18,6 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 const path = require('path');
+const fs = require('fs');
+const yaml = require('yaml');
 
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
@@ -56,14 +58,14 @@ function data(_izContext, objectSchema, srcPath) {
   let createSourceArray = [];
   for (const action of Object.values(ACTIONS)) {
     if (objectSchema.overWriteHandlers?.[action]) {
-      // if have overWriteHander of action check hdrApi inside
+      // if have overWriteHandler of action check hdrApi inside
       if (objectSchema.overWriteHandlers[action].includes(HANDLER.hdrApi)) {
         // create template data
         const createSourceParam = createParamForCreateSource(objectSchema, action, srcPath)
         createSourceArray.push(createSourceParam)
       }
     } else {
-      // if not have overWriteHander of action will use default handler
+      // if not have overWriteHandler of action will use default handler
       const defaultHandler = DEFAULT_HANDLER_PER_ACTION[action]
       if (defaultHandler.includes(HANDLER.hdrApi)) {
         // create template data and object for create source
@@ -86,6 +88,11 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
   let functionNameObjectType = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType
   let functionNameConfig = upperCase(functionNameObjectType) + upperCase(action) + upperCase(shortNameHandler(HANDLER.hdrApi))
 
+  const configPath = path.join(srcPath, '../../config/serverless.config.yml');
+  const serverlessConfig = fs.readFileSync(configPath, 'utf8');
+  const config = yaml.parse(serverlessConfig);
+  const serviceTag = config.main_config.iz_serviceTag;
+
   for (let storageResource of Object.values(objectSchema.storageResources)) {
     if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
       // add IamRole for dynamodb depend on tableName in storageResources of objectSchema
@@ -184,6 +191,7 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
       roleName: groupBy,
       action: action,
       functionNameConfig,
+      serviceTag: serviceTag
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/reStructure/TemplateData/perActionEndpoint/yaml/api/template.ejs

@@ -4,7 +4,7 @@
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
     - http:
-        path: <%- firstLetterUpperCase(objectType) %>/<%- firstLetterUpperCase(action) %>
+        path: /<%- serviceTag%>/<%- firstLetterUpperCase(objectType) %>/<%- firstLetterUpperCase(action) %>
         method: <%- event %>
         cors: true
         #<#<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>Authorizer#>

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
           )
         );
@@ -340,7 +348,15 @@ module.exports.createRelationship = async (
         _izContext,
         awaitingStepIds, // awaitingStepIds
         asyncFlowSharedLib.createPendingStepId( // pendingStepId
-          hash({ linkTypeId, relationshipProperties, correlationId: _izContext.correlationIds.get("id") }), // hash id
+          hash({
+            linkTypeId,
+            relationshipProperties,
+            correlationId: _izContext.correlationIds.get("id"),
+            callingFlowProperties: callingFlowConfig.callingFlowProperties || {},
+            firstObject: firstObject,
+            secondObject: secondObject,
+            relType: relType
+            }), // hash id
           PREFIX.createRel // prefix, use constant further
         )
       );

package/src/reStructure/TemplateData/relationshipPerAction/create/complete/handler/sqs/template.ejs

@@ -93,7 +93,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message.returnValue)
       passOnProperties.push(record.body.Message.status)
-      passOnProperties.push(record.body.Message.errorsFound)
+      passOnProperties.push(record.body.Message.errorsFound),
+      passOnProperties.push(record.body.Message.graphServiceTag),
       passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message)) // is Ok PassBackProperties
       // passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)) // is Ok callinfFlow
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);

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
     )

package/src/reStructure/TemplateData/flowSchema/externalTopic/Process/mainFunction/data.js

@@ -1,75 +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 { SOURCE_PATH, FUNCTION_NAME, HANDLER } = require('../../../../../../MainLibs/src/Consts');
-
-const { 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");
-/**
- * receive objectSchema
- * create data for WebScoket handler template
- *
- * @param {Object} objectSchema
- * @return {{templatePath, templateData,setting}}
- */
-
-
-async function data(_izContext, flowSchema, srcPath) {
-  return [await createParamsForCreateSource(_izContext, flowSchema, srcPath)]
-}
-
-async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
-  let functionName = "Process" + upperCase(flowSchema.flowTag);
-  let tableName = null;
-  if (flowSchema.statusType === "storedCache") {
-    let objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], path.join(srcPath, "./schemas")).then(res => res.records[0]);
-    for (const storageResource of Object.values(objectSchema.storageResources)) {
-      if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-        tableName = storageResource.tableName
-      }
-    }
-  }
-  let flowSchemaComplete = upperCase(flowSchema.flowTag) + "Complete"
-  return {
-    templatePath: templatePath,
-    templateData: {
-      statusType: flowSchema.statusType,
-      statusFieldTemplate,
-      storedCacheTemplate,
-      triggerCacheTemplate,
-      flowTag: flowSchema.flowTag,
-      functionName,
-      tableName,
-      flowSchemaComplete
-    },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
-      saveFileName: `${functionName}_Main`,
-      fileExtension: ".js",
-      isAppend: false
-    }
-  }
-}
-module.exports = data