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

package/src/SearchSortSharedLib.js

@@ -34,8 +34,7 @@ async function createSearchRequest(
   perParentCombinations,
   requiredDataLinkStepObjects,
   requiredDataLinkSteps,
-  values,
-  getSchemaFn
+  valueUserTags,
 ) {
   console.log('createSearchResult: ', {
     objType,
@@ -46,7 +45,7 @@ async function createSearchRequest(
     perParentCombinations,
     requiredDataLinkStepObjects,
     requiredDataLinkSteps,
-    values
+    valueUserTags
   });
 
   let filterElements = {};
@@ -57,13 +56,14 @@ async function createSearchRequest(
 
   let requiredDataPromise = dataFieldsSharedLib.createRequiredData(
     objType,
+    initialLogicalElementId,
+    logicalElements,
     requiredDataFields,
     complexFilterCombinations,
     perParentCombinations,
     requiredDataLinkStepObjects,
     requiredDataLinkSteps,
-    values,
-    getSchemaFn
+    valueUserTags,
   );
 
   //* create complexFilter normalize to send backend
@@ -76,7 +76,7 @@ async function createSearchRequest(
     objType,
     initialLogicalElementId,
     logicalElements,
-    values,
+    valueUserTags,
     []
   );
   console.log('return createComplexFilter: ', {
@@ -86,6 +86,9 @@ async function createSearchRequest(
     complexErrorsFound
   });
 
+  let searchResultId = null;
+  let searchDetailId = null;
+
   if (complexErrorsFound.length > 0) {
     errorsFound = errorsFound.concat(complexErrorsFound);
     Object.assign(errorsObject, complexErrorsObject);
@@ -100,7 +103,7 @@ async function createSearchRequest(
   //   perParentCombinations,
   //   requiredDataLinkStepObjects,
   //   requiredDataLinkSteps,
-  //   values,
+  //   valueUserTags,
   // );
   let requiredData = await requiredDataPromise;
   console.log('return create requiredData: ', requiredData);
@@ -112,7 +115,7 @@ async function createSearchRequest(
   }
 
   if (errorsFound.length > 0) {
-    return [null, 'invalid', errorsObject, errorsFound]
+    return [searchResultId, searchDetailId, null, 'invalid', errorsObject, errorsFound]
   }
 
   if (!isEmpty(requiredData.perParentCombinations)) {
@@ -137,10 +140,13 @@ async function createSearchRequest(
     filterElements
   });
 
+  searchResultId = complexFilterRequest.filterMainId;
+  searchDetailId = requiredData.requiredDataHash;
+
   let searchResultRequest = {
     objType: objType,
-    searchResultId: complexFilterRequest.filterMainId,
-    searchDetailId: requiredData.requiredDataHash,
+    searchResultId: searchResultId,
+    searchDetailId: searchDetailId,
     requiredDataObjects: requiredData.requiredDataObjects,
     searchParams: {
       filterObjectId: complexFilterRequest.filterMainId
@@ -151,7 +157,7 @@ async function createSearchRequest(
   };
   console.log("searchResultRequest: ", searchResultRequest);
 
-  return [searchResultRequest, status, errorsObject, errorsFound]
+  return [searchResultId, searchDetailId, searchResultRequest, status, errorsObject, errorsFound]
 
 }
 
@@ -165,7 +171,7 @@ async function createSortRequest(
   requiredDataLinkStepObjects,
   requiredDataLinkSteps,
   sortFields,
-  values,
+  valueUserTags,
 ) {
   console.log('createSortResult: ', {
     objType,
@@ -177,17 +183,24 @@ async function createSortRequest(
     requiredDataLinkStepObjects,
     requiredDataLinkSteps,
     sortFields,
-    values
+    valueUserTags
   });
 
   let sortFieldMain = []
 
+  let errorsObject = {};
+  let errorsFound = [];
+
   //* set sortField
   for (const sortField of sortFields) {
-    // {
-    //   requiredDataLinkStepObjectId: "userTag_LinkStepObjectC",
-    //   dataType: "number"
-    // },
+
+    if (!sortField.hasOwnProperty("dataType")) {
+      errorsFound.push(`${sortField.requiredDataLinkStepObjectId}: sortField is not set dataType`);
+      errorsObject = {
+        [sortField.requiredDataLinkStepObjectId]: 'sortField is not set dataType'
+      }
+      break;
+    }
 
     let requiredDataLinkStepObjectId = sortField.requiredDataLinkStepObjectId;
 
@@ -203,15 +216,35 @@ async function createSortRequest(
     let linkStep = requiredDataLinkSteps[lastRequiredDataLinkStepId];
     console.log('linkStep', linkStep);
 
-    sortFieldMain.push({
+    let sortObject = {
       fieldName: linkStep.fieldName,
       dataType: sortField.dataType
-    });
+    };
+
+    if (sortField.dataType === "array") {
+
+      if (isEmpty(sortField.sortByValueUserTags)) {
+        errorsFound.push(`${sortField.requiredDataLinkStepObjectId}: sortField has sortByValueUserTags is empty`);
+        errorsObject = {
+          [sortField.requiredDataLinkStepObjectId]: 'sortField has sortByValueUserTags is empty'
+        }
+        break;
+      }
+
+      sortObject.values = [];
+      for (let sort of sortField.sortByValueUserTags) {
+        sortObject.values.push(valueUserTags[sort].value);
+      };
+    };
+    sortFieldMain.push(sortObject);
+  }
+  console.log("sortFieldMain: ", sortFieldMain);
 
+  if (errorsFound.length > 0) {
+    return [null, null, 'invalid', errorsObject, errorsFound]
   }
-  console.log("sortFieldMain: ", sortFieldMain)
 
-  let [searchResultRequest, status, errorsObject, errorsFound] = await createSearchRequest(
+  let [searchResultId, searchDetailId, searchResultRequest, status, searchErrorsObject, searchErrorsFound] = await createSearchRequest(
     objType,
     initialLogicalElementId,
     logicalElements,
@@ -220,34 +253,29 @@ async function createSortRequest(
     perParentCombinations,
     requiredDataLinkStepObjects,
     requiredDataLinkSteps,
-    values
+    valueUserTags
   );
   console.log('SearchResultRequest: ', {
+    searchResultId,
+    searchDetailId,
     searchResultRequest,
     status,
-    errorsObject,
-    errorsFound
+    searchErrorsObject,
+    searchErrorsFound
   });
 
+  if (searchErrorsFound.length > 0) {
+    Object.assign(errorsObject, searchErrorsObject);
+    errorsFound = errorsFound.concat(searchErrorsFound);
+  }
+
   if (errorsFound.length > 0) {
     return [null, null, 'invalid', errorsObject, errorsFound]
   }
 
-  let searchResultId = searchResultRequest.searchResultId;
-  let searchDetailId = searchResultRequest.searchDetailId;
-  console.log('searchResultMain: ', {
-    searchResultId,
-    searchDetailId
-  });
-
   let sortFieldsHash = hash(sortFieldMain);
   let sortResultId = searchResultId + '__' + searchDetailId + '__' + sortFieldsHash;
-  // let sortResultId = searchResultShared.createSortResultId(
-  //   searchResultId,
-  //   searchDetailId,
-  //   sortFieldMain
-  // );
-  console.log('sortResultId: ', sortResultId)
+  console.log('sortResultId: ', sortResultId);
 
   let sortRequest = {
     objType: objType,