@izara_project/izara-market-library-service-schemas 1.0.78 → 1.0.79

package/index.js

@@ -28,6 +28,11 @@ import mainLibUtils from './src/MainLibs/src/Utils.js';
 import sourceManagerUtils from './src/SourceManager/src/Utils.js'
 import createSource from './src/SourceManager/src/CreateSource.js'
 
+import generateCode from './src/reStructure/GenerateCode.js';
+import generateSchema from './src/reStructure/GenerateSchema.js';
+import generateIntTest from './src/reStructure/GenerateTests.js';
+import generateResourceIntTest from './src/reStructure/GenerateResources.js';
+
 export {
   // generatedCode Libs
   constsGenerateCodeLibs, //generateCode Consts
@@ -44,4 +49,9 @@ export {
   // Libs
   checkPermission,
 
+  // main generateCode
+  generateCode,
+  generateSchema,
+  generateIntTest,
+  generateResourceIntTest
 };

package/package.json

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

package/src/reStructure/GenerateTests.js

@@ -111,7 +111,9 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
     const intTestPath = join(saveFilePath, `../../src/generateIntegrationTest/${getLocalConfig("iz_serviceTag")}`)
     console.log({ intTestPath })
 
-    uploadLib(intTestPath, settings)
+    // uploadLib(intTestPath, settings)
+
+
     // exec(`bash ${ path.join(packagePath, "./frontEnd/NpmBash.bash") } `, (error, stdout, stderr) => {
     //   if (error) {
     //     console.error(`

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

@@ -53,7 +53,8 @@ const {
   TOPIC_NAME_GRAPH_HANDLER
 } = constsGenerateCodeLibs;
 
-const { dynamoDbIdentifiersByStorageResource } = generateCodeLibs
+const { dynamoDbIdentifiersByStorageResource, createDataDetailsLib } = generateCodeLibs
+
 //(<optionalRequire>)
 //(</optionalRequire>)
 

package/src/reStructure/TemplateData/IntTest/generateResources/generateResources.js

@@ -61,16 +61,24 @@ async function generateCodeWithTemplate(_izContext, savePath) {
       }
     }
 
-    let functionComponent = {}
     const generateFunctionComponent = directoryPath(slsYmlPath);
     const mainFunctionComponent = directoryPath(functionPath);
     // console.log({ mainFunctionComponent, generateFunctionComponent })
-    Object.assign(functionComponent, generateFunctionComponent, mainFunctionComponent)
+    let lambdaComponent = { ...generateFunctionComponent, ...mainFunctionComponent }
+    let s3Component = {}
+    for (const lambdaFunctionName in lambdaComponent) {
+      if (lambdaFunctionName.endsWith("S3")) {
+        s3Component[lambdaFunctionName] = lambdaComponent[lambdaFunctionName]
+        delete lambdaComponent[lambdaFunctionName]
+      }
+    }
+    console.log(s3Component)
+
 
     allCreateSource.push(
       {
         templatePath: templatePath,
-        templateData: { tableNames, functionComponent },
+        templateData: { tableNames, functionComponent: lambdaComponent, s3Component },
         setting: {
           generateHookFile: false,
           savePath: path.join(savePath, `${serviceTag}/sharedResources/`),

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

@@ -7,7 +7,19 @@
         "functionName": "<%= funcName %>"
       }<%= index !== array.length - 1 ? ',' : '' %>
     <% }); -%>
-  },
+  }, <% Object.keys(s3Component).length ? "," : "" %>
+  <% if (Object.keys(s3Component).length) { -%>
+  "S3": {
+    <% Object.entries(s3Component).forEach(([functionName,filePath],index) => { -%>
+      "<%- functionName %>": {
+        "localLocation": "/<%- filePath %>",
+        "localHandler": "main",
+        "functionName": "<%- functionName %>"
+      }<%= index < Object.keys(s3Component).length - 1 ? "," : "" %>
+      <% }); -%>
+  } <% Object.keys(tableNames).length ? "," : "" -%>
+    <% } -%>
+  <% if (Object.keys(tableNames).length) { -%>
   "Dynamodb": {
     <% tableNames.forEach(function(tableName, index) { %>
       "<%= tableName %>": {
@@ -15,4 +27,5 @@
       }<% if (index < tableNames.length - 1) { %>,<% } %>
     <% }); %>
   }
+  <% } %>
 }

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

@@ -30,7 +30,6 @@ const {
   setEventInvoke,
   setEventDynamo,
   getHandlerFromEventTag,
-  getIntTestConfig
 } = libs;
 
 
@@ -74,6 +73,14 @@ async function data(_izContext, allIntTestConfig, srcPath) {
           }
         }
 
