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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -20,15 +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.47",
+    "@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.4",
+    "@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');
@@ -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) => {
@@ -452,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,
@@ -482,5 +522,7 @@ module.exports = {
   FIELD_NAME_TPYE,
   ADD_ON_DATA_STRUCTURE_TYPE,
   ATTRIBUTE_TAG,
-  PREFIX_RELATIONSHIP
+  PREFIX_RELATIONSHIP,
+  checkDynamoTypeRelationship,
+  createDynamoDbComponentByLinks
 }

package/src/reStructure/GenerateCode.js

@@ -121,10 +121,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
     // generate all source
     for (let item of allCreateSource) {
-      if (item.setting.initialData) {
-        console.log("setting::", item.setting)
-        console.log("templatePath::", item.templatePath)
-      }
       // throw error if item is invalid
       if (!item || !item.templatePath || !item.templateData || !item.setting) {
         console.log('Throwing invalid source item:', item);

package/src/reStructure/GenerateSchema.js

@@ -28,6 +28,8 @@ 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) {
@@ -48,7 +50,7 @@ async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings)
     // collect all result of template data for execute createSource
     let allCreateSource = [];
     // collect all path that need to empty before createSource
-    let allEmptyPath = [];
+    let allEmptyPath = new Set();
 
 
     // Validate that all generateNames in generateSettings are present in the schemaConfig
@@ -65,9 +67,17 @@ async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings)
 
 
     // start create generateSchema depend on
-    for (const { generateName, settingData } of generateSchemaSettings) {
-      let generateSchemaData = require(join(__dirname, schemaConfig.TemplateAndData[generateName]));
-      let createSourceResult = await generateSchemaData(_izContext, objSchemaPath, settingData);
+    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)) {
@@ -78,6 +88,7 @@ async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings)
       }
     }
 
+
     // check each allCreateSource valid
     for (let item of allCreateSource) {
       // throw Error('Skipping invalid source item:', item);
@@ -99,11 +110,12 @@ async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings)
         throw Error(errors);
       }
 
-      allEmptyPath.push(returnEmptyPath);
+      allEmptyPath.add(setting.savePath);
     }
 
     // validate path before empty folder
     for (let emptyPath of allEmptyPath) {
+      console.log("emptyPath: ", emptyPath);
       validatePathWithRootServicePath(localServicePath, emptyPath)
     }
 

package/src/reStructure/SchemaConfig.js

@@ -13,14 +13,15 @@ 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/mainAttributeTree/generateTemplateData.js',
+    mainAttributeTree: './TemplateData/attributeTreeSchema/generateTemplateData.js',
+    test: './TemplateData/testTemplate/data.js',
   },
   Plugin: {
 

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

@@ -18,10 +18,21 @@ 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: {}
+  mainAttributeTreeSchema: require('./mainAttributeTreeSchema/data')
 }
 /**
  * Generates code with templates for different actions
@@ -29,9 +40,52 @@ const modules = {
  * @param {string} objSchemaPath - Path to the schema
  * @returns {Array} Array of generated code parameters
  */
