renalware-core 2.0.158 → 2.0.163

data/app/models/renalware/clinics/create_clinic_visit.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/clinics"
-require_dependency "renalware/success"
-require_dependency "renalware/failure"
+require "success"
+require "failure"
 
 module Renalware
   module Clinics
@@ -22,9 +22,9 @@ module Renalware
           visit = patient.clinic_visits.new(params)
           objects = OpenStruct.new(clinic_visit: visit, appointment: appointment)
           if visit.save && update_appointment_with(visit.id)
-            return ::Renalware::Success.new(objects)
+            return ::Success.new(objects)
           else
-            return ::Renalware::Failure.new(objects)
+            return ::Failure.new(objects)
           end
         end
       end

data/app/models/renalware/clinics/current_observations.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Clinics
-    # TODO: Move this to a view?
+    # TODO: Unused?
     class CurrentObservations
       NULL_DATE = nil
       pattr_initialize :patient
@@ -17,7 +16,7 @@ module Renalware
         @weight ||= begin
           result = ClinicVisit
                     .most_recent_for_patient(patient)
-                    .where("weight is not null")
+                    .where.not(weight: nil)
                     .pluck(:date, :weight).first || []
 
           Observation.new(result.first, result.last)
@@ -29,7 +28,7 @@ module Renalware
         @height ||= begin
           result = ClinicVisit
                     .most_recent_for_patient(patient)
-                    .where("height is not null")
+                    .where.not(height: nil)
                     .pluck(:date, :height).first || []
 
           Observation.new(result.first, result.last)

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/events"
+
+module Renalware
+  module Events
+    # Query object that returns, for a patient, the most recent matching event (if any) for each
+    # event_type_alert_trigger row in the databse. The results are used to display
+    # alerts in the UI.
+    # For example given a vaccination Event::Type and an EventTypeAlertTrigger
+    # which is configured to find any vaccination event with the word "covid" in
+    # anywhere in the document, this query will return the most matching event.
+    # It is possible to have mltiple triggers rows for the same event type, so for eample one
+    # could display triggers for the most recent covid vaccination, and the most recent HBV
+    # vaccination.
+    class AlertableEventsQuery
+      def self.call(patient:)
+        Event
+          .for_patient(patient)
+          .joins(event_type: :alert_triggers)
+          .select("DISTINCT ON (events.patient_id, event_type_alert_triggers.id) events.*")
+          .where("(events.document::text ilike '%' || when_event_document_contains || '%') or (events.description ilike '%' || when_event_description_contains || '%')")
+          .order("events.patient_id, event_type_alert_triggers.id, events.created_at desc")
+      end
+    end
+  end
+end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/events"
-require "attr_extras"
 
 module Renalware
   module Events

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

@@ -45,6 +45,10 @@ module Renalware
       end
       alias :to_input_partial_path :to_partial_path
 
+      def to_alert_partial_path
+        partial_for "alert"
+      end
+
       def to_cell_partial_path
         partial_for "cell"
       end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/events"
+
+module Renalware
+  module Events
+    # Used to defines conditions where, for a particular event type, if the there is e.g. a case-
+    # insensitive text match against the contents of the event document (eg 'COVID')
+    # then an alert will be displayed in the UI (for the most recent match is there are > 1).
+    class EventTypeAlertTrigger < ApplicationRecord
+      belongs_to :event_type, class_name: "Events::Type"
+      validates :event_type, presence: true
+    end
+  end
+end

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

@@ -6,6 +6,13 @@ module Renalware
   module Events
     class Type < ApplicationRecord
       self.table_name = "event_types"
+      has_many(
+        :alert_triggers,
+        class_name: "EventTypeAlertTrigger",
+        foreign_key: :event_type_id,
+        dependent: :destroy
+      )
+
       DEFAULT_EVENT_CLASS_NAME = "Renalware::Events::Simple"
 
       acts_as_paranoid

data/app/models/renalware/feeds/files/exceptions.rb

@@ -7,6 +7,7 @@ module Renalware
     module Files
       class Exceptions
         class FileNotFoundError < StandardError; end
+
         class UnexpectedCSVFormatError < StandardError; end
       end
     end

data/app/models/renalware/feeds/files/practice_memberships/import_csv.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/feeds"
-require "attr_extras"
 
 module Renalware
   module Feeds

data/app/models/renalware/feeds/files/primary_care_physicians/import_csv.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/feeds"
-require "attr_extras"
 
 module Renalware
   module Feeds

data/app/models/renalware/feeds/message_processor.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/feeds"
-require "attr_extras"
 
 module Renalware
   module Feeds

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

@@ -9,10 +9,12 @@ module Renalware
       acts_as_paranoid
 
       # Set to true by the parent hd_session if we are not signing off at this stage
-      attr_accessor :skip_witness_validation
-      attr_accessor :skip_administrator_validation
-      attr_accessor :administered_by_password
-      attr_accessor :witnessed_by_password
+      attr_accessor(
+        :skip_witness_validation,
+        :skip_administrator_validation,
+        :administered_by_password,
+        :witnessed_by_password
+      )
 
       belongs_to :hd_session, class_name: "HD::Session", touch: true
       belongs_to :prescription, class_name: "Medications::Prescription"

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "attr_extras"
-
 module Renalware
   module HD
     class ProfilesInDateRangeQuery
@@ -13,9 +11,6 @@ module Renalware
       # so for the start date of the profile we always use created_at and ignore prescribed_on,
       # even if it is present.
       def call
