cht-conf 5.1.0 → 5.2.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [5.2.0](https://github.com/medic/cht-conf/compare/v5.1.0...v5.2.0) (2025-08-07)
+
+
+### Features
+
+* refactor requests from freetexts views to other similar views ([#660](https://github.com/medic/cht-conf/issues/660)) ([292565d](https://github.com/medic/cht-conf/commit/292565de488e05e630a21d5046215fa19910a1fb))
+
 # [5.1.0](https://github.com/medic/cht-conf/compare/v5.0.0...v5.1.0) (2025-07-02)
 
 

package/commitlint.config.js

@@ -1 +1 @@
-module.exports = {extends: ['@commitlint/config-conventional']}
+module.exports = {extends: ['@commitlint/config-conventional']};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cht-conf",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "Configure CHT deployments",
   "main": "./src/lib/main.js",
   "engines": {

package/src/lib/api.js

@@ -254,6 +254,22 @@ const api = {
       }
       return [];
     }
+  },
+
+  async getReportsByCreatedByIds (createdByIds, limit, skip) {
+    const queryString = createdByIds.map(id => `exact_match:"contact:${id}"`).join(' OR ');
+    const res = await request.get(`${environment.apiUrl}/_design/medic/_nouveau/reports_by_freetext`, {
+      qs: {
+        // sorting by this field ensures that the output are same with the clouseau views
+        // https://github.com/medic/cht-core/pull/9541
+        sort: '"reported_date"',
+        q: queryString,
+        include_docs: true,
+        limit,
+        skip
+      }, json: true
+    });
+    return res.hits.map(item => item.doc);
   }
 };
 

package/src/lib/hierarchy-operations/hierarchy-data-source.js

@@ -1,7 +1,11 @@
 const lineageManipulation = require('./lineage-manipulation');
+const {getValidApiVersion} = require('../get-api-version');
+const semver = require('semver');
+const api = require('../api');
 
 const HIERARCHY_ROOT = 'root';
 const BATCH_SIZE = 10000;
+const NOUVEAU_MIN_VERSION = '5.0.0';
 
 /*
 Fetches all of the documents associated with the "contactIds" and confirms they exist.
@@ -56,28 +60,48 @@ async function getContactWithDescendants(db, contactId) {
     .filter(doc => doc && doc.type !== 'tombstone');
 }
 
-async function getReportsForContacts(db, createdByIds, createdAtId, skip) {
-  const createdByKeys = createdByIds.map(id => [`contact:${id}`]);
-  const createdAtKeys = createdAtId ? [
-    [`patient_id:${createdAtId}`],
-    [`patient_uuid:${createdAtId}`],
-    [`place_id:${createdAtId}`],
-    [`place_uuid:${createdAtId}`]
-  ] : [];
-
-  const reports = await db.query('medic-client/reports_by_freetext', {
-    keys: [
-      ...createdByKeys,
-      ...createdAtKeys,
-    ],
+const getFromDbView = async (db, view, keys, skip) => {
+  const res = await db.query(view, {
+    keys,
     include_docs: true,
     limit: BATCH_SIZE,
-    skip,
+    skip
   });
+  return res.rows.map(row => row.doc);
+};
+
+const fetchReportsByCreator = async (db, createdByIds, skip) => {
+  if (createdByIds.length === 0) {
+    return [];
+  }
+
+  const coreVersion = await getValidApiVersion();
+  if (coreVersion && semver.gte(coreVersion, NOUVEAU_MIN_VERSION)) {
+    return await api().getReportsByCreatedByIds(createdByIds, BATCH_SIZE, skip);
+  }
+
+  const createdByKeys = createdByIds.map(id => [`contact:${id}`]);
+  return await getFromDbView(db, 'medic-client/reports_by_freetext', createdByKeys, skip);
+};
+
+const fetchReportsBySubject = async (db, createdAtId, skip) => {
+  if (!createdAtId) {
+    return [];
+  }
+  return await getFromDbView(db, 'medic-client/reports_by_subject', [createdAtId], skip);
+};
 
-  const docsWithId = reports.rows.map(({ doc }) => [doc._id, doc]);
+const getReportsForContacts = async (db, createdByIds, createdAtId, skip) => {
+  const [creatorReports, subjectReports] = await Promise.all([
+    fetchReportsByCreator(db, createdByIds, skip),
+    fetchReportsBySubject(db, createdAtId, skip)
+  ]);
+
+  const allRows = [...creatorReports, ...subjectReports];
+
+  const docsWithId = allRows.map(( doc ) => [doc._id, doc]);
   return Array.from(new Map(docsWithId).values());
-}
+};
 
 async function getAncestorsOf(db, contactDoc) {
   const ancestorIds = lineageManipulation.pluckIdsFromLineage(contactDoc.parent);