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

package/package.json

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

package/src/reStructure/TemplateData/Auth/generateAuthYml/template.ejs

@@ -1,17 +1,16 @@
-authorizer:
-  authorizerServiceSchema:
-    type: request
-    functionArn: ${self:custom.iz_authorizerServiceSchemaV2}
-    identitySource:
-      - $request.header.Authorization
-      - $context.routeKey
-    resultTtlInSeconds: 300
+authorizerServiceSchema:
+  type: request
+  functionArn: ${self:custom.iz_authorizerServiceSchemaV2}
+  identitySource:
+    - $request.header.Authorization
+    - $context.routeKey
+  resultTtlInSeconds: 300
 
-    authorizerIdentifiers:
-    type: request
-    functionArn: ${self:custom.iz_authorizerServiceSchemaV2}
-    identitySource:
-      - $request.header.Authorization
-      - $context.routeKey
-      - $request.querystring.identifiers
-    resultTtlInSeconds: 300
+authorizerIdentifiers:
+  type: request
+  functionArn: ${self:custom.iz_authorizerServiceSchemaV2}
+  identitySource:
+    - $request.header.Authorization
+    - $context.routeKey
+    - $request.querystring.identifiers
+  resultTtlInSeconds: 300

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/create/template.ejs

@@ -16,31 +16,49 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-const lodash = require("lodash")
+
+// ──────────────────────── Core Node Modules ────────────────────────
+const lodash = require("lodash");
+
+// ──────────────────────── Shared Core Libraries ────────────────────────
+const hash = require('@izara_project/izara-shared-core').objectHash;
+
+// ──────────────────────── Izara Core Libraries ────────────────────────
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
+const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
+const coreConsts = require('@izara_project/izara-core-library-core/src/Consts');
 
+// ──────────────────────── Middleware / External ────────────────────────
+const middlewareConsts = require('@izara_project/izara-middleware').consts;
 const externalRequest = require('@izara_project/izara-core-library-external-request');
 const sns = externalRequest.sns;
 
-const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
+// ──────────────────────── Service Schemas ────────────────────────
+const { createObjType } = require('@izara_project/izara-core-library-service-schemas/src/Utils');
+const { createNodeLib, uploadUseCase, consts, getObjectSchema } = require('@izara_project/izara-core-library-service-schemas');
 
-const uploadUseCase = require('@izara_project/izara-core-library-service-schemas/src/libs/UploadUseCase')
+// ──────────────────────── Graph Service Libraries ────────────────────────
+const graphSharedLibs = require('@izara_project/izara-core-library-graph-service');
 
