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

package/package.json

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

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/handler/data.js

@@ -51,7 +51,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)}_${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/handler/data.js

@@ -51,7 +51,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)}_${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/handler/data.js

@@ -51,7 +51,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)}_${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