feat(xml_query_fix): Refactor xmlfinder aggregation query to return t…

…otalItem count
Duke-MatSci · Aug 30, 2023 · f9f0030 · f9f0030
1 parent 3d5baa8
commit f9f0030
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/resfulservice/spec/graphql/resolver/xml.spec.js b/resfulservice/spec/graphql/resolver/xml.spec.js
@@ -48,7 +48,7 @@ describe('XmlData Resolver Unit Tests:', function () {
     it("should return paginated lists of xmlData when no input", async () => {
       sinon.stub(XmlData, 'countDocuments').returns(2);
       sinon.stub(CuratedSamples, 'countDocuments').returns(1)
-      sinon.stub(XmlData, 'aggregate').returns(mockXmlDataList);
+      sinon.stub(XmlData, 'aggregate').returns([{count: mockXmlDataList.length, xmlData: mockXmlDataList }]);
 
       const result = await xmlFinder({}, { input }, { req }); 
 
@@ -60,7 +60,7 @@ describe('XmlData Resolver Unit Tests:', function () {
       sinon.stub(XmlData, 'countDocuments').returns(2)
       sinon.stub(CuratedSamples, 'countDocuments').returns(1)
 
-      sinon.stub(XmlData, 'aggregate').returns(mockXmlDataList);
+      sinon.stub(XmlData, 'aggregate').returns([{count: mockXmlDataList.length, xmlData: mockXmlDataList }]);
 
       const result = await xmlFinder({}, { input }, { req }); 
 

diff --git a/resfulservice/src/graphql/resolver/xml/input.graphql b/resfulservice/src/graphql/resolver/xml/input.graphql
@@ -54,5 +54,5 @@ input xmlViewerInput {
   """
   A Boolean value to specify it is new curation
   """
-  isNewCuration: Boolean!
+  isNewCuration: Boolean
 }
diff --git a/resfulservice/src/pipelines/curation-pipeline.js b/resfulservice/src/pipelines/curation-pipeline.js
@@ -23,7 +23,7 @@ exports.curationSearchQuery = async (input) => {
   if (status) filter.status = status.replace('_', ' ');
   if (typeof isNewCuration === 'boolean') filter.isNewCuration = isNewCuration;
 
-  const xmlData = await XmlData.aggregate([
+  const data = await XmlData.aggregate([
     { $match: xmlDataFilter },
     {
       $project: {
@@ -54,9 +54,9 @@ exports.curationSearchQuery = async (input) => {
       }
     },
     { $match: filter },
-    { $skip: skip },
-    { $limit: pageSize }
+    { $group: { _id: null, count: { $sum: 1 }, xmlData: { $push: '$$ROOT' } } },
+    { $project: { _id: 0, count: 1, xmlData: { $slice: ['$xmlData', skip, pageSize] } } }
   ]);
-
-  return { xmlData, count: xmlData.length };
+  const { xmlData, count } = data[0];
+  return { xmlData, count };
 };