@izara_project/izara-market-library-service-schemas 1.0.34 → 1.0.36

package/src/reStructure/TemplateData/relationshipPerAction/update/complete/mainFunction/template.ejs

@@ -35,7 +35,8 @@ const {
   TOPIC_NAME_GRAPH_HANDLER,
   TOPIC_NAME_GENERATE_CODE
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
-
+//(<optionalRequire>)
+//(</optionalRequire>)
 module.exports.updateRelationshipComplete = async (
   _izContext,
   returnValue,

package/src/reStructure/TemplateData/resourceYaml/dynamodb/template.ejs

@@ -2,6 +2,7 @@
     Type: "AWS::DynamoDB::Table"
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}<%- tableName %>
+      BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
       <%_ attributes.forEach(attribute => { -%>
       - AttributeName: <%- attribute['AttributeName'] %>
@@ -18,9 +19,6 @@
         KeyType: RANGE
         <%_ } -%>
       <%_ }) _%>
-      ProvisionedThroughput:
-        ReadCapacityUnits: 1
-        WriteCapacityUnits: 1
         #<#<%- firstLetterUpperCase(tableName) %>DynamoDbSetting#>
         #<#/<%- firstLetterUpperCase(tableName) %>DynamoDbSetting#>
 <%_ function firstLetterUpperCase(text){

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

@@ -0,0 +1,61 @@
+/*
+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 path = require("path")
+
+
+// const {
+//   HANDLER,
+// STORAGE_TYPES
+// } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
+
+const STORAGE_TYPES = {
+  dynamoDB: "dynamoDB",
+  graph: "graph"
+}
+const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../../../MainLibs/src/Consts')
+const { firstUpperCase: upperCase } = require('../../../../MainLibs/src/Utils')
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
+const { NoRetryError } = require("@izara_project/izara-core-library-core");
+
+async function filterCreateResourceYaml(_izContext, createSourceParams, objSchemaPath) {
+  let tableNamesToFilter = new Set();
+  const allLocalFlowSchema = await getObjectSchema.getAllLocalFlowSchemas(_izContext, objSchemaPath);
+  for (const flowSchema of allLocalFlowSchema.records) {
+    if (flowSchema.statusType === "storedCache") {
+      const objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], objSchemaPath).then(res => res.records[0])
+      if (objectSchema) {
+        for (const storageResource of Object.values(objectSchema.storageResources)) {
+          tableNamesToFilter.add(storageResource.tableName);
+        }
+      } else {
+        throw new NoRetryError('not have objectSchema in service to get')
+      }
+    }
+  }
+
+  const filteredCreateSourceParams = createSourceParams.filter(
+    (result) => !tableNamesToFilter.has(result.templateData.tableName)
+  )
+
+  // console.log("filteredCreateSourceParams", filteredCreateSourceParams)
+  return filteredCreateSourceParams
+}
+
+module.exports = filterCreateResourceYaml;

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

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const { join } = require('path');
 
 // lib of generateCode
-const { checkValidTableYaml } = require('../../../MainLibs/index.js').generateCodeUtils;
+const { checkValidTableYaml } = require('../../../MainLibs/src/GenerateCodeUtils.js');
 
 const {
   getAllLocalObjectSchemasWithHierarchy,
@@ -37,6 +37,8 @@ const createDefaultSnsOutForFindDataAndProcessLogical = require('./sns-out/defau
 const createDataForCreateSourceSnsOut = require('./sns-out/data');
 const createFindDataAndProcessLogicalDefaultSnsInSqs = require('./sns-in-sqs/defaultSnsInSqsForFindDataAndProcessLogical');
 const createDynamoPerRelationshipLink = require('./dynamodb/generateDynamoPerLink.js')
+const filterCreateResourceYaml = require('./filterGenerateResource/data.js');
+
 /**
  * Generates code from templates based on object schemas
  * @param {Object} _izContext - Context object
@@ -48,7 +50,8 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     const saveFilePath = join(objSchemaPath, '../');
     const allObjSchemas = await getAllLocalObjectSchemasWithHierarchy(_izContext, objSchemaPath);
     const allLocalRelationshipSchema = getAllLocalRelationshipSchema(_izContext, objSchemaPath);
-    console.log("allLocalRelationship", allLocalRelationshipSchema)
+    const allLocalFlowSchema = await getAllLocalFlowSchemas(_izContext, objSchemaPath);
+
     let createSourceParams = [];
     let createdTableYaml = {}; // Declare createdTableYaml
 
@@ -56,9 +59,12 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     if (allObjSchemas && allObjSchemas.records) {
       for (const objectSchema of allObjSchemas.records) {
         try {
+
+          let createSourceDynamoDb = createSourceDataDynamoDB(_izContext, objectSchema, saveFilePath)
+
           const [dynamoResources, updatedTableYaml] = checkValidTableYaml(
             _izContext,
-            createSourceDataDynamoDB(_izContext, objectSchema, saveFilePath),
+            createSourceDynamoDb,
             createdTableYaml
           );
 
@@ -91,8 +97,11 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         ...dynamoDbResourcePerRelationshipLink
       )
     }
+    const filteredCreateSourceParams = await filterCreateResourceYaml(_izContext, createSourceParams, objSchemaPath);
+
+    // console.log("filteredCreateSourceParams", filteredCreateSourceParams);
 
-    return createSourceParams;
+    return filteredCreateSourceParams;
   } catch (error) {
     _izContext.logger.error('Error generating code with template resourceYaml: ', error);
     return [];

package/src/reStructure/libs/ValidateAddOnDataStructure.js

@@ -0,0 +1,62 @@
+/*
+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 Consts = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts')
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
+const { ADD_ON_DATA_STRUCTURE_TYPE } = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts');
+
+async function validateAddOnDataStructure(
+  _izContext,
+  settings
+) {
+
+  let errorFounds = [];
+  let returnObjectValue = {}
+
+  const objTypeString = objType => `{ serviceTag: ${objType.serviceTag}, objectType: ${objType.objectType} }`;
+
+  const objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, settings.objType);
+
+  if (!objectSchema) {
+    errorFounds.push(`Invalid objType:${objTypeString(settings.objType)}, cannot generate attribute tree schema cause objectSchema is not exists`)
+  };
+
+  if (!objectSchema.hasOwnProperty("addOnDataStructure") || !Array.isArray(objectSchema.addOnDataStructure) || !objectSchema.addOnDataStructure.length) {
+    errorFounds.push(`objType: ${objTypeString(settings.objType)}.cause addOnDataStructure is not exists or empty`)
+  };
+
+
+  if (settings.hasOwnProperty("attributeTag")) {
+    let addOnAttributeTree = objectSchema.addOnDataStructure.find(addOn => {
+      return addOn.type === ADD_ON_DATA_STRUCTURE_TYPE.attributeTree && addOn.attributeTreeTag === settings.attributeTag;
+    });
+    Object.assign(returnObjectValue, {
+      addOnAttributeTree: addOnAttributeTree,
+    });
+    if (!addOnAttributeTree) {
+      errorFounds.push(`objType: ${objTypeString(settings.objType)}. cannot generate attribute tree schema cause not found addOnDataStructure with attributeTreeTag: ${settings.attributeTag}`)
+    }
+  };
+
+  Object.assign(returnObjectValue, {
+    objectSchema: objectSchema
+  });
+
+  return [returnObjectValue, errorFounds];
+}
+module.exports = validateAddOnDataStructure

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

@@ -1,104 +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 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/data.js

@@ -1,188 +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';
-
-console.log("data main attribute tree schema");
-
-const path = require('path');
-const fs = require('fs');
-
-const serviceSchemaCore = require("@izara_project/izara-core-library-service-schemas");
-const getObjectSchema = serviceSchemaCore.getObjectSchema;
-
-
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils");
-const { SOURCE_PATH, ADD_ON_DATA_STRUCTURE_TYPE, ATTRIBUTE_TAG, fieldNameSetting, FIELD_NAME_TPYE, SAVE_FILE_NAME } = require('../../../../MainLibs/src/Consts');
-
-const templatePath = path.join(__dirname, "./attributeLinkTemplate.ejs");
-
-
-
-async function data(_izContext, settings, srcPath) {
-  const objTypeString = objType => `{ serviceTag: ${objType.serviceTag}, objectType: ${objType.objectType} }`;
-
-  const objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, settings.objType);
-
-  /*
-    validate settings with objectSchema
-  */
-
-  if (!objectSchema) {
-    throw Error(`Invalid objType:${objTypeString(settings.objType)}, cannot generate attribute tree schema cause objectSchema is not exists`);
-  }
-
-  if (!objectSchema.hasOwnProperty("addOnDataStructure") || !Array.isArray(objectSchema.addOnDataStructure) || !objectSchema.addOnDataStructure.length) {
-    throw Error(`objType: ${objTypeString(settings.objType)}. cannot generate attribute tree schema cause addOnDataStructure is not exists or empty`);
-  }
-
-  if (!objectSchema.hasOwnProperty("addOnDataStructure")) {
-    throw Error("Invalid objectSchema does not have addOnDataStructure");
-  }
-  // {
-  //   generateName: "mainAttributeTree",
-  //   objType: {
-  //     serviceTag: "GenerateCodeTemplate",
-  //     objectType: "person"
-  //   },
-  //   attributeTag: "productAttribute"
-  // }
-
-  let addOnAttributeTree = objectSchema.addOnDataStructure.find(addOn => {
-    return addOn.type === ADD_ON_DATA_STRUCTURE_TYPE.attributeTree && addOn.attributeTreeTag === settings.attributeTag;
-  })
-
-
-  if (!addOnAttributeTree) {
-    throw Error(`objType: ${objTypeString(settings.objType)}. cannot generate attribute tree schema cause not found addOnDataStructure with attributeTreeTag: ${settings.attributeTag}`);
-  }
-
-  // TODO: use addOnAttributeTree to generate attribute tree schema
-  // if addOnAttributeTree.havePropertyNode === true will generate property node schema
-
-
-  // console.log("objectSchema", objectSchema)
-  // console.log("srcPath", objectSchema)
-  // const createSources = [];
-  // let attributeTreeObjSchemas = [];
-  // if (objectSchema.hasOwnProperty("addOnDataStructure")) {
-
-  //   for (const versionedData of objectSchema.addOnDataStructure) {
-  //     if (versionedData.type === ADD_ON_DATA_STRUCTURE_TYPE.attributeTree) {
-  //       const attributeTreeSubject = objectSchema.objectType; // main objectType
-  //       const storageResources = objectSchema.storageResources // storageResource from main objectType
-  //       const storageResourceTags = Object.keys(storageResources) // storage ResourceTag from main objectType
-
-
-  //       attributeTreeObjSchemas.push(
-  //         {
-  //           objectType: attributeTreeSubject + ATTRIBUTE_TAG.attributeTagLabel,
-  //           storageResources: storageResources,
-  //           fieldNames: {
-  //             labelId: fieldNameSetting(FIELD_NAME_TPYE.identifiers)
-  //           },
-  //           identifiers: [
-  //             {
-  //               type: "identifier",
-  //               fieldName: "labelId"
-  //             }
-  //           ]
-  //         },
-  //         {
-  //           objectType: attributeTreeSubject + ATTRIBUTE_TAG.attributeTagLink,
-  //           storageResources: storageResources,
-  //           fieldNames: {
-  //             [attributeTreeSubject + ATTRIBUTE_TAG.attributeTagLink + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.identifiers),
-  //             [attributeTreeSubject + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.requiredOnCreateFieldName),
-  //             topLevelParentIdentifierProperties: fieldNameSetting(FIELD_NAME_TPYE.requiredOnCreateFieldName),
-  //             parentNodeIdentifierLabel: fieldNameSetting(FIELD_NAME_TPYE.requiredOnCreateFieldName),
-  //             parentNodeIdentifierProperties: fieldNameSetting(FIELD_NAME_TPYE.requiredOnCreateFieldName),
-  //           },
-  //           identifiers: [
-  //             {
-  //               type: "identifier",
-  //               fieldName: `${attributeTreeSubject + ATTRIBUTE_TAG.attributeTagLink}Id`
-  //             }
-  //           ]
-  //         },
-  //         {
-  //           objectType: attributeTreeSubject + ATTRIBUTE_TAG.attributeTagProperty,
-  //           storageResources: storageResources,
-  //           fieldNames: {
-  //             propertyId: fieldNameSetting(FIELD_NAME_TPYE.identifiers),
-  //             propertyLabelId: fieldNameSetting(FIELD_NAME_TPYE.optionalOnCreate)
-  //           },
-  //           identifiers: [
-  //             {
-  //               type: "identifier",
-  //               fieldName: "propertyId"
-  //             }
-  //           ]
-  //         },
-  //         {
-  //           objectType: attributeTreeSubject + ATTRIBUTE_TAG.attributeTagPropertyLabel,
-  //           storageResources: storageResources,
-  //           fieldNames: {
-  //             propertyLabelId: fieldNameSetting(FIELD_NAME_TPYE.identifiers)
-  //           },
-  //           identifiers: [
-  //             {
-  //               type: "identifier",
-  //               fieldName: "propertyLabelId"
-  //             }
-  //           ]
-  //         }
-  //       )
-
-
-  //       for (let attributeTreeObjSchema of attributeTreeObjSchemas) {
-  //         for (let attributeTreeFieldName of Object.values(attributeTreeObjSchema.fieldNames)) {
-  //           Object.assign(attributeTreeFieldName, { storageResourceTags: storageResourceTags }) // add storageResourceTags for each fieldName
-  //         }
-  //       }
-  //     }
-
-  //   }
-
-
-
-  //   // console.log("attributeTreeObjSchemas", attributeTreeObjSchemas)
-  //   for (const attributeTreeObjSchema of attributeTreeObjSchemas) {
-  //     createSources.push({
-  //       templatePath: templatePath,
-  //       templateData: {
-  //         fieldNames: JSON.stringify(attributeTreeObjSchema.fieldNames, null, 2),
-  //         identifiers: JSON.stringify(attributeTreeObjSchema.identifiers, null, 2),
-  //         objectType: attributeTreeObjSchema.objectType,
-  //         storageResources: JSON.stringify(attributeTreeObjSchema.storageResources, null, 2),
-  //         compositeKeyDeliminator: attributeTreeObjSchema.compositeKeyDeliminator
-  //       },
-  //       setting: {
-  //         savePath: path.join(srcPath, SOURCE_PATH.generatedAttributeTree, attributeTreeObjSchema.objectType + "/"),
-  //         hookPath: path.join(srcPath, "schemaHook", attributeTreeObjSchema.objectType, "/"),
-  //         saveFileName: SAVE_FILE_NAME.attributeTreeObjectSchema,
-  //         fileExtension: ".js",
-  //         isAppend: false
-  //       }
-  //     })
-  //   }
-  // }
-  // console.log("createSources", createSources)
-  return createSources;
-}
-
-module.exports = data