fix(api): do not return soft-deleted documents in populated ref fields

Author: yash-pouranik

apps/public-api/src/controllers/data.controller.js

@@ -383,7 +383,10 @@ module.exports.getSingleDoc = async (req, res, next) => {
       const fields = populateParam.split(',').map(f => f.trim()).filter(Boolean);
 
       fields.forEach(f => {
-        query = query.populate(f);
+        query = query.populate({
+          path: f,
+          match: includeDeleted ? {} : { isDeleted: { $ne: true } }
+        });
       });
     }
 

packages/common/src/utils/queryEngine.js

@@ -159,10 +159,17 @@ class QueryEngine {
     populate() {
         const rawParam = this.queryString.populate || this.queryString.expand;
         if (!rawParam) return this;
+        
+        const includeDeleted = this.queryString.include_deleted === 'true';
+        const matchCond = includeDeleted ? {} : { isDeleted: { $ne: true } };
+
         const populateParam = Array.isArray(rawParam) ? rawParam.join(',') : String(rawParam);
         const fields = populateParam.split(',').map(f => f.trim()).filter(Boolean);
         fields.forEach(f => {
-            this.query = this.query.populate(f);
+            this.query = this.query.populate({
+                path: f,
+                match: matchCond
+            });
         });
         return this;
     }