@izara_project/izara-market-library-service-schemas 1.0.26 → 1.0.28

package/index.js

@@ -23,5 +23,6 @@ module.exports = {
   generateCodeLibs: require('./src/GenerateCodeLibs'),
 
   generateSchemaWithTemplate: require('./src/TemplateManager/src/GenerateSchema').generateSchemaWithTemplate,
-  generateCodeWithTemplate: require('./src/reStructure/GenerateCode').generateCodeWithTemplate
+  generateCodeWithTemplate: require('./src/reStructure/GenerateCode').generateCodeWithTemplate,
+  generateSchema: require('./src/reStructure/GenerateSchema')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -20,14 +20,19 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@izara_project/izara-core-library-core": "^1.0.16",
+    "@izara_project/izara-core-library-core": "^1.0.18",
     "@izara_project/izara-core-library-external-request": "^1.0.17",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.44",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.48",
     "@izara_project/izara-shared": "^1.0.125",
+    "@izara_project/izara-shared-service-schemas": "^1.0.5",
+    "@izara_project/izara-core-library-sns": "^1.0.3",
+    "@izara_project/izara-core-library-sqs": "^1.0.3",
+    "@izara_project/izara-core-library-calling-flow": "^1.0.2",
+    "@izara_project/izara-core-library-logger": "^1.0.6",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.4",
     "lodash": "^4.17.21",
     "object-hash": "^3.0.0",
-    "yaml": "^2.7.0"
+    "yaml": "^2.7.1"
   }
 }

package/src/GenerateCodeLibs/src/Consts.js

