initial commit

Author: sugat009

src/lib/api.js

@@ -242,8 +242,8 @@ const api = {
       if (cache.has('compressibleTypes')) {
         return cache.get('compressibleTypes');
       }
-      const resp = await request.get({ url: configUrl, json: true });
-      const compressibleTypes = resp.compressible_types.split(',').map(s=>s.trim());
+      const resp = await request.get({url: configUrl, json: true});
+      const compressibleTypes = resp.compressible_types.split(',').map(s => s.trim());
       cache.set('compressibleTypes', compressibleTypes);
       return compressibleTypes;
     } catch (e) {
@@ -254,7 +254,9 @@ const api = {
       }
       return [];
     }
-  }
+  },
+
+  request
 };
 
 Object.entries(api)

src/lib/hierarchy-operations/delete-hierarchy.js

@@ -2,10 +2,12 @@ const DataSource = require('./hierarchy-data-source');
 const JsDocs = require('./jsdocFolder');
 const lineageConstraints = require('./lineage-constraints');
 const { trace, info } = require('../log');
+const requestsApi = require('../api');
 
 const prettyPrintDocument = doc => `'${doc.name}' (${doc._id})`;
 async function deleteHierarchy(db, options, sourceIds) {
   JsDocs.prepareFolder(options);
+  const api = requestsApi();
 
   const sourceDocs = await DataSource.getContactsByIds(db, sourceIds);
   const constraints = await lineageConstraints(db, options);
@@ -18,7 +20,7 @@ async function deleteHierarchy(db, options, sourceIds) {
     for (const descendant of descendantsAndSelf) {
       const toDeleteUsers = options.disableUsers && constraints.isPlace(descendant);
       JsDocs.deleteDoc(options, descendant, toDeleteUsers);
-      affectedReportCount += await deleteReportsForContact(db, options, descendant);
+      affectedReportCount += await deleteReportsForContact(api, options, descendant);
     }
 
     const affectedContactCount = descendantsAndSelf.length;
@@ -27,11 +29,11 @@ async function deleteHierarchy(db, options, sourceIds) {
   }
 }
 
-async function deleteReportsForContact(db, options, contact) {
+async function deleteReportsForContact(api, options, contact) {
   let skip = 0;
   let reportBatch;
   do {
-    reportBatch = await DataSource.getReportsForContacts(db, [], contact._id, skip);
+    reportBatch = await DataSource.getReportsForContacts(api, [], contact._id, skip);
 
     for (const report of reportBatch) {
       JsDocs.deleteDoc(options, report);

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

@@ -54,7 +54,7 @@ async function getContactWithDescendants(db, contactId) {
     .filter(doc => doc && doc.type !== 'tombstone');
 }
 
-async function getReportsForContacts(db, createdByIds, createdAtId, skip) {
+async function getReportsForContacts(api, createdByIds, createdAtId, skip) {
   const createdByKeys = createdByIds.map(id => [`contact:${id}`]);
   const createdAtKeys = createdAtId ? [
     [`patient_id:${createdAtId}`],

src/lib/hierarchy-operations/index.js

@@ -4,9 +4,11 @@ const JsDocs = require('./jsdocFolder');
 const lineageManipulation = require('./lineage-manipulation');
 const LineageConstraints = require('./lineage-constraints');
 const { trace, info } = require('../log');
+const requestsApi = require('../../lib/api');
 
 async function moveHierarchy(db, options, sourceIds, destinationId) {
   JsDocs.prepareFolder(options);
+  const api = requestsApi();
   trace(`Fetching contact details: ${destinationId}`);
   const constraints = await LineageConstraints(db, options);
   const destinationDoc = await DataSource.getContact(db, destinationId);
@@ -44,7 +46,7 @@ async function moveHierarchy(db, options, sourceIds, destinationId) {
 
     minifyLineageAndWriteToDisk(options, [...updatedDescendants, ...updatedAncestors]);
 
-    const movedReportsCount = await updateReports(db, options, moveContext);
+    const movedReportsCount = await updateReports(api, options, moveContext);
     trace(`${movedReportsCount} report(s) created by these affected contact(s) will be updated`);
 
     affectedContactCount += updatedDescendants.length + updatedAncestors.length;
@@ -56,15 +58,15 @@ async function moveHierarchy(db, options, sourceIds, destinationId) {
   info(`Staged changes to lineage information for ${affectedContactCount} contact(s) and ${affectedReportCount} report(s).`);
 }
 
-async function updateReports(db, options, moveContext) {
+async function updateReports(api, options, moveContext) {
   const descendantIds = moveContext.descendantsAndSelf.map(contact => contact._id);
 
   let skip = 0;
   let reportDocsBatch;
   do {
     info(`Processing ${skip} to ${skip + DataSource.BATCH_SIZE} report docs`);
     const createdAtId = options.merge && moveContext.sourceId;
-    reportDocsBatch = await DataSource.getReportsForContacts(db, descendantIds, createdAtId, skip);
+    reportDocsBatch = await DataSource.getReportsForContacts(api, descendantIds, createdAtId, skip);
 
     const lineageUpdates = replaceLineageOfReportCreator(reportDocsBatch, moveContext);
     const reassignUpdates = reassignReports(reportDocsBatch, moveContext);