@izara_project/izara-market-library-service-schemas 1.0.82 → 1.0.83

package/package.json

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

package/src/reStructure/GenerateTests.js

@@ -49,9 +49,9 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
     // collect all result of template data for execute createSource
     let allCreateSource = []
 
-
+    // console.log({ intTestPath })
     // let generateTemplateData = (await import(join(__dirname, IntTestConfig.TemplateAndData[templateName]))).default;
-    let createSourceResult = await generateTest(_izContext, savePath);
+    let createSourceResult = await generateTest(_izContext, savePath, { serviceTag, s3Prefix: settings });
     // console.log({ createSourceResult })
     // Filter out empty or invalid objects before adding to allCreateSource
     if (Array.isArray(createSourceResult)) {
@@ -85,7 +85,7 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
       }
 
       // validatePathWithRootServicePath(localServicePath, setting.savePath)
-      await deleteFileInDir(setting.savePath);
+      // await deleteFileInDir(setting.savePath);
     }
 
     // generate all source
@@ -109,10 +109,12 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
     console.log('Generated all source files successfully');
 
     console.log("upload file to S3")
-    const intTestPath = join(saveFilePath, `../../src/generateIntegrationTest/${serviceTag}`)
-    console.log({ intTestPath })
 
-    await uploadLib(intTestPath, { s3Prefix: settings, serviceTag: serviceTag })
+
+    await uploadLib.uploadTos3(
+      join(saveFilePath, `../../src/generateIntegrationTest/${serviceTag}`), //intTest path
+      { s3Prefix: settings, serviceTag: serviceTag } // settings
+    )
 
 
     // exec(`bash ${ path.join(packagePath, "./frontEnd/NpmBash.bash") } `, (error, stdout, stderr) => {

package/src/reStructure/TemplateData/IntTest/generateResources/templateResources.ejs

@@ -1,31 +1,33 @@
 {
   "Lambda": {
-    <% Object.entries(functionComponent).forEach(([funcName, filePath], index, array) => { -%>
+    <% Object.entries(functionComponent).forEach(([funcName, filePath], index, array) => { %>
       "<%= funcName %>": {
         "localLocation": "/<%= filePath %>.js",
         "localHandler": "main",
         "functionName": "<%= funcName %>"
-      }<%= index !== array.length - 1 ? ',' : '' %>
-    <% }); -%>
-  }, <% Object.keys(s3Component).length ? "," : "" %>
-  <% if (Object.keys(s3Component).length) { -%>
+      }<%= index < array.length - 1 ? "," : "" %>
+    <% }) %>
+  }<%= Object.keys(s3Component).length || Object.keys(tableNames).length ? "," : "" %>
+
+  <% if (Object.keys(s3Component).length) { %>
   "S3": {
-    <% Object.entries(s3Component).forEach(([functionName,filePath],index) => { -%>
-      "<%- functionName %>": {
-        "localLocation": "/<%- filePath %>",
+    <% Object.entries(s3Component).forEach(([functionName, filePath], index, array) => { %>
+      "<%= functionName %>": {
+        "localLocation": "/<%= filePath %>",
         "localHandler": "main",
-        "functionName": "<%- functionName %>"
-      }<%= index < Object.keys(s3Component).length - 1 ? "," : "" %>
-      <% }); -%>
-  } <% Object.keys(tableNames).length ? "," : "" -%>
-    <% } -%>
-  <% if (Object.keys(tableNames).length) { -%>
+        "functionName": "<%= functionName %>"
+      }<%= index < array.length - 1 ? "," : "" %>
+    <% }) %>
+  }<%= Object.keys(tableNames).length ? "," : "" %>
+  <% } %>
+
+  <% if (Object.keys(tableNames).length) { %>
   "Dynamodb": {
-    <% tableNames.forEach(function(tableName, index) { %>
+    <% tableNames.forEach((tableName, index) => { %>
       "<%= tableName %>": {
         "tableName": "<%= tableName %>"
-      }<% if (index < tableNames.length - 1) { %>,<% } %>
-    <% }); %>
+      }<%= index < tableNames.length - 1 ? "," : "" %>
+    <% }) %>
   }
   <% } %>
 }