-const hash = require('@izara_project/izara-shared-core').objectHash;
-const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
-const consts = require('@izara_project/izara-core-library-service-schemas/src/Consts');
-const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
-const middlewareConsts = require('@izara_project/izara-middleware').consts
-const graphSharedLibs = require('@izara_project/izara-core-library-graph-service')
+// ──────────────────────── Market Library Service Schemas ────────────────────────
 const {
   dynamoDbIdentifiersByStorageResource,
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
+const {
+  TOPIC_NAME_GENERATE_CODE,
+  TOPIC_NAME_GRAPH_HANDLER,
+  GRAPH_HANDLER_SERVICE_NAME,
+} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
+const {
+  createDataDetailsLib,
+} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
 
-
+//(<optionalRequire>)
+//(</optionalRequire>)
 
 //-----------------------------------------------------------------------------------------------------------
 const PREFIX = {
@@ -50,11 +68,6 @@ const PREFIX = {
   CREATE_OBJECT_ASYNC_COMPLETE: "createObjectAsyncComplete"
 }
 //-----------------------------------------------------------------------------------------------------------
-const { TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER, GRAPH_HANDLER_SERVICE_NAME } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
-const { createDataDetailsLib } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
-const createNodeLib = require('@izara_project/izara-core-library-service-schemas').createNodeLib
-//(<optionalRequire>)
-//(</optionalRequire>)
 
 /**
  *
@@ -301,7 +314,7 @@ module.exports.createMain = async (
               ...objInstanceFullForDynamoDb.fields
             }
           );
-          // (<afterCreateRecordDynamo>)
+          //(<afterCreateRecordDynamo>)
           //(</afterCreateRecordDynamo>)
         } else if (createDataDetail.storageType == consts.STORAGE_TYPES.graph) {
           //(<beforeCreateNode>)

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/delete/template.ejs

@@ -16,42 +16,60 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
-const snsSharedLib = require('@izara_project/izara-core-library-sns');
-const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
-const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
-const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
 
-const sns = require('@izara_project/izara-core-library-external-request/src/resources/Sns');
-const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
-const serviceConfigLib = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
+// ==================== Built-in Modules ====================
+const path = require('path');
+const schemasPath = path.join(__dirname, '../schemas');
 
-const uploadUseCase = require('@izara_project/izara-core-library-service-schemas/src/libs/UploadUseCase')
 
+// ==================== Shared Core Utilities ====================
 const hash = require('@izara_project/izara-shared-core').objectHash;
 const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
-const path = require('path')
-const schemasPath = path.join(__dirname, '../schemas');
+const coreConsts = require('@izara_project/izara-core-library-core/src/Consts');
+
+
+// ==================== Core Service Schemas ====================
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 const consts = require('@izara_project/izara-core-library-service-schemas/src/Consts');
-const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
+const { createObjType } = require('@izara_project/izara-core-library-service-schemas/src/Utils');
+const serviceConfigLib = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig');
+const {
+  getGraphServiceTagWithCache,
+  getServiceNameWithCache,
+} = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig');
+const uploadUseCase = require('@izara_project/izara-core-library-service-schemas/src/libs/UploadUseCase');
 
+
+// ==================== Market Service Schemas ====================
 const {
   generateDynamoDbIdentifiers,
   dynamoDbIdentifiersByStorageResource,
-  collectGetData
+  collectGetData,
+  createDeleteDataDetail,
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
 
 const {
-  getGraphServiceTagWithCache,
-  getServiceNameWithCache
-} = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig');
+  TOPIC_NAME_GENERATE_CODE,
+  TOPIC_NAME_GRAPH_HANDLER,
+} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
+
+
+// ==================== Shared Libraries ====================
+const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
+const snsSharedLib = require('@izara_project/izara-core-library-sns');
+const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
+const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
+const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
+
+
+// ==================== External Resources ====================
+const sns = require('@izara_project/izara-core-library-external-request/src/resources/Sns');
+
 
-const { TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
-const { createDeleteDataDetail } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
-const { createObjType } = require("@izara_project/izara-core-library-service-schemas/src/Utils");
+// ==================== Optional Requires ====================
+// (<optionalRequire>)
+// (</optionalRequire>)
 
-//(<optionalRequire>)
-//(</optionalRequire>)
 /**
  *
  * @param {*} _izContext

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/get/template.ejs

@@ -18,6 +18,7 @@ Copyright (C) 2020 Sven Mason <http: //izara.io>
 
 'use strict';
 
+// ==================== Izara Core Service Schemas ====================
 const {
   getObjSchemaS3WithHierarchy,
 } = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
@@ -29,17 +30,33 @@ const {
 const consts = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 
 const {
-  objInstanceFromObjInstanceBase
+  objInstanceFromObjInstanceBase,
 } = require('@izara_project/izara-core-library-service-schemas/src/IdentifiersObject');
 
+const {
+  createObjTypeConcat,
+  createObjType,
+} = require('@izara_project/izara-core-library-service-schemas/src/Utils');
+
+
+// ==================== Izara Market Service Schemas ====================
 const {
   dynamoDbIdentifiersByStorageResource,
   collectGetData,
   createGetDataDetails,
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
 
-const { createObjTypeConcat, createObjType } = require('@izara_project/izara-core-library-service-schemas/src/Utils');
+const {
+  TOPIC_NAME_GENERATE_CODE,
+} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
+
 
+// ==================== Shared Core Libraries ====================
+const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
+const coreConsts = require('@izara_project/izara-core-library-core/src/Consts');
+
+
+// ==================== Shared Utility Libraries ====================
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
@@ -47,14 +64,16 @@ const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
 const graphSharedLib = require('@izara_project/izara-core-library-graph-service');
 
+
+// ==================== External Services ====================
 const externalRequest = require('@izara_project/izara-core-library-external-request');
-const sns = externalRequest.sns
+const sns = externalRequest.sns;
+
+
+// ==================== Optional Requires ====================
+// (<optionalRequire>)
+// (</optionalRequire>)
 
-const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
-const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
-const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
-//(<optionalRequire>)
-//(</optionalRequire>)
 /**
  *
  *
@@ -87,6 +106,7 @@ module.exports.getMain = async (
 
     //(<beforeQuery>)
     //(</beforeQuery>)
+
     const objType = createObjType(requestParams.objectType)
     let objectSchema = await getObjSchemaS3WithHierarchy(
       _izContext,
@@ -95,6 +115,21 @@ module.exports.getMain = async (
 
     _izContext.logger.debug("objectSchema: ", objectSchema);
 
+    let userId;
+    let targetId;
+    if (objectSchema.generatedBy === "userGenerated") {
+      userId = _izContext.correlationIds.get(coreConsts.BASE_USER_ID);
+      targetId = _izContext.correlationIds.get(coreConsts.TARGET_ID)
+
+      if (!userId) {
+        errorsFound.push("Not have userId")
+      }
+
+      if (objectSchema.hasOwnProperty("belongTo") && !targetId) {
+        errorsFound.push('not have targetId')
+      }
+    }
+
     let getDataDetails = await createGetDataDetails(
       _izContext,
       objectSchema,

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/update/template.ejs

@@ -18,28 +18,48 @@ along with this program. If not, see
 
 'use strict';
 
+// ==================== Shared Core Utilities ====================
 const hash = require('@izara_project/izara-shared-core').objectHash;
+const coreConsts = require('@izara_project/izara-core-library-core/src/Consts');
+
+
+// ==================== Core Service Schemas ====================
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 const consts = require('@izara_project/izara-core-library-service-schemas/src/Consts');
+const { createObjType } = require('@izara_project/izara-core-library-service-schemas/src/Utils');
+
+
+// ==================== Market Service Schemas ====================
 const {
   dynamoDbIdentifiersByStorageResource,
-  createFieldForUpdateDynamoDb
+  createFieldForUpdateDynamoDb,
+  createUpdateDataDetail,
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
+
+const {
+  PREFIX,
+  TOPIC_NAME_GENERATE_CODE,
+  TOPIC_NAME_GRAPH_HANDLER,
+} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
+
+
+// ==================== Shared Libraries ====================
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
 
+
+// ==================== External Services ====================
 const externalRequest = require('@izara_project/izara-core-library-external-request');
-const sns = externalRequest.sns
-
-const { createUpdateDataDetail } = require("@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs")
-const { PREFIX, TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
-const coreConsts = require('@izara_project/izara-core-library-core/src/Consts')
-const { createObjType } = require("@izara_project/izara-core-library-service-schemas/src/Utils")
-//(<optionalRequire>)
-//(</optionalRequire>)
+const sns = externalRequest.sns;
+
+
+// ==================== Optional Requires ====================
+// (<optionalRequire>)
+// (</optionalRequire>)
+
 /**
  *
  *

package/src/reStructure/TemplateData/EndpointPerService/yaml/data.js

@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 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');
 const {
   DEFAULT_HANDLER_PER_ACTION,
@@ -56,6 +57,7 @@ const templatePath = path.join(__dirname, "./template.ejs")
  */
 async function data(_izContext, allObjSchemas, srcPath) {
   let createSourceSet = new Set();
+  console.debug('templatePath:::', templatePath)
   for (const action of Object.values(ACTIONS)) {
     const defaultHandlers = DEFAULT_HANDLER_PER_ACTION[action]
     for (const defaultHandler of defaultHandlers) {
@@ -202,7 +204,8 @@ async function createParamForCreateSource(_izContext, allObjSchemas, action, han
       roleName: groupBy,
       action: action,
       functionNameConfig,
-      resourceApis
+      resourceApis,
+      serviceTag: serviceTag
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/reStructure/TemplateData/EndpointPerService/yaml/template.ejs

@@ -10,13 +10,13 @@
   <%_ } else if (handlerType === "hdrApi") { _%>
     <%_ resourceApis.forEach(resourceApi => { _%>
     - httpApi:
-        path: /<%- resourceApi.event %>/<%- action %>
+        path: /<%- serviceTag %>/<%- resourceApi.event %>/<%- action %>
         method: <%- resourceApi.method %>
         authorizer: authorizerServiceSchema
         #<#<%- firstLetterUpperCase(resourceApi.event) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
         #<#/<%- firstLetterUpperCase(resourceApi.event) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
     - httpApi:
-        path: /<%- resourceApi.event %>/<%- action %>/{targetUserId}
+        path: /<%- serviceTag %>/<%- resourceApi.event %>/<%- action %>/{targetUserId}
         method: <%- resourceApi.method %>
         authorizer: authorizerIdentifiers
         #<#<%- firstLetterUpperCase(resourceApi.event) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>

package/src/reStructure/TemplateData/flowSchema/components/upload/createObject/mainFunction/data.js

@@ -25,7 +25,7 @@ const getObjectSchema = require('@izara_project/izara-core-library-service-schem
 
 /**
  * receive objectSchema
- * create data for WebScoket handler template
+ * create data for WebSocket handler template
  *
  * @param {Object} objectSchema
  * @return {{templatePath, templateData,setting}}
@@ -42,7 +42,7 @@ async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
   // let fieldNames = Object.keys(objectSchema.fieldNames)
   return {
     templatePath: templatePath,
-    templateData: {},
+    templateData: { flowTag: flowSchema.flowTag },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_Main`,

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/reservedLimit/mainFunction/template.ejs

@@ -130,7 +130,9 @@ module.exports.reservedLimit = async (
         callingFlowSharedLib.addParentCallingFlowConfig(
           callingFlowConfig,
           callingFlowSharedLib.createCallingFlowConfig(
+            //(<callingFlowProperties>)
             await lambdaSharedLib.lambdaFunctionName(_izContext, "ReservedLimitCompleteHdrSqs"),
+            //(</callingFlowProperties>)
             callingFlowProperties
           )
         )
@@ -139,7 +141,9 @@ module.exports.reservedLimit = async (
       sendMsgReservedDynamic = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
         sendMsgReservedDynamic,
         callingFlowSharedLib.createCallingFlowConfig(
+          //(<callingFlowProperties>)
           await lambdaSharedLib.lambdaFunctionName(_izContext, "ReservedLimitCompleteHdrSqs"),
+          //(</callingFlowProperties>)
           callingFlowProperties
         )
       );

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

@@ -57,7 +57,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   let handlerType = upperCase(HANDLER.hdrSqs)
   let additionalResourcePermission = defaultIamRolePerAction();
   let route = upperCase(flowSchema.flowTag);
-  let queueName = upperCase(flowSchema.flowTag) + handlerType;
+  let queueName = "Process" + upperCase(flowSchema.flowTag) + handlerType;
   let topicIn = route + "_In";
   additionalResourcePermission.push(
     createIamRole(

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

@@ -55,7 +55,7 @@ async function data(_izContext, flowSchema, srcPath) {
 async function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = "Process" + upperCase(flowSchema.flowTag)
   let handlerType = upperCase(HANDLER.hdrSqs)
-  let queueName = upperCase(flowSchema.flowTag) + handlerType;
+  let queueName = "Process" + upperCase(flowSchema.flowTag) + handlerType;
 
   return {
     templatePath: templatePath,

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

@@ -62,18 +62,18 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
   if (flowSteps.includes("In")) {
     generatedSnsTopicInForFlowSchema.push(
       {
-        queueName: upperCase(flowSchema.flowTag),
+        queueName: "Process" + upperCase(flowSchema.flowTag) + upperCase(HANDLER.hdrSqs)
       }
     )
   }
 
-  if (flowSteps.includes("Out") && flowSchema.outputTopic === true) {
-    generatedSnsTopicInForFlowSchema.push(
-      {
-        queueName: upperCase(flowSchema.flowTag) + "Complete" + upperCase(HANDLER.hdrSqs)
-      }
-    )
-  }
+  // if (flowSteps.includes("Out") && flowSchema.outputTopic === true) {
+  //   generatedSnsTopicInForFlowSchema.push(
+  //     {
+  //       queueName: upperCase(flowSchema.flowTag) + "Complete" + upperCase(HANDLER.hdrSqs)
+  //     }
+  //   )
+  // }
 
   for (let defaultSnsInSqsData of generatedSnsTopicInForFlowSchema) {
     resultsForCreateDefaultSnsInSqs.push({

package/src/reStructure/TemplateData/flowSchema/flowSchemaMainFunction/data.js

@@ -70,7 +70,7 @@ async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
       functionName,
       tableName,
       flowSchemaComplete,
-      triggerType
+      triggerType,
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), "source/"),

package/src/reStructure/TemplateData/flowSchema/flowSchemaMainFunction/template.ejs

@@ -36,7 +36,8 @@ const triggeredCacheSharedLib = require('@izara_project/izara-core-library-trigg
 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')
-<% } %>
+<% } -%>
+const { createFlowTypeConcat } = require('@izara_project/izara-core-library-service-schemas').utils
 //(<optionalRequire>)
 //(</optionalRequire>)
 /**
@@ -73,13 +74,14 @@ module.exports.<%- functionName %> = async (
     <% if (statusType === "statusField") { %>
       <%- include(statusFieldTemplate) %>
     <% } else if (statusType === "storedCache") { %>
-      <%- include(storedCacheTemplate, {tableName:tableName,flowSchemaComplete:flowSchemaComplete}) %>
+      <%- include(storedCacheTemplate, {tableName:tableName, flowSchemaComplete:flowSchemaComplete,flowTag}) %>
 
     <% } else if (statusType === "triggerCache") { %>
       <%- include(triggerCacheTemplate, {
         tableName: tableName,
         flowSchemaComplete: flowSchemaComplete,
-        triggerType: triggerType
+        triggerType: triggerType,
+        flowTag
         }) %>
     <% } %>
 

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

@@ -24,6 +24,7 @@ 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')
 

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

@@ -178,8 +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)
-      const flowSchemaEndpointMainFunction = await createFlowSchemaEndpointMainFunction(_izContext, flowSchema, saveFilePath);
-      createSourceParams.push(...webSocketGenerateCodeLibs, ...flowSchemaEndpointMainFunction)
+      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) {
@@ -190,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);
 
@@ -223,10 +225,10 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
             ...functionYamlCreateObjectWebSocket,
             ...handlerCreateObjectWebSocket,
             ...mainFunctionCreateObjectWebSocket,
-            ...webSocketCreateObjectCompleteFunctionYaml,
-            ...webSocketCreateObjectCompleteQueue,
-            ...webSocketCreateObjectCompleteMainFunction,
-            ...webSocketCreateObjectCompleteHandler
+            // ...webSocketCreateObjectCompleteFunctionYaml,
+            // ...webSocketCreateObjectCompleteQueue,
+            // ...webSocketCreateObjectCompleteMainFunction,
+            // ...webSocketCreateObjectCompleteHandler
           ];
 
           const getPreSignUrlResources = [

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')
@@ -56,6 +59,11 @@ function createSourceParamsApi(_izContext, flowSchema, srcPath) {
   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

@@ -4,13 +4,13 @@
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
     - httpApi:
-        path: /<%- firstLetterLowerCase(functionName) %>/
+        path: /<%- serviceTag %>/<%- firstLetterLowerCase(functionName) %>/<%- functionName %>
         method: <%- event %>
         authorizer: authorizerServiceSchema
         #<#<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
         #<#/<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
     - httpApi:
-        path: /<%- firstLetterLowerCase(functionName) %>/{targetUserId}
+        path: /<%- serviceTag %>/<%- firstLetterLowerCase(functionName) %>/<%- functionName %>/{targetUserId}
         method: <%- event %>
         authorizer: authorizerServiceSchema
         #<#<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>

package/src/reStructure/TemplateData/flowSchema/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/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/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

@@ -348,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);