add supporting configs in rems admin for communincation forwarding

.env

@@ -13,6 +13,9 @@ WHITELIST = *
 SERVER_NAME = CodeX REMS Administrator Prototype
 FULL_RESOURCE_IN_APP_CONTEXT = false
 DOCKERED_EHR_CONTAINER_NAME = false
+DOCKERED_INTERMEDIARY_CONTAINER_NAME = false
+INTERMEDIARY_PORT=3003
+EHR_PORT=8080
 
 #Frontend Vars
 FRONTEND_PORT=9090

src/config.ts

@@ -42,7 +42,10 @@
     auth: {
       // This server's URI
       resourceServer: env.get('RESOURCE_SERVER').required().asUrlString(),
-      dockered_ehr_container_name: env.get('DOCKERED_EHR_CONTAINER_NAME').asString()
+      dockered_ehr_container_name: env.get('DOCKERED_EHR_CONTAINER_NAME').asString(),
+      dockered_interemediary_container_name: env.get('DOCKERED_INTERMEDIARY_CONTAINER_NAME').asString(),
+      dockered_ehr_port: env.get('EHR_PORT').asInt(),
+      dockered_intermediary_port: env.get('INTERMEDIARY_PORT').asInt()
       //
       // if you use this strategy, you need to add the corresponding env vars to docker-compose
       //

src/fhir/models.ts

@@ -161,4 +161,4 @@
   drugCode: 1
 });
 
-export const remsCaseCollection = model<RemsCase>('RemsCaseCollection', remsCaseCollectionSchema);
+export const remsCaseCollection = model<RemsCase>('RemsCaseCollection', remsCaseCollectionSchema);

src/lib/communication.ts

@@ -19,7 +19,7 @@
     // Create patient object from REMS case
     const patient: Patient = {
       resourceType: 'Patient',
-      id: `${remsCase.patientFirstName}-${remsCase.patientLastName}`.replace(/\s+/g, '-'),
+      id: remsCase.remsPatientId,
       name: [
         {
           given: [remsCase.patientFirstName],
@@ -151,18 +151,26 @@
       return;
     }
 
-    if (config.fhirServerConfig.auth.dockered_ehr_container_name) {
-      const originalEhrEndpoint = ehrEndpoint;
+    const originalEhrEndpoint = ehrEndpoint.toString().replace(/\/$/, '') ;
+    logger.info(config.fhirServerConfig.auth);
+    if (config.fhirServerConfig.auth.dockered_ehr_container_name && originalEhrEndpoint.includes(config.fhirServerConfig.auth.dockered_ehr_port)) {
       ehrEndpoint = originalEhrEndpoint
         .replace(/localhost/g, config.fhirServerConfig.auth.dockered_ehr_container_name)
         .replace(/127\.0\.0\.1/g, config.fhirServerConfig.auth.dockered_ehr_container_name);
       logger.info(
-        `Running locally in Docker, converting EHR url from ${originalEhrEndpoint} to ${ehrEndpoint}`
+        `Running locally in Docker to ehr, converting EHR url from ${originalEhrEndpoint} to ${ehrEndpoint}`
+      );
+    } else if (config.fhirServerConfig.auth.dockered_interemediary_container_name && originalEhrEndpoint.includes(config.fhirServerConfig.auth.dockered_intermediary_port)) {
+      ehrEndpoint = originalEhrEndpoint
+        .replace(/localhost/g, config.fhirServerConfig.auth.dockered_interemediary_container_name)
+        .replace(/127\.0\.0\.1/g, config.fhirServerConfig.auth.dockered_interemediary_container_name);
+      logger.info(
+        `Running locally in Docker to intermediary, converting EHR url from ${originalEhrEndpoint} to ${ehrEndpoint}`
       );
     }
 
     // Send Communication to EHR
-    logger.info(`Sending Communication to EHR: ${ehrEndpoint}`);
+    logger.info(`Sending Communication to EHR: ${ehrEndpoint}/Communication`);
 
     const response = await axios.post(`${ehrEndpoint}/Communication`, communication, {
       headers: {
@@ -179,4 +187,4 @@
     logger.error(`Failed to send Communication to EHR: ${error.message}`);
     throw error;
   }
-}
+}

src/lib/etasu.ts

@@ -196,6 +196,11 @@
   const patientLastName = patient.name?.[0].family || '';
   const patientDOB = patient.birthDate || '';
   const case_number = uid();
+
+  // Extract patientId from the patientReference (e.g., "Patient/pat017" -> "pat017")
+  const patientId = patientReference.includes('/') 
+    ? patientReference.split('/').pop() || patientReference
+    : patientReference;
 
   // Fetch the full medication from database to get NDC code
   const fullMedication = await medicationCollection
@@ -225,6 +230,7 @@
   const remsRequest: Pick<
     RemsCase,
     | 'case_number'
+    | 'remsPatientId'
     | 'status'
     | 'dispenseStatus'
     | 'drugName'
@@ -242,6 +248,7 @@
     | 'metRequirements'
   > & { originatingFhirServer?: string } = {
     case_number: case_number,
+    remsPatientId: patientId,
     status: 'Pending',
     dispenseStatus: 'Pending',
     drugName: medicationData?.name,
@@ -1013,4 +1020,4 @@
 
 export { getResource, getQuestionnaireResponse };
 
-export default router;
+export default router;