renalware-core 2.0.0.pre.beta4 → 2.0.0.pre.beta5

data/app/controllers/renalware/system/errors_controller.rb

@@ -0,0 +1,20 @@
+module Renalware
+  module System
+    class ErrorsController < ApplicationController
+      layout "renalware/layouts/error"
+
+      def not_found
+        render status: 404, formats: [:html]
+      end
+
+      def internal_server_error
+        render status: 500, formats: [:html]
+      end
+
+      def generate_test_internal_server_error
+        raise "This is an intentionally raised error - please ignore it. " \
+              "It is used only to test system integration"
+      end
+    end
+  end
+end

data/app/controllers/renalware/system/mock_errors_controller.rb

@@ -0,0 +1,12 @@
+require_dependency "renalware"
+
+module Renalware
+  module System
+    class MockErrorsController < BaseController
+
+      def index
+        0 / 0 # ZeroDivisionError
+      end
+    end
+  end
+end

data/app/controllers/renalware/transplants/donations_controller.rb

@@ -22,7 +22,7 @@ module Renalware
           redirect_to patient_transplants_donor_dashboard_path(patient),
             notice: t(".success", model_name: "donation")
         else
-          flash[:error] = t(".failed", model_name: "donation")
+          flash.now[:error] = t(".failed", model_name: "donation")
           render :new, locals: { patient: patient, donation: donation }
         end
       end
@@ -40,7 +40,7 @@ module Renalware
           redirect_to patient_transplants_donor_dashboard_path(patient),
             notice: t(".success", model_name: "donation")
         else
-          flash[:error] = t(".failed", model_name: "donation")
+          flash.now[:error] = t(".failed", model_name: "donation")
           render :edit, locals: { patient: patient, donation: donation }
         end
       end

data/app/controllers/renalware/transplants/donor_operations_controller.rb

@@ -22,7 +22,7 @@ module Renalware
           redirect_to patient_transplants_donor_dashboard_path(patient),
             notice: t(".success", model_name: "donor operation")
         else
-          flash[:error] = t(".failed", model_name: "donor operation")
+          flash.now[:error] = t(".failed", model_name: "donor operation")
           render :new, locals: { operation: operation, patient: patient }
         end
       end
@@ -40,7 +40,7 @@ module Renalware
           redirect_to patient_transplants_donor_dashboard_path(patient),
             notice: t(".success", model_name: "donor operation")
         else
-          flash[:error] = t(".failed", model_name: "donor operation")
+          flash.now[:error] = t(".failed", model_name: "donor operation")
           render :edit, locals: { operation: operation, patient: patient }
         end
       end

data/app/controllers/renalware/transplants/donor_workups_controller.rb

@@ -23,7 +23,7 @@ module Renalware
           redirect_to patient_transplants_donor_workup_path(patient),
             notice: t(".success", model_name: "donor work up")
         else
-          flash[:error] = t(".failed", model_name: "donor work up")
+          flash.now[:error] = t(".failed", model_name: "donor work up")
           render :edit, locals: { patient: patient, workup: workup }
         end
       end

data/app/controllers/renalware/transplants/recipient_followups_controller.rb

@@ -25,7 +25,7 @@ module Renalware
           redirect_to patient_transplants_recipient_dashboard_path(patient),
             notice: t(".success", model_name: "recipient follow up")
         else
-          flash[:error] = t(".failed", model_name: "recipient follow up")
+          flash.now[:error] = t(".failed", model_name: "recipient follow up")
           render :new, locals: { patient: patient, recipient_followup: recipient_followup }
         end
       end
@@ -45,7 +45,7 @@ module Renalware
           redirect_to patient_transplants_recipient_dashboard_path(patient),
             notice: t(".success", model_name: "recipient follow up")
         else
