renalware-core 2.0.145 → 2.0.151

data/app/models/renalware/ukrdc/housekeeping/remove_old_export_archive_folders.rb

@@ -8,7 +8,7 @@ module Renalware
     module Housekeeping
       # Responsible for cleaning up old archive folders that are created each time the
       # ukrdc:export task has run. Each archive folder's name has a batch number in it which is the
-      # id of the UKRDC::BatchNumber model created at the start of each export. We can find the
+      # id of the UKRDC::Batch model created at the start of each export. We can find the
       # folders to remove by extracting the batch number from the folder name and deleting the
       # folder if that batch is no longer 'recent'.
       # Called from a housekeeping rake task.
@@ -64,12 +64,12 @@ module Renalware
           Renalware.config.ukrdc_number_of_archived_folders_to_keep.to_i
         end
 
-        # Returns the ids of a few of the most recent BatchNumbers rows (ie the batch number) that
+        # Returns the ids of a few of the most recent Batch rows (ie the batch number) that
         # we should not delete - these being the most recent ones we want to stick around in case we
         # need to inspect what was sent.
         def batch_numbers_to_keep
           @batch_numbers_to_keep ||= begin
-            BatchNumber
+            Batch
               .limit(number_of_archived_folders_to_keep)
               .order(created_at: :desc)
               .pluck(:id)

data/app/models/renalware/ukrdc/housekeeping/remove_stale_files.rb

@@ -53,11 +53,11 @@ module Renalware
           Renalware.config.ukrdc_number_of_archived_folders_to_keep.to_i
         end
 
-        # Returns the ids of a few of the most recent BatchNumbers rows (ie the batch number) that
+        # Returns the ids of a few of the most recent Batch rows (ie the batch number) that
         # we should not delete - these being the most recent ones
         def batch_numbers_to_keep
           @batch_numbers_to_keep ||= begin
-            BatchNumber
+            Batch
               .limit(number_of_batches_to_keep)
               .order(created_at: :desc)
               .pluck(:id)

data/app/models/renalware/ukrdc/incoming/import_surveys.rb

@@ -23,7 +23,6 @@ module Renalware
               FileUtils.mv filepath, paths.archive.join(filepath.basename)
               next
             end
-
             logger.info "Processing: #{filepath}"
             import_surveys_from_file(filepath)
           end
@@ -49,7 +48,7 @@ module Renalware
         def import_surveys_from_file(file)
           # Important to create the log before we do anything that might cause an error
           # eg parse the xml etc.
-          TransmissionLog.with_logging(nil, batch_uuid, log_options(file)) do |log|
+          TransmissionLog.with_logging(request_uuid: batch_uuid, **log_options(file)) do |log|
             doc = XmlDocument.new(file)
             patient = find_patient(doc.nhs_number)
             log.update!(patient_id: patient.id)

data/app/models/renalware/ukrdc/outgoing/rendering/patient_number.rb

@@ -15,7 +15,7 @@ module Renalware
 
           def name_element
             create_node("PatientNumber") do |elem|
-              elem << create_node("Number", number)
+              elem << create_node("Number", number&.delete(" "))
               elem << create_node("Organization", organisation)
               elem << create_node("NumberType", type)
             end

data/app/models/renalware/ukrdc/transmission_log.rb

@@ -17,12 +17,13 @@ module Renalware
       }
       enum direction: { out: 0, in: 1 }
       scope :ordered, -> { order(sent_at: :asc) }
+      belongs_to :batch
 
-      def self.with_logging(patient, request_uuid, **options)
+      def self.with_logging(patient: nil, batch: nil, **options)
         log = new(
           patient: patient,
           sent_at: Time.zone.now,
-          request_uuid: request_uuid,
+          batch: batch,
           **options)
         yield log if block_given?
         log.save!

data/app/models/renalware/user.rb

@@ -42,6 +42,8 @@ module Renalware
     scope :hidden, -> { where(hidden: true) }
     scope :picklist, -> { visible.ordered }
 
+    store_accessor :preferences, :experimental_features
+
     # Non-persistent attribute to signify we want to use extended validation.
     # We need to refactor this by ising a form object for updating a user.
     attr_accessor :with_extended_validation
@@ -100,6 +102,14 @@ module Renalware
     #   Pundit.policy(self, record).public_send(method.to_sym)
     # end
 
+    # We can enable experiment features for particular users using the bitmask user#feature_flags
+    # property and bitwise operators.
+    # For example given the the feature flag FANCY_GRAPHS = 2, we if they user should see these with
+    #   FANCY_GRAPHS & feature_flags == FANCY_GRAPHS
+    def wants_feature?(flag)
+      (flag & feature_flags) == flag
+    end
+
     private
 
     def build_authentication_token