-        # p "  from #{from}"
-        # p "  to #{to}"
-
         # If to is nil it is because modality we are targetting is a current one.
         # We need a date for the from..to range to work so use a far future one.
         @to ||= Date.parse("3000-01-01")
@@ -24,7 +19,7 @@ module Renalware
         # we will have duplicate Treatments with odd state/end date ordering
         used_profiles_ids = UKRDC::Treatment
                              .where(patient: patient)
-                             .where("hd_profile_id is not null")
+                             .where.not(hd_profile_id: nil)
                              .pluck(:hd_profile_id)
         HD::Profile
           .with_deactivated

data/app/models/renalware/hd/scheduling/diary_range.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require "renalware/hd"
-require "renalware/week_period"
-require "attr_extras"
+require "week_period"
 
 module Renalware
   module HD

data/app/models/renalware/hd/scheduling/find_or_create_diary_by_week_query.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/hd"
-require "renalware/week_period"
+require "week_period"
 ##
 # Returns a hospital unit's diary for the requested week (passed to #new as a WeekPeriod
 # value object).

data/app/models/renalware/hd/session_forms/batch.rb

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

data/app/models/renalware/hd/session_forms/batch_compile_pdfs.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module HD

data/app/models/renalware/hd/session_forms/batch_item.rb

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

data/app/models/renalware/hd/sessions/close_stale_open_sessions.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/hd"
-require "attr_extras"
 
 module Renalware
   module HD

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

data/app/models/renalware/letters/delivery/delivery_policy.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

data/app/models/renalware/letters/delivery/email_letter_to_practice.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

data/app/models/renalware/letters/delivery/practice_email.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

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

@@ -5,7 +5,7 @@ module Renalware
     # Note we cannot use a partial layout with render_to_string as it will always expect
     # the location to be in views/layouts and its not possible in Rails 5.1 to specify
     # another or absolute path
-    class HTMLRenderer
+    class HtmlRenderer
       def call(letter)
         context = LettersController.new
         context.render_to_string_with_wicked_pdf(

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

@@ -54,7 +54,7 @@ module Renalware
         Letter::Draft.new(params.merge!(type: Letter::Draft.name, patient: patient))
       end
 
-      # note both practice and gp need to be present before we can send to the pcp - we'll use the
+      # NOTE: both practice and gp need to be present before we can send to the pcp - we'll use the
       # practice address but the GP's name as the salutation.
       def include_primary_care_physician_as_default_main_recipient
         return if letter.main_recipient.present?

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "renalware/letters/part"
-require "attr_extras"
 
 # When rendered, the template in `to_partial_path` will be used, and our Part object here will be
 # available in the partial as `recent_pathology_results`.

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

@@ -11,7 +11,7 @@ module Renalware
       def each_group
         Pathology::ObservationDescription
           .select(:id, :code, :letter_group, :letter_order)
-          .where("letter_group is not null")
+          .where.not(letter_group: nil)
           .order("letter_group asc, letter_order asc")
           .group_by(&:letter_group)
           .each do |group_number, descriptions|

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

@@ -40,7 +40,7 @@ module Renalware
         delegate :clear, to: :store
 
         def fetch(letter, **options)
-          store.fetch(cache_key_for(letter, **options)) { yield }
+          store.fetch(cache_key_for(letter, **options), expires_in: 4.weeks) { yield }
         end
 
         # Note the letter must be a LetterPresenter which has a #to_html method

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

@@ -2,7 +2,7 @@
 
 #
 # Render a Letter to PDF. Try and get it from the cachefirst
-# Lean on Letters::HTMLRenderer which already renders the letter to html via
+# Lean on Letters::HtmlRenderer which already renders the letter to html via
 # LetterPresenter#content.
 #
 module Renalware

data/app/models/renalware/letters/printing/batch_compile_pdfs.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

data/app/models/renalware/letters/printing/complete_batch.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

data/app/models/renalware/letters/printing/pdf_combining.rb

@@ -2,8 +2,6 @@
 
 require_dependency "renalware/letters"
 
-require "attr_extras"
-
 module Renalware
   module Letters
     module Printing

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "attr_extras"
-
 module Renalware
   module Letters
     # This class is responsible for collating the complete set of default electronic ccs for a new

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters
@@ -36,10 +35,12 @@ module Renalware
         temp_html_file.unlink # allows garbage collection and temp file removal
       end
 
+      # Use windows line endings (CRLF) rather than linux (LF).
+      # This solves a problem at Barts exporting RTFs to send to GPs
       def rtf_content_converted_from(html_temp_file)
         rtf_template = File.join(Engine.root, "lib", "pandoc", "templates", "default.rtf")
         options = { template: rtf_template }
-        PandocRuby.html([html_temp_file.path], options, :standalone).to_rtf
+        PandocRuby.html([html_temp_file.path], options, :standalone).to_rtf("--eol=crlf")
       end
 
       def html_with_images_stripped

data/app/models/renalware/modalities/change_patient_modality.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/modalities"
-require_dependency "renalware/success"
-require_dependency "renalware/failure"
+require "success"
+require "failure"
 
 module Renalware
   module Modalities
@@ -50,9 +50,9 @@ module Renalware
         if new_modality.valid?
           make_new_modality_the_current_one(new_modality)
           broadcast_modality_change_event_to_any_listeners(new_modality)
-          ::Renalware::Success.new(new_modality)
+          ::Success.new(new_modality)
         else
-          ::Renalware::Failure.new(new_modality)
+          ::Failure.new(new_modality)
         end
       end