-          flash[:error] = t(".failed", model_name: "recipient follow up")
+          flash.now[:error] = t(".failed", model_name: "recipient follow up")
           render :edit,
                  locals: {
                    patient: patient,

data/app/controllers/renalware/transplants/recipient_operations_controller.rb

@@ -27,7 +27,7 @@ module Renalware
           redirect_to patient_transplants_recipient_dashboard_path(patient),
             notice: t(".success", model_name: "recipient operation")
         else
-          flash[:error] = t(".failed", model_name: "recipient operation")
+          flash.now[:error] = t(".failed", model_name: "recipient operation")
           render :new,
                  locals: {
                    patient: patient,
@@ -50,7 +50,7 @@ module Renalware
           redirect_to patient_transplants_recipient_dashboard_path(patient),
             notice: t(".success", model_name: "recipient operation")
         else
-          flash[:error] = t(".failed", model_name: "recipient operation")
+          flash.now[:error] = t(".failed", model_name: "recipient operation")
           render :edit, locals: { patient: patient, recipient_operation: operation }
         end
       end

data/app/controllers/renalware/transplants/recipient_workups_controller.rb

@@ -32,7 +32,7 @@ module Renalware
           redirect_to patient_transplants_recipient_workup_path(patient),
             notice: t(".success", model_name: "recipient work up")
         else
-          flash[:error] = t(".failed", model_name: "recipient work up")
+          flash.now[:error] = t(".failed", model_name: "recipient work up")
           render :edit, locals: { patient: patient, workup: workup }
         end
       end

data/app/controllers/renalware/transplants/registration_statuses_controller.rb

@@ -19,7 +19,7 @@ module Renalware
           redirect_to patient_transplants_recipient_dashboard_path(patient),
             notice: t(".success", model_name: "registration status")
         else
-          flash[:error] = t(".failed", model_name: "registration status")
+          flash.now[:error] = t(".failed", model_name: "registration status")
           render :new, locals: { patient: patient, status: status }
         end
       end
@@ -38,7 +38,7 @@ module Renalware
           redirect_to patient_transplants_recipient_dashboard_path(patient),
             notice: t(".success", model_name: "registration status")
         else
-          flash[:error] = t(".failed", model_name: "registration status")
+          flash.now[:error] = t(".failed", model_name: "registration status")
           render :edit, locals: { patient: patient, status: status }
         end
       end

data/app/controllers/renalware/transplants/registrations_controller.rb

@@ -22,7 +22,7 @@ module Renalware
           redirect_to patient_transplants_recipient_dashboard_path(patient),
             notice: t(".success", model_name: "registration")
         else
-          flash[:error] = t(".failed", model_name: "registration")
+          flash.now[:error] = t(".failed", model_name: "registration")
           render :edit, locals: { patient: patient, registration: registration }
         end
       end

data/app/documents/renalware/renal/profile_document.rb

@@ -20,6 +20,7 @@ module Renalware
         attribute :ischaemic_neuropathic_ulcers, YearDatedConfirmation
         attribute :non_coronary_intervention, YearDatedConfirmation
         attribute :dementia, YearDatedConfirmation
+        attribute :smoking, SmokingStatus
       end
       attribute :comorbidities, Comorbidities
 

data/app/documents/renalware/smoking_status.rb

@@ -0,0 +1,9 @@
+require "document/enum"
+
+module Renalware
+  class SmokingStatus < NestedAttribute
+    attribute :value,
+              Document::Enum,
+              enums: %i(non_smoker ex_smoker current)
+  end
+end

data/app/helpers/renalware/application_helper.rb

@@ -5,7 +5,7 @@ module Renalware
   module ApplicationHelper
 
     def patient_search
-      ::Renalware::PatientSearch.call(params)
+      ::Renalware::Patients::PatientSearch.call(params)
     end
 
     # For use in layouts

data/app/helpers/renalware/navigation_helper.rb

@@ -4,7 +4,7 @@ module Renalware
     # e.g. Engine.routes.url_for({controller: .., action: .., only_path: true})
     def sub_nav_item(label, path)
       current_page = current_page?(path)
-      content_tag(:dd, class: (current_page ? "active" : "")) do
+      content_tag(:dd, class: ("active" if current_page)) do
         link_to label, path
       end
     end

data/app/models/concerns/renalware/accountable.rb

@@ -1,7 +1,7 @@
 require_dependency "renalware"
 
 module Renalware
-  # Reponsible for assigning a system user to the record when it is created
+  # Responsible for assigning a system user to the record when it is created
   # and updated.
   #
   # @example
@@ -27,6 +27,21 @@ module Renalware
       scope :with_updated_by, -> { includes(:updated_by) }
     end
 
+    def save_by!(user)
+      self.by = user
+      save!
+    end
+
+    def save_by(user)
+      self.by = user
+      save
+    end
+
+    def update_by(user, attrs)
+      self.by = user
+      update(attrs)
+    end
+
     private
 
     def assign_creator

data/app/models/concerns/renalware/broadcasting.rb

@@ -0,0 +1,33 @@
+require_dependency "renalware"
+
+module Renalware
+  module Broadcasting
+    include Wisper::Publisher
+    extend ActiveSupport::Concern
+
+    # Subscribes any listeners configured in Renalware.config.broadcast_subscription_map
+    # to the current instance.
+    #
+    # Example usage
+    #
+    #   class SomeServiceObject
+    #     include Broadcasting
+    #
+    #     def call
+    #       ..
+    #     end
+    #   end
+    #
+    #   SomeServiceObject.new(..).broadcasting_to_configured_subscribers.call(..)
+    #
+    # See https://github.com/krisleech/wisper
+    #
+    def broadcasting_to_configured_subscribers
+      subscribers = Renalware.config.broadcast_subscription_map[self.class.name]
+      Array(subscribers).each{ |listener|
+        subscribe(listener.to_s.constantize.new)
+      }
+      self
+    end
+  end
+end

data/app/models/renalware/clinical/modality_description.rb

@@ -3,6 +3,9 @@ require_dependency "renalware/clinical"
 module Renalware
   module Clinical
     class ModalityDescription < Modalities::Description
+      def to_sym
+        :clinical
+      end
     end
   end
 end

data/app/models/renalware/deaths/modality_description.rb

@@ -3,6 +3,9 @@ require_dependency "renalware/deaths"
 module Renalware
   module Deaths
     class ModalityDescription < Modalities::Description
+      def to_sym
+        :death
+      end
     end
   end
 end

data/app/models/renalware/directory/person.rb

@@ -18,7 +18,7 @@ module Renalware
       end
 
       def self.build(attributes = {})
-        person = self.new(attributes)
+        person = new(attributes)
         person.build_address
         person
       end

data/app/models/renalware/events/event.rb

@@ -16,7 +16,9 @@ module Renalware
       belongs_to :patient, touch: true
       belongs_to :event_type, class_name: "Type"
 
-      validates :patient, :date_time, presence: true
+      validates :patient, presence: true
+      validates :date_time, presence: true
+      validates :event_type_id, presence: true
       validates :date_time, timeliness: { type: :datetime }
 
       scope :ordered, -> { order(date_time: :desc, updated_at: :desc) }

data/app/models/renalware/events/event_query.rb

@@ -0,0 +1,29 @@
+require_dependency "renalware/clinics"
+
+module Renalware
+  module Events
+    class EventQuery
+      attr_reader :query, :patient
+
+      def initialize(patient:, query: {})
+        @query = query
+        @patient = patient
+        @query[:s] = "created_at DESC" if @query[:s].blank?
+      end
+
+      def call
+        search.result.for_patient(patient)
+                     .includes(:event_type)
+                     .eager_load(:event_type)
+                     .includes(:created_by)
+                     .eager_load(:created_by)
+                     .page(query[:page]).per(query[:per_page])
+                     .ordered
+      end
+
+      def search
+        @search ||= Event.ransack(query)
+      end
+    end
+  end
+end

data/app/models/renalware/events/line_change_event_query.rb

@@ -0,0 +1,25 @@
+require_dependency "renalware/clinics"
+
+module Renalware
+  module Events
+    class LineChangeEventQuery
+      attr_reader :patient
+
+      def initialize(patient)
+        @patient = patient
+      end
+
+      def call(limit: 1)
+        return [] if event_type.nil?
+        Event.for_patient(patient)
+             .where(event_type_id: event_type.id)
+             .order(date_time: :desc)
+             .limit(limit)
+      end
+
+      def event_type
+        @event_type ||= Renalware::Events::Type.find_by(slug: :pd_line_changes)
+      end
+    end
+  end
+end

data/app/models/renalware/events/patient_listener.rb

@@ -0,0 +1,8 @@
+require_dependency "renalware/events"
+
+module Renalware
+  module Events
+    class PatientListener
+    end
+  end
+end

data/app/models/renalware/events/simple.rb

@@ -3,7 +3,7 @@ require_dependency "renalware/events"
 module Renalware
   module Events
     class Simple < Event
-
+      validates :description, presence: true
     end
   end
 end

data/app/models/renalware/hd/diurnal_period_code.rb

@@ -0,0 +1,9 @@
+require_dependency "renalware/hd"
+
+module Renalware
+  module HD
+    class DiurnalPeriodCode < ApplicationRecord
+      validates :code, presence: true, uniqueness: true
+    end
+  end
+end

data/app/models/renalware/hd/mdm_patients_query.rb

@@ -17,6 +17,7 @@ module Renalware
       def search
         @search ||= begin
           relation
+            .includes(:hd_profile)
             .extending(ModalityScopes)
             .extending(Scopes)
             .with_current_key_pathology

data/app/models/renalware/hd/modality_description.rb

@@ -3,6 +3,9 @@ require_dependency "renalware/hd"
 module Renalware
   module HD
     class ModalityDescription < Modalities::Description
+      def to_sym
+        :hd
+      end
     end
   end
 end

data/app/models/renalware/hd/patient_listener.rb

@@ -0,0 +1,20 @@
+# rubocop:disable Rails/SkipsModelValidations
+module Renalware
+  module HD
+    class PatientListener
+      def patient_modality_changed_to_death(patient:, modality:, actor:)
+        nullify_significant_hd_profile_attributes(patient, by: actor)
+      end
+
+      private
+
+      def nullify_significant_hd_profile_attributes(patient, by:)
+        hd_profile = HD.cast_patient(patient).hd_profile
+        return if hd_profile.nil?
+        hd_profile.hospital_unit = nil
+        hd_profile.schedule = nil
+        hd_profile.save_by!(by)
+      end
+    end
+  end
+end

data/app/models/renalware/hd/patients_with_unmet_preferences_query.rb

@@ -15,6 +15,8 @@ module Renalware
       def search
         HD::Patient
           .extend(Scopes)
+          .includes(hd_profile: :hospital_unit)
+          .includes(hd_preference_set: :hospital_unit)
           .eager_load(:hd_profile)
           .eager_load(:hd_preference_set)
           .having_an_unmet_preference

data/app/models/renalware/hd/session/closed.rb

@@ -31,8 +31,8 @@ module Renalware
 
         class Observations < Renalware::HD::SessionDocument::Observations
           validates_presence_of :pulse, :blood_pressure, :weight_measured, :temperature_measured
-          validates_presence_of :weight, if: "weight_measured.try!(:yes?)"
-          validates_presence_of :temperature, if: "temperature_measured.try!(:yes?)"
+          validates_presence_of :weight, if: ->{ weight_measured&.yes? }
+          validates_presence_of :temperature, if: ->{ temperature_measured&.yes? }
           validates :blood_pressure, "renalware/patients/blood_pressure_presence" => true
         end
         attribute :observations_before, Observations

data/app/models/renalware/hd/station.rb

@@ -0,0 +1,24 @@
+# To override the values in the location enum use something like this:
+# module CustomizeHDStationLocationEnum
+#   extend Enumerize
+#   enumerize :location, in: %i(side_room ante_room cubicle)
+# end
+# Renalware::HD::Station.singleton_class.send(:prepend, CustomizeHDStationLocationEnum)
+#
+require_dependency "renalware/hd"
+
+module Renalware
+  module HD
+    class Station < ApplicationRecord
+      extend Enumerize
+      include Accountable
+      validates :hospital_unit_id, presence: true
+      validates :name, uniqueness: { scope: :hospital_unit_id }
+
+      enumerize :location, in: %i(side_room)
+
+      scope :for_unit, ->(id){ where(hospital_unit_id: id) }
+      scope :ordered, ->{ order(position: :asc) }
+    end
+  end
+end

data/app/models/renalware/hospitals/unit.rb

@@ -12,6 +12,7 @@ module Renalware
       validates :name, presence: true
       validates :renal_registry_code, presence: true
       validates :unit_type, presence: true
+      validates :number_of_hd_stations, numericality: { allow_blank: true, only_integer: true }
 
       enumerize :unit_type, in: %i(hospital satellite home)
 

data/app/models/renalware/letters/draft_letter.rb

@@ -6,7 +6,7 @@ module Renalware
       include Wisper::Publisher
 
       def self.build
-        self.new
+        new
       end
 
       def call(patient, params = {})

data/app/models/renalware/letters/letter_params_processor.rb

@@ -18,7 +18,7 @@ module Renalware
       private
 
       def process_main_recipient_attributes(params)
-        return params unless params.has_key?(:main_recipient_attributes)
+        return params unless params.key?(:main_recipient_attributes)
 
         params.merge(
           main_recipient_attributes: main_recipient_attributes(params)
@@ -26,7 +26,7 @@ module Renalware
       end
 
       def process_cc_recipients_attributes(params)
-        return params unless params.has_key?(:cc_recipients_attributes)
+        return params unless params.key?(:cc_recipients_attributes)
 
         params.merge(
           cc_recipients_attributes: cc_recipients_attributes(params)

data/app/models/renalware/letters/letter_query.rb

@@ -27,7 +27,7 @@ module Renalware
       end
 
       def search
-        @search ||= Letter.extend(QueryableLetter).search(@q)
+        @search ||= Letter.extend(QueryableLetter).includes(:event).search(@q)
       end
     end
   end

data/app/models/renalware/letters/part/recent_pathology_results.rb

@@ -4,7 +4,7 @@ module Renalware
   module Letters
     class Part::RecentPathologyResults < Part
 
-      delegate :each, :present?, to: :recent_pathology_results
+      delegate :each, :any?, :present?, to: :recent_pathology_results
 
       def to_partial_path
         "renalware/letters/parts/recent_pathology_results"
@@ -19,9 +19,14 @@ module Renalware
       def find_recent_pathology_results
         presenter = Pathology::CurrentObservationResults::Presenter.new
         descriptions = Letters::RelevantObservationDescription.all
-        results = Pathology::CurrentObservationsForDescriptionsQuery
-          .new(patient: @patient, descriptions: descriptions)
-          .call
+        query = Pathology::CurrentObservationsForDescriptionsQuery.new(
+          patient: @patient,
+          descriptions: descriptions
+        )
+
+        # Only select display result with a value
+        results = query.call.reject{ |result| result.result.blank? }
+
         # Removes the header from the results, this will be unnecessary when
         # a custom Presenter is implemented
         presenter.present(results)[1..-1]

data/app/models/renalware/letters/patient_listener.rb

@@ -0,0 +1,16 @@
+# rubocop:disable Rails/SkipsModelValidations
+module Renalware
+  module Letters
+    class PatientListener
+      def patient_modality_changed_to_death(patient:, modality:, actor:)
+        # Using update_columns here (bypassing validation) because currently, once the Death
+        # modality is assigned, attempting to update the patient triggers validation
+        # on cause_of_death which will at this stage be missing.
+        patient.update_columns(
+          cc_on_all_letters: false,
+          cc_decision_on: modality.started_on
+        )
+      end
+    end
+  end
+end

data/app/models/renalware/letters/revise_letter.rb

@@ -6,7 +6,7 @@ module Renalware
       include Wisper::Publisher
 
       def self.build
-        self.new
+        new
       end
 
       def call(patient, letter_id, params = {})

data/app/models/renalware/medications/patient_listener.rb

@@ -0,0 +1,11 @@
+require_dependency "renalware/medications"
+
+module Renalware
+  module Medications
+    class PatientListener
+      def patient_modality_changed_to_death(patient:, modality:, actor:)
+        TerminateAllPatientPrescriptions.call(patient: patient, by: actor)
+      end
+    end
+  end
+end

data/app/models/renalware/medications/prescriptions_by_drug_type_query.rb

@@ -17,7 +17,8 @@ module Renalware
         @search ||= begin
           Prescription
             .current
-            .includes(:medication_route, :patient, :drug)
+            .includes(:medication_route, :drug)
+            .includes(patient: { current_modality: :description })
             .eager_load(drug: [:drug_types])
             .where("lower(drug_types.name) = lower(?)", drug_type_name)
             .search(search_params)

data/app/models/renalware/medications/terminate_all_patient_prescriptions.rb

@@ -0,0 +1,24 @@
+require_dependency "renalware/medications"
+
+module Renalware
+  module Medications
+    class TerminateAllPatientPrescriptions
+      attr_reader :patient, :by
+
+      def self.call(patient:, by:)
+        new(patient, by).call
+      end
+
+      def initialize(patient, by)
+        @patient = patient
+        @by = by
+      end
+
+      def call
+        patient.prescriptions.each do |prescription|
+          prescription.terminate(by: by).save!
+        end
+      end
+    end
+  end
+end

data/app/models/renalware/messaging/author.rb

@@ -0,0 +1,9 @@
+require_dependency "renalware/messaging"
+
+module Renalware
+  module Messaging
+    class Author < ActiveType::Record[Renalware::User]
+      has_many :messages
+    end
+  end
+end