data/app/pdfs/renalware/events/event_pdf.rb

@@ -12,6 +12,7 @@ module Renalware
     class EventPdf
       include Prawn::View
       attr_reader :event
+
       delegate :patient, :event_type, to: :event
 
       def initialize(event)

data/app/policies/renalware/events/advanced_care_plan_policy.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/messaging"
+
+module Renalware
+  module Events
+    class AdvancedCarePlanPolicy < BasePolicy
+    end
+  end
+end

data/app/policies/renalware/events/clinical_frailty_score_policy.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/messaging"
+
+module Renalware
+  module Events
+    class ClinicalFrailtyScorePolicy < BasePolicy
+    end
+  end
+end

data/app/policies/renalware/letters/mailshots/mailshot_policy.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Letters
+    module Mailshots
+      class MailshotPolicy < BasePolicy
+        def new?
+          user_is_super_admin?
+        end
+
+        def create?
+          new?
+        end
+
+        def index?
+          user_is_super_admin? || user_is_admin?
+        end
+      end
+    end
+  end
+end

data/app/policies/renalware/pd/adequacy_result_policy.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Renalware
+  module PD
+    class AdequacyResultPolicy < BasePolicy
+      def destroy?
+        user_is_admin? || user_is_super_admin?
+      end
+
+      def edit?
+        destroy?
+      end
+    end
+  end
+end

data/app/policies/renalware/pd/pet_result_policy.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Renalware
+  module PD
+    class PETResultPolicy < BasePolicy
+      def destroy?
+        user_is_admin? || user_is_super_admin?
+      end
+
+      def edit?
+        destroy?
+      end
+    end
+  end
+end

data/app/policies/renalware/renal/registry_preflight_check_policy.rb

@@ -12,6 +12,10 @@ module Renalware
       def patients?
         index?
       end
+
+      def missing_esrf?
+        index?
+      end
     end
   end
 end

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

@@ -6,6 +6,7 @@ module Renalware
   module Clinical
     class ProfilePresenter
       attr_reader :patient, :params
+
       delegate :allergies, :document, to: :patient
 
       def initialize(patient:, params:)

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

@@ -6,6 +6,7 @@ module Renalware
   module HD
     class DashboardPresenter
       attr_accessor :patient
+
       delegate :has_ever_been_on_hd?, to: :patient
 
       def initialize(patient, view_context, current_user)

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

@@ -4,6 +4,7 @@ module Renalware
   module HD
     class ProfilePresenter < DumbDelegator
       attr_reader :preference_set
+
       delegate :dialysis,
                :anticoagulant,
                :transport,

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

@@ -8,6 +8,7 @@ module Renalware
     module Scheduling
       class DiaryPresenter
         attr_reader :user, :weekly_diary, :master_diary, :null_diary
+
         delegate :id, :hospital_unit_id, :to_s, :week, :created_at, to: :weekly_diary
 
         # https://github.com/avdi/naught

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

@@ -10,6 +10,7 @@ module Renalware
       }.freeze
 
       attr_reader :preference_set
+
       delegate :info,
                :observations_before,
                :observations_after,

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

@@ -28,7 +28,7 @@ module Renalware
         value = yield(value) if block_given?
         return value if preference_satisfied?(attribute)
 
-        content_tag(:b, value)
+        tag.b(value)
       end
 
       def preference_satisfied?(attribute)

data/app/presenters/renalware/mdm_patients_presenter.rb

@@ -5,6 +5,7 @@ module Renalware
   class MDMPatientsPresenter
     include PresenterHelper
     attr_reader :patients, :view_proc, :page_title, :q