-async function generateCodeWithTemplate(_izContext, objSchemaPath) {
+async function generateCodeWithTemplate(_izContext, objSchemaPath, settings) {
   try {
-    const saveFilePath = join(objSchemaPath, '../');
+    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
@@ -40,9 +94,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     // (template, data, { savePath, hookPath, saveFileName, fileExtension, initialData, isAppend = false, checkCreateSourcePass = false })
 
 
-    return {
-
-    };
+    return allCreateSource;
   } catch (error) {
     _izContext.logger.error('Error generating code with template perActionComplete:', error);
     return [];

package/src/reStructure/TemplateData/attributeTreeSchema/mainAttributeTreeSchema/data.js

@@ -16,112 +16,172 @@ 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('../../libs/Consts');
-const templatePath = path.join(__dirname, "./template.ejs");
-
-function data(_izContext, objectSchema, srcPath) {
-  const createSources = [];
-  let attributeTreeObjSchemas = [];
-  if (objectSchema.hasOwnProperty("addOnDataStructure")) {
-    for (const versionedData of objectSchema.addOnDataStructure) {
-      if (versionedData.type === ADD_ON_DATA_STRUCTURE_TYPE.attributeTree) {
-        const objectType = objectSchema.objectType; // main objectType
-        const storageResources = objectSchema.storageResources // storageResource from main objectType
-        const storageResourceTag = Object.keys(storageResources) // storage ResourceTag from main objectType
-        const compositeKeyDeliminator = objectSchema.compositeKeyDeliminator
-        attributeTreeObjSchemas.push(
-          {
-            objectType: objectType + ATTRIBUTE_TAG.attributeTagLabel,
-            fieldNames: {
-              labelId: fieldNameSetting(FIELD_NAME_TPYE.identifiers)
-            },
-            identifiers: [
-              {
-                type: "identifier",
-                fieldName: "labelId"
-              }
-            ]
-          },
-          {
-            objectType: objectType + ATTRIBUTE_TAG.attributeTagLink,
-            fieldNames: {
-              [objectType + ATTRIBUTE_TAG.attributeTagLink + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.identifiers),
-              [objectType + "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: `${objectType + ATTRIBUTE_TAG.attributeTagLink}Id`
-              }
-            ]
-          },
-          {
-            objectType: objectType + ATTRIBUTE_TAG.attributeTagProperty,
-            fieldNames: {
-              propertyId: fieldNameSetting(FIELD_NAME_TPYE.identifiers),
-              propertyLabelId: fieldNameSetting(FIELD_NAME_TPYE.optionalOnCreate)
-            },
-            identifiers: [
-              {
-                type: "identifier",
-                fieldName: "propertyId"
-              }
-            ]
-          },
-          {
-            objectType: objectType + ATTRIBUTE_TAG.attributeTagPropertyLabel,
-            fieldNames: {
-              propertyLabelId: fieldNameSetting(FIELD_NAME_TPYE.identifiers)
-            },
-            identifiers: [
-              {
-                type: "identifier",
-                fieldName: "propertyLabelId"
-              }
-            ]
-          }
-        )
-        for (let attributeTreeObjSchema of attributeTreeObjSchemas) {
-          Object.assign(attributeTreeObjSchema, {
-            storageResources: storageResources, // add storageResources
-            compositeKeyDeliminator: compositeKeyDeliminator
-          })
-          for (let attributeTreeFieldName of Object.values(attributeTreeObjSchema.fieldNames)) {
-            Object.assign(attributeTreeFieldName, { storageResourceTags: storageResourceTag }) // add storageResourceTags for each fieldName
-          }
-        }
-      }
-
-    }
-    // console.log("attributeTreeObjSchemas", attributeTreeObjSchemas)
-    for (const attributeTreeObjSchema of attributeTreeObjSchemas) {
-      createSources.push({
-        templatePath: templatePath,
-        templateData: {
-          fieldNames: JSON.stringify(attributeTreeObjSchema.fieldNames),
-          identifiers: JSON.stringify(attributeTreeObjSchema.identifiers),
-          objectType: attributeTreeObjSchema.objectType,
-          storageResources: JSON.stringify(attributeTreeObjSchema.storageResources),
-          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
-        }
-      })
-    }
+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");
   }
-  console.log("createSources", createSources)
+  // {
+  //   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;
 }
 

package/src/reStructure/TemplateData/externalService/lambdaRole/template.ejs

@@ -18,10 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 const Logger = require('@izara_project/izara-core-library-logger')
-const izaraShared = require('@izara_project/izara-shared')
-const dynamodbSharedLib = izaraShared.dynamodbSharedLib
-const lambdaSharedLib = izaraShared.lambdaSharedLib
-const snsSharedLib = izaraShared.snsSharedLib
+const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb')
+const lambdaSharedLib = require('@izara_project/izara-core-library-lambda')
+const snsSharedLib = require('@izara_project/izara-core-library-sns')
 const initialSetupConfig = require('../../config/Config') // config external serviceName
 const basicNodeSchemaLib = require('@izara_project/izara-attribute-tree').basicNodeSchemaLib
 const _izContext = {logger : Logger}

package/src/reStructure/TemplateData/findData/handler/template.ejs

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
-const recordHandlerSharedLib = require("@izara_project/izara-shared").recordHandlerSharedLib;
+const recordHandlerSharedLib = require("@izara_project/izara-core-library-record-handler");
 const Logger = require('@izara_project/izara-core-library-logger');
 
 const findData = require('./FindData_Main');

package/src/reStructure/TemplateData/findData/mainFunction/template.ejs

@@ -18,9 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 const izaraShared = require("@izara_project/izara-shared");
-const findDataSharedLib = izaraShared.findDataSharedLib;
-const graphSharedLib = izaraShared.graphSharedLib;
-const dynamodbSharedLib = izaraShared.dynamodbSharedLib;
+const findDataSharedLib = require('@izara_project/izara-core-library-find-data');
+const graphSharedLib = require('@izara_project/izara-core-library-graph-service');
+const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb')
 
 const serviceSchemas = require('@izara_project/izara-core-library-service-schemas');
 const serviceConfig = serviceSchemas.serviceConfig;