renalware-core 2.0.51 → 2.0.52

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

@@ -36,16 +36,7 @@ module Renalware
       private
 
       def workup_params
-        params
-          .require(:transplants_donor_workup)
-          .permit
-          .merge(document: document_attributes)
-      end
-
-      def document_attributes
-        params
-          .require(:transplants_donor_workup)
-          .fetch(:document, nil).try(:permit!)
+        params.require(:transplants_donor_workup).permit(document: {})
       end
     end
   end

data/app/controllers/renalware/virology/dashboards_controller.rb

@@ -6,7 +6,7 @@ module Renalware
   module Virology
     class DashboardsController < BaseController
       def show
-        authorize patient
+        authorize [:renalware, :virology, :dashboard], :show?
         render locals: {
           patient: patient,
           vaccinations: Vaccination.for_patient(patient)

data/app/controllers/renalware/virology/profiles_controller.rb

@@ -42,20 +42,7 @@ module Renalware
       end
 
       def profile_params
-        params
-          .require(:virology_profile)
-          .permit(attributes)
-          .merge(document: document_attributes)
-      end
-
-      def attributes
-        [
-          document: []
-        ]
-      end
-
-      def document_attributes
-        params.require(:virology_profile).fetch(:document, nil).try(:permit!)
+        params.require(:virology_profile).permit(document: {})
       end
     end
   end

data/app/helpers/renalware/admin_helper.rb

@@ -9,5 +9,9 @@ module Renalware
     def admin_inactive_users_path
       admin_users_path(q: { inactive: true })
     end
+
+    def admin_expired_users_path
+      admin_users_path(q: { expired: true })
+    end
   end
 end

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

@@ -32,7 +32,7 @@ module Renalware
         verified_values = verify_values(attribute, values.map(&:to_s))
 
         where(attribute => verified_values)
-          .order("CASE #{generate_conditions(attribute, values.uniq)} END")
+          .order(Arel.sql("CASE #{generate_conditions(attribute, values.uniq)} END"))
       end
 
       private

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

@@ -43,15 +43,21 @@ module Renalware
     #   so should rise above them when sorted
     # 3. Nulls (mapped to -1)
     def self.pathology_result_sort_predicate(column)
+      sanitized_column = Arel.sql(sanitize(column.to_s.upcase))
       Arel.sql(
-        "coalesce(convert_to_float(values -> '#{column.upcase}' ->> 'result'), -1)"
+        "coalesce(convert_to_float(values -> #{sanitized_column} ->> 'result'), -1)"
       )
     end
 
     def self.pathology_date_sort_predicate(column)
+      sanitized_column = Arel.sql(sanitize(column.to_s.upcase))
       Arel.sql(
-        "cast(values -> '#{column.upcase}' ->> 'observed_at' as date)"
+        "cast(values -> #{sanitized_column} ->> 'observed_at' as date)"
       )
     end
+
+    def self.sanitize(sql)
+      ActiveRecord::Base.connection.quote(sql)
+    end
   end
 end

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

@@ -23,18 +23,26 @@ module Renalware
         with_deleted
       end
 
+      # Make a deep copy of the current object (self) into a successor, and update it with any
+      # changes. Mark self as deleted.
+      # Note 'update' callbacks will not be called on our successor until it has been saved first.
+      # So we save the copy without any modifictions first, so that on a subsequent update!
+      # the update callbacks in the Accountable module will be called and if the
+      # caller of this fn has supplied :by in attrs, it will cause the updated_by_id
+      # column to be updated. Its a bit odd saving twice, but required here.
+      # Without this 2 phase save, updated_by_id (if present) will remain at whatever it was
+      # set at to in the object we are superceding.
       def supersede!(attrs = {})
         attrs = attrs.to_h unless attrs.is_a?(Hash)
         transaction do
           successor = dup
           destroy!
-          successor.assign_attributes(attrs) if attrs.any?
           successor.save!
+          successor.update!(attrs) if attrs.any?
           successor
         end
       end
 
-      # Unused?
       def paranoia_restore_attributes
         {
           deactivated_at: nil,
@@ -42,7 +50,6 @@ module Renalware
         }
       end
 
-      # Unused
       def paranoia_destroy_attributes
         {
           deactivated_at: current_time_from_proper_timezone,

data/app/models/renalware/admissions/consult_query.rb

@@ -23,9 +23,11 @@ module Renalware
       # included in the model file.
       # note that adding .includes(:created_by) her creates an ambigous column
       # 'family_name' error
+      # rubocop:disable Metrics/MethodLength
       def search
         @search ||= begin
           Consult
+            .extend(RansackScopes)
             .joins(:patient)
             .eager_load(patient: [current_modality: :description])
             .includes(
@@ -37,6 +39,18 @@ module Renalware
             .ransack(query)
         end
       end
+      # rubocop:enable Metrics/MethodLength
+
+      module RansackScopes
+        def self.extended(base)
+          # Using a custom ransacker here in order to sort by modality description name
+          # because using a predicate like  :patient_current_modality_description_name
+          # results in an INNER JOIN onto modalities.
+          base.ransacker :modality_desc do
+            Arel.sql("modality_descriptions.name")
+          end
+        end
+      end
     end
   end
 end

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

@@ -12,16 +12,23 @@ module Renalware
       include Virtus::Model
 
       attribute :hospital_unit_id, Integer
+      attribute :named_nurse_id, Integer
       attribute :schedule_definition_ids, String # an Integer array in string form e.g. "[1 ,2]"
 
       # The hash returned here is passed into the Ransack #search method later i the ouery object.
       def ransacked_parameters
         {
           hd_profile_hospital_unit_id_eq: hospital_unit_id,
-          hd_profile_schedule_definition_id_in: schedule_definition_ids_array
+          hd_profile_schedule_definition_id_in: schedule_definition_ids_array,
+          hd_profile_named_nurse_id_eq: named_nurse_id
         }
       end
 
+      # StrongParameter support. Called by a controller when whitelisting params.
+      def self.permittable_attributes
+        attribute_set.map(&:name)
+      end
+
       private
 
       # Convert e.g. "[1,2,3]" to [1,2,3]

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

@@ -46,7 +46,8 @@ module Renalware
 
       def all_other_users
         ids_to_exclude = ids_of_users_having_previously_received_been_cced_about_this_patient +
-                         ids_of_users_having_recently_been_cced_by_author
+                         ids_of_users_having_recently_been_cced_by_author +
+                         ids_of_excludable_users
         Group.new(
           name: "All other user",
           users: User.where.not(id: ids_to_exclude)
@@ -55,13 +56,14 @@ module Renalware
 
       def ids_of_users_having_previously_received_been_cced_about_this_patient
         @ids_of_users_having_previously_received_been_cced_about_this_patient ||= begin
-          Letter
+          ids = Letter
             .includes(:electronic_receipts)
             .eager_load(:electronic_receipts)
             .where(patient: patient)
             .limit(20)
             .pluck(:recipient_id)
             .flatten.uniq.compact
+          ids - ids_of_excludable_users
         end
       end
 
@@ -72,9 +74,15 @@ module Renalware
             .where(author: author)
             .limit(20)
             .pluck(:recipient_id).uniq.compact
-          ids - ids_of_users_having_previously_received_been_cced_about_this_patient
+          ids -
+            ids_of_users_having_previously_received_been_cced_about_this_patient -
+            ids_of_excludable_users
         end
       end
+
+      def ids_of_excludable_users
+        User.excludable.pluck(:id)
+      end
     end
   end
 end

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

@@ -56,8 +56,8 @@ module Renalware
       }
       singleton_class.send(:alias_method, :in_progress, :pending)
 
-      scope :reversed, -> { order("#{effective_date_sort} asc")  }
-      scope :ordered, -> { order("#{effective_date_sort} desc") }
+      scope :reversed, -> { order(Arel.sql(effective_date_sort) => :asc) }
+      scope :ordered, -> { order(Arel.sql(effective_date_sort) => :desc) }
       scope :with_letterhead, -> { includes(:letterhead) }
       scope :with_main_recipient, -> { includes(main_recipient: [:address, :addressee]) }
       scope :with_author, -> { includes(:author) }
@@ -79,7 +79,7 @@ module Renalware
       end
 
       def self.effective_date_sort
-        "coalesce(completed_at, approved_at, submitted_for_approval_at, created_at)"
+        Arel.sql("coalesce(completed_at, approved_at, submitted_for_approval_at, created_at)")
       end
 
       EVENTS_MAP = {

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

@@ -64,6 +64,7 @@ module Renalware
                 if letter.page_count.to_i < 1
                   raise(ArgumentError, "letter.page_count not set on letter.id=#{letter.id}")
                 end
+
                 letter_filename = create_letter_pdf_in(dir, letter)
                 files << letter_filename
               end

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

@@ -20,7 +20,18 @@ module Renalware
 
       validates :addressee_id, presence: { if: :contact? }
 
-      delegate :primary_care_physician?, :patient?, :contact?, to: :person_role
+      validate :person_role_present?
+
+      # Check we have a person_role. If we don't add an error to the parent letter if one is
+      # present, otherwise add to our errors.
+      def person_role_present?
+        return if person_role.present?
+
+        errs = letter&.errors || errors
+        errs.add(:base, "Please select a main recipient")
+      end
+
+      delegate :primary_care_physician?, :patient?, :contact?, to: :person_role, allow_nil: true
 
       def to_s
         (address || current_address).to_s

data/app/models/renalware/low_clearance.rb

@@ -4,7 +4,7 @@ require_dependency "renalware"
 
 module Renalware
   module LowClearance
-    MDM_FILTERS = %w(urea hgb_low hgb_high on_worryboard supportive_care).freeze
+    MDM_FILTERS = %w(urea hgb_low hgb_high on_worryboard supportive_care tx_candidates).freeze
 
     def self.table_name_prefix
       "low_clearance_"

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

@@ -20,6 +20,7 @@ module Renalware
         search.result
       end
 
+      # rubocop:disable Metrics/MethodLength
       def search
         @search ||= begin
           relation
@@ -35,6 +36,7 @@ module Renalware
             .search(query)
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       module NamedFilterScopes
         def none
@@ -51,7 +53,7 @@ module Renalware
         end
 
         def tx_candidates
-          self
+          where("transplant_registration_status_descriptions.code not ilike '%permanent'")
         end
 
         def urea

data/app/models/renalware/messaging.rb

@@ -18,10 +18,6 @@ module Renalware
       ActiveType.cast(author, ::Renalware::Messaging::Author)
     end
 
-    # def cast_recipient(recipient)
-    #   ActiveType.cast(recipient, ::Renalware::Messaging::Recipient)
-    # end
-
     module Internal
       module_function
 

data/app/models/renalware/messaging/internal/recipient_options.rb

@@ -54,7 +54,9 @@ module Renalware
 
         def all_other_users
           ids_to_exclude = ids_of_users_having_received_a_message_about_patient +
-                           ids_of_users_having_received_messages_from_author
+                           ids_of_users_having_received_messages_from_author +
+                           ids_of_excludable_users
+
           Group.new(
             name: "All other users",
             users: Recipient.where.not(id: ids_to_exclude)
@@ -63,26 +65,34 @@ module Renalware
 
         def ids_of_users_having_received_a_message_about_patient
           @ids_of_users_having_received_a_message_about_patient ||= begin
-            Message
+            ids = Message
               .includes(:receipts)
               .eager_load(:receipts)
               .where(patient: patient)
               .limit(20)
               .pluck(:author_id, :recipient_id)
               .flatten.uniq.compact
+            ids - ids_of_excludable_users
           end
         end
 
         def ids_of_users_having_received_messages_from_author
           @ids_of_users_having_received_messages_from_author ||= begin
             ids = Message
-              .includes(:receipts).eager_load(:receipts)
+              .includes(:receipts)
+              .eager_load(:receipts)
               .where(author: author)
               .limit(20)
               .pluck(:recipient_id).uniq.compact
-            ids - ids_of_users_having_received_a_message_about_patient
+            ids -
+              ids_of_users_having_received_a_message_about_patient -
+              ids_of_excludable_users
           end
         end
+
+        def ids_of_excludable_users
+          User.excludable.pluck(:id)
+        end
       end
     end
   end

data/app/models/renalware/pathology/observation_descriptions_by_code_query.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/pathology"
-require "sql/index_case_stmt"
+require "sql/indexed_case_stmt"
 
 module Renalware
   module Pathology

data/app/models/renalware/pathology/ordered_patient_query.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/pathology"
-require "sql/index_case_stmt"
+require "sql/indexed_case_stmt"
 
 module Renalware
   module Pathology

data/app/models/renalware/research/study_participant.rb

@@ -6,6 +6,8 @@ module Renalware
   module Research
     class StudyParticipant < ApplicationRecord
       include Accountable
+      include PatientsRansackHelper
+
       acts_as_paranoid
       validates :participant_id, presence: true, uniqueness: { scope: :study }
       validates :study, presence: true

data/app/models/renalware/research/study_participants_query.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/research"
+require "attr_extras"
+
+module Renalware
+  module Research
+    class StudyParticipantsQuery
+      pattr_initialize [:study!, :options!]
+
+      def call
+        search.result
+      end
+
+      def search
+        study.participants.joins(:patient).eager_load(:patient).ransack(options)
+      end
+    end
+  end
+end

data/app/models/renalware/transplants/registrations/wait_list_query.rb

@@ -123,6 +123,20 @@ module Renalware
             Arel.sql("renal_profiles.esrf_on")
           end
 
+          # TODO: move ransacker to Renal namespace
+          ransacker :patient_current_status_description_name do
+            Arel.sql("transplant_registration_status_descriptions.name")
+          end
+
+          ransacker :ukt_status do
+            Arel.sql(<<-SQL)
+              COALESCE(
+                transplant_registrations.document -> 'uk_transplant_centre' ->> 'status',
+                ''
+              )
+            SQL
+          end
+
           private_class_method :ransackable_scopes
 
           def self.ransackable_scopes(_auth_object = nil)