Merge pull request #1809 from Inist-CNRS/fix-all-graph-routines

Fixes sorting and filtering issue for all formats that use source/tar…
Inist-CNRS · Nov 29, 2023 · e26bac5 · e26bac5
2 parents a4d0f5b + afdec28
commit e26bac5
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 9 deletions.
diff --git a/packages/ezsLodex/src/reduceQuery.js b/packages/ezsLodex/src/reduceQuery.js
@@ -49,7 +49,7 @@ export const createFunction = () => async function LodexReduceQuery(data, feed)
         throw new Error(`Unknown reducer '${reducer}'`);
     }
 
-    const { map, reduce, finalize } = reducers[reducer];
+    const { map, reduce, finalize, fieldname } = reducers[reducer];
     const fds = Array.isArray(field) ? field : [field];
     const fields = fds.filter(Boolean);
     const collName = String('mp_').concat(
@@ -79,21 +79,24 @@ export const createFunction = () => async function LodexReduceQuery(data, feed)
     const findFilter = {};
 
     if (minValue) {
-        findFilter.value = {
+        const minFilter = {
             $gte: Number(minValue),
         };
+        findFilter[fieldname('value')] = {
+            ...minFilter,
+        };
     }
-
     if (maxValue) {
-        findFilter.value = {
-            ...(findFilter.value || {}),
+        const maxFilter = {
             $lte: Number(maxValue),
         };
+        findFilter[fieldname('value')] = {
+            ...maxFilter,
+        };
     }
-
     const [order, dir] = String(orderBy).split('/');
     const sort = order && dir ? ({
-        [order]: dir === 'asc' ? 1 : -1,
+        [fieldname(order)]: dir === 'asc' ? 1 : -1,
     }) : ({});
     const cursor = result.find(findFilter);
     const count = await cursor.count();

diff --git a/packages/ezsLodex/src/reducers/count.js b/packages/ezsLodex/src/reducers/count.js
@@ -23,3 +23,10 @@ module.exports.reduce = function (key, values) {
 module.exports.finalize = function finalize(key, value) {
     return value;
 };
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value';
+    }
+    return '_id';
+};
diff --git a/packages/ezsLodex/src/reducers/distinct.js b/packages/ezsLodex/src/reducers/distinct.js
@@ -40,3 +40,10 @@ module.exports.reduce = function (key, values) {
 module.exports.finalize = function finalize(key, value) {
     return value;
 };
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value';
+    }
+    return '_id';
+};
diff --git a/packages/ezsLodex/src/reducers/graph.js b/packages/ezsLodex/src/reducers/graph.js
@@ -69,3 +69,13 @@ module.exports.finalize = function finalize(key, value) {
     }
     return obj;
 };
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value.weight';
+    }
+    if (name === 'label') {
+        return 'value.source';
+    }
+    return '_id';
+};
diff --git a/packages/ezsLodex/src/reducers/groupby.js b/packages/ezsLodex/src/reducers/groupby.js
@@ -33,3 +33,10 @@ module.exports.reduce = function (key, values) {
 module.exports.finalize = function finalize(key, value) {
     return value;
 };
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value';
+    }
+    return '_id';
+};
diff --git a/packages/ezsLodex/src/reducers/keys.js b/packages/ezsLodex/src/reducers/keys.js
@@ -19,3 +19,10 @@ module.exports.reduce = function (key, values) {
 module.exports.finalize = function finalize(key, value) {
     return value;
 };
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value';
+    }
+    return '_id';
+};
diff --git a/packages/ezsLodex/src/reducers/max.js b/packages/ezsLodex/src/reducers/max.js
@@ -31,3 +31,10 @@ module.exports.reduce = function (key, values) {
 module.exports.finalize = function finalize(key, value) {
     return value;
 };
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value';
+    }
+    return '_id';
+};
diff --git a/packages/ezsLodex/src/reducers/merge.js b/packages/ezsLodex/src/reducers/merge.js
@@ -50,3 +50,10 @@ module.exports.reduce = function (key, values) {
 module.exports.finalize = function finalize(key, value) {
     return value;
 };
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value';
+    }
+    return '_id';
+};
diff --git a/packages/ezsLodex/src/reducers/min.js b/packages/ezsLodex/src/reducers/min.js
@@ -31,3 +31,10 @@ module.exports.reduce = function (key, values) {
 module.exports.finalize = function finalize(key, value) {
     return value;
 };
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value';
+    }
+    return '_id';
+};
diff --git a/packages/ezsLodex/src/reducers/pairing.js b/packages/ezsLodex/src/reducers/pairing.js
@@ -48,3 +48,13 @@ module.exports.finalize = function finalize(key, value) {
     }
     return obj;
 };
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value.weight';
+    }
+    if (name === 'label') {
+        return 'value.source';
+    }
+    return '_id';
+};
diff --git a/packages/ezsLodex/src/reducers/stats.js b/packages/ezsLodex/src/reducers/stats.js
@@ -63,6 +63,10 @@ module.exports.finalize = function finalize(key, value) {
     return value;
 };
 
-module.exports.finalize = function finalize(key, value) {
-    return value;
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value.count';
+    }
+    return '_id';
 };
diff --git a/packages/ezsLodex/src/reducers/total.js b/packages/ezsLodex/src/reducers/total.js
@@ -35,3 +35,10 @@ module.exports.reduce = function (key, values) {
 module.exports.finalize = function finalize(key, value) {
     return value;
 };
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value';
+    }
+    return '_id';
+};
diff --git a/packages/ezsLodex/src/reducers/ventilate.js b/packages/ezsLodex/src/reducers/ventilate.js
@@ -31,3 +31,10 @@ module.exports.reduce = function (key, values) {
 module.exports.finalize = function finalize(key, value) {
     return value;
 };
+
+module.exports.fieldname = function (name) {
+    if (name === 'value') {
+        return 'value';
+    }
+    return '_id';
+};