+
     def initialize(patients:,
                    view_proc:,
                    page_title:,

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

@@ -29,13 +29,21 @@ module Renalware
 
       def peritonitis_episodes
         @peritonitis_episodes ||= begin
-          episodes = PeritonitisEpisode.for_patient(patient).ordered.includes(:episode_types)
+          episodes = PeritonitisEpisode
+            .for_patient(patient)
+            .ordered
+            .includes(:episode_types, infection_organisms: :organism_code)
           present(episodes, PeritonitisEpisodePresenter)
         end
       end
 
       def exit_site_infections
-        @exit_site_infections ||= ExitSiteInfection.for_patient(patient).ordered
+        @exit_site_infections ||= begin
+          ExitSiteInfection
+            .for_patient(patient)
+            .includes(infection_organisms: :organism_code)
+            .ordered
+        end
       end
 
       def pet_adequacies

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

@@ -9,6 +9,7 @@ module Renalware
       UKRDC_MAX_PHONE_LEN = 80
 
       attr_reader :changes_since, :changes_up_until
+
       delegate :prd_description, to: :profile, allow_nil: true
       delegate :code, :term, to: :prd_description, allow_nil: true, prefix: true
 

data/app/presenters/renalware/user_session_presenter.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_dependency "renalware"
+
+module Renalware
+  class UserSessionPresenter
+    # Returns a hash to be splatted into the body attributes in a layout e.g. application.html.slim
+    # e.g.
+    #
+    #  body(class="..." *Renalware::UserSessionPresenter.session_controller_data_attributes)
+    #
+    # renders:
+    #
+    # <body class="..."
+    #       data-controller="session"
+    #       data-session-check-alive-path="/check_session_expired"
+    #       data-session-debug="true"
+    #       data-session-keep-alive-path="/keep_session_alive"
+    #       data-session-login-path="/users/sign_in"
+    #       data-session-polling-interval="60"
+    #       data-session-timeout="3600">
+    # rubocop:disable Metrics/MethodLength
+    def self.session_controller_data_attributes
+      return {} if Renalware.config.session_expiry_use_previous_mechansim
+
+      urls = Renalware::Engine.routes.url_helpers
+      {
+        data: {
+          controller: "session",
+          session: {
+            "login-path": urls.new_user_session_path,
+            "check-alive-path": urls.check_session_expired_path,
+            "keep-alive-path": urls.keep_session_alive_path,
+            debug: Rails.env.development?.to_s, # eg "true" or "false"
+            "register-user-activity-after":
+              Renalware.config.session_register_user_user_activity_after.to_i,
+            timeout: ::Devise.timeout_in
+          }
+        }
+      }
+    end
+  end
+  # rubocop:enable Metrics/MethodLength
+end

data/app/validators/renalware/patients/nhs_number_validator.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Patients
+    # Validates an NHS number which should be 10 characters long and confirm to the modulo 11
+    # algorithm where the 10th character is a check digit.
+    class NHSNumberValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        return if value.blank?
+
+        Validator.new(record, attribute, value).validate
+      end
+
+      class Validator
+        pattr_initialize :record, :attribute, :number
+        LENGTH = 10
+
+        def validate
+          strip_spaces_from_nhs_number
+          validate_length
+          validate_numeric
+          validate_using_modulus_11
+        end
+
+        private
+
+        def strip_spaces_from_nhs_number
+          @record[attribute] = @number = @number.delete(" ")
+        end
+
+        def validate_length
+          ActiveModel::Validations::LengthValidator.new(
+            is: LENGTH,
+            attributes: [attribute]
+          ).validate(record)
+        end
+
+        def validate_numeric
+          return if record.errors[attribute].any?
+
+          unless number =~ /\d{10}/
+            record.errors.add(attribute, :nhs_number_not_numeric)
+          end
+        end
+
+        # See https://www.datadictionary.nhs.uk/data_dictionary/attributes/n/nhs/nhs_number_de.asp
+        # rubocop:disable Metrics/AbcSize
+        def validate_using_modulus_11
+          return if record.errors[attribute].any?
+
+          # Step 1 Multiply each of the first nine digits by a weighting factor
+          # Digit Position  Factor
+          # 1                10
+          # 2                9
+          # 3                8
+          # 4                7
+          # 5                6
+          # 6                5
+          # 7                4
+          # 8                3
+          # 9                2
+          weighting_factors = [10, 9, 8, 7, 6, 5, 4, 3, 2]
+          first_9_digits = number.chars.map(&:to_i).take(9)
+          first_9_digits_weighted = first_9_digits.each_with_index.map do |num, idx|
+            num * weighting_factors[idx]
+          end
+
+          # Step 2 Add the results of each multiplication together.
+          # Step 3 Divide the total by 11 and establish the remainder.
+          # Step 4 Subtract the remainder from 11 to give the check digit.
+          checkdigit = 11 - (first_9_digits_weighted.sum % 11)
+
+          # If the result is 11 then a check digit of 0 is used.
+          checkdigit = 0 if checkdigit == 11
+
+          # If the result is 10 then the NHS NUMBER is invalid and not used.
+          # Step 5 Check the remainder matches the check digit. Otherwise the NHS NUMBER is invalid.
+          if checkdigit == 10 || number[9].to_i != checkdigit
+            # record.errors[attribute] << "Invalid NHS number (checkdigit mismatch)"
+            record.errors.add(attribute, :nhs_number_invalid_checkdigit)
+          end
+        end
+        # rubocop:enable Metrics/AbcSize
+      end
+      private_constant :Validator
+    end
+  end
+end

data/app/values/renalware/address.rb

@@ -11,6 +11,7 @@ module Renalware
     # Set to true to avoid address validation - useful when archiving a letter with a migrated
     # address that might not have a postcode for instance
     attr_accessor :skip_validation
+
     validates_with AddressValidator, unless: :skip_validation
 
     def self.reject_if_blank