renalware-core 2.0.0.pre.rc11 → 2.0.0.pre.rc13

data/app/presenters/renalware/admissions/summary_part.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/medications"
 require "collection_presenter"
 

data/app/presenters/renalware/clinical/body_composition_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module Clinical
     class BodyCompositionPresenter < DumbDelegator

data/app/presenters/renalware/clinical/dry_weight_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module Clinical
     class DryWeightPresenter < DumbDelegator

data/app/presenters/renalware/clinical/dry_weights_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/clinical"
 
 module Renalware

data/app/presenters/renalware/clinical/header_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware"
 require "attr_extras"
 

data/app/presenters/renalware/clinical/profile_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware"
 
 module Renalware

data/app/presenters/renalware/country_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware"
 
 module Renalware

data/app/presenters/renalware/dashboard/dashboard_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/dashboard"
 require_dependency "collection_presenter"
 

data/app/presenters/renalware/directory/person_auto_complete_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/directory"
 
 module Renalware

data/app/presenters/renalware/events/events_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/events"
 
 module Renalware

data/app/presenters/renalware/events/summary_part.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/events"
 
 module Renalware

data/app/presenters/renalware/hd/dashboard_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "collection_presenter"
 
 module Renalware

data/app/presenters/renalware/hd/diary_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "collection_presenter"
 
 # TODO: mixing query and presenter here..

data/app/presenters/renalware/hd/diary_slot_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/hd"
 require_dependency "collection_presenter"
 

data/app/presenters/renalware/hd/mdm_patient_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/hd"
 
 module Renalware

data/app/presenters/renalware/hd/mdm_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware"
 
 module Renalware

data/app/presenters/renalware/hd/null_slot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "renalware/hd"
 
 module Renalware

data/app/presenters/renalware/hd/patient_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "renalware/hd"
 
 module Renalware

data/app/presenters/renalware/hd/profile_document_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module HD
     class ProfileDocumentPresenter < ::DumbDelegator

data/app/presenters/renalware/hd/profile_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module HD
     class ProfilePresenter < DumbDelegator

data/app/presenters/renalware/hd/protocol/session_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Override SessionPresenter methods where necessary in order
 # to tailor output for the Protocol PDF.
 module Renalware

data/app/presenters/renalware/hd/protocol_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "collection_presenter"
 
 module Renalware

data/app/presenters/renalware/hd/session_access_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module HD
     class SessionAccessPresenter

data/app/presenters/renalware/hd/session_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module HD
     class SessionPresenter < SimpleDelegator

data/app/presenters/renalware/hd/station_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module HD
     class StationPresenter < SimpleDelegator

data/app/presenters/renalware/hd/unmet_preferences_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # A presenter which, for a patient, displays any HD preferences (for example when or where they
 # have HD) that do not match their current HD profile.

data/app/presenters/renalware/letters/contact_description_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 
 module Renalware

data/app/presenters/renalware/letters/contact_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 
 module Renalware

data/app/presenters/renalware/letters/contacts_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 require_dependency "collection_presenter"
 

data/app/presenters/renalware/letters/electronic_receipt_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 
 module Renalware

data/app/presenters/renalware/letters/letter_form_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 
 module Renalware

data/app/presenters/renalware/letters/letter_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 require "collection_presenter"
 

data/app/presenters/renalware/letters/letter_presenter_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 
 module Renalware

data/app/presenters/renalware/letters/part_class_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "renalware/letters"
 require "attr_extras"
 

data/app/presenters/renalware/letters/practice_email_meta_data.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 require "attr_extras"
 

data/app/presenters/renalware/letters/recipient_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 require_dependency "renalware/address_presenter"
 

data/app/presenters/renalware/letters/summary_part.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 require "collection_presenter"
 

data/app/presenters/renalware/low_clearance/dashboard_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/low_clearance"
 require "attr_extras"
 

data/app/presenters/renalware/low_clearance/mdm_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module LowClearance
     class MDMPresenter < Renalware::MDMPresenter

data/app/presenters/renalware/mdm_patient_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   # Presenter formatting a single patient for use behind any MDM Patients listing.
   class MDMPatientPresenter < PatientPresenter

data/app/presenters/renalware/mdm_patients_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   # Presenter formatting a collection of patients for use behind any MDM Patients listing.
   class MDMPatientsPresenter

data/app/presenters/renalware/mdm_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable Metrics/ClassLength
 require_dependency "renalware/clinics"
 
@@ -126,10 +128,6 @@ module Renalware
       Renalware::Pathology.cast_patient(patient)
     end
 
-    # def pathology_table_view
-    #   Pathology::HistoricalObservationResults::HTMLTableView.new(view_context)
-    # end
-
     def execute_prescriptions_query(relation)
       query = Medications::PrescriptionsQuery.new(relation: relation)
       query.call

