@izara_project/izara-shared-search-and-sort 1.0.8 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-shared-search-and-sort",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Shared Libraries frontend/backend for Search and Sort stack",
   "main": "index.js",
   "scripts": {

package/src/DataFieldsSharedLib.js

@@ -22,29 +22,33 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // let { pattern } = validatorSchema.stringNotEmpty();
 // export default [...]
 
-import { objectHash as hash } from '@izara_project/izara-shared-core';  //const hash = require('@izara_project/izara-shared-core').objectHash;
+import { objectHash as hash } from '@izara_project/izara-shared-core';
 import lodash from 'lodash';
 const { isEmpty } = lodash;
-import filtersSharedLib from './FiltersSharedLib.js'; //const filtersSharedLib = require('./FiltersSharedLib');
+import filtersSharedLib from './FiltersSharedLib.js';
+import LogicalStructureSharedLib from './LogicalStructureSharedLib'
 
 async function createRequiredData(
   objType,
+  initialLogicalElementId,
+  logicalElements,
   requiredDataFields,
   complexFilterCombinations,
   perParentCombinations,
   requiredDataLinkStepObjects,
   requiredDataLinkSteps,
   values,
-  getSchemaFn
 ) {
   console.log('createRequiredData: ', {
     objType,
+    initialLogicalElementId,
+    logicalElements,
     requiredDataFields,
     complexFilterCombinations,
     perParentCombinations,
     requiredDataLinkStepObjects,
+    requiredDataLinkSteps,
     values,
-    getSchemaFn
   });
 
   let errorsObject = {};
@@ -270,6 +274,8 @@ async function createLinkPath(
   perParentCombinations,
   complexFilterCombinations,
   values,
+  filtersStructure,
+  path,
   errorsObject,
   errorsFound,
   index = 0,
@@ -283,6 +289,8 @@ async function createLinkPath(
     perParentCombinations,
     complexFilterCombinations,
     values,
+    filtersStructure,
+    path,
     errorsObject,
     errorsFound,
     index,
@@ -292,6 +300,8 @@ async function createLinkPath(
   let fieldName = null;
   let returnValue = {}; //* must return only linkPath params
 
+  let sortObj = null;
+
   let linkStepId = linkSteps[index];
   console.log('linkStepId: ', linkStepId);
 
@@ -302,12 +312,32 @@ async function createLinkPath(
     // last link that has only fieldName
     console.log('---------- is final link ----------', { index, linkStep });
 
-    return [linkStep.fieldName, returnValue, errorsObject, errorsFound]
+    let sortValueObj = null;
+
+    if (linkStep.hasOwnProperty("dataType")) {
+
+      sortValueObj = {
+        dataType: linkStep.dataType,
+        value: linkStep.value
+      }
+
+    }
+
+    return [linkStep.fieldName, returnValue, errorsObject, errorsFound, sortValueObj]
 
   } else {
     // has nextLink
     console.log('---------- is next link ----------', { index, linkStep });
 
+    if (linkStep.hasOwnProperty("pathLinkType")) {
+      path.push({
+        objType: objType,
+        pathLinkType: linkStep.pathLinkType
+      });
+      console.log("path", path);
+      // console.log('---------- is next link ----------', hhhh);
+    }
+
     let conditionsPromise = checkConditionsLink(
       // let [conditions, conditionErrObject, conditionErrFound] = await this.checkConditionsLink(
       linkStep.pathLinkType.objType,
@@ -318,17 +348,20 @@ async function createLinkPath(
       linkSteps,
       requiredDataLinkStepObjects,
       requiredDataLinkSteps,
+      path,
       errorsObject,
       errorsFound
     );
 
-    [fieldName, returnValue, errorsObject, errorsFound] = await createLinkPath(
+    [fieldName, returnValue, errorsObject, errorsFound, sortObj] = await createLinkPath(
       linkSteps,
       requiredDataLinkStepObjects,
       requiredDataLinkSteps,
       perParentCombinations,
       complexFilterCombinations,
       values,
+      filtersStructure,
+      path,
       errorsObject,
       errorsFound,
       index + 1
@@ -606,9 +639,11 @@ async function checkConditionsLink(
   perParentCombinations,
   complexFilterCombinations,
   values,
+  filtersStructure,
   linkSteps,
   requiredDataLinkStepObjects,
   requiredDataLinkSteps,
+  path,
   errorsObject,
   errorsFound
 ) {
@@ -618,23 +653,76 @@ async function checkConditionsLink(
     perParentCombinations,
     complexFilterCombinations,
     values,
+    filtersStructure,
     linkSteps,
     requiredDataLinkStepObjects,
     requiredDataLinkSteps,
+    path,
     errorsObject,
     errorsFound
   });
 
 
-  let conditionLinkObject = {}
+  let conditionLinkObject = {};
+  let filterMainRequest = null
+
+  if (linkStepObject.hasOwnProperty("addFilterMain") && linkStepObject.addFilterMain === true) {
+
+    path.push({ objType: objType });
+    console.log('path', path);
+
+    let [filterStructureCurrent, filterErrorObject, filterErrorFound] = await LogicalStructureSharedLib.changeObjTypePath(
+      objType,
+      filtersStructure,
+      path
+    );
+
+    console.log('changeObjTypePath', {
+      filterStructureCurrent,
+      filterErrorObject,
+      filterErrorFound
+    });
+
+    if (filterErrorFound.length > 0) {
+      Object.assign(errorsObject, filterErrorObject);
+      errorsFound = errorsFound.concat('filterErrorFound');
+    } else {
+      filterMainRequest = filterStructureCurrent;
+    }
+
+  }
 
   if (linkStepObject.hasOwnProperty('filterElements')) {
     console.log('------------ has filterElements ------------');
 
+    let filters = {};
+
+    if (filterMainRequest !== null) {
+      if (hash(filterMainRequest.objType) !== hash(linkStepObject.filterElements.objType)) {
+        errorsObject[linkStepObject.filterElements.objType.objectType] = 'this linkStep has error when combine filterMain in link';
+        errorsFound.push(`${linkStepObject.filterElements.objType.objectType}: this linkStep has error when combine filterMain in link`);
+        return [null, errorsObject, errorsFound];
+      }
+
+      filters = filtersSharedLib.combineLogicalElements(
+        filterMainRequest,
+        linkStepObject.filterElements
+      );
+
+
+    } else {
+      filters = {
+        objType: linkStepObject.filterElements.objType,
+        initialLogicalElementId: linkStepObject.filterElements.initialLogicalElementId,
+        logicalElements: linkStepObject.filterElements.logicalElements,
+      }
+    }
+    console.log('filters: ', filters);
+
     let [complexFilterRequest, status, filterErrorsObject, filterErrorsFound] = filtersSharedLib.createFiltersRequest(
-      linkStepObject.filterElements.objType,
-      linkStepObject.filterElements.initialLogicalElementId,
-      linkStepObject.filterElements.logicalElements,
+      filters.objType,
+      filters.initialLogicalElementId,
+      filters.logicalElements,
       values
     );
     console.log('return complexFilter for filterElements: ', {
@@ -646,13 +734,40 @@ async function checkConditionsLink(
 
     if (filterErrorsFound.length > 0) {
       Object.assign(errorsObject, filterErrorsObject)
-      errorsFound = errorsFound.concat(filterErrorsFound);
-      return [null, errorsObject, errorsFound]
+      errorsFound = errorsFound.concat(filterErrorsFound)
     };
+
     conditionLinkObject.filterElements = complexFilterRequest.filterElements;
     console.log('conditionLinkObject in condition link: ', conditionLinkObject);
+
   }
 
+
+  // if (linkStepObject.hasOwnProperty('filterElements')) {
+  //   console.log('------------ has filterElements ------------');
+
+  //   let [complexFilterRequest, status, filterErrorsObject, filterErrorsFound] = filtersSharedLib.createFiltersRequest(
+  //     linkStepObject.filterElements.objType,
+  //     linkStepObject.filterElements.initialLogicalElementId,
+  //     linkStepObject.filterElements.logicalElements,
+  //     values
+  //   );
+  //   console.log('return complexFilter for filterElements: ', {
+  //     complexFilterRequest,
+  //     status,
+  //     filterErrorsObject,
+  //     filterErrorsFound
+  //   });
+
+  //   if (filterErrorsFound.length > 0) {
+  //     Object.assign(errorsObject, filterErrorsObject)
+  //     errorsFound = errorsFound.concat(filterErrorsFound);
+  //     return [null, errorsObject, errorsFound]
+  //   };
+  //   conditionLinkObject.filterElements = complexFilterRequest.filterElements;
+  //   console.log('conditionLinkObject in condition link: ', conditionLinkObject);
+  // }
+
   if (linkStepObject.hasOwnProperty('aggregate')) {
     console.log('------------ has aggregate ------------');
     if (!linkStepObject.hasOwnProperty('sortFields')) {
@@ -696,6 +811,8 @@ async function checkConditionsLink(
         perParentCombinations,
         complexFilterCombinations,
         values,
+        filtersStructure,
+        [],
         errorsObject,
         errorsFound
       );
@@ -766,10 +883,19 @@ async function checkConditionsLink(
         });
       };
 
-      sortFieldObjects.push({
+      let sortObject = {
         fieldName: fieldName,
-        dataType: sortField.dataType
-      });
+        // dataType: sortField.dataType
+      }
+
+      if (sortObj !== null) {
+        if (sortObj.dataType === "array") {
+          sortObject.dataType = sortObj.dataType
+          sortObject.values = sortObj.value;
+        }
+      }
+
+      sortFieldObjects.push(sortObject);
       console.log('sortFieldObjects: ', sortFieldObjects);
 
     };

package/src/FiltersSharedLib.js

@@ -17,10 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 "use strict";
 
-import { objectHash as hash } from '@izara_project/izara-shared-core';  //const hash = require('@izara_project/izara-shared-core').objectHash;
+import { objectHash as hash } from '@izara_project/izara-shared-core';
 import lodash from 'lodash';
 const { isEmpty } = lodash;
-import complexFilterShared from '@izara_project/izara-core-library-complex-filter';
 
 function validateFilterElement(
   filterElements,
@@ -162,18 +161,6 @@ function createFiltersRequest(
   };
   console.log('complexFilterRequest: ', complexFilterRequest);
 
-  // let validate = validateFilterElement(
-  //   complexFilterRequest.filterElements,
-  //   logicalElements
-  // );
-  // _izContext.logger.debug('validate: ', validate);
-
-  // if (validate === false) {
-  //   errorsObject[initialLogicalElementId] = 'filterElements has create fail';
-  //   errorsFound.push("filterElements has create fail");
-  //   return [null, "error", errorsObject, errorsFound]
-  // }
-
   return [
     complexFilterRequest,
     status,
@@ -1005,7 +992,6 @@ function filterLogicalElements(
 
   if (lastNextLogicalElementId !== null) {
 
-    // [runningFilterMainId, runningFilterObject, operation, operationErrorsFound] = complexFilterShared.validateOperation(
     [runningFilterMainId, runningFilterObject, operation, operationErrorsFound] = validateOperation(
       objType,
       runningFilterMainId,
@@ -1203,7 +1189,7 @@ export default {
   //* create filter
   createFiltersRequest,
   validateCombinationStructure,
-  // validateOperation,
   filterLogicalElements,
+  // validateOperation,
   // splitFilterElements,
 }

package/src/InitialSchemaLib.js

@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 import LogicalStructureSharedLib from './LogicalStructureSharedLib.js';
 
-function initSchemaFn(getObjSchemaS3WithoutHierarchy, getObjectRelationship) { //getObjectLinks
-  return LogicalStructureSharedLib.initSchemaFn(getObjSchemaS3WithoutHierarchy, getObjectRelationship);
+function initSchemaFn(getObjSchemaS3WithHierarchyShared, getObjectLinksShared) {
+  return LogicalStructureSharedLib.initSchemaFn(getObjSchemaS3WithHierarchyShared, getObjectLinksShared);
 }
 
 export default {

package/src/LogicalStructureSharedLib.js

@@ -18,24 +18,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 
-import { objectHash as hash } from '@izara_project/izara-shared-core';  //const hash = require('@izara_project/izara-shared-core').objectHash;
+import { objectHash as hash } from '@izara_project/izara-shared-core';
 import lodash from 'lodash';
 const { isEmpty } = lodash;
-import { v4 as uuidV4 } from 'uuid'; //const { v4: uuidv4 } = require('uuid');
-// import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import { v4 as uuidV4 } from 'uuid';
 const MAX_ITER = 4;
 
 let getObjectSchema = {};
 
-function initSchemaFn(getObjSchemaS3WithoutHierarchy, getObjectRelationship) { //getObjectLinks
+function initSchemaFn(getObjSchemaS3WithHierarchyShared, getObjectLinksShared) {
   getObjectSchema = {
-    getObjSchemaS3WithoutHierarchy,
-    getObjectRelationship: getObjectRelationship // getObjectRelationship: getObjectLinks
+    getObjSchemaS3WithHierarchyShared,
+    getObjectLinksShared
   }
-
   return getObjectSchema;
 }
 
+
 function combineLogicalStructure(
   objType,
   initialLogicalElementId,
@@ -752,7 +751,7 @@ async function changeObjTypePath(
                             if (!childLogicalElement.hasOwnProperty('childLogicalElementId')) {
 
                               // let childSchema = await getObjectSchema.getObjSchemaS3WithCache(
-                              let childSchema = await getObjectSchema.getObjSchemaS3WithoutHierarchyV2(
+                              let childSchema = await getObjectSchema.getObjSchemaS3WithHierarchyShared(
                                 childLogicalElement.objType
                               );
                               console.log('childSchema: ', childSchema);
@@ -810,7 +809,6 @@ async function changeObjTypePath(
 
                   let logicalStructure = {};
                   [previousLogicalElementId, previousLogicalElement, logicalStructure, errorsFound] = createChildComplexFilterStructure(
-                    _izContext,
                     logicalElements,
                     previousLogicalElementId,
                     previousLogicalElement,
@@ -860,7 +858,6 @@ async function changeObjTypePath(
                 let logicalStructure = {};
                 // change function name ==> set logicalElementId
                 [previousLogicalElementId, previousLogicalElement, logicalStructure, errorsFound] = createChildComplexFilterStructure(
-                  _izContext,
                   logicalElements,
                   previousLogicalElementId,
                   previousLogicalElement,
@@ -1028,9 +1025,7 @@ async function recursiveFindObjTypeTypePathToAnotherObjType(
       return [null, errorsObject, errorsFound];
     };
 
-    // let objectRelationship = await getObjectSchema.getObjectRelationshipWithCache(
-    const objectRelationship = await getObjectSchema.getObjectRelationship(
-      {},  //_izContext maybe delete
+    const objectRelationship = await getObjectSchema.getObjectLinksShared(
       fromObjType
     );
     console.log("objectRelationship: ", { fromObjType, objectRelationship });
@@ -1063,8 +1058,7 @@ async function recursiveFindObjTypeTypePathToAnotherObjType(
       };
 
       // const objectSchema = await getObjectSchema.getObjSchemaS3WithCache(
-      const objectSchema = await getObjectSchema.getObjSchemaS3WithoutHierarchy(
-        {}, //_izContext maybe delete
+      const objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchyShared(
         toObjType,
       );
       console.log('objectSchema: ', objectSchema);

package/src/SearchSortSharedLib.js

@@ -18,12 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 "use strict";
 
 //* searchResultMain record
-import { objectHash as hash } from '@izara_project/izara-shared-core';  //const hash = require('@izara_project/izara-shared-core').objectHash;
+import { objectHash as hash } from '@izara_project/izara-shared-core';
 import lodash from 'lodash';
 const { isEmpty } = lodash;
-import filtersSharedLib from './FiltersSharedLib.js'; //const filtersSharedLib = require('./FiltersSharedLib');
+import filtersSharedLib from './FiltersSharedLib.js';
 import dataFieldsSharedLib from './DataFieldsSharedLib.js';
-import LogicalStructureSharedLib from './LogicalStructureSharedLib.js';
+
 
 async function createSearchRequest(
   objType,
@@ -105,11 +105,11 @@ async function createSearchRequest(
   let requiredData = await requiredDataPromise;
   console.log('return create requiredData: ', requiredData);
 
-  // if (requiredData.status === 'invalid' || requiredData.errorsFound.length > 0) {
-  //   Object.assign(errorsObject, requiredData.errorsObject)
-  //   errorsFound.push('requiredData cannot create');
-  //   errorsFound = errorsFound.concat(requiredData.errorsFound);
-  // }
+  if (requiredData.status === 'invalid' || requiredData.errorsFound.length > 0) {
+    Object.assign(errorsObject, requiredData.errorsObject)
+    errorsFound.push('requiredData cannot create');
+    errorsFound = errorsFound.concat(requiredData.errorsFound);
+  }
 
   if (errorsFound.length > 0) {
     return [null, 'invalid', errorsObject, errorsFound]