fixed $unwind of deleted measurements

2020-08-17 11:54:03 +02:00
parent c6f5186f7e
commit a75d2a3424
2 changed files with 27 additions and 6 deletions
--- a/src/routes/sample.ts
+++ b/src/routes/sample.ts
@ -827,10 +827,10 @@ function addMeasurements(queryPtr, templates) {
  queryPtr.push(
    {$addFields: {[templates[0].name]: {$let: {vars: {
      arr: {$filter: {
-        input: '$measurements', cond: {$in: [
-          '$$this.measurement_template',
-          templates.map(e => mongoose.Types.ObjectId(e._id))
-        ]}
+        input: '$measurements', cond: {$and: [
+          {$in: ['$$this.measurement_template', templates.map(e => mongoose.Types.ObjectId(e._id))]},
+          {$ne: ['$$this.status', globals.status.del]}
+        ]},
      }}},
      in: {$cond: [{$lte: [{$size: '$$arr'}, 1]}, {$arrayElemAt: ['$$arr', 0]}, '$$arr']}
    }}}},