Contact summary of a place should not receive reports of children which are places

.github/workflows/run-ci-scripts.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -26,4 +26,5 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: sudo apt install -y xsltproc
     - run: npm ci --legacy-peer-deps
+    - run: echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
     - run: npm run git-ci

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cht-conf-test-harness",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "Test Framework for CHT Projects",
   "repository": {
     "type": "git",

src/core-adapter.js

@@ -78,7 +78,11 @@ class CoreAdapter {
     }
 
     const contactDocs = [contact, ...state.contacts];
-    const relevantContactDocs = contactDocs.filter(contact => contact?._id === contactId || contact?.parent?._id === contactId);
+    const relevantContactDocs = contactDocs.filter(contact => {
+      const isSelf = contact?._id === contactId;
+      const isChild = contact?.parent?._id === contactId;
+      return isSelf || (isChild && this.core.ContactTypesUtils.isPerson(this.appSettings, contact));
+    });
     const subjectIds = _.flatten(relevantContactDocs.map(contact => this.core.RegistrationUtils.getSubjectIds(contact)));
 
     const reportHasMatchingSubject = report => subjectIds.includes(this.core.RegistrationUtils.getSubjectId(report));

test/collateral/harness.defaults.json

@@ -88,6 +88,21 @@
       }
     },
 
+    {
+      "_id": "supervisor_area_id",
+      "name": "Supervisor Area",
+      "type": "district_hospital"
+    },
+
+    {
+      "_id": "supervisor_id",
+      "name": "Supervisor",
+      "type": "person",
+      "parent": {
+        "_id": "supervisor_area_id"
+      }
+    },
+
     {
       "_id": "family_head_id",
       "name": "CHP Area 001 Contact",

test/collateral/project-with-source/.eslintrc

@@ -9,6 +9,7 @@
   "globals": {
     "cht": true,
     "Utils": true,
-    "user": true
+    "user": true,
+    "reports": true
   }
 }

test/collateral/project-with-source/app_settings.json

@@ -4,7 +4,7 @@
       "chw_role"
     ]
   },
