feat(#138): move polling to openhim channel config

mediator/config/index.ts

@@ -31,7 +31,9 @@ export const OPENMRS = {
   timeout: Number(getEnvironmentVariable('REQUEST_TIMEOUT', '5000'))
 };
 
-export const SYNC_INTERVAL = getEnvironmentVariable('SYNC_INTERVAL', '60000');
+//export const SYNC_INTERVAL = getEnvironmentVariable('SYNC_INTERVAL', '60000');
+// hard code sync interval to 1 minute because it is hard coded in mediator config
+export const SYNC_INTERVAL = '60000';
 
 function getEnvironmentVariable(env: string, def: string) {
   if (process.env.NODE_ENV === 'test') {

mediator/config/openmrs_mediator.ts

@@ -3,11 +3,30 @@ export const openMRSMediatorConfig = {
   version: '1.0.0',
   name: 'OpenMRS Mediator',
   description: 'A mediator to sync CHT data with OpenMRS',
+  defaultChannelConfig: [
+    {
+      name: 'OpenMRS Sync',
+      urlPattern: '^/trigger$',
+      routes: [
+        {
+          name: 'OpenMRS polling Mediator',
+          host: 'mediator',
+          path: '/openmrs/sync',
+          port: 6000,
+          primary: true,
+          type: 'http',
+        },
+      ],
+      allow: ['interop'],
+      type: 'polling',
+      pollingSchedule: '1 minute'
+    },
+  ],
   endpoints: [
     {
       name: 'OpenMRS Mediator',
       host: 'mediator',
-      path: '/',
+      path: '/openmrs/sync',
       port: '6000',
       primary: true,
       type: 'http',

mediator/index.ts

@@ -3,15 +3,15 @@ import { mediatorConfig } from './config/mediator';
 import { openMRSMediatorConfig } from './config/openmrs_mediator';
 import { logger } from './logger';
 import bodyParser from 'body-parser';
-import {PORT, OPENHIM, SYNC_INTERVAL, OPENMRS} from './config';
+import {PORT, OPENHIM, OPENMRS} from './config';
 import patientRoutes from './src/routes/patient';
 import serviceRequestRoutes from './src/routes/service-request';
 import encounterRoutes from './src/routes/encounter';
 import organizationRoutes from './src/routes/organization';
 import endpointRoutes from './src/routes/endpoint';
 import chtRoutes from './src/routes/cht';
+import openMRSRoutes from './src/routes/openmrs';
 import { registerMediatorCallback } from './src/utils/openhim';
-import { syncPatients, syncEncounters } from './src/utils/openmrs_sync'
 import os from 'os';
 
 const {registerMediator} = require('openhim-mediator-utils');
@@ -34,30 +34,21 @@ app.use('/encounter', encounterRoutes);
 app.use('/organization', organizationRoutes);
 app.use('/endpoint', endpointRoutes);
 
-// routes for cht docs
+// routes for CHT docs
 app.use('/cht', chtRoutes);
 
+// routes for OpenMRS
+app.use('/openmrs', openMRSRoutes);
+
 if (process.env.NODE_ENV !== 'test') {
   app.listen(PORT, () => logger.info(`Server listening on port ${PORT}`));
 
   // TODO => inject the 'port' and 'http scheme' into 'mediatorConfig'  
   registerMediator(OPENHIM, mediatorConfig, registerMediatorCallback);
 
   // if OPENMRS is specified, register its mediator
-  // and start the sync background task
   if (OPENMRS.url) {
     registerMediator(OPENHIM, openMRSMediatorConfig, registerMediatorCallback);
-    // start patient and ecnounter sync in the background
-    setInterval(async () => {
-      try {
-        const startTime = new Date();
-        startTime.setHours(startTime.getHours() - 1);
-        await syncPatients(startTime);
-        await syncEncounters(startTime);
-      } catch (error: any) {
-        logger.error(error);
-      }
-    }, Number(SYNC_INTERVAL));
   }
 }
 

mediator/src/controllers/openmrs.ts

@@ -0,0 +1,15 @@
+import { logger } from '../../logger';
+import { syncPatients, syncEncounters } from '../utils/openmrs_sync'
+
+export async function sync() {
+  try {
+    const startTime = new Date();
+    startTime.setHours(startTime.getHours() - 1);
+    await syncPatients(startTime);
+    await syncEncounters(startTime);
+    return { status: 200, data: { message: `OpenMRS sync completed successfully`} };
+  } catch(error: any) {
+    logger.error(error);
+    return { status: 500, data: { message: `Error during OpenMRS Sync`} };
+  }
+}

mediator/src/routes/openmrs.ts

@@ -0,0 +1,12 @@
+import { Router } from 'express';
+import { requestHandler } from '../utils/request';
+import { sync } from '../controllers/openmrs'
+
+const router = Router();
+
+router.get(
+  '/sync',
+  requestHandler((req) => sync())
+);
+
+export default router;