+        if (getHandlerFromEventTag(testTag) === "S3") {
+          if (config.hasOwnProperty("s3Config") && Object.keys(config.s3Config).length > 0) {
+            Object.assign(inputConfig, {
+              uploadS3: true,
+              uploadS3Setting: config.s3Config
+            })
+          }
+        }
         createEventSources.push({
           templatePath: templatePath,
           templateData: {
@@ -96,7 +103,7 @@ async function data(_izContext, allIntTestConfig, srcPath) {
     }
 
   }
-  
+
   return createEventSources
 }
 

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

@@ -64,6 +64,8 @@ async function data(_izContext, allIntTestConfig, srcPath) {
           }
         };
 
+        console.log({ testConfig });
+
         for (let idx = 0; idx < testConfig.testStages.length; idx++) {
           const stage = testConfig.testStages[idx];
 
@@ -76,6 +78,7 @@ async function data(_izContext, allIntTestConfig, srcPath) {
           if (handler === "S3") {
             resourceType = "S3"
           }
+
           // baseIntTest.stage.push({
           stages.push({
             inputEventTag,
@@ -85,6 +88,15 @@ async function data(_izContext, allIntTestConfig, srcPath) {
             resourceType: resourceType
           });
 
+          if (testConfig.hasOwnProperty("s3Config") && Object.keys(testConfig.s3Config).length > 0) {
+            if (testConfig.s3Config.hasOwnProperty("destinationBucket") && testConfig.s3Config.hasOwnProperty("temporaryBucket")) {
+              Object.assign(stages[idx], {
+                destinationBucket: testConfig.s3Config.destinationBucket,
+                temporaryBucket: testConfig.s3Config.temporaryBucket
+              })
+            }
+          }
+
           // const currentStageIdx = baseIntTest.stage.length - 1;
           const currentStageIdx = stages.length - 1;
 

package/src/reStructure/TemplateData/IntTest/libs/libs.js

@@ -104,8 +104,9 @@ function setEvent(input, settings = {}) {
   const forStageMatchs = settings?.forStageMatchs || [];
   const testValueMatches = settings?.testValueMatches || [];
   const isEqual = settings?.isEqual || [];
+
   if (Array.isArray(input)) {
-    return { eventValue: input };
+    return { eventValue: input }
   }
 
   if (input === undefined) {
@@ -128,14 +129,13 @@ function setEvent(input, settings = {}) {
       if (forStageMatchs.includes(key)) {
         field.forStageMatching = true;
       }
+
       if (testValueMatches.includes(key)) {
         field.testValueMatches = false;
       }
 
-      if (Array.isArray(key)) {
-        if (isEqual.includes(key)) {
-          field.isEqual = true
-        }
+      if (isEqual.includes(key)) {
+        field.isEqual = true;
       }
 
       if (typeof transformatValue === "object" && !Array.isArray(transformatValue)) {

package/src/reStructure/TemplateData/findData/handler/template.ejs

@@ -21,7 +21,7 @@ import { middlewareHandler as middleware, validatorSchema } from "@izara_project
 import { recordHandlerSharedLib } from "@izara_project/izara-core-library-record-handler";
 import Logger from '@izara_project/izara-core-library-logger';
 
-import findData from './FindData_Main';
+import findData from './FindData_Main.js';
 
 // validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());

package/src/reStructure/TemplateData/resourceYaml/filterGenerateResource/data.js

@@ -22,8 +22,8 @@ import path from 'path';
 import { consts, utils } from '../../../../MainLibs/index.js';
 const { STORAGE_TYPES } = consts;
 const { firstLetterUpperCase: upperCase, getLocalConfig } = utils;
-const { getObjectSchema } = require('@izara_project/izara-core-library-service-schemas');
-const { NoRetryError } = require("@izara_project/izara-core-library-core");
+import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import { NoRetryError } from "@izara_project/izara-core-library-core";
 
 async function filterCreateResourceYaml(_izContext, createSourceParams, objSchemaPath) {
   try {

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

@@ -1,45 +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';
-
-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, "./templateEvents.ejs")
-import libs from '../../libs/libs.js';
-const {
-  setEvent,
-  createEventCaseByHandler,
-  getLocalConfig,
-  setEventInvoke,
-  setEventDynamo,
-  getHandlerFromEventTag,
-  getIntTestConfig
-} = libs;
-
-
-async function data(_izContext, allIntTestConfig, srcPath) {
-  let createEventSources = [];
-  let serviceTag = getLocalConfig("iz_serviceTag")
-
-
-  return createEventSources
-}
-
-export default data