@izara_project/izara-shared-search-and-sort 1.0.2 → 1.0.4

package/index.js

@@ -16,9 +16,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-import SearchSortSharedLib from './src/SearchSortSharedLib';
-import FiltersSharedLib from './src/FiltersSharedLib'
-import DataFieldsSharedLib from './src/DataFieldsSharedLib'
+import SearchSortSharedLib from './src/SearchSortSharedLib.js';
+import FiltersSharedLib from './src/FiltersSharedLib.js'
+import DataFieldsSharedLib from './src/DataFieldsSharedLib.js'
 
 export {
   SearchSortSharedLib,

package/package.json

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

package/src/DataFieldsSharedLib.js

@@ -23,11 +23,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // export default [...]
 
 import { objectHash as hash } from '@izara_project/izara-shared-core';  //const hash = require('@izara_project/izara-shared-core').objectHash;
-import { isEmpty as isEmpty } from 'lodash';
-import filtersSharedLib from './FiltersSharedLib'; //const filtersSharedLib = require('./FiltersSharedLib');
+import lodash from 'lodash';
+const { isEmpty } = lodash;
+import filtersSharedLib from './FiltersSharedLib.js'; //const filtersSharedLib = require('./FiltersSharedLib');
 
 async function createRequiredData(
-  _izContext,
   objType,
   requiredDataFields,
   complexFilterCombinations,
@@ -36,7 +36,7 @@ async function createRequiredData(
   requiredDataLinkSteps,
   values,
 ) {
-  _izContext.logger.debug('createRequiredData: ', {
+  console.log('createRequiredData: ', {
     objType,
     requiredDataFields,
     complexFilterCombinations,
@@ -56,18 +56,17 @@ async function createRequiredData(
   let setComplexFilterCombinations = {};
   let setFilterElementsLink = {}
 
-  _izContext.logger.debug('--------------- start requiredData  fields ---------------')
+  console.log('--------------- start requiredData  fields ---------------')
   for (const requiredDataFieldId of requiredDataFields) {
-    _izContext.logger.debug('extract requiredDataFields: ', requiredDataFieldId);
+    console.log('extract requiredDataFields: ', requiredDataFieldId);
 
     let requiredDataLinkObject = requiredDataLinkStepObjects[requiredDataFieldId];
-    _izContext.logger.debug('requiredDataLinkObject: ', requiredDataLinkObject);
+    console.log('requiredDataLinkObject: ', requiredDataLinkObject);
 
     let linkSteps = requiredDataLinkObject.linkSteps;
-    _izContext.logger.debug('initial data: ', { linkSteps });
+    console.log('initial data: ', { linkSteps });
 
     let [fieldName, returnValue, linkPathErrorObject, linkPathErrorsFound] = await createLinkPath(
-      _izContext,
       linkSteps,
       requiredDataLinkStepObjects,
       requiredDataLinkSteps,
@@ -77,7 +76,7 @@ async function createRequiredData(
       errorsObject,
       errorsFound
     );
-    _izContext.logger.debug('return createLinkPath: ', {
+    console.log('return createLinkPath: ', {
       fieldName,
       returnValue,
       linkPathErrorObject,
@@ -119,10 +118,10 @@ async function createRequiredData(
         initialObjType: objType,
         linkSteps: returnValue.linkSteps
       };
-      _izContext.logger.debug('pathObject: ', pathObject);
+      console.log('pathObject: ', pathObject);
 
       let pathId = hash(pathObject);
-      _izContext.logger.debug('pathId: ', pathId);
+      console.log('pathId: ', pathId);
 
       let setObject = {
         fieldName: fieldName,
@@ -158,10 +157,10 @@ async function createRequiredData(
         requiredFieldNameObject.filterElements = returnValue.filterElements;
         Object.assign(setFilterElementsLink, returnValue.filterElements);
       };
-      _izContext.logger.debug('requiredFieldNameObject: ', requiredFieldNameObject);
+      console.log('requiredFieldNameObject: ', requiredFieldNameObject);
 
       let requiredDataFieldNameId = hash(requiredFieldNameObject);
-      _izContext.logger.debug('requiredDataFieldNameId: ', requiredDataFieldNameId);
+      console.log('requiredDataFieldNameId: ', requiredDataFieldNameId);
 
       if (isEmpty(requiredDataObject)) {
         requiredDataObject = {
@@ -173,15 +172,15 @@ async function createRequiredData(
       };
 
     } else {
-      _izContext.logger.debug("------- requiredData has only fieldName ---------");
+      console.log("------- requiredData has only fieldName ---------");
 
       let requiredFieldNameObject = {
         fieldName: fieldName
       };
-      _izContext.logger.debug("requiredFieldNameObject: ", requiredFieldNameObject);
+      console.log("requiredFieldNameObject: ", requiredFieldNameObject);
 
       let requiredDataFieldNameId = hash(requiredFieldNameObject);
-      _izContext.logger.debug("requiredDataFieldNameId: ", requiredDataFieldNameId);
+      console.log("requiredDataFieldNameId: ", requiredDataFieldNameId);
 
       if (isEmpty(requiredDataObject)) {
 
@@ -193,7 +192,7 @@ async function createRequiredData(
         requiredDataObject[requiredDataFieldNameId] = requiredFieldNameObject;
       };
     }
-    _izContext.logger.debug("before return linkPath: ", { requiredDataObject, linkPathObjects, linkPathSteps });
+    console.log("before return linkPath: ", { requiredDataObject, linkPathObjects, linkPathSteps });
   }
 
   let requiredObject = {};
@@ -219,11 +218,11 @@ async function createRequiredData(
   if (!isEmpty(setFilterElementsLink)) {
     requiredObject.filterElements = setFilterElementsLink;
   };
-  _izContext.logger.debug('requiredObject: ', requiredObject);
+  console.log('requiredObject: ', requiredObject);
 
   if (!isEmpty(requiredObject)) {
     requiredDataHash = hash(requiredObject);
-    _izContext.logger.debug('requiredDataHash: ', requiredDataHash);
+    console.log('requiredDataHash: ', requiredDataHash);
   }
 
   let status = 'valid"';
@@ -231,7 +230,7 @@ async function createRequiredData(
     status = 'invalid';
   };
 
-  _izContext.logger.debug('return : ', {
+  console.log('return : ', {
     requiredDataHash: requiredDataHash,
     requiredDataObjects: requiredDataObject,
     linkPathObjects: linkPathObjects,
@@ -261,7 +260,6 @@ async function createRequiredData(
 
 
 async function createLinkPath(
-  _izContext,
   linkSteps,
   requiredDataLinkStepObjects,
   requiredDataLinkSteps,
@@ -274,7 +272,7 @@ async function createLinkPath(
   previousLinkId = null,
   previousLink = null
 ) {
-  _izContext.logger.debug('create LinkPath: ', {
+  console.log('create LinkPath: ', {
     linkSteps,
     requiredDataLinkStepObjects,
     requiredDataLinkSteps,
@@ -302,24 +300,23 @@ async function createLinkPath(
   // let childLinkErrors = []
 
   let linkStepId = linkSteps[index];
-  _izContext.logger.debug('linkStepId: ', linkStepId);
+  console.log('linkStepId: ', linkStepId);
 
   let linkStep = requiredDataLinkSteps[linkStepId];
-  _izContext.logger.debug('linkStep: ', linkStep);
+  console.log('linkStep: ', linkStep);
 
   if (index + 1 === linkSteps.length) {
     // last link that has only fieldName
-    _izContext.logger.debug('---------- is final link ----------', { index, linkStep });
+    console.log('---------- is final link ----------', { index, linkStep });
 
     return [linkStep.fieldName, returnValue, errorsObject, errorsFound]
 
   } else {
     // has nextLink
-    _izContext.logger.debug('---------- is next link ----------', { index, linkStep });
+    console.log('---------- is next link ----------', { index, linkStep });
 
     let conditionsPromise = checkConditionsLink(
       // let [conditions, conditionErrObject, conditionErrFound] = await this.checkConditionsLink(
-      _izContext,
       linkStep.pathLinkType.objType,
       linkStep,
       perParentCombinations,
@@ -333,7 +330,6 @@ async function createLinkPath(
     );
 
     [fieldName, returnValue, errorsObject, errorsFound] = await createLinkPath(
-      _izContext,
       linkSteps,
       requiredDataLinkStepObjects,
       requiredDataLinkSteps,
@@ -344,7 +340,7 @@ async function createLinkPath(
       errorsFound,
       index + 1
     )
-    _izContext.logger.debug('createLinkPath in link', {
+    console.log('createLinkPath in link', {
       fieldName,
       returnValue,
       errorsObject,
@@ -352,7 +348,7 @@ async function createLinkPath(
       index
     });
 
-    _izContext.logger.debug('linkStep', linkStep);
+    console.log('linkStep', linkStep);
 
     let [conditions, conditionErrObject, conditionErrFound] = await conditionsPromise;
 
@@ -362,7 +358,7 @@ async function createLinkPath(
     };
 
     if (!isEmpty(returnValue)) {
-      _izContext.logger.debug('----------------- has returnValue ---------------------', { index, fieldName, returnValue, conditions })
+      console.log('----------------- has returnValue ---------------------', { index, fieldName, returnValue, conditions })
 
       let linkStepObject = {
         pathLinkType: linkStep.pathLinkType
@@ -421,7 +417,7 @@ async function createLinkPath(
             };
           }
 
-          _izContext.logger.debug('returnValue', returnValue);
+          console.log('returnValue', returnValue);
 
         } else {
           //* error
@@ -456,16 +452,16 @@ async function createLinkPath(
         };
       };
 
-      _izContext.logger.debug('linkStepObject', linkStepObject);
+      console.log('linkStepObject', linkStepObject);
       let linkStepId = hash(linkStepObject);
-      _izContext.logger.debug('linkStepId', linkStepId);
+      console.log('linkStepId', linkStepId);
 
       returnValue['linkSteps'].unshift(linkStepId);
       returnValue['linkStepObjects'] = Object.assign({ [linkStepId]: linkStepObject }, returnValue['linkStepObjects']);
-      _izContext.logger.debug('returnValue', returnValue);
+      console.log('returnValue', returnValue);
 
     } else {
-      _izContext.logger.debug('----------------- no returnValue ---------------------', { index, fieldName, conditions })
+      console.log('----------------- no returnValue ---------------------', { index, fieldName, conditions })
       //returnValue: {  linkSteps, linkStepsObjects, perParent, combinations, sortFieldLinkStepObjects  }
       //sortFieldLinkStepObjects  from in sortField in link
 
@@ -556,15 +552,15 @@ async function createLinkPath(
         };
       };
 
-      _izContext.logger.debug('linkStepObject', linkStepObject);
+      console.log('linkStepObject', linkStepObject);
       let linkStepId = hash(linkStepObject);
-      _izContext.logger.debug('linkStepId', linkStepId);
+      console.log('linkStepId', linkStepId);
 
       returnValue.linkSteps = [linkStepId];
       returnValue.linkStepObjects = {
         [linkStepId]: linkStepObject
       };
-      _izContext.logger.debug('returnValue', returnValue);
+      console.log('returnValue', returnValue);
     }
   }
   return [fieldName, returnValue, errorsObject, errorsFound]
@@ -572,7 +568,6 @@ async function createLinkPath(
 
 
 async function checkConditionsLink(
-  _izContext,
   objType,
   linkStepObject,
   perParentCombinations,
@@ -584,7 +579,7 @@ async function checkConditionsLink(
   errorsObject,
   errorsFound
 ) {
-  _izContext.logger.debug('checkConditionsLink:', {
+  console.log('checkConditionsLink:', {
     objType,
     linkStepObject,
     perParentCombinations,
@@ -601,16 +596,15 @@ async function checkConditionsLink(
   let conditionLinkObject = {}
 
   if (linkStepObject.hasOwnProperty('filterElements')) {
-    _izContext.logger.debug('------------ has filterElements ------------');
+    console.log('------------ has filterElements ------------');
 
-    let [complexFilterRequest, status, filterErrorsObject, filterErrorsFound] = filtersSharedLib.createComplexFilter(
-      _izContext,
+    let [complexFilterRequest, status, filterErrorsObject, filterErrorsFound] = filtersSharedLib.createFiltersRequest(
       linkStepObject.filterElements.objType,
       linkStepObject.filterElements.initialLogicalElementId,
       linkStepObject.filterElements.logicalElements,
       values
     );
-    _izContext.logger.debug('return complexFilter for filterElements: ', {
+    console.log('return complexFilter for filterElements: ', {
       complexFilterRequest,
       status,
       filterErrorsObject,
@@ -622,11 +616,11 @@ async function checkConditionsLink(
       errorsFound = errorsFound.concat(filterErrorsFound)
     };
     conditionLinkObject.filterElements = complexFilterRequest.filterElements;
-    _izContext.logger.debug('conditionLinkObject in condition link: ', conditionLinkObject);
+    console.log('conditionLinkObject in condition link: ', conditionLinkObject);
   }
 
   if (linkStepObject.hasOwnProperty('aggregate')) {
-    _izContext.logger.debug('------------ has aggregate ------------');
+    console.log('------------ has aggregate ------------');
     if (!linkStepObject.hasOwnProperty('sortFields')) {
       errorsFound.push('if has aggregate need to has sortFields, too');
     };
@@ -648,19 +642,18 @@ async function checkConditionsLink(
     let setPerParentCombinations = {};
     let setFilterElements = {};
 
-    _izContext.logger.debug('linkStepObject.sortFields', linkStepObject.sortFields);
+    console.log('linkStepObject.sortFields', linkStepObject.sortFields);
 
     for (const sortField of linkStepObject.sortFields) {
-      _izContext.logger.debug('sortField: ', sortField);
-      _izContext.logger.debug('requiredDataLinkSteps: ', requiredDataLinkSteps);
+      console.log('sortField: ', sortField);
+      console.log('requiredDataLinkSteps: ', requiredDataLinkSteps);
       let requiredDataLinkStepSortField = requiredDataLinkStepObjects[sortField.requiredDataLinkStepObjectId];
-      _izContext.logger.debug('requiredDataLinkStepSortField: ', requiredDataLinkStepSortField);
+      console.log('requiredDataLinkStepSortField: ', requiredDataLinkStepSortField);
 
-      _izContext.logger.debug(' requiredDataLinkStepSortField.linkSteps: ', requiredDataLinkStepSortField.linkSteps);
+      console.log(' requiredDataLinkStepSortField.linkSteps: ', requiredDataLinkStepSortField.linkSteps);
 
       //* make all linkPath in here and send out to combine allLinkPath
       let [fieldName, childLinkStep, linkErrorsObject, linkErrorsFound] = await createLinkPath(
-        _izContext,
         requiredDataLinkStepSortField.linkSteps,
         requiredDataLinkStepObjects,
         requiredDataLinkSteps,
@@ -670,7 +663,7 @@ async function checkConditionsLink(
         errorsObject,
         errorsFound
       );
-      _izContext.logger.debug(' cratelinkPath in checkCondition for sortField: ', {
+      console.log(' cratelinkPath in checkCondition for sortField: ', {
         fieldName,
         childLinkStep,
         linkErrorsObject,
@@ -684,12 +677,12 @@ async function checkConditionsLink(
           initialObjType: objType,
           linkSteps: childLinkStep.linkSteps
         };
-        _izContext.logger.debug('pathObject: ', pathObject);
+        console.log('pathObject: ', pathObject);
 
         let pathId = hash(pathObject);
-        _izContext.logger.debug('pathId: ', pathId);
+        console.log('pathId: ', pathId);
 
-        _izContext.logger.debug('linkPathObjects xxxxxx: ', linkPathObjects);
+        console.log('linkPathObjects xxxxxx: ', linkPathObjects);
 
         Object.assign(linkPathObjects, { [pathId]: pathObject });
 
@@ -735,7 +728,7 @@ async function checkConditionsLink(
         fieldName: fieldName,
         dataType: sortField.dataType
       });
-      _izContext.logger.debug('sortFieldObjects: ', sortFieldObjects);
+      console.log('sortFieldObjects: ', sortFieldObjects);
 
     };
 
@@ -758,7 +751,7 @@ async function checkConditionsLink(
       };
     };
 
-    _izContext.logger.debug('conditionLinkObject: ', conditionLinkObject);
+    console.log('conditionLinkObject: ', conditionLinkObject);
 
   } else {
     if (linkStepObject.hasOwnProperty('combine')) {
@@ -767,7 +760,7 @@ async function checkConditionsLink(
   };
 
   if (linkStepObject.hasOwnProperty('requestProperties')) {
-    _izContext.logger.debug('------------ link has requestProperties ------------');
+    console.log('------------ link has requestProperties ------------');
 
     let perParentCombinationIds = [];
     let perParentCombinationObjects = {}
@@ -775,27 +768,26 @@ async function checkConditionsLink(
     let applyCombinations = [];
 
     for (const [tag, requestPropertyId] of Object.entries(linkStepObject.requestProperties)) {
-      _izContext.logger.debug('extract requestProperties', { tag, requestPropertyId });
+      console.log('extract requestProperties', { tag, requestPropertyId });
       let requestPropertyObject = values[requestPropertyId];
-      _izContext.logger.debug('extract requestProperties', requestPropertyObject);
+      console.log('extract requestProperties', requestPropertyObject);
 
 
       if (requestPropertyObject.hasOwnProperty('valueSource')) {
 
         if (requestPropertyObject.valueSource === 'perParentCombination') {
-          _izContext.logger.debug('------------- perParentCombinations -------------');
+          console.log('------------- perParentCombinations -------------');
 
           let perParentCombinationObject = perParentCombinations[requestPropertyObject.perParentCombinationId];
-          _izContext.logger.debug('perParentCombinationObject', perParentCombinationObject);
+          console.log('perParentCombinationObject', perParentCombinationObject);
 
-          let [complexFilterRequest, status, perParentErrorsObject, perParentErrorsFound] = filtersSharedLib.createComplexFilter(
-            _izContext,
+          let [complexFilterRequest, status, perParentErrorsObject, perParentErrorsFound] = filtersSharedLib.createFiltersRequest(
             perParentCombinationObject.objType,
             perParentCombinationObject.initialLogicalElementId,
             perParentCombinationObject.logicalElements,
             values,
           );
-          _izContext.logger.debug('return complexFilter for perParentCombinations: ', {
+          console.log('return complexFilter for perParentCombinations: ', {
             complexFilterRequest,
             status,
             perParentErrorsObject,
@@ -819,25 +811,24 @@ async function checkConditionsLink(
               filterElements: complexFilterRequest.filterElements
             }
           });
-          _izContext.logger.debug('set perParentCombinations: ', { perParentCombinationIds, perParentCombinationObjects });
+          console.log('set perParentCombinations: ', { perParentCombinationIds, perParentCombinationObjects });
 
         } else if (requestPropertyObject.valueSource === 'complexFilterCombination') {
-          _izContext.logger.debug('------------- complexFilterCombination will set applyCombinations -------------', complexFilterCombinations);
+          console.log('------------- complexFilterCombination will set applyCombinations -------------', complexFilterCombinations);
 
           let complexFilterCombinationId = requestPropertyObject.complexFilterCombinationId;
-          _izContext.logger.debug('complexFilterCombinationId: ', complexFilterCombinationId);
+          console.log('complexFilterCombinationId: ', complexFilterCombinationId);
 
           let complexFilterCombinationObject = complexFilterCombinations[complexFilterCombinationId];
-          _izContext.logger.debug('complexFilterCombinationObject: ', complexFilterCombinationObject);
+          console.log('complexFilterCombinationObject: ', complexFilterCombinationObject);
 
-          let [complexFilterRequest, status, complexFilterErrorsObject, complexFilterErrorsFound] = filtersSharedLib.createComplexFilter(
-            _izContext,
+          let [complexFilterRequest, status, complexFilterErrorsObject, complexFilterErrorsFound] = filtersSharedLib.createFiltersRequest(
             complexFilterCombinationObject.objType,
             complexFilterCombinationObject.initialLogicalElementId,
             complexFilterCombinationObject.logicalElements,
             values
           );
-          _izContext.logger.debug('return complexFilter for complexFilterCombinations: ', {
+          console.log('return complexFilter for complexFilterCombinations: ', {
             complexFilterRequest,
             status,
             complexFilterErrorsObject,
@@ -857,7 +848,7 @@ async function checkConditionsLink(
             filterMainId: complexFilterRequest.filterMainId,
             // identifiersFieldName: requestPropertyObject.identifierFieldName
           });
-          _izContext.logger.debug('applyCombinations: ', applyCombinations);
+          console.log('applyCombinations: ', applyCombinations);
 
           Object.assign(complexFilterCombinationObjects, {
             [complexFilterRequest.filterMainId]: {
@@ -889,7 +880,7 @@ async function checkConditionsLink(
       };
     };
 
-    _izContext.logger.debug('perParentCombinations: ', {
+    console.log('perParentCombinations: ', {
       perParentCombinationIds,
       perParentCombinationObjects,
       applyCombinations
@@ -904,15 +895,14 @@ async function checkConditionsLink(
       conditionLinkObject.applyCombinations = applyCombinations
       conditionLinkObject.complexFilterCombinationObjects = complexFilterCombinationObjects;
     };
-    _izContext.logger.debug('conditionLinkObject: ', conditionLinkObject);
+    console.log('conditionLinkObject: ', conditionLinkObject);
   }
-  _izContext.logger.debug('conditionLinkObject', conditionLinkObject);
+  console.log('conditionLinkObject', conditionLinkObject);
   return [conditionLinkObject, errorsObject, errorsFound];
 }
 
 
 function checkConditionsLinkStep(
-  _izContext,
   multipleIdentifiers,
   linkConfig,
   combine
@@ -934,7 +924,7 @@ function checkConditionsLinkStep(
   }
 
   let requestProperties = false;
-  if (linkConfig.hasOwnProperty('requestProperties')) {
+  if (linkConfig.hasOwnProperty('requestProperties') && !isEmpty(linkConfig.requestProperties)) {
     requestProperties = true;
   }
   if (multipleIdentifiers) {
@@ -983,44 +973,82 @@ function checkConditionsLinkStep(
 
 
 function checkMultipleIdentifers(
-  _izContext,
   linkConfig = {},
-  aggregate = false,
-  comparison = false,
-  combine = false,
-  applyCombinations = false,
+  conditions = {},
   multipleIdentifiers = false,
+  //
 ) {
+  // conditions: {
+  //   aggregate ,
+  //   comparison,
+  //   combine ,
+  //   applyCombinations ,
+  //   multipleIdentifiers,
+  // }
+
   let manyIdentifiers = null;
+
   if (!isEmpty(linkConfig)) {
+
     let toMany = false;
     if (linkConfig.other.linkType === 'many') {
       toMany = true;
     };
 
     if (multipleIdentifiers) {
+
       if (toMany || !toMany) {
-        if (!combine) {
-          manyIdentifiers = true;
-        } else {
-          if (aggregate) {
-            manyIdentifiers = false;
+
+        if (conditions.hasOwnProperty("combine") && conditions.combine === true) {
+
+          if (conditions.hasOwnProperty("aggregate")) {
+            if (conditions.aggregate === true) {
+              manyIdentifiers = false;
+            }
           }
+
+        } else {
+          manyIdentifiers = true;
         }
       }
+
     } else {
+
       if (toMany) {
-        if (aggregate) {
+
+        if (conditions.hasOwnProperty("aggregate") && conditions.aggregate === true) {
           manyIdentifiers = false;
         } else {
           manyIdentifiers = true;
         }
+
       } else {
-        if (!aggregate && !combine && !applyCombinations && !comparison) {
+
+        if (isEmpty(conditions)) {
+
           manyIdentifiers = false;
+
+        } else {
+
+          if (conditions.hasOwnProperty("applyCombinations") && conditions.applyCombinations === true) {
+            manyIdentifiers = true;
+          } else {
+
+            if ((conditions.hasOwnProperty("aggregate") && conditions.aggregate === true)
+              || (conditions.hasOwnProperty("combine") && conditions.combine === true)
+              || (conditions.hasOwnProperty("comparison") && conditions.comparison === true)
+            ) {
+              manyIdentifiers = null;
+            } else {
+              manyIdentifiers = false;
+            }
+          }
         }
       }
     }
+
+  } else {
+    manyIdentifiers = false
   }
   return manyIdentifiers
 }