filtering lab member on HCERES period fixes #387

SciencesPo · Mar 15, 2017 · c6b7f79 · c6b7f79
1 parent 304af33
commit c6b7f79
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/server/export/annex4.js b/server/export/annex4.js
@@ -824,7 +824,21 @@ module.exports = function annex4(models, centerId, callback) {
       return People.aggregate([
         {
           $match: {
-            'academicMemberships.organization': ObjectId(centerId)
+            academicMemberships: {
+                $elemMatch:{
+                  $and:[
+                    {organization: ObjectId(centerId)},
+                    {$or: [
+                        {endDate:{$gte: HCERESPERIOD.startDate}},
+                        {endDate:{$exists: false }}
+                    ]},
+                    {$or: [
+                        {startDate:{$lte: HCERESPERIOD.endDate}},
+                        {startDate:{$exists: false }}
+                    ]}
+                  ]
+                }
+            }
           }
         },
         {