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

package/src/SearchSortSharedLib.js

@@ -19,14 +19,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //* searchResultMain record
 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 dataFieldsSharedLib from './DataFieldsSharedLib';
+import lodash from 'lodash';
+const { isEmpty } = lodash;
+import filtersSharedLib from './FiltersSharedLib.js'; //const filtersSharedLib = require('./FiltersSharedLib');
+import dataFieldsSharedLib from './DataFieldsSharedLib.js';
 import searchResultShared from '@izara_project/izara-core-library-search-result';
 
 
 function createSearchRequest(
-  _izContext,
   objType,
   initialLogicalElementId,
   logicalElements,
@@ -37,7 +37,7 @@ function createSearchRequest(
   requiredDataLinkSteps,
   values
 ) {
-  _izContext.logger.debug('createSearchResult: ', {
+  console.log('createSearchResult: ', {
     objType,
     initialLogicalElementId,
     logicalElements,
@@ -61,14 +61,13 @@ function createSearchRequest(
     complexErrorsObject,
     complexErrorsFound
   ] = filtersSharedLib.createFiltersRequest(
-    _izContext,
     objType,
     initialLogicalElementId,
     logicalElements,
     values,
     []
   );
-  _izContext.logger.debug('return createComplexFilter: ', {
+  console.log('return createComplexFilter: ', {
     complexFilterRequest,
     complexFilterStatus,
     complexErrorsObject,
@@ -81,7 +80,6 @@ function createSearchRequest(
   }
 
   let requiredData = dataFieldsSharedLib.createRequiredData(
-    _izContext,
     objType,
     requiredDataFields,
     complexFilterCombinations,
@@ -90,7 +88,7 @@ function createSearchRequest(
     requiredDataLinkSteps,
     values,
   );
-  _izContext.logger.debug('return create requiredData: ', requiredData);
+  console.log('return create requiredData: ', requiredData);
 
   if (requiredData.status === 'invalid' || requiredData.errorsFound.length > 0) {
     Object.assign(errorsObject, requiredData.errorsObject)
@@ -120,7 +118,7 @@ function createSearchRequest(
     Object.assign(filterElements, requiredData.filterElements);
   }
 
-  _izContext.logger.debug("--------------------------- start create searchResult request -------------------------------", {
+  console.log("--------------------------- start create searchResult request -------------------------------", {
     complexFilterRequest,
     requiredData,
     filterElements
@@ -138,14 +136,13 @@ function createSearchRequest(
     linkPathObjects: requiredData.linkPathObjects,
     linkPathSteps: requiredData.linkPathSteps
   };
-  _izContext.logger.debug("searchResultRequest: ", searchResultRequest);
+  console.log("searchResultRequest: ", searchResultRequest);
 
   return [searchResultRequest, status, errorsObject, errorsFound]
 
 }
 
 function createSortRequest(
-  _izContext,
   objType,
   initialLogicalElementId,
   logicalElements,
@@ -157,7 +154,7 @@ function createSortRequest(
   sortFields,
   values
 ) {
-  _izContext.logger.debug('createSortResult: ', {
+  console.log('createSortResult: ', {
     objType,
     initialLogicalElementId,
     logicalElements,
@@ -182,16 +179,16 @@ function createSortRequest(
     let requiredDataLinkStepObjectId = sortField.requiredDataLinkStepObjectId;
 
     let requiredDataLinkObject = requiredDataLinkStepObjects[requiredDataLinkStepObjectId];
-    _izContext.logger.debug('requiredDataLinkObject', requiredDataLinkObject);
+    console.log('requiredDataLinkObject', requiredDataLinkObject);
 
     let requiredDataLinkStepsSortField = requiredDataLinkObject.linkSteps;
-    _izContext.logger.debug('requiredDataLinkStepsSortField', requiredDataLinkStepsSortField);
+    console.log('requiredDataLinkStepsSortField', requiredDataLinkStepsSortField);
 
     let lastRequiredDataLinkStepId = requiredDataLinkStepsSortField[requiredDataLinkStepsSortField.length - 1];
-    _izContext.logger.debug('lastRequiredDataLinkStepId', lastRequiredDataLinkStepId);
+    console.log('lastRequiredDataLinkStepId', lastRequiredDataLinkStepId);
 
     let linkStep = requiredDataLinkSteps[lastRequiredDataLinkStepId];
-    _izContext.logger.debug('linkStep', linkStep);
+    console.log('linkStep', linkStep);
 
     sortFieldMain.push({
       fieldName: linkStep.fieldName,
@@ -199,10 +196,9 @@ function createSortRequest(
     });
 
   }
-  _izContext.logger.debug("sortFieldMain: ", sortFieldMain)
+  console.log("sortFieldMain: ", sortFieldMain)
 
   let [searchResultRequest, status, errorsObject, errorsFound] = createSearchRequest(
-    _izContext,
     objType,
     initialLogicalElementId,
     logicalElements,
@@ -213,7 +209,7 @@ function createSortRequest(
     requiredDataLinkSteps,
     values
   );
-  _izContext.logger.debug('SearchResultRequest: ', {
+  console.log('SearchResultRequest: ', {
     searchResultRequest,
     status,
     errorsObject,
@@ -226,18 +222,19 @@ function createSortRequest(
 
   let searchResultId = searchResultRequest.searchResultId;
   let searchDetailId = searchResultRequest.searchDetailId;
-  _izContext.logger.debug('searchResultMain: ', {
+  console.log('searchResultMain: ', {
     searchResultId,
     searchDetailId
   });
 
-  let sortResultId = searchResultShared.createSortResultId(
-    _izContext,
-    searchResultId,
-    searchDetailId,
-    sortFieldMain
-  );
-  _izContext.logger.debug('sortResultId: ', sortResultId)
+  let sortFieldsHash = hash(sortFieldMain);
+  let sortResultId = searchResultId + '__' + searchDetailId + '__' + sortFieldsHash;
+  // let sortResultId = searchResultShared.createSortResultId(
+  //   searchResultId,
+  //   searchDetailId,
+  //   sortFieldMain
+  // );
+  console.log('sortResultId: ', sortResultId)
 
   let sortRequest = {
     objType: objType,
@@ -250,9 +247,9 @@ function createSortRequest(
     linkPathSteps: searchResultRequest.linkPathSteps,
     sortFields: sortFieldMain
   };
-  _izContext.logger.debug('sortRequest: ', sortRequest);
+  console.log('sortRequest: ', sortRequest);
 
-  return [sortRequest, status, errorsObject, errorsFound]
+  return [sortResultId, sortRequest, status, errorsObject, errorsFound]
 
 }