-  "contact_summary": "var ContactSummary = {}; !function(e,t){if('object'==typeof exports&&'object'==typeof module)module.exports=t();else if('function'==typeof define&&define.amd)define([],t);else{var n=t();for(var r in n)('object'==typeof exports?exports:e)[r]=n[r]}}(ContactSummary,(function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){'undefined'!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:'Module'}),Object.defineProperty(e,'__esModule',{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&'object'==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,'default',{enumerable:!0,value:e}),2&t&&'string'!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,'a',t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p='',n(n.s=0)}([function(e,t){const n={hasPermissions:cht.v1.hasPermissions('chw_permission'),hasAnyPermission:cht.v1.hasAnyPermission([['chw_permission']]),chtApiAnalyticsTargets:cht.v1.analytics&&cht.v1.analytics.getTargetDocs()};e.exports={context:n}}])})); return ContactSummary;",
+  "contact_summary": "var ContactSummary = {}; !function(e,t){if('object'==typeof exports&&'object'==typeof module)module.exports=t();else if('function'==typeof define&&define.amd)define([],t);else{var n=t();for(var r in n)('object'==typeof exports?exports:e)[r]=n[r]}}(ContactSummary,(function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){'undefined'!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:'Module'}),Object.defineProperty(e,'__esModule',{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&'object'==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,'default',{enumerable:!0,value:e}),2&t&&'string'!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,'a',t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p='',n(n.s=0)}([function(e,t,n){var r=n(1),o=n(2);e.exports=o(r,contact,reports)},function(e,t){const n={hasPermissions:cht.v1.hasPermissions('chw_permission'),hasAnyPermission:cht.v1.hasAnyPermission([['chw_permission']]),chtApiAnalyticsTargets:cht.v1.analytics&&cht.v1.analytics.getTargetDocs(),reportCount:reports.length};e.exports={context:n}},function(e,t){function n(e){return e?Array.isArray(e)?e:[e]:[]}function r(e,t){switch(typeof e){case'undefined':return!0;case'function':return e(t);default:return e}}function o(e,t,n){if(r(e.appliesIf,n)){var o='function'==typeof e.fields?e.fields(n):e.fields.filter((function(e){return r(e.appliesIf,n)})).map((function(e){var t={};return i(e,t,'label'),i(e,t,'value'),i(e,t,'translate'),i(e,t,'filter'),i(e,t,'width'),i(e,t,'icon'),e.context&&(t.context={},i(e.context,t.context,'count'),i(e.context,t.context,'total')),t}));return e.modifyContext&&e.modifyContext(t,n),{label:e.label,fields:o}}function i(e,t,r){switch(typeof e[r]){case'undefined':return;case'function':t[r]=e[r](n);break;default:t[r]=e[r]}}}e.exports=function(e,t,r){var i=e.fields||[],c=e.context||{},u=e.cards||[],f=t&&('contact'===t.type?t.contact_type:t.type),s={cards:[],fields:i.filter((function(e){var t=n(e.appliesToType),r=t.filter((function(e){return e&&'!'===e.charAt(0)}));if((0===t.length||t.includes(f)||r.length>0&&!r.includes('!'+f))&&(!e.appliesIf||e.appliesIf()))return delete e.appliesToType,delete e.appliesIf,!0}))};return u.forEach((function(e){var t,i,u,a,l=n(e.appliesToType);if(l.includes('report')&&l.length>1)throw new Error('You cannot set appliesToType to an array which includes the type \\'report\\' and another type.');if(l.includes('report'))for(t=0;t<r.length;++t)i=r[t],!(a=i)||a.errors&&a.errors.length||(u=o(e,c,i))&&s.cards.push(u);else{if(!l.includes(f)&&l.length>0)return;(u=o(e,c))&&s.cards.push(u)}})),s.context=c,s}}])})); return ContactSummary;",
   "tasks": {
     "rules": "!function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){'undefined'!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:'Module'}),Object.defineProperty(e,'__esModule',{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&'object'==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,'default',{enumerable:!0,value:e}),2&t&&'string'!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,'a',t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p='',n(n.s=1)}([function(e,t){e.exports=function(e){var t={};!function e(t,n){var o=Object.keys(t);for(var r in o){var a=o[r];switch(typeof t[a]){case'object':e(t[a],n);break;case'function':t[a]=t[a].bind(n)}}}(e,t),t.definition=function e(t){var n=Object.assign({},t),o=Object.keys(n);for(var r in o){var a=o[r];if(Array.isArray(n[a])){n[a]=n[a].slice(0);for(var i=0;i<n[a].length;++i)'object'==typeof n[a][i]&&(n[a][i]=e(n[a][i]))}else'object'==typeof n[a]&&(n[a]=e(n[a]))}return n}(e)}},function(e,t,n){var o=n(2),r=n(3),a=n(4);n(6)(r,c,Utils,Target,emit),a(o,c,Utils,Task,emit),emit('_complete',{_id:!0})},function(e,t){const n=e=>({name:'cht.api.'+e,title:'cht.api.'+e,appliesTo:'contacts',appliesIf:()=>'undefined'!=typeof cht?cht.v1.hasPermissions(e):void 0,actions:[{form:'assessment'}],events:[{dueDate:()=>Utils.now(),start:1,end:1}]});e.exports=[n('chw_permission'),n('permission_dne')]},function(e,t){e.exports=[{id:'cht.api',type:'count',goal:-1,appliesTo:'contacts',appliesToType:['health_center'],appliesIf:()=>'undefined'!=typeof cht?cht.v1.hasPermissions('chw_permission'):void 0,date:'now'}]},function(e,t,n){var o=n(0),r=n(5);function a(e,t,n,o,r,a){var i;if(e.appliesToType){var c;if('contacts'===e.appliesTo){if(!r.contact)return;c='contact'===r.contact.type?r.contact.contact_type:r.contact.type}else{if(!a)return;c=a.form}if(-1===e.appliesToType.indexOf(c))return}if('scheduled_tasks'===e.appliesTo||!e.appliesIf||e.appliesIf(r,a))if('scheduled_tasks'===e.appliesTo){if(a&&e.appliesIf){if(!a.scheduled_tasks)return;for(i=0;i<a.scheduled_tasks.length;i++)e.appliesIf(r,a,i)&&d(i)}}else d();function s(e,t,n){var o;return(o='function'==typeof e.contactLabel?e.contactLabel(t,n):e.contactLabel)?{name:o}:t.contact}function d(i){var c,d,p,l,u=null;for(c=0;c<e.events.length;c++){if((d=e.events[c]).dueDate)u=d.dueDate(d,r,a,i);else if(a)u=void 0!==i?new Date(t.addDate(new Date(a.scheduled_tasks[i].due),d.days)):new Date(t.addDate(new Date(a.reported_date),d.days));else if(d.dueDate)u=d.dueDate(d,r);else{var y=r.contact&&r.contact.reported_date?new Date(r.contact.reported_date):new Date;u=new Date(t.addDate(y,d.days))}t.isTimely(u,d)&&(l={_id:(a?a._id:r.contact&&r.contact._id)+'~'+(d.id||c)+'~'+e.name,deleted:!(!(r.contact&&r.contact.deleted||a)||!a.deleted),doc:r,contact:s(e,r,a),icon:e.icon,date:u,readyStart:d.start||0,readyEnd:d.end||0,title:e.title,resolved:e.resolvedIf(r,a,d,u,i),actions:f(e.actions,d)},void 0!==i&&(l._id+='-'+i),'function'==typeof(p=e.priority)&&(p=p(r,a)),p&&(l.priority=p.level,l.priorityLabel=p.label),o('task',new n(l)))}}function f(t,n){return e.actions.map((function(e){return function(e,t){var n={source:'task',source_id:a?a._id:r.contact&&r.contact._id,contact:r.contact};e.modifyContent&&e.modifyContent(n,r,a,t);return{type:e.type||'report',form:e.form,label:e.label||'Follow up',content:n}}(e,n)}))}}e.exports=function(e,t,n,i,c){if(e)for(var s,d,f=0;f<e.length;++f)switch('function'!=typeof(s=Object.assign({},e[f],r)).resolvedIf&&(s.resolvedIf=function(e,t,o,r){return s.defaultResolvedIf(e,t,o,r,n)}),o(s),s.appliesTo){case'reports':case'scheduled_tasks':for(var p=0;p<t.reports.length;++p)d=t.reports[p],a(s,n,i,c,t,d);break;case'contacts':t.contact&&a(s,n,i,c,t);break;default:throw new Error('Unrecognised task.appliesTo: '+s.appliesTo)}}},function(e,t){e.exports={defaultResolvedIf:function(e,t,n,o,r){var a,i;r||(r=Utils);var c=function(e){var t;if(!e||!e.actions)return;return(t=e.actions.find((function(e){return!e.type||'report'===e.type})))&&t.form}(this.definition);if(!c)throw new Error('Could not find the default resolving form!');return a=0,a=t?Math.max(r.addDate(o,-n.start).getTime(),t.reported_date+1):r.addDate(o,-n.start).getTime(),i=r.addDate(o,n.end+1).getTime(),r.isFormSubmittedInWindow(e.reports,c,a,i)}}},function(e,t,n){var o=n(0);function r(e,t,n,o,r,a){var i=!!a;if(r.contact){var c='contact'===r.contact.type?r.contact.contact_type:r.contact.type,s=i?a.form:c;if(!(e.appliesToType&&e.appliesToType.indexOf(s)<0)&&(!e.appliesIf||e.appliesIf(r,a)))for(var d=i?a:r.contact,f=function(e,t,n){var o;return o='function'==typeof e.idType?e.idType(t,n):'report'===e.idType?n&&n._id:t.contact&&t.contact._id,Array.isArray(o)||(o=[o]),o}(e,r,a),p=!e.passesIf||!!e.passesIf(r,a),l=function(e,t,n,o){if('function'==typeof e.date)return e.date(n,o)||t.now().getTime();if(void 0===e.date||null===e.date||'now'===e.date)return t.now().getTime();if('reported'===e.date)return o?o.reported_date:n.contact.reported_date;throw new Error('Unrecognised value for target.date: '+e.date)}(e,n,r,a),u=e.groupBy&&e.groupBy(r,a),y=0;y<f.length;++y){var v=new t({_id:f[y]+'~'+e.id,contact:r.contact,deleted:!!d.deleted,type:e.id,pass:p,groupBy:u,date:l});e.emitCustom?e.emitCustom(m,v,r,a):m(v)}}function m(e){o('target',e)}}e.exports=function(e,t,n,a,i){for(var c=0;c<e.length;++c){var s=e[c];switch(o(s),s.appliesTo){case'contacts':r(s,a,n,i,t);break;case'reports':for(var d=0;d<t.reports.length;++d){r(s,a,n,i,t,t.reports[d])}break;default:throw new Error('Unrecognised target.appliesTo: '+s.appliesTo)}}}}]);",
     "isDeclarative": true,

test/collateral/project-with-source/contact-summary.js → test/collateral/project-with-source/contact-summary.templated.js

@@ -2,6 +2,7 @@ const context = {
   hasPermissions: cht.v1.hasPermissions('chw_permission'),
   hasAnyPermission: cht.v1.hasAnyPermission([['chw_permission']]),
   chtApiAnalyticsTargets: cht.v1.analytics && cht.v1.analytics.getTargetDocs(),
+  reportCount: reports.length,
 };
 
 module.exports = {

test/contact-summary.spec.js

@@ -68,7 +68,10 @@ describe('getContactSummary', () => {
     expect(args[2][1]).to.deep.contain({
       _id: 'chw_area_id',
     });
-    expect(args[2][2]).to.be.undefined;
+    expect(args[2][2]).to.deep.contain({
+      _id: 'supervisor_area_id',
+    });
+    expect(args[2][3]).to.be.undefined;
   }));
 
   it('#240 - contact summary includes reports of the selected contacts children', withFunctionStub(async () => {
@@ -133,7 +136,7 @@ describe('getContactSummary', () => {
   });
 });
 
-describe('cht.v1 in contact summary ', () => {
+describe('using project-with-source', () => {
   const harness = new Harness({
     directory: path.join(__dirname, 'collateral', 'project-with-source'),
     harnessDataPath: path.join(__dirname, 'collateral', 'harness.defaults.json'),
@@ -184,5 +187,33 @@ describe('cht.v1 in contact summary ', () => {
     const targetFromDocs = contactSummary.context.chtApiAnalyticsTargets.map(t => t.targets[0]);
     expect(targetFromDocs).to.deep.eq(targets);
   });
+
+  it('#272 - reports of a place with place-child not visible', async () => {
+    harness.pushMockedDoc({
+      type: 'data_record',
+      form: 'abc',
+      reported_date: 1000,
+      fields: {
+        place_id: 'chw_area_id',
+      }
+    });
+
+    const contactSummary = await harness.getContactSummary('supervisor_area_id');
+    expect(contactSummary.context.reportCount).to.eq(0);
+  });
+
+  it('#272 - reports of a place with person-child is visible', async () => {
+    harness.pushMockedDoc({
+      type: 'data_record',
+      form: 'abc',
+      reported_date: 1000,
+      fields: {
+        patient_uuid: 'supervisor_id',
+      }
+    });
+
+    const contactSummary = await harness.getContactSummary('supervisor_area_id');
+    expect(contactSummary.context.reportCount).to.eq(1);
+  });
 });