diff --git a/Dockerfile b/Dockerfile index e7ffdad..0a70286 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,18 @@ FROM node:14-alpine -ENV NODE_ENV production WORKDIR /home/node/app COPY --chown=node:node . . -RUN npm install -g typescript WORKDIR /home/node/app/backend RUN npm install -RUN npm link typescript WORKDIR /home/node/app/frontend RUN npm install -RUN npm link typescript WORKDIR /home/node/app -# RUN npm install pm2 -g - EXPOSE 5050 -EXPOSE 5051 -CMD ./dockerRunnerProd.sh \ No newline at end of file +HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD (wget --no-verbose --tries=1 --spider http://localhost:5051/doctorOrders/api/getRx/pending && wget --no-verbose --tries=1 --spider http://localhost:5050) || exit 1 + +CMD ./dockerRunnerProd.sh diff --git a/Dockerfile.dev b/Dockerfile.dev index 37bb419..c0ad0b0 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -2,15 +2,12 @@ FROM node:14-alpine WORKDIR /home/node/app COPY --chown=node:node . . -RUN npm install -g typescript WORKDIR /home/node/app/backend RUN npm install -RUN npm link typescript WORKDIR /home/node/app/frontend RUN npm install -RUN npm link typescript WORKDIR /home/node/app diff --git a/backend/env.json b/backend/env.json index 02bc8c7..cc05b6a 100644 --- a/backend/env.json +++ b/backend/env.json @@ -20,12 +20,12 @@ }, "MONGO_USERNAME": { "type": "string", - "default": "rems-admin-pims-root" + "default": "pims-user" }, "MONGO_PASSWORD": { "type": "string", - "default": "rems-admin-pims-password" + "default": "pims-pass" }, "MONGO_URL": { @@ -35,7 +35,7 @@ "AUTH_SOURCE": { "type": "string", - "default": "admin" + "default": "pims" }, "HTTPS_KEY_PATH": { @@ -61,5 +61,9 @@ "INTERMEDIARY_FHIR_URL": { "type": "string", "default": "http://localhost:3003/4_0_0" + }, + "REMS_ADMIN_NCPDP": { + "type": "string", + "default": "http://localhost:8090/ncpdp/script" } } diff --git a/backend/package-lock.json b/backend/package-lock.json index 81d798b..8465dfd 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -51,7 +51,7 @@ "sinon": "^15.0.3", "ts-node": "^10.9.1", "ts-node-dev": "^2.0.0", - "typescript": "^4.9.3" + "typescript": "^4.9.5" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/backend/package.json b/backend/package.json index 5b8c448..31f34b0 100644 --- a/backend/package.json +++ b/backend/package.json @@ -46,7 +46,7 @@ "sinon": "^15.0.3", "ts-node": "^10.9.1", "ts-node-dev": "^2.0.0", - "typescript": "^4.9.3" + "typescript": "^4.9.5" }, "scripts": { "start": "ts-node-dev src/server.ts", diff --git a/backend/src/routes/doctorOrders.js b/backend/src/routes/doctorOrders.js index 3c8e0a0..c4a3851 100644 --- a/backend/src/routes/doctorOrders.js +++ b/backend/src/routes/doctorOrders.js @@ -177,6 +177,15 @@ router.patch('/api/updateRx/:id/pickedUp', async (req, res) => { } }); console.log('Sent RxFill to EHR and received status from EHR', status.data); + + const remsAdminStatus = await axios.post(env.REMS_ADMIN_NCPDP, rxFill, { + headers: { + Accept: 'application/xml', // Expect that the Status that the rems admin returns back is in XML + 'Content-Type': 'application/xml' // Tell the rems admin that the RxFill is in XML + } + }); + + console.log('Sent RxFill to rems admin and received status from rems admin: ', remsAdminStatus); } catch (error) { console.log('Could not send RxFill to EHR', error); return error; diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e815efa..14c3751 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -52,7 +52,7 @@ "ts-jest": "^27.1.2", "ts-node": "^10.9.1", "ts-node-dev": "^2.0.0", - "typescript": "^4.9.3" + "typescript": "^4.9.5" } }, "node_modules/@adobe/css-tools": { diff --git a/frontend/package.json b/frontend/package.json index 5ac5d70..e216d1d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -47,7 +47,7 @@ "ts-jest": "^27.1.2", "ts-node": "^10.9.1", "ts-node-dev": "^2.0.0", - "typescript": "^4.9.3" + "typescript": "^4.9.5" }, "scripts": { "start": "react-scripts start",