Merge pull request #139 from mcode/dev

Dev

Author: smalho01

Dockerfile

@@ -8,6 +8,7 @@ RUN npm install
 
 WORKDIR /home/node/app/frontend
 RUN npm install
+RUN npm run build
 
 WORKDIR /home/node/app
 

README.md

@@ -52,3 +52,35 @@ This application requires node.js v20.0 or greater. Using [`nvm`](https://github
 
 - `nvm install 20`
 - `nvm use 20` or `nvm use default 20`, as most of the REMS Integration Prototype repositories are compatible with node v20.0.
+
+# Data Rights
+
+<div style="text-align:center">
+<b>NOTICE</b>
+</div>
+
+This (software/technical data) was produced for the U. S. Government under Contract Number 75FCMC18D0047/75FCMC23D0004, and is subject to Federal Acquisition Regulation Clause 52.227-14, Rights in Data-General.
+
+
+No other use other than that granted to the U. S. Government, or to those acting on behalf of the U. S. Government under that Clause is authorized without the express written permission of The MITRE Corporation.
+
+
+For further information, please contact The MITRE Corporation, Contracts Management Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
+
+<div style="text-align:center">
+<b>&copy;2025 The MITRE Corporation.</b>
+</div>
+
+<br />
+
+Licensed under the Apache License, Version 2.0 (the "License"); use of this repository is permitted in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+

backend/env.json

@@ -4,19 +4,8 @@
     "default": 5051
   },
   "ALLOWED_ORIGIN": {
-    "type": "object",
-    "default": [
-      "http://localhost:3000",
-      "http://localhost:3000/",
-      "http://localhost:3005",
-      "http://localhost:3005/",
-      "http://localhost:3008",
-      "http://localhost:3008/",
-      "http://localhost:5050",
-      "http://localhost:5050/",
-      "http://localhost:4040",
-      "http://localhost:4040/"
-    ]
+    "type": "string",
+    "default": "*"
   },
   "MONGO_USERNAME": {
     "type": "string",

backend/src/routes/doctorOrders.js

@@ -396,51 +396,53 @@ const getDispenseStatus = (order, guidanceResponse) => {
  */
 async function parseNCPDPScript(newRx) {
   // Parsing XML NCPDP SCRIPT from EHR
+  const patient = newRx.Message.Body.NewRx.Patient;
+  const prescriber = newRx.Message.Body.NewRx.Prescriber;
+  const medicationPrescribed = newRx.Message.Body.NewRx.MedicationPrescribed;
+
   const incompleteOrder = {
     orderId: newRx.Message.Header.MessageID.toString(), // Will need to return to this and use actual pt identifier or uuid
     caseNumber: newRx.Message.Header.AuthorizationNumber,
     prescriberOrderNumber: newRx.Message.Header.PrescriberOrderNumber,
-    patientName:
-      newRx.Message.Body.NewRx.Patient.HumanPatient.Name.FirstName +
-      ' ' +
-      newRx.Message.Body.NewRx.Patient.HumanPatient.Name.LastName,
-    patientFirstName: newRx.Message.Body.NewRx.Patient.HumanPatient.Name.FirstName,
-    patientLastName: newRx.Message.Body.NewRx.Patient.HumanPatient.Name.LastName,
-    patientDOB: newRx.Message.Body.NewRx.Patient.HumanPatient.DateOfBirth.Date,
-    patientCity: newRx.Message.Body.NewRx.Patient.HumanPatient.Address.City,
-    patientStateProvince: newRx.Message.Body.NewRx.Patient.HumanPatient.Address.StateProvince,
-    patientPostalCode: newRx.Message.Body.NewRx.Patient.HumanPatient.Address.PostalCode,
-    patientCountry: newRx.Message.Body.NewRx.Patient.HumanPatient.Address.Country,
+    patientName: patient.HumanPatient.Name.FirstName + ' ' + patient.HumanPatient.Name.LastName,
+    patientFirstName: patient.HumanPatient.Name.FirstName,
+    patientLastName: patient.HumanPatient.Name.LastName,
+    patientDOB: patient.HumanPatient.DateOfBirth.Date,
+    patientCity: patient.HumanPatient.Address.City,
+    patientStateProvince: patient.HumanPatient.Address.StateProvince,
+    patientPostalCode: patient.HumanPatient.Address.PostalCode,
+    patientCountry: patient.HumanPatient.Address.Country,
     doctorName:
       'Dr. ' +
-      newRx.Message.Body.NewRx.Prescriber.NonVeterinarian.Name.FirstName +
+      prescriber.NonVeterinarian.Name.FirstName +
       ' ' +
-      newRx.Message.Body.NewRx.Prescriber.NonVeterinarian.Name.LastName,
-    doctorContact:
-      newRx.Message.Body.NewRx.Prescriber.NonVeterinarian.CommunicationNumbers.PrimaryTelephone
-        ?.Number,
-    doctorID: newRx.Message.Body.NewRx.Prescriber.NonVeterinarian.Identification.NPI,
-    doctorEmail:
-      newRx.Message.Body.NewRx.Prescriber.NonVeterinarian.CommunicationNumbers.ElectronicMail,
-    drugNames: newRx.Message.Body.NewRx.MedicationPrescribed.DrugDescription,
-    simpleDrugName: newRx.Message.Body.NewRx.MedicationPrescribed.DrugDescription.split(' ')[0],
+      prescriber.NonVeterinarian.Name.LastName,
+    doctorContact: prescriber.NonVeterinarian.CommunicationNumbers.PrimaryTelephone?.Number,
+    doctorID: prescriber.NonVeterinarian.Identification.NPI,
+    doctorEmail: prescriber.NonVeterinarian.CommunicationNumbers.ElectronicMail,
+    drugNames: medicationPrescribed.DrugDescription,
+    simpleDrugName: medicationPrescribed.DrugDescription?.split(' ')[0],
 
     drugNdcCode:
-      newRx.Message.Body.NewRx.MedicationPrescribed.DrugCoded.ProductCode?.Code ||
-      newRx.Message.Body.NewRx.MedicationPrescribed.DrugCoded.NDC ||
+      medicationPrescribed.DrugCoded.ProductCode?.Code ||
+      medicationPrescribed.DrugCoded.NDC ||
       null,
 
-    drugRxnormCode:
-      newRx.Message.Body.NewRx.MedicationPrescribed.DrugCoded.DrugDBCode?.Code || null,
+    drugRxnormCode: medicationPrescribed.DrugCoded.DrugDBCode?.Code || null,
 
-    rxDate: newRx.Message.Body.NewRx.MedicationPrescribed.WrittenDate.Date,
+    rxDate: medicationPrescribed.WrittenDate.Date,
     drugPrice: 200, // Add later?
-    quantities: newRx.Message.Body.NewRx.MedicationPrescribed.Quantity.Value,
+    quantities: medicationPrescribed.Quantity.Value,
     total: 1800,
     pickupDate: 'Tue Dec 13 2022', // Add later?
     dispenseStatus: 'Pending'
   };
 
+  if (incompleteOrder.drugNames === undefined || incompleteOrder.drugNames === 'undefined') {
+    incompleteOrder.drugNames = incompleteOrder.drugNdcCode;
+    incompleteOrder.simpleDrugName = incompleteOrder.drugNdcCode;
+  }
+
   const metRequirements = isRemsDrug(incompleteOrder) ? [] : null;
   const order = new doctorOrder({ ...incompleteOrder, metRequirements });
   return order;

backend/src/server.ts

@@ -21,6 +21,8 @@ async function main() {
     origin: env.ALLOWED_ORIGIN
   };
 
+  console.log('CORS OPTIONS: ' + JSON.stringify(options));
+
   app.use(bodyParser.urlencoded({ extended: false }));
   app.use(cors(options));
   app.use('/doctorOrders', doctorOrders);

dockerRunnerProd.sh

@@ -1,7 +1,8 @@
 #!/bin/sh
 
 cd frontend
-( npm run start ) & SERVER_PID=$!
+npm run build
+( npm run preview ) & SERVER_PID=$!
 
 cd ../backend
 ( npm run start ) & BACKEND_SERVER_PID=$!

frontend/package-lock.json

@@ -13,10 +13,12 @@ axios.defaults.baseURL = process.env.REACT_APP_PIMS_BACKEND_URL
   : 'http://localhost:' +
     (process.env.REACT_APP_PIMS_BACKEND_PORT ? process.env.REACT_APP_PIMS_BACKEND_PORT : '5051');
 
+const basename = process.env.REACT_APP_VITE_BASE?.replace(/\/$/, '') || '';
+
 function App() {
   return (
     <Box>
-      <Router>
+      <Router basename={basename}>
         <div className="App">
           <Container className="NavContainer" maxWidth="xl">
             <div className="containerg">

frontend/src/App.tsx

@@ -6,10 +6,12 @@ import dotenv from 'dotenv';
 dotenv.config({ path: '.env' }); // load env vars from .env
 export default defineConfig({
   // depending on your application, base can also be "/"
-  base: '',
+  base: process.env.REACT_APP_VITE_BASE || '',
   plugins: [react()],
   preview: {
-    allowedHosts: ['.mitre.org', '.us-east-1.elb.amazonaws.com']
+    allowedHosts: ['.mitre.org', '.elb.us-east-1.amazonaws.com'],
+    port: parseInt(process.env.PORT!),
+    host: true
   },
   define: {
     'process.env': process.env
@@ -18,6 +20,6 @@ export default defineConfig({
     port: parseInt(process.env.PORT!),
     open: false,
     host: true,
-    allowedHosts: ['.mitre.org', '.us-east-1.elb.amazonaws.com']
+    allowedHosts: ['.mitre.org', '.elb.us-east-1.amazonaws.com']
   }
 });