@izara_project/izara-market-library-service-schemas 1.0.85 → 1.0.87

package/src/{reStructure/TemplateData/propertyValueSchema/relationshipPropertyValueSchema → TemplateData/PropertyValueSchema/PropertyValueRelationshipSchema}/data.js

@@ -21,20 +21,19 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 import lodash from 'lodash';
 import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import propertyNode from '@izara_project/izara-property-nodes'
+import { consts, utils } from '@izara_project/izara-core-generate-service-code'
 
-import { consts, utils } from '../../../../MainLibs/index.js';
 const {
   SOURCE_PATH,
-  PREFIX_RELATIONSHIP,
-  PROPERTY_VALUE_TAG,
   SAVE_FILE_NAME,
   STORAGE_TYPES,
   ADD_ON_DATA_STRUCTURE_TYPE
 } = consts;
 
 const { firstLetterUpperCase: upperCase, getLocalConfig } = utils;
-const { generateCodeLibs } = require('../../../../GenerateCodeLibs/index.js');
-const { createBasicRelationshipsProperties } = generateCodeLibs;
+import libs from '../../../Libs/Libs.js';
+const { createBasicRelationshipsProperties } = libs;
 
 const templatePath = path.join(__dirname, './tempRelationship.ejs');
 
@@ -42,39 +41,39 @@ async function data(_izContext, settings, srcPath) {
   // console.log("create Data function ::", { settings })
   let createSourceRecords = [];
   for (const settingPropertyValue of settings) {
-    let objectSchema = await getObjectSchema
-      .getLocalObjectSchemasWithHierarchy(
-        _izContext,
-        settingPropertyValue.objType.objectType,
-        path.join(srcPath, './schemas')
-      )
-      .then(res => res.records[0]);
+    let objectSchema = await getObjectSchema.getLocalObjectSchemasWithHierarchy(_izContext,
+      settingPropertyValue.objectType,
+      path.join(srcPath, './schemas')
+    ).then(res => res.records[0]);
 
     if (!objectSchema) {
       throw Error(
-        `Invalid objType:${objTypeString(objType)}, cannot generate attribute tree schema cause objectSchema is not exists`
+        `Invalid objType:${(settingPropertyValue.objType)}, cannot generate attribute tree schema cause objectSchema is not exists`
       );
     }
-
+    // console.log("objectSchema", objectSchema)
     // validate addOnData type PropertyValues
-    let addOn = objectSchema.addOnDataStructure.find(addOn => {
-      return (
-        addOn.type === ADD_ON_DATA_STRUCTURE_TYPE.propertyValue &&
-        objectSchema.objectType === settingPropertyValue.objType.objectType
-      );
-    });
-
-    if (!addOn) {
-      throw Error(
-        `Invalid objType:${objTypeString(objType)}, not have setting for generate propertyValues`
-      );
+    if (objectSchema.addOnDataStructure && Object.keys(objectSchema.addOnDataStructure).length) {
+      let addOn = objectSchema.addOnDataStructure.find(addOn => {
+        return (
+          addOn.type === ADD_ON_DATA_STRUCTURE_TYPE.propertyValue &&
+          objectSchema.objectType === settingPropertyValue.objectType
+        );
+      });
+
+      if (!addOn) {
+        throw Error(
+          `Invalid objType:${settingPropertyValue.objectType}, not have setting for generate propertyValues`
+        );
+      }
+    } else {
+      throw Error(`objectType: ${settingPropertyValue.objectType} not have addOnDataStructure`)
     }
 
     let generateRelationships = createSourceParams(
       _izContext,
       objectSchema,
-      settingPropertyValue,
-      srcPath
+      settingPropertyValue
     );
     createSourceRecords.push(...generateRelationships);
   }
@@ -95,28 +94,24 @@ async function data(_izContext, settings, srcPath) {
   }
 }
 
-function createSourceParams(_izContext, objectSchema, settings, srcPath) {
+function createSourceParams(_izContext, objectSchema, settings) {
   const attributeRelationships = [];
   // const objectType = objectSchema.objectType; // main objectType
-  let propertyValue = settings.propertyValueTag;
+  let propertyValue = settings.propertyNodeName;
   const storageResources = objectSchema.storageResources; // storageResource from main objectType
   let cloneDeepStorageResources = lodash.cloneDeep(storageResources);
-  for (let [storageResourceTag, storageResourceSetting] of Object.entries(
-    cloneDeepStorageResources
-  )) {
+  for (let [storageResourceTag, storageResourceSetting] of Object.entries(cloneDeepStorageResources)) {
     if (storageResourceSetting.storageType === STORAGE_TYPES.dynamoDB) {
       delete cloneDeepStorageResources[storageResourceTag];
     }
   }
 
-  const serviceTag = getLocalConfig(path.join(srcPath, '../'), 'iz_serviceTag');
+  const serviceTag = getLocalConfig('iz_serviceTag');
   attributeRelationships.push(
     {
       // has{objectType}propertyValue
-      relationshipTag:
-        PREFIX_RELATIONSHIP.has +
-        upperCase(propertyValue) +
-        PROPERTY_VALUE_TAG.property,
+      // relationshipTag: PREFIX_RELATIONSHIP.has + upperCase(propertyValue) + PROPERTY_VALUE_TAG.property,
+      relationshipTag: propertyNode.createHasPropertyGraphRelationshipType(upperCase(propertyValue)),
       relationshipProperties: createBasicRelationshipsProperties(
         {
           serviceTag: serviceTag,
@@ -126,7 +121,8 @@ function createSourceParams(_izContext, objectSchema, settings, srcPath) {
         },
         {
           serviceTag: serviceTag,
-          objectType: propertyValue + PROPERTY_VALUE_TAG.property,
+          // objectType: propertyValue + PROPERTY_VALUE_TAG.property,
+          objectType: propertyNode.createPropertyValueGraphNodeLabel(upperCase(propertyValue)),
           linkType: 'many',
           requiredOnCreate: true
         },
@@ -136,10 +132,8 @@ function createSourceParams(_izContext, objectSchema, settings, srcPath) {
     },
     // disabled{objectType}propertyValue
     {
-      relationshipTag:
-        PREFIX_RELATIONSHIP.disabled +
-        upperCase(propertyValue) +
-        PROPERTY_VALUE_TAG.property,
+      // relationshipTag: PREFIX_RELATIONSHIP.disabled + upperCase(propertyValue) + PROPERTY_VALUE_TAG.property,
+      relationshipTag: propertyNode.createDisabledPropertyGraphRelationshipType(upperCase(propertyValue)),
       relationshipProperties: createBasicRelationshipsProperties(
         {
           serviceTag: serviceTag,
@@ -149,7 +143,8 @@ function createSourceParams(_izContext, objectSchema, settings, srcPath) {
         },
         {
           serviceTag: serviceTag,
-          objectType: propertyValue + PROPERTY_VALUE_TAG.property,
+          // objectType: propertyValue + PROPERTY_VALUE_TAG.property,
+          objectType: propertyNode.createPropertyValueGraphNodeLabel(upperCase(propertyValue)),
           linkType: 'many',
           requiredOnCreate: false
         },
@@ -160,20 +155,19 @@ function createSourceParams(_izContext, objectSchema, settings, srcPath) {
 
     {
       // is{objectType}PropertyLabel
-      relationshipTag:
-        PREFIX_RELATIONSHIP.is +
-        upperCase(propertyValue) +
-        PROPERTY_VALUE_TAG.propertyLabel,
+      relationshipTag: propertyNode.createIsPropertyLabelGraphRelationshipType(upperCase(propertyValue)),
       relationshipProperties: createBasicRelationshipsProperties(
         {
           serviceTag: serviceTag,
-          objectType: propertyValue + PROPERTY_VALUE_TAG.property,
+          // objectType: propertyValue + PROPERTY_VALUE_TAG.property,
+          objectType: propertyNode.createPropertyValueGraphNodeLabel(upperCase(propertyValue)),
           linkType: 'many',
           requiredOnCreate: true
         },
         {
           serviceTag: serviceTag,
-          objectType: propertyValue + PROPERTY_VALUE_TAG.propertyLabel,
+          // objectType: propertyValue + PROPERTY_VALUE_TAG.propertyLabel,
+          objectType: propertyNode.createPropertyLabelGraphNodeLabel(upperCase(propertyValue)),
           linkType: 'one',
           requiredOnCreate: false
         },

package/src/{reStructure/TemplateData/propertyValueSchema/relationshipPropertyValueSchema → TemplateData/PropertyValueSchema/PropertyValueRelationshipSchema}/tempRelationship.ejs

@@ -1,4 +1,4 @@
-module.exports [
+export default [
 <%datas.forEach(data=> {%>
     {
       <%- data.relationshipTag %>: {

package/src/{reStructure/TemplateData/propertyValueSchema → TemplateData/PropertyValueSchema}/generateTemplateData.js

@@ -19,8 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // console.log("generate main PropertyValue Schema");
 import { join } from 'path';
 
-import objectPropertyNodeSchema from './objectPropertyValueSchema/data';
-import relationshipPropertyNodeSchema from './relationshipPropertyValueSchema/data';
+import objectPropertyNodeSchema from './PropertyValueObjectSchema/data.js';
+import relationshipPropertyNodeSchema from './PropertyValueRelationshipSchema/data.js';
 
 /**
  * Generates code with templates for different actions
@@ -40,14 +40,13 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath, settings) {
       settings,
       srcPath
     );
-    allCreateSource.push(...objSchemaPropertyNode);
 
     let relationshipSchemaPropertyNode = await relationshipPropertyNodeSchema(
       _izContext,
       settings,
       srcPath
     );
-    allCreateSource.push(relationshipSchemaPropertyNode);
+    allCreateSource.push(relationshipSchemaPropertyNode, ...objSchemaPropertyNode);
 
     // } else {
     // throw Error(`Generate propertyNode schema Invalid generateName:${settings.generateName} `);

package/src/GenerateCodeLibs/index.js

@@ -1,22 +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/>.
-*/
-
-// contain functions that use with generated code in each services
-import consts from './src/Consts.js';
-import generateCodeLibs from './src/GenerateCodeLibs.js';
-
-export { consts, generateCodeLibs };

package/src/GenerateCodeLibs/src/Consts.js

@@ -1,135 +0,0 @@
-/*
-Copyright(C) 2021 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/>.
-*/
-
-// constant for updateRelationship and createRelationship
-
-const PREFIX = {
-  updateRel: 'updateRelationshipEndpoint',
-  createRel: 'createRelationshipEndpoint',
-  deleteRel: 'deleteRelationshipEndpoint',
-  updateNode: 'updateNodeEndpoint',
-  createNode: 'createNodeEndpoint',
-  getRel: 'getRelationshipEndpoint',
-  changeRel: 'changeRelationshipEndpoint',
-  ONE: 'one',
-  MANY: 'many',
-  CREATE_OBJECT_ASYNC: 'createObjectAsync',
-  CREATE_OBJECT_ASYNC_COMPLETE: 'createObjectAsyncComplete',
-  CREATE_OBJECT_EXTERNAL_TOPIC: 'createObjectExternalTopic'
-};
-
-// const TOPIC_NAME_GRAPH_HANDLER = {
-//   inUpdateRel: "InUpdateRelationship",
-//   inCreateRel: "InCreateRelationshipV2",
-//   outUpdateRel: "OutUpdateRelationship",
-//   outCreateRel: "OutCreateRelationship",
-//   inDeleteRel: "InDeleteRelationshipV2",
-//   outDeleteRel: "OutDeleteRelationshipV2",
-//   inUpdateNode: "InUpdateNode",
-//   outUpdateNode: "OutUpdateNode",
-//   inCreateNode: "InCreateNodeV2",
-//   outCreateNode: "OutCreateNodeV2",
-//   inDeleteNode: "InDeleteNodeV2",
-//   outDeleteNode: "OutDeleteNodeV2",
-// }
-
-const TOPIC_NAME_GRAPH_HANDLER = {
-  inUpdateRel: 'UpdateRelationship_In',
-  inCreateRel: 'CreateRelationship_In',
-  outUpdateRel: 'UpdateRelationship_Out',
-  outCreateRel: 'CreateRelationship_Out',
-  inDeleteRel: 'DeleteRelationship_In',
-  outDeleteRel: 'DeleteRelationship_Out',
-  inUpdateNode: 'UpdateNode_In',
-  outUpdateNode: 'UpdateNode_Out',
-  inCreateNode: 'CreateNode_In',
-  outCreateNode: 'CreateNode_Out',
-  inDeleteNode: 'DeleteNode_In',
-  outDeleteNode: 'DeleteNode_Out',
-  inChangeRelationship: 'ChangeRelationshipType_In',
-  outChangeRelationship: 'ChangeRelationshipType_Out',
-  inMoveRelationship: 'MoveRelationship_In',
-  outMoveRelationship: 'MoveRelationship_Out'
-};
-
-const TOPIC_NAME_GENERATE_CODE = {
-  updateRelComplete: 'UpdateRelationshipComplete',
-  createRelComplete: 'CreateRelationshipComplete',
-  deleteRelComplete: 'DeleteRelationshipComplete',
-  getRelComplete: 'GetRelationshipComplete',
-  outUpdateRelComplete: 'UpdateRelationshipComplete_Out',
-  outCreateRelComplete: 'CreateRelationshipComplete_Out',
-  outDeleteRelComplete: 'DeleteRelationshipComplete_Out',
-  outGetRelComplete: 'GetRelationshipComplete_Out',
-  updateNodeComplete: 'UpdateNodeComplete',
-  outUpdateNodeComplete: 'UpdateNodeComplete_Out',
-  createNodeComplete: 'CreateObjectComplete',
-  outCreateNodeComplete: 'CreateObjectComplete_Out',
-  deleteNodeComplete: 'DeleteNodeComplete',
-  outDeleteNodeComplete: 'DeleteNodeComplete_Out',
-  getNodeComplete: 'GetNodeComplete',
-  outGetNodeComplete: 'GetNodeComplete_Out',
-  reservedLimitComplete: 'ReservedLimitComplete',
-  createPresignUrl: 'CreatePresignUrl',
-  flowSchemaOwnTopicComplete: 'FlowSchemaOwnTopicComplete',
-  flowSchemaOwnTopicEndpointComplete: 'FlowSchemaOwnTopicEndpointComplete',
-  createRecordComplete: 'CreateRecordComplete',
-  changeRelationshipComplete: 'ChangeRelationshipComplete',
-  outChangeRelationshipComplete: 'ChangeRelationshipComplete_Out',
-  moveRelationshipComplete: 'MoveRelationshipComplete',
-  outMoveRelationshipComplete: 'MoveRelationshipComplete_Out'
-};
-
-const GRAPH_HANDLER_SERVICE_NAME = {
-  graphHandler: 'GraphHandler'
-};
-
-const ACCOUNTLIMIT_TAG = {
-  staticLimit: 'staticLimit',
-  reservedDynamic: 'reservedDynamic'
-};
-
-const LIMIT_TAG = {
-  uploadImage: 'uploadImageS3',
-  uploadData: 'uploadDataS3'
-};
-
-const RBAC_TYPE = {
-  appLevel: 'AppLevel',
-  userLevel: 'UserLevel'
-};
-
-const TOPIC_NAME_EXTERNAL_SERVICE = {
-  staticLimitProcessComplete: 'StaticLimitProcessComplete_Out',
-  reservedDynamicUsageComplete: 'ReservedDynamicUsageComplete_Out'
-};
-
-const EXTERNAL_SERVICE_NAME = {
-  accountLimits: 'AccountLimits'
-};
-
-export default {
-  TOPIC_NAME_GENERATE_CODE,
-  TOPIC_NAME_GRAPH_HANDLER,
-  PREFIX,
-  GRAPH_HANDLER_SERVICE_NAME,
-  ACCOUNTLIMIT_TAG,
-  LIMIT_TAG,
-  RBAC_TYPE,
-  TOPIC_NAME_EXTERNAL_SERVICE,
-  EXTERNAL_SERVICE_NAME
-};

package/src/MainLibs/index.js

@@ -1,22 +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/>.
-*/
-
-// MainLibs use for contain shared logic and constant
-import consts from './src/Consts.js';
-import utils from './src/Utils.js';
-import generateCodeUtils from './src/GenerateCodeUtils.js';
-export { consts, utils, generateCodeUtils };