Avoid inventory lookups when possible

This commit denormalizes medication information on medication and
proc-charge records by making the relationship to inventory async and
adding two additional properties to the medication and proc-charge
models: medicationTitle (denormalized inventory name) and
priceOfMedication(denormalized inventory price).
Resolves #261

app/invoices/edit/controller.js

@@ -231,20 +231,20 @@ export default AbstractEditController.extend(NumberFormat, PatientSubmodule, Pub
   }.observes('model.visit'),
 
   _addPharmacyCharge: function(charge, medicationItemName) {
-    var medicationItem = charge.get(medicationItemName),
-      price = medicationItem.get('price'),
-      quantity = charge.get('quantity'),
-      pharmacyCharges = this.get('pharmacyCharges'),
-      pharmacyExpenseAccount = this.get('pharmacyExpenseAccount'),
-      pharmacyCharge = this.store.createRecord('line-item-detail', {
+    return charge.getMedicationDetails(medicationItemName).then((medicationDetails) => {
+      let quantity = charge.get('quantity');
+      let pharmacyCharges = this.get('pharmacyCharges');
+      let pharmacyExpenseAccount = this.get('pharmacyExpenseAccount');
+      let pharmacyCharge = this.store.createRecord('line-item-detail', {
         id: PouchDB.utils.uuid(),
-        name: medicationItem.get('name'),
+        name: medicationDetails.name,
         quantity: quantity,
-        price: price,
+        price: medicationDetails.price,
         department: 'Pharmacy',
         expenseAccount: pharmacyExpenseAccount
       });
-    pharmacyCharges.addObject(pharmacyCharge);
+      pharmacyCharges.addObject(pharmacyCharge);
+    });
   },
 
   _addSupplyCharge: function(charge, department) {
@@ -334,8 +334,9 @@ export default AbstractEditController.extend(NumberFormat, PatientSubmodule, Pub
       }
     }
 
+    let pharmacyChargePromises = [];
     medication.forEach(function(medicationItem) {
-      this._addPharmacyCharge(medicationItem, 'inventoryItem');
+      pharmacyChargePromises.push(this._addPharmacyCharge(medicationItem, 'inventoryItem'));
     }.bind(this));
 
     this.set('wardCharges', visitCharges.map(this._mapWardCharge.bind(this)));
@@ -344,7 +345,7 @@ export default AbstractEditController.extend(NumberFormat, PatientSubmodule, Pub
       var charges = procedure.get('charges');
       charges.forEach(function(charge) {
         if (charge.get('medicationCharge')) {
-          this._addPharmacyCharge(charge, 'medication');
+          pharmacyChargePromises.push(this._addPharmacyCharge(charge, 'medication'));
         } else {
           this._addSupplyCharge(charge, 'O.R.');
         }
@@ -375,45 +376,47 @@ export default AbstractEditController.extend(NumberFormat, PatientSubmodule, Pub
       }.bind(this));
     }.bind(this));
 
-    lineItem = this.store.createRecord('billing-line-item', {
-      id: PouchDB.utils.uuid(),
-      name: 'Pharmacy',
-      category: 'Hospital Charges'
-    });
-    lineItem.get('details').addObjects(this.get('pharmacyCharges'));
-    lineItems.addObject(lineItem);
+    Ember.RSVP.all(pharmacyChargePromises).then(() =>  {
+      lineItem = this.store.createRecord('billing-line-item', {
+        id: PouchDB.utils.uuid(),
+        name: 'Pharmacy',
+        category: 'Hospital Charges'
+      });
+      lineItem.get('details').addObjects(this.get('pharmacyCharges'));
+      lineItems.addObject(lineItem);
 
-    lineItem = this.store.createRecord('billing-line-item', {
-      id: PouchDB.utils.uuid(),
-      name: 'X-ray/Lab/Supplies',
-      category: 'Hospital Charges'
-    });
-    lineItem.get('details').addObjects(this.get('supplyCharges'));
-    lineItems.addObject(lineItem);
+      lineItem = this.store.createRecord('billing-line-item', {
+        id: PouchDB.utils.uuid(),
+        name: 'X-ray/Lab/Supplies',
+        category: 'Hospital Charges'
+      });
+      lineItem.get('details').addObjects(this.get('supplyCharges'));
+      lineItems.addObject(lineItem);
 
-    lineItem = this.store.createRecord('billing-line-item', {
-      id: PouchDB.utils.uuid(),
-      name: 'Ward Items',
-      category: 'Hospital Charges'
-    });
-    lineItem.get('details').addObjects(this.get('wardCharges'));
-    lineItems.addObject(lineItem);
+      lineItem = this.store.createRecord('billing-line-item', {
+        id: PouchDB.utils.uuid(),
+        name: 'Ward Items',
+        category: 'Hospital Charges'
+      });
+      lineItem.get('details').addObjects(this.get('wardCharges'));
+      lineItems.addObject(lineItem);
 
-    lineItem = this.store.createRecord('billing-line-item', {
-      id: PouchDB.utils.uuid(),
-      name: 'Physical Therapy',
-      category: 'Hospital Charges'
-    });
-    lineItems.addObject(lineItem);
+      lineItem = this.store.createRecord('billing-line-item', {
+        id: PouchDB.utils.uuid(),
+        name: 'Physical Therapy',
+        category: 'Hospital Charges'
+      });
+      lineItems.addObject(lineItem);
 
-    lineItem = this.store.createRecord('billing-line-item', {
-      id: PouchDB.utils.uuid(),
-      name: 'Others/Misc',
-      category: 'Hospital Charges'
-    });
-    lineItems.addObject(lineItem);
+      lineItem = this.store.createRecord('billing-line-item', {
+        id: PouchDB.utils.uuid(),
+        name: 'Others/Misc',
+        category: 'Hospital Charges'
+      });
+      lineItems.addObject(lineItem);
 
-    this.send('update', true);
+      this.send('update', true);
+    });
   },
 
   _resolveVisitDescendents: function(results, childNameToResolve) {

app/medication/edit/controller.js

@@ -136,6 +136,8 @@ export default AbstractEditController.extend(InventorySelection, FulfillRequest,
                 this._addNewPatient();
                 reject('creating new patient first');
               } else {
+                newMedication.set('medicationTitle', newMedication.get('inventoryItem.name'));
+                newMedication.set('priceOfMedication', newMedication.get('inventoryItem.price'));
                 newMedication.set('status', 'Requested');
                 newMedication.set('requestedBy', newMedication.getUserName());
                 newMedication.set('requestedDate', new Date());

app/medication/edit/template.hbs

@@ -24,7 +24,7 @@
     {{#if isFulfilledOrRequested}}
       <div class="form-group">
         <label class="control-label">Medication</label>
-        <p class="form-control-static">{{model.inventoryItem.name}}</p>
+        <p class="form-control-static">{{model.medicationName}}</p>
       </div>
     {{else}}
       {{inventory-typeahead property="inventoryItemTypeAhead" label="Medication" content=medicationList selection=selectedInventoryItem class="required test-medication-input"}}

app/medication/index/template.hbs

@@ -15,7 +15,7 @@
         <tr {{action 'editItem' medicationRequest}}>
           <td>{{date-format medicationRequest.prescriptionDate}}</td>
           <td>{{medicationRequest.patient.displayName}}</td>
-          <td>{{medicationRequest.inventoryItem.name}}</td>
+          <td>{{medicationRequest.medicationName}}</td>
           <td>{{medicationRequest.quantity}}</td>
           <td>{{medicationRequest.status}}</td>
           {{#if showActions}}

app/mixins/medication-details.js

@@ -0,0 +1,49 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+export default Ember.Mixin.create({
+  // Denormalized medication details so that inventory records do not need to be retrieved
+  getMedicationName: function(inventoryAttribute) {
+    let medicationTitle = this.get('medicationTitle');
+    if (!Ember.isEmpty(medicationTitle)) {
+      return medicationTitle;
+    } else {
+      this.get(inventoryAttribute).then((inventoryItem) => {
+        this.set('medicationTitle', inventoryItem.get('name'));
+      });
+    }
+  },
+
+  getMedicationPrice: function(inventoryAttribute) {
+    let priceOfMedication = this.get('priceOfMedication');
+    if (!Ember.isEmpty(priceOfMedication)) {
+      return priceOfMedication;
+    } else {
+      this.get(inventoryAttribute).then((inventoryItem) => {
+        this.set('priceOfMedication', inventoryItem.get('price'));
+      });
+    }
+  },
+
+  getMedicationDetails: function(inventoryAttribute) {
+    return new Ember.RSVP.Promise((resolve) => {
+      let medicationTitle = this.get('medicationTitle');
+      let priceOfMedication = this.get('priceOfMedication');
+      if (!Ember.isEmpty(medicationTitle) && !Ember.isEmpty(priceOfMedication)) {
+        resolve({
+          name: medicationTitle,
+          price: priceOfMedication
+        });
+      } else {
+        this.get(inventoryAttribute).then((inventoryItem) => {
+          resolve({
+            name: inventoryItem.get('name'),
+            price: inventoryItem.get('price')
+          });
+        });
+      }
+    });
+  },
+
+  medicationTitle: DS.attr('string'),
+  priceOfMedication: DS.attr('number')
+});

app/models/medication.js

@@ -3,10 +3,11 @@ import CanEditRequested from 'hospitalrun/mixins/can-edit-requested';
 import DS from 'ember-data';
 import DateFormat from 'hospitalrun/mixins/date-format';
 import Ember from 'ember';
+import MedicationDetails from 'hospitalrun/mixins/medication-details';
 
-export default AbstractModel.extend(CanEditRequested, DateFormat, {
+export default AbstractModel.extend(CanEditRequested, DateFormat, MedicationDetails, {
   inventoryItem: DS.belongsTo('inventory', {
-    async: false
+    async: true
   }),
   notes: DS.attr('string'),
   patient: DS.belongsTo('patient', {
@@ -28,6 +29,14 @@ export default AbstractModel.extend(CanEditRequested, DateFormat, {
     return (status === 'Requested');
   }.property('status'),
 
+  medicationName: function() {
+    return this.getMedicationName('inventoryItem');
+  }.property('medicationTitle', 'inventoryItem'),
+
+  medicationPrice: function() {
+    return this.getMedicationPrice('inventoryItem');
+  }.property('priceOfMedication', 'inventoryItem'),
+
   prescriptionDateAsTime: function() {
     return this.dateToTime(this.get('prescriptionDate'));
   }.property('prescriptionDate'),

app/models/proc-charge.js

@@ -1,11 +1,12 @@
 import AbstractModel from 'hospitalrun/models/abstract';
 import DS from 'ember-data';
 import Ember from 'ember';
+import MedicationDetails from 'hospitalrun/mixins/medication-details';
 
 /**
  * Procedure charges
  */
-export default AbstractModel.extend({
+export default AbstractModel.extend(MedicationDetails, {
   medication: DS.belongsTo('inventory', {
     async: false
   }),
@@ -16,15 +17,22 @@ export default AbstractModel.extend({
   dateCharged: DS.attr('date'),
 
   medicationCharge: function() {
-    var medication = this.get('medication'),
+    let medicationTitle = this.get('medicationTitle');
+    if (!Ember.isEmpty(medicationTitle)) {
+      return true;
+    }
+    var pricingItem = this.get('pricingItem'),
       newMedicationCharge = this.get('newMedicationCharge');
-    return (!Ember.isEmpty(medication) || newMedicationCharge);
-  }.property('medication'),
+    return (Ember.isEmpty(pricingItem) || newMedicationCharge);
+  }.property('medicationTitle', 'pricingItem', 'newMedicationCharge'),
+
+  medicationName: function() {
+    return this.getMedicationName('medication');
+  }.property('medicationTitle', 'medication'),
 
-  inventoryItemChanged: function() {
-    var inventoryItem = this.get('inventoryItem');
-    this.set('medication', inventoryItem);
-  }.observes('inventoryItem'),
+  medicationPrice: function() {
+    return this.getMedicationPrice('medication');
+  }.property('priceOfMedication', 'medication'),
 
   validations: {
     itemName: {

app/patients/medication/template.hbs

@@ -10,7 +10,7 @@
     {{#each patientMedications as |medication|}}
         <tr {{action "editMedication" medication}}>
             <td>{{date-format medication.prescriptionDate}}</td>
-            <td>{{medication.inventoryItem.name}}</td>
+            <td>{{medication.medicationName}}</td>
             <td>{{medication.status}}</td>
             <td>{{medication.prescription}}</td>
             <td>{{medication.requestedBy}}</td>

app/procedures/edit/template.hbs

@@ -62,7 +62,7 @@
           {{#each model.charges as |charge|}}
             {{#if charge.medicationCharge}}
               <tr>
-                <td>{{charge.medication.name}}</td>
+                <td>{{charge.medicationName}}</td>
                 <td>{{charge.quantity}}</td>
                 <td>
                   {{#if canAddCharge}}

app/procedures/medication/controller.js

@@ -10,15 +10,6 @@ export default AbstractEditController.extend(InventorySelection, {
 
   updateCapability: 'add_charge',
 
-  medicationChanged: function() {
-    var model = this.get('model'),
-      itemName = model.get('itemName'),
-      medication = model.get('medication');
-    if (!Ember.isEmpty(medication) && medication.get('name') !== itemName) {
-      model.set('itemName', medication.get('name'));
-    }
-  }.observes('model.medication'),
-
   title: function() {
     var isNew = this.get('model.isNew');
     if (isNew) {
@@ -31,6 +22,11 @@ export default AbstractEditController.extend(InventorySelection, {
     var isNew = this.get('model.isNew');
     if (isNew) {
       this.set('newCharge', true);
+      let model = this.get('model');
+      let inventoryItem = model.get('inventoryItem');
+      model.set('medication', inventoryItem);
+      model.set('medicationTitle', inventoryItem.get('name'));
+      model.set('priceOfMedication', inventoryItem.get('price'));
     }
     return Ember.RSVP.Promise.resolve();
   },