sort by year and limit range

dataesr · Aug 5, 2024 · da83b29 · da83b29
1 parent 8795a8e
commit da83b29
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/server/src/routes/tableaux/european-projects/index.js b/server/src/routes/tableaux/european-projects/index.js
@@ -701,10 +701,16 @@ router
     if (req.query.country_code) {
       req.query.country_code = req.query.country_code.toUpperCase();
     }
+    const rangeOfYears = ["2021", "2022", "2023"];
     const data_country = await db
       .collection("fr-esr-all-projects-synthese")
       .aggregate([
-        { $match: { country_code: req.query.country_code } },
+        {
+          $match: {
+            country_code: req.query.country_code,
+            call_year: { $in: rangeOfYears },
+          },
+        },
         {
           $group: {
             _id: {
@@ -755,7 +761,7 @@ router
             total_evaluated: 1,
           },
         },
-        { $sort: { pilier_name_fr: 1 } },
+        { $sort: { pilier_name_fr: 1, year: 1 } },
       ])
       .toArray();