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

package/src/reStructure/TemplateData/{propertyNodeSchema/relationshipPropertyNodeSchema → propertyValueSchema/relationshipPropertyValueSchema}/data.js

@@ -17,67 +17,46 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-console.log("=== relationship property node schema ===");
+console.log("=== relationship property value schema ===");
 
 const path = require('path');
 const fs = require('fs');
 const {
   SOURCE_PATH,
   PREFIX_RELATIONSHIP,
-  PROPERTYNODE_TAG,
+  PROPERTYVALUE_TAG,
   SAVE_FILE_NAME
 } = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts');
 
-const templatePath = path.join(__dirname, "./templateRelationshipPropertyNodeSchema.ejs");
-
+const templatePath = path.join(__dirname, "./tempRelationship.ejs");
 const yaml = require("yaml")
+
 const objectschemaLocalByPath = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema')
-const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
-const Consts = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts');
+
 const { firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils");
 const { createBasicRelationshipsProperties } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
 
 async function data(_izContext, settings, srcPath) {
 
-  let objectSchemaPath = path.join(srcPath, "schemas")
-  let allObjectSchemas = await objectschemaLocalByPath.getAllLocalObjectSchemas(
+
+  let objectSchema = await objectschemaLocalByPath.getObjSchemaS3(
     _izContext,
-    objectSchemaPath
+    settings.objType
   );
 
-  let createSourceRecords = [];
-
-  if (allObjectSchemas.records.length == 0) {
+  if (!objectSchema) {
     throw Error(`Invalid objType:${objTypeString(objType)}, cannot generate attribute tree schema cause objectSchema is not exists`)
   };
-  nextObjectSchema:
-  for (const objectSchema of allObjectSchemas.records) {
 
-    // validate only addOnndataStructure is type propertyNode.
-    if (!objectSchema.hasOwnProperty("addOnDataStructure") || !Array.isArray(objectSchema.addOnDataStructure) || !objectSchema.addOnDataStructure.length) {
-      console.log("Not have data in addOnDataStructure ,continute nextObjectSchema")
-      continue
-    };
 
-    for (let eachAddOnDataStructure of objectSchema.addOnDataStructure) {
 
-      if (eachAddOnDataStructure.type !== Consts.ADD_ON_DATA_STRUCTURE_TYPE.propertyNode) {
-        console.log("continute,AddOnDataStructure not type propertyNode")
-        continue
-      };
-
-      let generateRelationships = createSourceParams(
-        _izContext,
-        objectSchema,
-        srcPath
-      );
-      console.log("generateRelationship", generateRelationships);
-
-      createSourceRecords.push(...generateRelationships);
-
-    };//End loop addOn
-  }; //End loop objectSchema
-  console.log("createSourceRecords: ", createSourceRecords);
+  let createSourceRecords = []
+  let generateRelationships = createSourceParams(
+    _izContext,
+    objectSchema,
+    srcPath
+  );
+  createSourceRecords.push(...generateRelationships);
 
   if (createSourceRecords.length) {
     return {
@@ -86,12 +65,11 @@ async function data(_izContext, settings, srcPath) {
         datas: createSourceRecords
       },
       setting: {
-        savePath: path.join(srcPath, SOURCE_PATH.generatedPropertyNode),
-        hookPath: path.join(srcPath, "schemaHook", "propertyNode", "/"),
+        savePath: path.join(srcPath, SOURCE_PATH.generatedPropertyValue),
+        hookPath: path.join(srcPath, "schemaHook", "propertyValue", "/"),
         saveFileName: SAVE_FILE_NAME.objectRelationship,
         fileExtension: ".js",
         isAppend: false,
-        // encloseTemplate: "\n ]",
       }
     }
   };
@@ -111,42 +89,41 @@ function createSourceParams(
   const config = yaml.parse(serverlessConfig);
   const serviceTag = config.main_config.iz_serviceTag;
 
-
   attributeRelationships.push(
-    { // has{objectType}property
-      relationshipTag: PREFIX_RELATIONSHIP.has + upperCase(objectType) + PROPERTYNODE_TAG.property,
+    { // has{objectType}propertyValue
+      relationshipTag: PREFIX_RELATIONSHIP.has + upperCase(objectType) + PROPERTYVALUE_TAG.property,
       relationshipProperties: createBasicRelationshipsProperties(
         {
           serviceTag: serviceTag,
           objectType: objectType,
-          linkType: "many",
+          linkType: "one",
           requiredOnCreate: false
         },
         {
           serviceTag: serviceTag,
-          objectType: upperCase(objectType) + PROPERTYNODE_TAG.property,
+          objectType: upperCase(objectType) + PROPERTYVALUE_TAG.property,
           linkType: "many",
-          requiredOnCreate: false
+          requiredOnCreate: true
         },
         storageResources,
         "from"
       )
     },
-    // disabled{objectType}property
+    // disabled{objectType}propertyValue
     {
-      relationshipTag: PREFIX_RELATIONSHIP.disabled + upperCase(objectType) + PROPERTYNODE_TAG.property,
+      relationshipTag: PREFIX_RELATIONSHIP.disabled + upperCase(objectType) + PROPERTYVALUE_TAG.property,
       relationshipProperties: createBasicRelationshipsProperties(
         {
           serviceTag: serviceTag,
           objectType: objectType,
-          linkType: "many",
+          linkType: "one",
           requiredOnCreate: false
         },
         {
           serviceTag: serviceTag,
-          objectType: upperCase(objectType) + PROPERTYNODE_TAG.property,
+          objectType: upperCase(objectType) + PROPERTYVALUE_TAG.property,
           linkType: "many",
-          requiredOnCreate: false
+          requiredOnCreate: true
         },
         storageResources,
         "from"
@@ -154,18 +131,18 @@ function createSourceParams(
     },
 
     { // is{objectType}PropertyLabel
-      relationshipTag: PREFIX_RELATIONSHIP.is + upperCase(objectType) + PROPERTYNODE_TAG.propertyLabel,
+      relationshipTag: PREFIX_RELATIONSHIP.is + upperCase(objectType) + PROPERTYVALUE_TAG.propertyLabel,
       relationshipProperties: createBasicRelationshipsProperties(
         {
           serviceTag: serviceTag,
-          objectType: upperCase(objectType) + PROPERTYNODE_TAG.property,
+          objectType: upperCase(objectType) + PROPERTYVALUE_TAG.property,
           linkType: "many",
           requiredOnCreate: true
         },
         {
           serviceTag: serviceTag,
-          objectType: upperCase(objectType) + PROPERTYNODE_TAG.propertyLabel,
-          linkType: "many",
+          objectType: upperCase(objectType) + PROPERTYVALUE_TAG.propertyLabel,
+          linkType: "one",
           requiredOnCreate: false
         },
         storageResources,

package/src/reStructure/TemplateData/propertyValueSchema/relationshipPropertyValueSchema/tempRelationship.ejs

@@ -0,0 +1,13 @@
+module.exports = [
+<%datas.forEach(data=> {%>
+    {
+      <%- data.relationshipTag %>: {
+          fieldNames:{
+            //(<fieldNames>)
+            //(<fieldNames>)
+          },
+          storageResources:<%- JSON.stringify(data.relationshipProperties.storageResources,null,2) %>,
+          links:<%- JSON.stringify(data.relationshipProperties.links,null,2) %>,
+      }
+    },<%})%>
+]

package/src/reStructure/TemplateData/propertyValueSchema/relationshipPropertyValueSchema/templateRelationshipPropertyValueSchema.ejs

@@ -0,0 +1,7 @@
+module.exports = [
+<%datas.forEach(data=> {%>
+    {
+       <%- data.relationshipTag %>: <%- JSON.stringify(data.relationshipProperties,null,2) %>
+    },
+<%})%>
+]

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

@@ -54,7 +54,8 @@ const {
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
-
+//(<optionalRequire>)
+//(</optionalRequire>)
 /**
  * update relationship endpoint
  *

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

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

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

@@ -51,7 +51,8 @@ const {
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
-
+//(<optionalRequire>)
+//(</optionalRequire>)
 /**
  * update relationship endpoint
  *

package/src/reStructure/TemplateData/relationshipPerAction/delete/complete/handler/sqs/template.ejs

@@ -26,7 +26,7 @@ const izaraShared = require('@izara_project/izara-shared');
 const recordHandlerSharedLib = izaraShared.recordHandlerSharedLib
 const callingFlowSharedLib = izaraShared.callingFlowSharedLib;
 
-const createRelationshipComplete = require('./CreateRelationshipComplete_Main');
+const deleteRelationshipComplete = require('./DeleteRelationshipComplete_Main');
 const Logger = require('@izara_project/izara-core-library-logger');
 // validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
@@ -82,7 +82,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       //validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
         record,                             // one record will send to mainFunction
-        "CreateRelationshipComplete",       // queue name that need to retry or send to dlq
+        "DeleteRelationshipComplete",       // queue name that need to retry or send to dlq
         perRecordsValidatorSchema,          // schema for record.Message
         // messageAttributeValidatorSchema  // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
       );
@@ -98,8 +98,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record,                                                 // one record will send to mainFunction
-        createRelationshipComplete.createRelationshipComplete,  // mainFunction that need to invoke.
-        "CreateRelationshipComplete",                           // queue name that need to retry or send to dlq
+        deleteRelationshipComplete.deleteRelationshipComplete,  // mainFunction that need to invoke.
+        "DeleteRelationshipComplete",                           // queue name that need to retry or send to dlq
         passOnProperties,                                       // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');
@@ -119,7 +119,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     Logger.debug('after Promise.all(recordPromises) in handler');
 
   } catch (err) {
-    Logger.error('Unhandled Error, CreateRelationshipCompleteHdrSqs: ', err);
+    Logger.error('Unhandled Error, deleteRelationshipComplete: ', err);
     throw (err);
   }
 });

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

@@ -35,8 +35,9 @@ const {
   TOPIC_NAME_GRAPH_HANDLER,
   PREFIX
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
-
-module.exports.createRelationshipComplete = async (
+//(<optionalRequire>)
+//(</optionalRequire>)
+module.exports.deleteRelationshipComplete = async (
   _izContext,
   returnValue,
   status,
@@ -45,7 +46,7 @@ module.exports.createRelationshipComplete = async (
 
 ) => {
   try {
-    _izContext.logger.debug("Function:createRelationshipComplete", {
+    _izContext.logger.debug("Function:deleteRelationshipComplete", {
       returnValue: returnValue,
       status: status,
       errorsFound: errorsFound,
@@ -112,7 +113,7 @@ module.exports.createRelationshipComplete = async (
             MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
             TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outDeleteRelComplete)
           };
-          _izContext.logger.debug("Send message to OutCreateRelationshipComplete :::>", sendMessageToOutDeleteRelatonshipComplete);
+          _izContext.logger.debug("Send message to OutdeleteRelationshipComplete :::>", sendMessageToOutDeleteRelatonshipComplete);
           await sns.publishAsync(_izContext, sendMessageToOutDeleteRelatonshipComplete);
 
 

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

@@ -53,7 +53,8 @@ const {
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
-
+//(<optionalRequire>)
+//(</optionalRequire>)
 /**
  * update relationship endpoint
  *

package/src/reStructure/TemplateData/relationshipPerAction/get/complete/handler/sqs/template.ejs

@@ -26,7 +26,7 @@ const izaraShared = require('@izara_project/izara-shared');
 const recordHandlerSharedLib = izaraShared.recordHandlerSharedLib
 const callingFlowSharedLib = izaraShared.callingFlowSharedLib;
 
-const createRelationshipComplete = require('./CreateRelationshipComplete_Main');
+const getRelationshipComplete = require('./GetRelationshipComplete_Main');
 const Logger = require('@izara_project/izara-core-library-logger');
 // validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
@@ -82,7 +82,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       //validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
         record,                             // one record will send to mainFunction
-        "CreateRelationshipComplete",       // queue name that need to retry or send to dlq
+        "GetRelationshipComplete",       // queue name that need to retry or send to dlq
         perRecordsValidatorSchema,          // schema for record.Message
         // messageAttributeValidatorSchema  // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
       );
@@ -98,8 +98,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record,                                                 // one record will send to mainFunction
-        createRelationshipComplete.createRelationshipComplete,  // mainFunction that need to invoke.
-        "CreateRelationshipComplete",                           // queue name that need to retry or send to dlq
+        getRelationshipComplete.getRelationshipComplete,  // mainFunction that need to invoke.
+        "GetRelationshipComplete",                           // queue name that need to retry or send to dlq
         passOnProperties,                                       // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');

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

@@ -35,8 +35,9 @@ const {
   TOPIC_NAME_GRAPH_HANDLER,
   PREFIX
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
-
-module.exports.createRelationshipComplete = async (
+//(<optionalRequire>)
+//(</optionalRequire>)
+module.exports.getRelationshipComplete = async (
   _izContext,
   returnValue,
   status,
@@ -45,7 +46,7 @@ module.exports.createRelationshipComplete = async (
 
 ) => {
   try {
-    _izContext.logger.debug("Function:createRelationshipComplete", {
+    _izContext.logger.debug("Function:getRelationshipComplete", {
       returnValue: returnValue,
       status: status,
       errorsFound: errorsFound,

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

@@ -57,7 +57,8 @@ const {
   TOPIC_NAME_GRAPH_HANDLER,
   TOPIC_NAME_GENERATE_CODE
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
-
+//(<optionalRequire>)
+//(</optionalRequire>)
 /**
  * update relationship endpoint
  *

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 [];