package/src/reStructure/TemplateData/IntTest/generateTests/generateTemplate.js

@@ -20,17 +20,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { join } from 'path';
 import generateEvent from './events/data.js'
 import generateTest from "./tests/data.js"
+import generatePathIntTest from './pathIntTest/data.js';
 // import generateBashScript from './bashScript/data.js'
 import libs from '../libs/libs.js'
-const { getIntTestConfig } = libs;
+const { getIntTestConfig, getLocalConfig } = libs;
 /**
  * Generates code with templates for different actions
  * @param {Object} _izContext - Context object
  * @param {string} savePath - Path to the schema
  * @returns {Array} Array of generated code parameters
  */
-async function generateCodeWithTemplate(_izContext, savePath) {
+async function generateCodeWithTemplate(_izContext, savePath, settings) {
   try {
+    console.log("settingsInGenerateCodeWithTemplate", settings)
+    let serviceTag = getLocalConfig("iz_serviceTag")
     // console.log({ savePath })
     // console.log("settings generateCodeWithTemplate", settings)
     let allCreateSource = [];
@@ -42,10 +45,12 @@ async function generateCodeWithTemplate(_izContext, savePath) {
     // console.log("event", JSON.stringify(event, null, 2))
     const test = await generateTest(_izContext, allIntTestConfig, savePath)
     // console.log("test", JSON.stringify(test, null, 2));
+    const intTestBucketPath = await generatePathIntTest(_izContext, savePath, { serviceTag, s3Prefix: settings.s3Prefix })
 
     allCreateSource.push(
       ...event,
-      ...test
+      ...test,
+      intTestBucketPath
     )
 
     // console.log("allCreateSource", allCreateSource)

package/src/reStructure/TemplateData/IntTest/generateTests/pathIntTest/data.js

@@ -0,0 +1,46 @@
+/*
+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';
+
+import path, { join } from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const templatePath = path.join(__dirname, "./template.ejs")
+import uploadIntTest from '../../upload/uploadIntTest.js';
+const { bucketPathForUpload } = uploadIntTest;
+
+async function data(_izContext, srcPath, settings) {
+  console.log("settingsInData", settings)
+  let pathIntTestInBuckets = await bucketPathForUpload(join(srcPath, `../../src/generateIntegrationTest/${settings.serviceTag}`), settings)
+  console.log({ pathIntTestInBuckets })
+
+  return {
+    templateData: { pathIntTestInBuckets },
+    templatePath: templatePath,
+    setting: {
+      generateHookFile: false,
+      savePath: path.join(srcPath, `./libs/`),
+      saveFileName: 'IntTestPath',
+      fileExtension: ".js",
+      isAppend: false
+    }
+  }
+}
+
+export default data

package/src/reStructure/TemplateData/IntTest/generateTests/pathIntTest/template.ejs

@@ -0,0 +1,5 @@
+let intTestPath = [
+<% pathIntTestInBuckets.forEach((item, index) => { %>
+  "<%- item.key %>"<%= index < pathIntTestInBuckets.length - 1 ? "," : "" -%>
+<% }) %>
+]

package/src/reStructure/TemplateData/IntTest/generateTests/tests/data.js

@@ -104,6 +104,9 @@ async function data(_izContext, allIntTestConfig, srcPath) {
             // baseIntTest.stage[currentStageIdx].initialStage = true;
             stages[currentStageIdx].initialStage = true;
             if (handler === HANDLER.hdrSqs) {
+              if (functionName.startsWith("Process")) {
+                functionName = functionName.split("Process")[1]
+              }
               // Object.assign(baseIntTest.stage[currentStageIdx], {
               Object.assign(stages[currentStageIdx], {
                 resourceName,

package/src/reStructure/TemplateData/IntTest/upload/uploadIntTest.js

@@ -25,12 +25,13 @@ import Logger from "@izara_project/izara-core-library-logger";
 
 const _izContext = { Logger }
 
-async function uploadFolder(folderPath, settings) {
-
+async function bucketPathForUpload(folderPath, settings) {
+  console.log({ folderPath, settings })
+  let dataToUploads = [];
   try {
 
     const files = getAllFiles(folderPath);
-    console.log({ files })
+    // console.log({ files })
     for (const filePath of files) {
       const fileContent = fs.readFileSync(filePath);
       const index = filePath.indexOf(settings.serviceTag);
@@ -43,19 +44,14 @@ async function uploadFolder(folderPath, settings) {
       }
 
       let s3Key = path.join('test_config', settings.s3Prefix, relativePath).split(path.sep).join('/');
-      const params = {
-        Bucket: 'integrationtest-config-us-east-2',
-        Key: s3Key,
-        Body: fileContent,
-        ContentType: 'application/json'
-      };
-
-      await s3.putObjectS3(_izContext, params)
 
+      dataToUploads.push({ key: s3Key, fileContent })
     }
 
+    return dataToUploads
+
   } catch (err) {
-    console.error("Upload Failed:", err);
+    console.error("prepare data to upload fail", err);
   }
 }
 
@@ -77,4 +73,20 @@ function getAllFiles(dirPath, filePaths) {
   return filePaths;
 }
 
-export default uploadFolder;
+async function uploadTos3(folderPath, settings) {
+  let uploadLists = [];
+  let datas = await bucketPathForUpload(folderPath, settings)
+  // console.log({ keys })
+  await Promise.all(datas.map(async (data) => {
+    uploadLists.push(s3.putObjectS3(_izContext, {
+      Bucket: 'integrationtest-config-us-east-2',
+      Key: data.key,
+      Body: data.fileContent,
+      ContentType: 'application/json'
+    }));
+  }))
+
+  await Promise.all(uploadLists);
+}
+
+export default { uploadTos3, bucketPathForUpload };

package/src/reStructure/TemplateData/flowSchema/register/complete/handler/template.ejs

@@ -17,12 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-import { middlewareHandler as middleware } from "@izara_project/izara-middleware";
+import { middlewareHandler } from "@izara_project/izara-middleware";
 import Logger from '@izara_project/izara-core-library-logger';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import { recordHandlerSharedLib } from "@izara_project/izara-core-library-record-handler";
 
-import <%- functionName %> from './<%- functionName %>_Main.js';
+import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Main.js';
 
 // validate event properties in body.Message of sqs event
 middlewareHandler.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/checkTriggerCacheComplete/mainFunction/template.ejs

@@ -38,7 +38,7 @@ import { triggeredCacheSharedLibV2 } from '@izara_project/izara-core-library-tri
  * @returns {object} description of return value
  */
 
-export default async function <%- functionName %> (
+export default async function <% - functionName %> (
   _izContext,
   identifiers,
   topicArn,
@@ -67,12 +67,10 @@ export default async function <%- functionName %> (
         flowTag: flowTag
       },
       ...identifiers,
-      //(<triggerCacheAdditionalParam>)
-      "",                                  // overwriteUniqueRequestId,
-      {},                                  // flowParams
-      true,                                // createIfNotExists
-      {},                                  // triggerFlowIdentifiers
-      //(</triggerCacheAdditionalParam>)
+      {
+        flowTag: <%- flowTag %>,
+        serviceTag: process.env.iz_serviceTag
+      }
     )
 
     _izContext.logger.debug("checkTriggerCache: ", checkTriggerCache)

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

@@ -57,9 +57,10 @@ async function data(_izContext, flowSchema, srcPath) {
 async function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = "ProcessTriggerCache" + upperCase(flowSchema.flowTag)
   // let functionName = createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig("iz_serviceTag"), flowTag: upperCase(flowSchema.flowTag) })
-  let handlerType = upperCase(HANDLER.hdrSqs)
+  let handlerType = upperCase(HANDLER.hdrDsq)
   let additionalResourcePermission = defaultIamRolePerAction();
   // let queueName = "ProcessTriggerCache" + upperCase(flowSchema.flowTag) + handlerType;
+
   let queueName = `${createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig("iz_serviceTag"), flowTag: upperCase(flowSchema.flowTag) })}_Main`
 
 

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

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 import path from 'path';
+import path from 'path';
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -47,7 +48,7 @@ function data(_izContext, flowSchema, srcPath) {
 function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = "ProcessTriggerCache" + upperCase(flowSchema.flowTag)
   // let functionName = createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig("iz_serviceTag"), flowTag: upperCase(flowSchema.flowTag) })
-  let handlerType = upperCase(HANDLER.hdrSqs)
+  let handlerType = upperCase(HANDLER.hdrDsq)
   let queueName = `${createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig("iz_serviceTag"), flowTag: upperCase(flowSchema.flowTag) })}_Main`
 
 

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

@@ -27,7 +27,7 @@ import <%- functionName %> from './<%- functionName %>_Main.js';
 // validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 let perRecordsValidatorSchema = {}
-module.exports.main = middleware.wrap(async (event, context, callback) => {
+export const main = middleware.wrap(async (event, context, callback) => {
 
   try {
 

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

@@ -20,12 +20,11 @@ along with this program. If not, see
 
 import { NoRetryError } from '@izara_project/izara-core-library-core';
 import { consts } from "@izara_project/izara-middleware"
-import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas/src/GetObjectSchema';
-import { utils } from "@izara_project/izara-core-library-service-schemas"
+import { getObjectSchema, utils } from '@izara_project/izara-core-library-service-schemas';
 const { createFlowTypeConcat } = utils;
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 
-import { postToConnection } from "../../../libs/source/GenerateCodeLibs";
+import { postToConnection } from "../../../libs/source/GenerateCodeLibs.js";
 
 //(<optionalRequire>)
 //(</optionalRequire>)

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

@@ -26,25 +26,29 @@ import asyncFlowSharedLib from "@izara_project/izara-core-library-asynchronous-f
 
 import { sns } from "@izara_project/izara-core-library-external-request";
 
-import { getObjectSchema, utils, serviceConfig, consts, relSchemaLib as findLinksByObjTypes } from '@izara_project/izara-core-library-service-schemas'
+import {
+  getObjectSchema,
+  utils,
+  serviceConfig,
+  consts,
+  relSchemaLib
+} from '@izara_project/izara-core-library-service-schemas';
 
-const {
-  getRelationshipSchemaWithCache,
-  getObjSchemaS3WithHierarchy
-} = getObjectSchema
+const { getRelationshipSchemaWithCache, getObjSchemaS3WithHierarchy } = getObjectSchema;
 
-const {
-  createLinkTypeId
-} = utils;
+const { createLinkTypeId } = utils;
 
-const {
-  getGraphServiceTagWithCache
-} = serviceConfig;
+const { getGraphServiceTagWithCache } = serviceConfig;
+
+const { findLinksByObjTypes } = relSchemaLib;
 
 import { constsGenerateCodeLibs } from '@izara_project/izara-market-library-service-schemas';
-const { PREFIX,
+const {
+  PREFIX,
   TOPIC_NAME_GENERATE_CODE,
-  TOPIC_NAME_GRAPH_HANDLER } = constsGenerateCodeLibs;
+  TOPIC_NAME_GRAPH_HANDLER
+} = constsGenerateCodeLibs;
+
 import { const as coreConsts } from '@izara_project/izara-core-library-core';
 
 //(<optionalRequire>)

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

@@ -130,7 +130,7 @@ export default async function createRelationship(
     const relationshipSchema = await getRelationshipSchemaWithCache(_izContext, relType);
     _izContext.logger.debug("relationshipSchema: ", relationshipSchema);
 
-    const links = await findLinksByObjTypes.findLinksByObjTypes(_izContext, [firstObject.objType, secondObject.objType], relationshipSchema.links)
+    const links = await findLinksByObjTypes(_izContext, [firstObject.objType, secondObject.objType], relationshipSchema.links)
     _izContext.logger.debug("links", links)
     if (!links.length) {
       errorsFound.push(`not found link between ${JSON.stringify({ firstObject: firstObject.objType })} ${JSON.stringify({ secondObject: secondObject.objType })}`)