@izara_project/izara-market-library-service-schemas 1.0.70 → 1.0.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.70",
+  "version": "1.0.72",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "@izara_project/izara-core-library-core": "^1.0.20",
     "@izara_project/izara-core-library-external-request": "^1.0.20",
     "@izara_project/izara-core-library-logger": "^1.0.7",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.95",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.96",
     "@izara_project/izara-core-library-sns": "^1.0.6",
     "@izara_project/izara-core-library-sqs": "^1.0.4",
     "@izara_project/izara-shared": "^1.0.126",

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

@@ -133,8 +133,13 @@ module.exports.createMain = async (
       parentObject = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, objectSchema.extendObjType)
     }
 
-    let userAgent = _izContext.correlationIds.get(middlewareConsts.USER_AGENT)
-    _izContext.logger.debug("userAgent::", userAgent);
+    let userAgent = false;
+    let directInvoke = false;
+    if (_izContext.correlationIds.get(middlewareConsts.USER_AGENT)) {
+      userAgent = true;
+    } else if (requestParams.hasOwnProperty("__context__") && requestParams.izEventSource.eventSourceTag === "DirectInvoke") {
+      directInvoke = true;
+    }
 
     let createDataDetails = await createDataDetailsLib(
       _izContext,
@@ -472,10 +477,27 @@ module.exports.createMain = async (
               objInstanceFullForGraph,
               requestParams.relationships || [],
               Date.now(),
-              { updatePropertiesOnMatch: false }
+              {
+                updatePropertiesOnMatch: false
+              }
             )
             return createNodeResult
 
+          } else if (directInvoke) {
+            _izContext.logger.debug("Direction Invoke case will invoke GraphHandlerInv")
+            let createNodeResult = await graphSharedLibs.createNodeV2(
+              _izContext,
+              graphServiceName,
+              objType,
+              objInstanceFullForGraph,
+              requestParams.relationships,
+              Date.now(),
+              {
+                updatePropertiesOnMatch: false
+              }
+            );
+
+            return createNodeResult;
           } else {
             _izContext.logger.debug("not have userAgent will send Message to GraphHandler")
             messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/functionYml/HdrS3/template.ejs

@@ -7,9 +7,11 @@
         bucket: <%- bucketName %>
         event: s3:ObjectCreated:*
         existing: true
-        # rules:
-        #     - prefix: uploads/
-        #     - suffix: .csv
+        rules:
+        #<#<%- functionName %><%- handlerType %>rules#>
+        #<#/<%- functionName %><%- handlerType %>rules#>
+            - prefix: uploads/
+            - suffix: .csv
         forceDeploy: true
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>

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

@@ -197,7 +197,6 @@ 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);
@@ -207,6 +206,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       // event has [s3, extTopic, ownTopic, eventBridge, lambdaSync]
       for (const event of flowSchema.event) {
         if (event.includes("s3")) {
+
           const reservedDataTable = createReservedDataMainTable(_izContext, saveFilePath);
           const bucketS3 = createBucketS3(_izContext, flowSchema, saveFilePath)
 
@@ -232,7 +232,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
           const processAfterUploadFunctionYmlS3 = createProcessAfterUploadS3FunctionYmlS3(_izContext, flowSchema, saveFilePath);
           // const processAfterUploadFunctionYamlHdrDsq = createProcessAfterUploadS3FunctionYmlDsq(_izContext, saveFilePath);
-          const processAfterUploadSqs = createProcessAfterUploadS3Queue(_izContext, saveFilePath);
+          // const processAfterUploadSqs = createProcessAfterUploadS3Queue(_izContext, saveFilePath);
           const processAfterUploadHandlerS3 = createProcessAfterUploadS3HandlerS3(_izContext, flowSchema, saveFilePath);
           // const processAfterUploadHandlerDsq = createProcessAfterUploadS3HandlerDsq(_izContext, saveFilePath);
           const processAfterUploadMainFunction = createProcessAfterUploadS3MainFunction(_izContext, flowSchema, saveFilePath);
@@ -270,7 +270,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
           const processAfterUploadResources = [
             ...processAfterUploadFunctionYmlS3,
-            ...processAfterUploadSqs,
+            // ...processAfterUploadSqs,
             ...processAfterUploadHandlerS3,
             ...processAfterUploadMainFunction
             // Commented resources kept for reference
@@ -303,6 +303,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           );
 
         } else if (event.includes("extTopic")) {
+
           // ** External Topic ** //
           const externalSqsFunctionYaml = await createExternalSqsFunctionYaml(_izContext, flowSchema, saveFilePath);
           const externalSqsHandler = await createExternalSqsHandler(_izContext, flowSchema, saveFilePath);
@@ -358,6 +359,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           createSourceParams.push(...ownTopicResources);
 
         } else if (event.includes("eventBridge")) {
+
           const flowSchemaEventBridgeHandler = createFlowSchemaEventBridgeHandler(_izContext, flowSchema, saveFilePath);
           const flowSchemaEventBridgeMainFunction = createFlowSchemaEventBridgeMainFunction(_izContext, flowSchema, saveFilePath);
           const flowSchemaEventBridgeFunctionYaml = createFlowSchemaEventBridgeFunctionYaml(_izContext, flowSchema, saveFilePath);
@@ -373,6 +375,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           console.log("event eventBridge generated")
           createSourceParams.push(...eventBridgeResources);
         } else if (event.includes("lambdaSyncInv")) {
+
           const flowSchemaLambdaSyncFunctionYamlInv = createFlowSchemaLambdaSyncFunctionYamlInv(_izContext, flowSchema, saveFilePath);
           const flowSchemaLambdaSyncHandlerInv = createFlowSchemaLambdaSyncHandlerInv(_izContext, flowSchema, saveFilePath);
           // const flowSchemaLambdaSyncMainFunctionInv = createFlowSchemaLambdaSyncMainFunctionInv(_izContext, flowSchema, saveFilePath);
@@ -434,18 +437,21 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       createSourceParams.push(...flowSchemaOwnTopicFlowStep)
 
       if (flowSchema.statusType === "triggerCache") {
-        const functionYaml = await Promise.all(
-          Object.entries(createFlowSchemaTriggerCacheFunctionYaml).flatMap(([type, functionYaml]) => functionYaml(_izContext, flowSchema, saveFilePath)));
+        const functionYaml = (await Promise.all(Object.entries(createFlowSchemaTriggerCacheFunctionYaml).map(([type, functionYaml]) => functionYaml(_izContext, flowSchema, saveFilePath)))).flat();
         const mainFunction = Object.entries(createFlowSchemaTriggerCacheMainFunction).flatMap(([type, mainFunction]) => mainFunction(_izContext, flowSchema, saveFilePath));
         const handler = Object.entries(createFlowSchemaTriggerCacheHandler).flatMap(([type, handler]) => handler(_izContext, flowSchema, saveFilePath));
         const queue = createFlowSchemaTriggerCacheQueue(flowSchema, saveFilePath);
-
+        // console.log("functionYaml", JSON.stringify(...functionYaml, null, 2))
         createSourceParams.push(...functionYaml, ...mainFunction, ...handler, ...queue)
+        // console.log("createSourceParams triggerCache", JSON.stringify(createSourceParams, null, 2))
+        console.log("mainFunction triggerCache", JSON.stringify(mainFunction, null, 2))
+        console.log("handler triggerCache", JSON.stringify(handler, null, 2))
         console.log("Generate triggerCache component")
       }
     }
 
     if (allLocalFlowSchemas.records.length) {
+
       console.log("flowSchema Register");
       const flowSchemaRegisterHandlerComplete = createFlowSchemaRegisterHandlerComplete(_izContext, saveFilePath);
       const flowSchemaRegisterMainComplete = await createFlowSchemaRegisterMainCompleteFunc(_izContext, allLocalFlowSchemas, saveFilePath);

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/checkTriggerCacheComplete/functionYaml/data.js

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

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/checkTriggerCacheComplete/handler/data.js

@@ -46,12 +46,11 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, upperCase(functionName), "source/"),
       functionName,
       queueName
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag)),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), 'source/'),
       saveFileName: `${upperCase(functionName)}_${upperCase(handlerType)}`,
       fileExtension: ".js",
       isAppend: true

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/checkTriggerCacheComplete/mainFunction/data.js

