Change DataContext.get to DataContext.bind

api/src/controllers/person.js

@@ -3,7 +3,7 @@ const ctx = require('../services/data-context');
 const serverUtils = require('../server-utils');
 const auth = require('../auth');
 
-const getPerson = (qualifier) => ctx.get(Person.v1.get)(qualifier);
+const getPerson = (qualifier) => ctx.bind(Person.v1.get)(qualifier);
 
 module.exports = {
   v1: {

api/src/services/data-context.js

@@ -2,6 +2,4 @@ const { getLocalDataContext } = require('@medic/cht-datasource');
 const db = require('../db');
 const config = require('../config');
 
-const dataContext = getLocalDataContext(config, db);
-
-Object.assign(module.exports, dataContext);
+module.exports = getLocalDataContext(config, db);

api/tests/mocha/controllers/person.spec.js

@@ -8,14 +8,14 @@ const serverUtils = require('../../../src/server-utils');
 
 describe('Person Controller', () => {
   let authCheck;
-  let dataContextGet;
+  let dataContextBind;
   let serverUtilsError;
   let req;
   let res;
 
   beforeEach(() => {
     authCheck = sinon.stub(auth, 'check');
-    dataContextGet = sinon.stub(dataContext, 'get');
+    dataContextBind = sinon.stub(dataContext, 'bind');
     serverUtilsError = sinon.stub(serverUtils, 'error');
     res = {
       json: sinon.stub(),
@@ -36,7 +36,7 @@ describe('Person Controller', () => {
           .stub(Qualifier, 'byUuid')
           .returns(qualifier);
         personGet = sinon.stub();
-        dataContextGet
+        dataContextBind
           .withArgs(Person.v1.get)
           .returns(personGet);
       });
@@ -48,7 +48,7 @@ describe('Person Controller', () => {
         await controller.v1.get(req, res);
 
         expect(authCheck.calledOnceWithExactly(req, 'can_view_contacts')).to.be.true;
-        expect(dataContextGet.calledOnceWithExactly(Person.v1.get)).to.be.true;
+        expect(dataContextBind.calledOnceWithExactly(Person.v1.get)).to.be.true;
         expect(byUuid.calledOnceWithExactly(req.params.uuid)).to.be.true;
         expect(personGet.calledOnceWithExactly(qualifier)).to.be.true;
         expect(res.json.calledOnceWithExactly(person)).to.be.true;
@@ -61,7 +61,7 @@ describe('Person Controller', () => {
         await controller.v1.get(req, res);
 
         expect(authCheck.calledOnceWithExactly(req, 'can_view_contacts')).to.be.true;
-        expect(dataContextGet.calledOnceWithExactly(Person.v1.get)).to.be.true;
+        expect(dataContextBind.calledOnceWithExactly(Person.v1.get)).to.be.true;
         expect(byUuid.calledOnceWithExactly(req.params.uuid)).to.be.true;
         expect(personGet.calledOnceWithExactly(qualifier)).to.be.true;
         expect(res.json.notCalled).to.be.true;
@@ -79,7 +79,7 @@ describe('Person Controller', () => {
         await controller.v1.get(req, res);
 
         expect(authCheck.calledOnceWithExactly(req, 'can_view_contacts')).to.be.true;
-        expect(dataContextGet.notCalled).to.be.true;
+        expect(dataContextBind.notCalled).to.be.true;
         expect(byUuid.notCalled).to.be.true;
         expect(personGet.notCalled).to.be.true;
         expect(res.json.notCalled).to.be.true;

api/tests/mocha/services/data-context.spec.js

@@ -8,7 +8,7 @@ describe('Data context service', () => {
   it('is initialized with the methods from the data context', () => {
     const expectedDataContext = dataSource.getLocalDataContext(config, db);
 
-    expect(dataContext.get).is.a('function');
-    expect(dataContext).excluding('get').to.deep.equal(expectedDataContext);
+    expect(dataContext.bind).is.a('function');
+    expect(dataContext).excluding('bind').to.deep.equal(expectedDataContext);
   });
 });

shared-libs/cht-datasource/src/index.ts

@@ -56,7 +56,7 @@ export const getDatasource = (ctx: DataContext) => {
          * @param uuid the UUID of the person to retrieve
          * @returns the person or `null` if no person is found for the UUID
          */
-        getByUuid: (uuid: string) => ctx.get(Person.v1.get)(Qualifier.byUuid(uuid)),
+        getByUuid: (uuid: string) => ctx.bind(Person.v1.get)(Qualifier.byUuid(uuid)),
       }
     }
   };

shared-libs/cht-datasource/src/libs/core.ts

@@ -40,5 +40,5 @@ export const hasFields = (
 
 /** @internal */
 export abstract class AbstractDataContext implements DataContext {
-  readonly get = <T>(fn: (ctx: DataContext) => T): T => fn(this);
+  readonly bind = <T>(fn: (ctx: DataContext) => T): T => fn(this);
 }

shared-libs/cht-datasource/src/libs/data-context.ts

@@ -13,11 +13,11 @@ export interface DataContext {
    * @param fn the function to execute
    * @returns the result of the function
    */
-  get: <T>(fn: (ctx: DataContext) => T) => T
+  bind: <T>(fn: (ctx: DataContext) => T) => T
 }
 
 const isDataContext = (context: unknown): context is DataContext => {
-  return isRecord(context) && hasField(context, { name: 'get', type: 'function' });
+  return isRecord(context) && hasField(context, { name: 'bind', type: 'function' });
 };
 
 /** @internal */

shared-libs/cht-datasource/test/index.spec.ts

@@ -9,13 +9,13 @@ import { DataContext } from '../src';
 
 describe('CHT Script API - getDatasource', () => {
   let dataContext: DataContext;
-  let dataContextGet: SinonStub;
+  let dataContextBind: SinonStub;
   let assertDataContext: SinonStub;
   let datasource: ReturnType<typeof Index.getDatasource>;
 
   beforeEach(() => {
-    dataContextGet = sinon.stub();
-    dataContext = { get: dataContextGet };
+    dataContextBind = sinon.stub();
+    dataContext = { bind: dataContextBind };
     assertDataContext = sinon.stub(Context, 'assertDataContext');
     datasource = Index.getDatasource(dataContext);
   });
@@ -57,14 +57,14 @@ describe('CHT Script API - getDatasource', () => {
       it('getByUuid', async () => {
         const expectedPerson = {};
         const personGet = sinon.stub().resolves(expectedPerson);
-        dataContextGet.returns(personGet);
+        dataContextBind.returns(personGet);
         const qualifier = { uuid: 'my-persons-uuid' };
         const byUuid = sinon.stub(Qualifier, 'byUuid').returns(qualifier);
 
         const returnedPerson = await person.getByUuid(qualifier.uuid);
 
         expect(returnedPerson).to.equal(expectedPerson);
-        expect(dataContextGet.calledOnceWithExactly(Person.v1.get)).to.be.true;
+        expect(dataContextBind.calledOnceWithExactly(Person.v1.get)).to.be.true;
         expect(personGet.calledOnceWithExactly(qualifier)).to.be.true;
         expect(byUuid.calledOnceWithExactly(qualifier.uuid)).to.be.true;
       });

shared-libs/cht-datasource/test/libs/core.spec.ts

@@ -73,11 +73,11 @@ describe('core lib', () => {
   describe('AbstractDataContext', () => {
     class TestDataContext extends AbstractDataContext { }
 
-    it('get', () => {
+    it('bind', () => {
       const ctx = new TestDataContext();
       const testFn = sinon.stub().returns('test');
 
-      const result = ctx.get<string>(testFn);
+      const result = ctx.bind<string>(testFn);
 
       expect(result).to.equal('test');
       expect(testFn.calledOnceWithExactly(ctx)).to.be.true;

shared-libs/cht-datasource/test/libs/data-context.spec.ts

@@ -7,7 +7,7 @@ import { DataContext } from '../../dist';
 
 
 describe('context lib', () => {
-  const context = { get: sinon.stub() } as DataContext;
+  const context = { bind: sinon.stub() } as DataContext;
   let isLocalDataContext: SinonStub;
   let isRemoteDataContext: SinonStub;
   let assertRemoteDataContext: SinonStub;