data/app/presenters/renalware/medications/prescription_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/medications"
 
 module Renalware

data/app/presenters/renalware/medications/provider_code_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module Medications
     class ProviderCodePresenter < DumbDelegator

data/app/presenters/renalware/medications/route_form_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/medications"
 
 module Renalware

data/app/presenters/renalware/medications/summary_part.rb

@@ -1,23 +1,54 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/medications"
 require "collection_presenter"
 
 module Renalware
   module Medications
     class SummaryPart < Renalware::SummaryPart
+      delegate :prescriptions, to: :patient
+
       def current_prescriptions
         @current_prescriptions ||= begin
-          prescriptions = patient.prescriptions
-                                 .includes(drug: [:drug_types, :classifications])
-                                 .includes(:medication_route)
-                                 .current
-                                 .ordered
-          CollectionPresenter.new(prescriptions, Medications::PrescriptionPresenter)
+          prescripts = prescriptions
+                         .includes(drug: [:drug_types, :classifications])
+                         .includes(:medication_route)
+                         .current
+                         .ordered
+          CollectionPresenter.new(prescripts, Medications::PrescriptionPresenter)
         end
       end
 
       def to_partial_path
         "renalware/medications/summary_part"
       end
+
+      # The cache key here must be such that a change to any prescription or its associated
+      # drug (including a reclassification of drug_type e.g. changing from ESA to immunosuppressant
+      # or a change in the drug name) will invalidate the cache for this patient's prescriptions.
+      # So we build a composite cache_key based on prescriptions and their drugs.
+      # Note we rely on an a couple of things here:
+      # - an after_remove callback in Drug -> Classification to set updated_at on the drug; removing
+      #   classifications uses a delete not a destroy so otherwise would not touch the parent drug.
+      # - adding a drug classification to a drug (e.g. making a drug ESA) touches the drug and this
+      #   generates a new cache_key here
+      # - note that although adding `belongs_to :prescription, touch: true` to Drug would solve
+      #   our cache validation here, that would mean knowing the Drugs module knowing about the
+      #   Prescriptions module, when currently only the reverse is acceptable (i.e.
+      #   Prescriptions -> Drugs)
+      def cache_key
+        # Based on AR::Relation.cache_key, this key incorporates the following, scoped to the
+        # current patient:
+        # - max(prescriptions.updated)
+        # - count(prescriptions)
+        # - max(drug.updated_at) in drugs across all prescriptions
+        # - count(drugs) across all prescriptions (same as prescriptions.count so not really
+        #   required, but comes for free with AR::Relation.cache_key)
+        [
+          prescriptions.cache_key,
+          Drugs::Drug.where(id: prescriptions.pluck(:drug_id)).cache_key
+        ].join("$")
+      end
     end
   end
 end

data/app/presenters/renalware/medications/treatable_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/medications"
 
 module Renalware

data/app/presenters/renalware/messaging/internal/message_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/messaging"
 
 module Renalware

data/app/presenters/renalware/messaging/internal/receipt_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/messaging"
 
 module Renalware

data/app/presenters/renalware/pathology/observation_presenter.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/pathology"
 
 module Renalware
   module Pathology
     class ObservationPresenter < SimpleDelegator
       delegate :name, :code, :loinc_code, to: :description, prefix: true, allow_nil: true
-      delegate :measurement_unit, to: :description
-      delegate :name, to: :measurement_unit, prefix: true
+      delegate :measurement_unit, to: :description, allow_nil: true
+      delegate :name, to: :measurement_unit, prefix: true, allow_nil: true
 
       def html_class
         description.to_s.downcase

data/app/presenters/renalware/pathology/observation_set_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/pathology"
 require_dependency "attr_extras"
 
@@ -18,15 +20,26 @@ module Renalware
         (values.present? && values.respond_to?(method_name)) || super
       end
 
-      def each_observation
+      def each_display_group
         return unless block_given?
-        __getobj__.values.sort.sort.each do |code, observation_hash|
-          observation = build_observation(
-            code: code,
-            observation_hash: observation_hash,
-            with_description: true
-          )
-          yield observation
+        ObservationDescription
+          .in_display_order
+          .to_a
+          .group_by(&:display_group)
+          .each do |group_number, array_of_obs_desc|
+
+          group = array_of_obs_desc.map do |obs_desc|
+            observation_hash = send(obs_desc.code.to_sym) || {}
+            observed_at = observation_hash["observed_at"]
+            Observation.new(
+              code: obs_desc.code,
+              result: observation_hash["result"],
+              observed_at: observed_at && ::Time.zone.parse(observed_at),
+              description: obs_desc
+            )
+          end
+
+          yield group, group_number
         end
       end