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

package/package.json

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

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -428,7 +428,8 @@ async function createGetDataDetails(_izContext, objectSchema) {
         }
 
         for (let versionedData of versionedDataPerStorageTag[storageTag]) {
-          let versionedDataFieldNames = versionedData.fieldNames.map(data => data.fieldName);
+          _izContext.logger.debug("versionedData.fieldNames", versionedData.fieldNames)
+          let versionedDataFieldNames = Object.keys(versionedData.fieldNames);
           Object.assign(
             getGraphDataDetails[useStorageTag].versionedDatas,
             { [versionedData.versionedDataLabel]: versionedDataFieldNames }

package/src/MainLibs/src/Consts.js

@@ -120,10 +120,9 @@ const SOURCE_PATH = {
   webSocket: "../src/generatedCode/FlowSchema/UploadS3/",
   resourceLocationWebSocket: "src/generatedCode/FlowSchema/UploadS3/",
   // * FlowSchema event
-  flowSchemaOwnTopic: "../src/generatedCode/FlowSchema/FlowSchemaOwnTopic/",
-  resourceLocationFlowSchemaOwnTopic: "src/generatedCode/flowSchemaOwnTopic/",
-  flowSchemaExternalTopic: "../src/generatedCode/FlowSchema/FlowSchemaExternalTopic/",
-  resourceLocationFlowSchemaExternalTopic: "src/generatedCode/flowSchemaExternalTopic/",
+  flowSchema: "../src/generatedCode/FlowSchema/",
+  resourceLocationFlowSchema: "src/generatedCode/FlowSchema/",
+  // * FlowSchema event
   flowSchemaEventBridge: "../src/generatedCode/FlowSchema/EventBridge/",
   resourceLocationFlowSchemaEventBridge: "src/generatedCode/FlowSchema/EventBridge/",
   // * FlowSchema Register
@@ -136,7 +135,8 @@ const SOURCE_PATH = {
   generatedCodeHookFunction: "../src/generatedCode/WebSocket/source/FlowSchemaHook/HookFunctionGeneratedCode/source/",
   resourceLocationGeneratedCodeHookFunction: "src/generatedCode/WebSocket/source/FlowSchemaHook/HookFunctionGeneratedCode/source/",
   generatedAttributeTree: "../src/schemas/generatedCode/attributeTree/",
-  generatedPropertyNode: "../src/schemas/generatedCode/propertyNode/",
+  generatedPropertyValue: "../src/schemas/generatedCode/propertyValue/",
+  generatedRefRelationshipAttribute: "../src/schemas/generatedCode/refRelationshipAttribute/",
   endpointPerService: "../src/generatedCode/ActionEndpoint/source/",
   resourceLocationHandlerEndpointPerService: "src/generatedCode/ActionEndpoint/source/",
   createRecordComplete: "../src/generatedCode/CreateRecordComplete/",
@@ -415,8 +415,8 @@ const ATTRIBUTE_TAG = {
   attributeTagPropertyLabel: "PropertyLabel",
 };
 
-const PROPERTYNODE_TAG = {
-  property: "Property",
+const PROPERTYVALUE_TAG = {
+  property: "PropertyValue",
   propertyLabel: "PropertyLabel",
 };
 
@@ -585,7 +585,7 @@ module.exports = {
   FIELD_NAME_TPYE,
   ADD_ON_DATA_STRUCTURE_TYPE,
   ATTRIBUTE_TAG,
-  PROPERTYNODE_TAG,
+  PROPERTYVALUE_TAG,
   PREFIX_RELATIONSHIP,
   checkDynamoTypeRelationship,
   createDynamoDbComponentByLinks,

package/src/MainLibs/src/GenerateCodeUtils.js

@@ -51,6 +51,8 @@ function checkValidTableYaml(_izContext, currentTableSetting, existsTableSetting
       );
     }
   }
+  // console.log("filteredDynamoDbYamlSetting: ", JSON.stringify(filteredDynamoDbYamlSetting, null, 2),
+  //   "existsTableSetting:", JSON.stringify(existsTableSetting, null, 2))
   return [filteredDynamoDbYamlSetting, existsTableSetting];
 }
 

package/src/{reStructure/TemplateData → TemplateManager/src}/attributeTreeSchema/generateTemplateData.js

@@ -33,7 +33,8 @@ const { validateObjType } = serviceSchemaShared.validateObjType
 
 const modules = {
   mainAttributeTreeSchema: require('./mainAttributeTree/data'),
-  relaAttributeTreeSchema: require('./relationshipSchema/data')
+  relaAttributeTreeSchema: require('./relationshipSchema/data'),
+  referenceRelaAttributeTreeSchema: require('./referenceRelationshipSchema/data')
 }
 /**
  * Generates code with templates for different actions
@@ -50,33 +51,47 @@ async function generateCodeWithTemplate(
     let allCreateSource = [];
     const srcPath = join(objSchemaPath, '../');
 
-    if (!settings || !settings.generateName || !settings.objType || !settings.attributeTag) {
-      validateObjType(settings.objType);
-      throw new Error("Invalid settings object. Must contain objType and attributeTag properties.");
-    }
-    if (settings.generateName === "mainAttributeTree") {
-      let objSchemaAttributeTree = await modules.mainAttributeTreeSchema(
-        _izContext,
-        settings,
-        srcPath
-      );
-      allCreateSource.push(...objSchemaAttributeTree);
-      console.log("objSchemaAttributeTree finish");
 
+    if (settings.generateName === "referenceAttributeTree") {
+      console.log("case: generateName === referenceAttributeTree");
 
-      let relaSchemaAttributeTree = await modules.relaAttributeTreeSchema(
+      let referenceRelaSchemaAttributeTree = await modules.referenceRelaAttributeTreeSchema(
         _izContext,
         settings,
         srcPath
       );
-      allCreateSource.push(relaSchemaAttributeTree);
-      console.log("relaSchemaAttributeTree finish");
-
-
+      allCreateSource.push(referenceRelaSchemaAttributeTree);
+      console.log("referenceRelaSchemaAttributeTree finish");
     } else {
-      throw Error(`Generate attribute tree schema Invalid generateName:${settings.generateName} `);
-    }
 
+      if (!settings || !settings.generateName || !settings.objType || !settings.attributeTag) {
+        validateObjType(settings.objType);
+        throw new Error("Invalid settings object. Must contain objType and attributeTag properties.");
+      };
+
+      if (settings.generateName === "mainAttributeTree") {
+        let objSchemaAttributeTree = await modules.mainAttributeTreeSchema(
+          _izContext,
+          settings,
+          srcPath
+        );
+        allCreateSource.push(...objSchemaAttributeTree);
+        console.log("objSchemaAttributeTree finish");
+
+
+        let relaSchemaAttributeTree = await modules.relaAttributeTreeSchema(
+          _izContext,
+          settings,
+          srcPath
+        );
+        allCreateSource.push(relaSchemaAttributeTree);
+        console.log("relaSchemaAttributeTree finish");
+
+
+      } else {
+        throw Error(`Generate attribute tree schema Invalid generateName:${settings.generateName} `);
+      }
+    };
     _izContext.logger.debug("allCreateSource is", allCreateSource);
     return [...allCreateSource];
   } catch (error) {

package/src/TemplateManager/src/attributeTreeSchema/referenceRelationshipSchema/data.js

@@ -0,0 +1,84 @@
+/*
+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("====== process referenceRelationship =====");
+
+const path = require('path');
+const fs = require('fs');
+const yaml = require("yaml")
+const { firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils");
+const {
+  SOURCE_PATH,
+  SAVE_FILE_NAME,
+  PREFIX_RELATIONSHIP,
+  ATTRIBUTE_TAG
+} = require('../../../../MainLibs/src/Consts');
+const templatePath = path.join(__dirname, "./tempReferenceRelationshipSchema.ejs");
+// const getObjectSchema = require("@izara_project/izara-shared-service-schemas/src/")
+// const modules = {
+//   validateAddOnDataStructure: require('../../../libs/ValidateAddOnDataStructure')
+// };
+
+// const configPath = path.join(srcPath, '../../config/serverless.config.yml');
+// const serverlessConfig = fs.readFileSync(configPath, 'utf8');
+// const config = yaml.parse(serverlessConfig);
+// const serviceTag = config.main_config.iz_serviceTag;
+
+async function data(
+  _izContext,
+  settings,
+  srcPath
+) {
+  console.log("settings:::::::::", settings)
+  // settings:{
+  //   generateName: "referenceAttributeTree",
+  //   objectType: "School",
+  //   attributeTag: "primaryEducation",
+  //   attributeTreeServiceTag: "primaryEducation"
+  // }
+
+  let generateRefRelationships = [];
+
+  generateRefRelationships.push(
+    {
+      objectType: settings.objectType,
+      relationshipTag: PREFIX_RELATIONSHIP.has + upperCase(settings.attributeTag) + ATTRIBUTE_TAG.attributeTagLink,
+      relationshipServiceTag: settings.attributeTreeServiceTag,
+    },
+    {
+      objectType: settings.objectType,
+      relationshipTag: PREFIX_RELATIONSHIP.disabled + upperCase(settings.attributeTag) + ATTRIBUTE_TAG.attributeTagLink,
+      relationshipServiceTag: settings.attributeTreeServiceTag,
+    }
+  )
+
+  return {
+    templatePath: templatePath,
+    templateData: { datas: generateRefRelationships },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.generatedRefRelationshipAttribute),
+      hookPath: path.join(srcPath, "schemaHook", "refRelationshipAttribute", "/"),
+      saveFileName: SAVE_FILE_NAME.refObjectRelationship,
+      fileExtension: ".js",
+      isAppend: true
+    }
+  };
+}
+
+
+module.exports = data

package/src/TemplateManager/src/attributeTreeSchema/referenceRelationshipSchema/tempReferenceRelationshipSchema.ejs

@@ -0,0 +1,9 @@
+module.exports = [
+<% datas.forEach(data => { %>
+  {
+    objectType: "<%- data.objectType %>",
+    relationshipTag:"<%- data.relationshipTag %>",
+    relationshipServiceTag:"<%- data.relationshipServiceTag %>",
+  },
+  <% }) %>
+]

package/src/{reStructure/TemplateData → TemplateManager/src}/attributeTreeSchema/relationshipSchema/data.js

@@ -32,7 +32,7 @@ const { createBasicRelationshipsProperties } = require("../../../../GenerateCode
 const templatePath = path.join(__dirname, "./template.ejs");
 
 const modules = {
-  validateAddOnDataStructure: require('../../../libs/ValidateAddOnDataStructure')
+  validateAddOnDataStructure: require('../../../../reStructure/libs/ValidateAddOnDataStructure')
 };
 
 async function data(_izContext, settings, srcPath) {

package/src/reStructure/SchemaConfig.js

@@ -19,10 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module.exports = {
   TemplateAndData: {
-    // ** mock schema config **
-    mainAttributeTree: './TemplateData/attributeTreeSchema/generateTemplateData.js',
-    propertyNode: './TemplateData/propertyNodeSchema/generateTemplateData.js',
-    test: './TemplateData/testTemplate/data.js',
+    propertyValue: './TemplateData/propertyValueSchema/generateTemplateData.js',
   },
   Plugin: {