@@ -49,7 +49,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
       flowTag: flowSchema.flowTag
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag)),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), 'source/'),
       saveFileName: `${upperCase(functionName)}_Main`,
       fileExtension: ".js",
       isAppend: true

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/processTriggerCache/functionYaml/data.js

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

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/processTriggerCache/handler/data.js

@@ -46,12 +46,11 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, upperCase(functionName), "source/"),
       functionName,
       queueName
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag)),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), 'source/'),
       saveFileName: `${upperCase(functionName)}_${upperCase(handlerType)}`,
       fileExtension: ".js",
       isAppend: true

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/processTriggerCache/mainFunction/data.js

@@ -48,7 +48,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
       queueName
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag)),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), 'source/'),
       saveFileName: `${upperCase(functionName)}_Main`,
       fileExtension: ".js",
       isAppend: true

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/triggerCacheComplete/functionYaml/data.js

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

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/triggerCacheComplete/handler/data.js

@@ -46,12 +46,11 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, upperCase(functionName), "source/"),
       functionName,
       queueName
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag)),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), 'source/'),
       saveFileName: `${upperCase(functionName)}_${upperCase(handlerType)}`,
       fileExtension: ".js",
       isAppend: true

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/triggerCacheComplete/mainFunction/data.js

@@ -49,7 +49,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
       flowTag: flowSchema.flowTag
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag)),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), 'source/'),
       saveFileName: `${upperCase(functionName)}_Main`,
       fileExtension: ".js",
       isAppend: true

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

@@ -96,7 +96,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       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
+      // passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)) // is Ok callingFlow
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)