@@ -24,7 +24,8 @@ const PREFIX = {
   createRel: "createRelationshipEndpoint",
   deleteRel: "deleteRelationshipEndpoint",
   updateNode: "updateNodeEndpoint",
-  createNode: "createNodeEndpoint"
+  createNode: "createNodeEndpoint",
+  getRel: "getRelationshipEndpoint"
 }
 
 const TOPIC_NAME_GRAPH_HANDLER = {
@@ -39,16 +40,18 @@ const TOPIC_NAME_GRAPH_HANDLER = {
   inCreateNode: "InCreateNodeV2",
   outCreateNode: "OutCreateNodeV2",
   inDeleteNode: "InDeleteNodeV2",
-  outDeleteNode: "OutDeleteNodeV2"
+  outDeleteNode: "OutDeleteNodeV2",
 }
 
 const TOPIC_NAME_GENERATE_CODE = {
   updateRelComplete: "UpdateRelationshipComplete",
   createRelComplete: "CreateRelationshipComplete",
   deleteRelComplete: "DeleteRelationshipComplete",
+  getRelComplete: "GetRelationshipComplete",
   outUpdateRelComplete: "OutUpdateRelationshipComplete",
   outCreateRelComplete: "OutCreateRelationshipComplete",
   outDeleteRelComplete: "OutDeleteRelationshipComplete",
+  outGetRelComplete: "OutGetRelationshipComplete",
   updateNodeComplete: "UpdateNodeComplete",
   outUpdateNodeComplete: "OutUpdateNodeComplete",
   createNodeComplete: "CreateObjectComplete",

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -20,10 +20,10 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 const lodash = require('lodash');
 const hash = require("object-hash")
 
-const sqsSharedLib = require('@izara_project/izara-shared/src/SqsSharedLib');
-const snsSharedLib = require('@izara_project/izara-shared/src/SnsSharedLib');
-const inMemoryCacheLib = require('@izara_project/izara-shared/src/InMemoryCacheLib');
-const callingFlowSharedLib = require('@izara_project/izara-shared/src/CallingFlowSharedLib');
+const snsSharedLib = require('@izara_project/izara-core-library-sns');
+const sqsSharedLib = require('@izara_project/izara-core-library-sqs');
+const inMemoryCacheLib = require('@izara_project/izara-core-library-core').inMemoryCacheLib;
+const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 
 const sns = require('@izara_project/izara-core-library-external-request/src/resources/Sns');
 const sqs = require('@izara_project/izara-core-library-external-request/src/resources/Sqs');
@@ -46,7 +46,7 @@ const {
 const Logger = require("@izara_project/izara-core-library-logger");
 
 const nodeLabelRegexPattern = "^[a-zA-Z0-9_-]+(?:\:[a-zA-Z0-9_-]+)?$"
-const { validateObjType } = require('@izara_project/izara-core-library-service-schemas').validateObjType;
+const { validateObjType } = require('@izara_project/izara-shared-service-schemas').validateObjType;
 
 
 
@@ -564,7 +564,7 @@ async function generateDynamoDbIdentifiers(_izContext, objectSchema, reqIdentifi
  * @param {Object} objectSchema
  * @param {Object} reqIdentifiers       - input identifier from calling function
  */
-const generateDynamoDbIdentifiersWithCache = inMemoryCacheLib.inMemoryCacheLib(
+const generateDynamoDbIdentifiersWithCache = inMemoryCacheLib(
   generateDynamoDbIdentifiers, // fn
   { // setting
     max: 20, maxAge: 86400000, promise: true, profileName: 'generateDynamoDbIdentifiers',

package/src/MainLibs/src/Consts.js

@@ -244,7 +244,9 @@ const FUNCTION_NAME = {
   deleteNodeComplete: "deleteNodeComplete",
   createObjectS3: "createObjectS3",
   createObjectS3Complete: "webSocketTaskComplete",
-  processAfterUploadS3: "processAfterUploadS3"
+  processAfterUploadS3: "processAfterUploadS3",
+  getRel: "getRelationship",
+  getRelComplete: "getRelationshipComplete"
 };
 
 const SHORT_FUNCTION_NAME = {
@@ -266,6 +268,8 @@ const SHORT_FUNCTION_NAME = {
   deleteNode: "deleteNode",
   deleteNodeComplete: "deleteNodeComp",
   createObjectS3Complete: "webSocketTaskComp",
+  getRel: "getRel",
+  getRelComplete: "getRelComp"
 }
 
 const getGraphServiceNameFromAllRelSchema = async (_izContext, allRelSchemas) => {
@@ -367,6 +371,7 @@ const SOURCE_GENERATE_IAM_ROLE = {
   NodeCompleteRole: "NodeCom",
   RelationshipRole: "Relationship",
   RelationshipCompleteRole: "RelationshipCom",
+  FlowSchemaUploadS3Role: "FlowSchemaUploadS3"
 };
 
 const ADD_ON_DATA_STRUCTURE_TYPE = {
@@ -451,6 +456,42 @@ const PREFIX_RELATIONSHIP = {
   disabled: "disabled"
 }
 
+function checkDynamoTypeRelationship(relationship) {
+  let relaitonshipTag;
+  let links;
+  for (const [relTag, relProperties] of Object.entries(relationship)) {
+    relaitonshipTag = relTag
+    for (const [storageResourceTag, storageResource] of Object.entries(relProperties.storageResources)) {
+      if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+        for (const link of relProperties.links) {
+          if (link.storageResourceTags.includes(storageResourceTag)) {
+            links = relProperties.links
+          }
+        }
+      }
+    }
+  }
+  return [relaitonshipTag, links];
+}
+function createDynamoDbComponentByLinks(link, relationshipTag) {
+  let tableNameFrom = `${link.from.objType.serviceTag}_${link.from.objType.objectType}__${relationshipTag}__${link.to.objType.serviceTag}_${link.to.objType.objectType}`
+  let tableNameTo = `${link.to.objType.serviceTag}_${link.to.objType.objectType}__${relationshipTag}__${link.from.objType.serviceTag}_${link.from.objType.objectType}`
+
+  let identifiersConcatFrom = `${link.from.objType.serviceTag}_${link.from.objType.objectType}__identifiersConcat`
+  let identifiersConcatTo = `${link.to.objType.serviceTag}_${link.to.objType.objectType}__identifiersConcat`
+
+  let resourceNameFrom = `${upperCase(link.from.objType.objectType) + upperCase(link.to.objType.objectType)}Relationship`
+  let resourceNameTo = `${upperCase(link.to.objType.objectType) + upperCase(link.from.objType.objectType)}Relationship`
+  return {
+    tableNameFrom,
+    tableNameTo,
+    identifiersConcatFrom,
+    identifiersConcatTo,
+    resourceNameFrom,
+    resourceNameTo
+  }
+}
+
 module.exports = {
   ACTIONS,
   DEFAULT_HANDLER_PER_ACTION,
@@ -481,5 +522,7 @@ module.exports = {
   FIELD_NAME_TPYE,
   ADD_ON_DATA_STRUCTURE_TYPE,
   ATTRIBUTE_TAG,
-  PREFIX_RELATIONSHIP
+  PREFIX_RELATIONSHIP,
+  checkDynamoTypeRelationship,
+  createDynamoDbComponentByLinks
 }

package/src/TemplateManager/src/libs/Consts.js

@@ -23,7 +23,6 @@ const {
   STORAGE_TYPES
 } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 
-const { firstLetterUpperCase: upperCase } = require("../../../MainLibs/src/Utils")
 
 const { getGraphServiceNameFromGraphServerTagWithCache, getGraphServiceTagWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig');
 

package/src/reStructure/GenerateCode.js

@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const { join, resolve } = require("path");
 const { readFileSync } = require("fs");
 
+const { validatePathWithRootServicePath } = require("./libs/GenerateCodeLibs")
+
 const templateConfig = require("./TemplateConfig");
 
 // SourceManager
@@ -39,6 +41,9 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     // point to app/src
     let saveFilePath = join(objSchemaPath, `../`);
 
+    // point to root folder of service
+    let localServicePath = join(saveFilePath, "../../");
+
     // // define path for store yml file
     const GENERATE_CODE_SOURCE_PATH = {
       appYaml: join(saveFilePath, SOURCE_PATH.appYaml),
@@ -50,7 +55,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       generateCodeLib: join(saveFilePath, SOURCE_PATH.generateCodeLib),
     };
 
-
     //------ Start Create Source ------
 
     // collect all result of template data for execute createSource
@@ -105,9 +109,13 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       }
     }
 
+    // validate path before empty folder
+    for (let folderPathToEmpty of Object.values(GENERATE_CODE_SOURCE_PATH)) {
+      validatePathWithRootServicePath(localServicePath, folderPathToEmpty)
+    }
 
-    for (let folderPathToEmpty of Object.keys(GENERATE_CODE_SOURCE_PATH)) {
-      await deleteFileInDir(GENERATE_CODE_SOURCE_PATH[folderPathToEmpty]);
+    for (let folderPathToEmpty of Object.values(GENERATE_CODE_SOURCE_PATH)) {
+      await deleteFileInDir(folderPathToEmpty);
     }
 
 
@@ -139,4 +147,15 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
 module.exports = {
   generateCodeWithTemplate
-}
+}
+
+
+/*
+  GenerateCode will iterate through templateConfig and generate each template dependOn each templateAndData\
+
+  GenerateSchema now use for generate attribute tree only
+  generateSchema can be modify use used depend on use case eg: some objectType have attribute tree inside addOn
+    when generateSchema in own service need to generate ref objectRelationship only
+    and attribute tree service can generate schema
+
+*/

package/src/reStructure/GenerateSchema.js

@@ -0,0 +1,153 @@
+/*
+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';
+
+const { join, resolve } = require("path");
+const { readFileSync } = require("fs");
+
+const schemaConfig = require("./SchemaConfig");
+
+// SourceManager
+const { deleteFileInDir, createHookFunction } = require("../SourceManager/src/Utils");
+const { createSource } = require("../SourceManager/src/CreateSource");
+
+const { SOURCE_PATH } = require('../TemplateManager/src/libs/Consts');
+
+const { validatePathWithRootServicePath } = require("./libs/GenerateCodeLibs");
+
+
+
+async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings) {
+  try {
+    console.log('objSchemaPath', objSchemaPath);
+    // ---------  Prepare path  -------------
+    // point to app/src
+    let saveFilePath = join(objSchemaPath, `../`);
+    console.log("saveFilePath: ", saveFilePath);
+
+    // point to root folder of service
+    let localServicePath = join(saveFilePath, "../../");
+    console.log("localServicePath: ", localServicePath);
+
+
+    //------ Start Create Source ------
+
+    // collect all result of template data for execute createSource
+    let allCreateSource = [];
+    // collect all path that need to empty before createSource
+    let allEmptyPath = new Set();
+
+
+    // Validate that all generateNames in generateSettings are present in the schemaConfig
+    const generateNameSet = new Set(Object.keys(schemaConfig.TemplateAndData));
+
+    // Find any missing generateNames that are not in the schemaConfig
+    let missingGenerateName = generateSchemaSettings.
+      filter(({ generateName }) => !generateNameSet.has(generateName));
+
+    // If there are missing generateNames, throw an error with the list of missing names
+    if (missingGenerateName.length) {
+      throw Error(`Invalid generateName:[ ${missingGenerateName.map(({ generateName }) => generateName).join(", ")} ]`);
+    }
+
+
+    // start create generateSchema depend on
+    for (const generateSetting of generateSchemaSettings) {
+      console.log('Loading template:', generateSetting.generateName);
+      console.log('Setting data:', generateSetting);
+      console.log('schemaPath:', schemaConfig.TemplateAndData[generateSetting.generateName]);
+      console.log('schemaPath:', join(__dirname, schemaConfig.TemplateAndData[generateSetting.generateName]));
+
+      // get generateSchema template depend on generateName
+      let generateSchemaData = require(join(__dirname, schemaConfig.TemplateAndData[generateSetting.generateName]));
+      console.log("generateSchemaData: ", generateSchemaData);
+
+      let createSourceResult = await generateSchemaData(_izContext, objSchemaPath, generateSetting);
+
+      // Filter out empty or invalid objects before adding to allCreateSource
+      if (Array.isArray(createSourceResult)) {
+        const validResults = createSourceResult.filter(item =>
+          item && item.templatePath && item.templateData && item.setting
+        );
+        allCreateSource.push(...validResults);
+      }
+    }
+
+
+    // check each allCreateSource valid
+    for (let item of allCreateSource) {
+      // throw Error('Skipping invalid source item:', item);
+      if (!item || !item.templatePath || !item.templateData || !item.setting) {
+        console.log('throw Error Skipping invalid source item:', item);
+        throw Error('Skipping invalid source item:', item);
+      }
+
+      const { templatePath, templateData, setting, emptyPath: returnEmptyPath } = item;
+      setting.checkCreateSourcePass = true;
+
+      let [status, errors] = await createSource(
+        readFileSync(templatePath, 'utf8'),
+        templateData,
+        setting,
+      );
+
+      if (status === false) {
+        throw Error(errors);
+      }
+
+      allEmptyPath.add(setting.savePath);
+    }
+
+    // validate path before empty folder
+    for (let emptyPath of allEmptyPath) {
+      console.log("emptyPath: ", emptyPath);
+      validatePathWithRootServicePath(localServicePath, emptyPath)
+    }
+
+    for (let emptyPath of allEmptyPath) {
+      await deleteFileInDir(emptyPath);
+    }
+
+
+    // generate all source
+    for (let item of allCreateSource) {
+      // throw error if item is invalid
+      if (!item || !item.templatePath || !item.templateData || !item.setting) {
+        console.log('Throwing invalid source item:', item);
+        throw Error('Throwing invalid source item:', item);
+      }
+
+      const { templatePath, templateData, setting } = item;
+      setting.checkCreateSourcePass = false;
+
+      await createSource(
+        readFileSync(templatePath, 'utf8'),
+        templateData,
+        setting,
+      );
+    }
+
+    console.log('Generated all source files successfully');
+    return 'return values';
+  } catch (error) {
+    console.error('Error generating code:', error);
+    throw error;
+  }
+}
+
+module.exports = generateSchema

package/src/reStructure/SchemaConfig.js

@@ -0,0 +1,29 @@
+/*
+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';
+
+module.exports = {
+  TemplateAndData: {
+    // ** mock schema config **
+    mainAttributeTree: './TemplateData/attributeTreeSchema/generateTemplateData.js',
+    test: './TemplateData/testTemplate/data.js',
+  },
+  Plugin: {
+
+  }
+}

package/src/reStructure/TemplateConfig.js

@@ -1,3 +1,23 @@
+/*
+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';
+
+
 module.exports = {
   TemplateAndData: {
     // ** PerActionEndpoint **

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

@@ -0,0 +1,104 @@
+/*
+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 required modules
+console.log("generate main attri ");
+const { join } = require('path');
+
+
+const { data: mainAttributeData } = require('./mainAttributeTreeSchema/data');
+
+const serviceSchemaCore = require("@izara_project/izara-core-library-service-schemas");
+const getObjectSchema = serviceSchemaCore.getObjectSchema;
+
+const serviceSchemaShared = require('@izara_project/izara-shared-service-schemas');
+const { validateObjType } = serviceSchemaShared.validateObjType
+
+
+const modules = {
+  mainAttributeTreeSchema: require('./mainAttributeTreeSchema/data')
+}
+/**
+ * Generates code with templates for different actions
+ * @param {Object} _izContext - Context object
+ * @param {string} objSchemaPath - Path to the schema
+ * @returns {Array} Array of generated code parameters
+ */
+async function generateCodeWithTemplate(_izContext, objSchemaPath, settings) {
+  try {
+    let allCreateSource = [];
+    const srcPath = join(objSchemaPath, '../');
+
+    // {
+    //   generateName: "mainAttributeTree",
+    //   objType: {
+    //     serviceTag: "GenerateCodeTemplate",
+    //     objectType: "person"
+    //   },
+    //   attributeTag: "productAttribute"
+    // }
+
+    if (!settings || !settings.generateName || !settings.objType || !settings.attributeTag) {
+      validateObjType(settings.objType);
+      throw new Error("Invalid settings object. Must contain objType and attributeTag properties.");
+    }
+    // const allObjectSchema = await getObjectSchema.getObjSchemaS3WithoutHierarchy(_izContext, objSchemaPath)
+    //   .then(data => data.records);
+
+    // const objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, settings.objType)
+    // console.log("allObjectSchema: ", allObjectSchema);
+    // console.log("settings: ", settings);
+    /*
+      use settings to get main objType
+      then check if addOnDataStructure is exist
+      if exist, check if type is attributeTree and match with attributeTreeTag
+      if match, start generate schema of attributeTree
+    */
+
+    /*
+    {
+      objectSchema
+
+
+    }
+    */
+    if (settings.generateName === "mainAttributeTree") {
+      let objSchemaAttributeTree = await modules.mainAttributeTreeSchema(_izContext, settings, srcPath);
+      console.log("objSchemaAttributeTree: ", objSchemaAttributeTree);
+      allCreateSource.push(...objSchemaAttributeTree);
+
+    } else {
+      throw Error(`Generate attribute tree schema Invalid generateName:${settings.generateName} `);
+    }
+
+
+    // will receive objSchemaPath and prepare params for each data function
+    // then data function will return params for createSource
+
+    // (template, data, { savePath, hookPath, saveFileName, fileExtension, initialData, isAppend = false, checkCreateSourcePass = false })
+
+
+    return allCreateSource;
+  } catch (error) {
+    _izContext.logger.error('Error generating code with template perActionComplete:', error);
+    return [];
+  }
+}
+
+module.exports = generateCodeWithTemplate;

package/src/reStructure/TemplateData/attributeTreeSchema/mainAttributeTreeSchema/attributeLinkTemplate.ejs

@@ -0,0 +1,21 @@
+const izara = require("@izara_project/izara-middleware");
+let { pattern } = izara.validatorSchema.stringNotEmpty(); // should not be empty string
+
+module.exports = [
+  {
+    objectType: "<%- objectType %>",
+    overWriteHandlers: { // optional, if not set will create default handlers, if empty will not create handler and main function
+      //(<overWriteHandlers<%- objectType %>>)
+      //(</overWriteHandlers<%- objectType %>>)
+    },
+    overwriteGeneratedMainFunction: [
+    //(<overwriteGeneratedMainFunction<%- objectType %>>)
+    //(</overwriteGeneratedMainFunction<%- objectType %>>)
+    ],
+    canDelete: true,
+    storageResources: <%- storageResources %>,
+    fieldNames: <%- fieldNames %>,
+    compositeKeyDeliminator: "<%- compositeKeyDeliminator %>",
+    identifiers: <%- identifiers %>
+  }
+]