Created GraphQL Middleware and changed Patient retrieval and creation to use new graphQL middleware

Author: purnet

src/redux/configureStore.js

@@ -1,6 +1,7 @@
 import thunk from 'redux-thunk';
 import rootReducer from './modules';
 import { fetchMiddleware } from './middleware/FetchMiddleware';
+import { graphqlMiddleware } from './middleware/graphqlMiddleware';
 import {
   applyMiddleware,
   compose,
@@ -10,7 +11,7 @@ import {
 export default function configureStore (initialState) {
   let createStoreWithMiddleware;
 
-  const middleware = applyMiddleware(thunk, fetchMiddleware);
+  const middleware = applyMiddleware(thunk, fetchMiddleware, graphqlMiddleware);
 
   if (__DEBUG__) {
     createStoreWithMiddleware = compose(

src/redux/middleware/FetchMiddleware.js

@@ -2,9 +2,8 @@ import { notificationManager } from 'utils/NotificationManager';
 
 const fetchMiddleware = store => next => action => {
   next(action);
-
+  let options;
   if (action.meta && action.meta.endpoint) {
-    let options;
     switch (action.meta.method) {
       case 'POST':
         options = {

src/redux/middleware/graphqlMiddleware.js

@@ -0,0 +1,54 @@
+import { notificationManager } from 'utils/NotificationManager';
+
+const graphqlMiddleware = store => next => action => {
+  next(action);
+
+  if (action.meta && action.meta.query) {
+    let options;
+    options = {
+      method: 'post',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        query: action.meta.query,
+        variables: action.meta.variables,
+      })
+    };
+    fetch(`${process.env.BACKEND_API_URL}/graphql`, options)
+    .then(function (response) {
+      return response.json();
+    }).then(function (json) {
+      if (json.status === 'error') {
+        if (json.message) {
+          notificationManager.addNotification({
+            message: json.message,
+            level: 'error'
+          });
+        }
+        if (action.meta.error) {
+          var errorResult = action.meta.error(json, action.payload);
+          // Check to see if the result has a type attribute, if it does then
+          // assume its a Redux action and dispatch it.
+          if (errorResult && errorResult.type) {
+            next(errorResult);
+          }
+        }
+        return;
+      }
+      if (action.meta.success) {
+        var successResult = action.meta.success(json.data, action.payload);
+        // Check to see if the result has a type attribute, if it does then
+        // assume its a Redux action and dispatch it.
+        if (successResult && successResult.type) {
+          next(successResult);
+        }
+      }
+    }).catch(function (ex) {
+      console.log('parsing failed', ex);
+    });
+    console.log('fetching: ' + action.meta.query);
+  }
+};
+
+export { graphqlMiddleware as graphqlMiddleware };

src/redux/modules/patient.js

@@ -65,22 +65,58 @@ export const createPatient = createAction(
     return {patient: newPatient};
   },
   (patient) => {
-    const body = {
-      firstNames: patient.firstName,
-      lastNames: patient.lastName,
-      gender: patient.gender,
-      dateOfBirth: patient.dob.toISOString(),
-      address: patient.address,
-      mrn: patient.mrn,
-      tumorType: patient.tumorType,
-      isSurgical: (patient.surgical) ? 'true' : 'false',
-      phone: patient.phone,
-      email: patient.email,
-    };
+    const query = `mutation insertPatient (
+        $firstname: String!,
+        $surname: String!,
+        $gender: String!,
+        $dob: String!,
+        $address: String!,
+        $mrn: Int!,
+        $tumorType: String!,
+        $surgical: String!,
+        $phone: String!,
+        $email: String!
+      ) {
+      patient: createPatient(
+        firstname: $firstname,
+        surname: $surname,
+        gender: $gender,
+        dob: $dob,
+        address: $address,
+        mrn: $mrn,
+        tumorType: $tumorType,
+        surgical: $surgical,
+        phone: $phone,
+        email: $email
+      ) {
+        id,
+        mrn,
+        surname
+        firstname,
+        gender,
+        tumorType,
+        surgical,
+        dob,
+        address,
+        phone,
+        email,
+      }
+    }`;
+    const variables = `{
+      "firstname": "${patient.firstName}",
+      "surname": "${patient.lastName}",
+      "gender": "${patient.gender}",
+      "dob": "${patient.dob.toISOString()}",
+      "address": "${patient.address}",
+      "mrn": ${patient.mrn},
+      "tumorType": "${patient.tumorType}",
+      "surgical": "${(patient.surgical) ? 'true' : 'false'}",
+      "phone": "${patient.phone}",
+      "email": "${patient.email}"
+    }`;
     return {
-      endpoint: `${process.env.BACKEND_API_URL}/patient/`,
-      method: 'POST',
-      body: body,
+      query: query,
+      variables: variables,
       success: updatePatient,
       error: removePatient,
     };
@@ -135,7 +171,7 @@ export const followUpPDF = createAction(
 export const updatePatient = createAction(
   UPDATE_PATIENT,
   (patient, originalPayload) => {
-    return {patient, token: originalPayload.patient.token};
+    return {patient: patient.patient, token: originalPayload.patient.token};
   }
 );
 
@@ -149,7 +185,7 @@ export const removePatient = createAction(
 const fetchPatient = createAction(
   FETCH_PATIENT,
   (patientJson) => {
-    return {patient: patientJson};
+    return {patient: patientJson.patient};
   }
 );
 
@@ -166,7 +202,7 @@ const setPatientSearchResults = createAction(
   SET_PATIENT_SEARCH_RESULTS,
   (patientsJson) => {
     return {
-      patients: patientsJson
+      patients: patientsJson.patients
     };
   }
 );
@@ -175,8 +211,23 @@ export const searchPatients = createAction(
   SEARCH_PATIENTS,
   null,
   (patientId) => {
+    const query = `query getAllPatients {
+      patients {
+        id,
+        mrn,
+        surname
+        firstname,
+        gender,
+        tumorType,
+        surgical,
+        dob,
+        address,
+        phone,
+        email,
+      }
+    }`;
     return {
-      endpoint: `${process.env.BACKEND_API_URL}/patient/`,
+      query: query,
       success: setPatientSearchResults
     };
   }
@@ -188,8 +239,32 @@ export const fetchPatientFromServer = createAction(
     return {patientId: patientId};
   },
   (patientId) => {
+    const query = `query getPatient ($id: Int!) {
+      patient(id: $id) {
+        id,
+        mrn,
+        ehrId,
+        surname
+        firstname,
+        gender,
+        tumorType,
+        surgical,
+        dob,
+        address,
+        phone,
+        email,
+        allergies{
+          name,
+          date
+        }
+      }
+    }`;
+    const variables = `{
+      "id": ${patientId}
+    }`;
     return {
-      endpoint: `${process.env.BACKEND_API_URL}/patient/${patientId}`,
+      query: query,
+      variables: variables,
       success: fetchPatient
     };
   }

src/views/AddPatientView.js

@@ -135,9 +135,9 @@ export class AddPatientView extends Component {
                                                // when resetting
             >
             <option></option>
-            <option value='PROSTATE'>Prostate</option>
+            <option value='Prostate'>Prostate</option>
             <option value='CNS'>CNS</option>
-            <option value='BREAST'>Breast</option>
+            <option value='Breast'>Breast</option>
           </select>
           {tumorType.touched && tumorType.error && <span className={styles['apv-error-span']}>{tumorType.error}</span>}
         </div>