RubyGems - renalware-core - Versions diffs - 2.0.155 → 2.0.160 - Mend

renalware-core 2.0.155 → 2.0.160

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (199) hide show

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

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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_renderer.rb CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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

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

@@ -21,6 +21,7 @@ module Renalware
     end
     class MissingRequestDescriptionError < StandardError; end
     class MissingObservationDescriptionError < StandardError; end
   end
 end

data/app/models/renalware/pathology/adjust_observation.rb CHANGED

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

data/app/models/renalware/pathology/message_listener.rb CHANGED

@@ -9,7 +9,7 @@ require_dependency "renalware/pathology"
 module Renalware
   module Pathology
     class MessageListener
-      # Note: We are already inside a transaction here
+      # NOTE: We are already inside a transaction here
       def oru_message_arrived(hl7_message:, **)
         pathology_params = parse_pathology_params(hl7_message)
         create_observation_requests_and_their_child_observations_from(pathology_params)

data/app/models/renalware/pathology/observation.rb CHANGED

@@ -19,7 +19,7 @@ module Renalware
       scope :ordered, -> { order(observed_at: :desc) }
       scope :for_description, ->(description) { where(description: description) }
-      scope :having_a_loinc_code, -> { joins(:description).where("loinc_code is not null") }
+      scope :having_a_loinc_code, -> { joins(:description).where.not(loinc_code: nil) }
       def observed_on
         observed_at.to_date

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

@@ -28,7 +28,7 @@ module Renalware
       #     ...
       #   ]
       def call
-        stmt = SQL::IndexedCaseStmt.new(:code, @codes) # Generate a CASE statement for ordering
+        stmt = Sql::IndexedCaseStmt.new(:code, @codes) # Generate a CASE statement for ordering
         records = @relation.where(code: @codes).order(stmt.generate)
         verify_all_records_found(records)
         records

data/app/models/renalware/pathology/observations_grouped_by_date_query.rb CHANGED

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

data/app/models/renalware/pathology/observations_grouped_by_date_table.rb CHANGED

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

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

@@ -19,7 +19,7 @@ module Renalware
       private
       def ids_index
-        ::SQL::IndexedCaseStmt.new("patients.id", @patient_ids).generate
+        ::Sql::IndexedCaseStmt.new("patients.id", @patient_ids).generate
       end
     end
   end

data/app/models/renalware/pathology/requests/request_params_factory.rb CHANGED

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

data/app/models/renalware/patients/calculate_age.rb CHANGED

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

data/app/models/renalware/patients/clear_patient_ukrdc_data.rb CHANGED

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

data/app/models/renalware/patients/ingestion/update_master_patient_index.rb CHANGED

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

data/app/models/renalware/patients/last_successful_practice_sync_date_query.rb CHANGED

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
-require "attr_extras"
 module Renalware
   module Patients
     class LastSuccessfulPracticeSyncDateQuery

data/app/models/renalware/patients/primary_care_physician.rb CHANGED

@@ -57,6 +57,7 @@ module Renalware
       end
       class PrimaryCarePhysicianAddressAccessError < StandardError; end
       def current_address
         raise PrimaryCarePhysicianAddressAccessError,
               "primary_care_physician#current_address should not be called: "\

data/app/models/renalware/patients/sync_ods_job.rb CHANGED

@@ -33,7 +33,7 @@ module Renalware
       # practices. On successive runs it will just find changes since the last run.
       def sync_practices(dry_run)
         Renalware::System::APILog.with_log("nhs_data_api", dry_run: dry_run) do |api_log|
-          Renalware::Patients::SyncPracticesViaApi.call(
+          Renalware::Patients::SyncPracticesViaAPI.call(
             dry_run: dry_run,
             api_log: api_log
           )

data/app/models/renalware/patients/sync_practices_via_api.rb CHANGED

@@ -7,7 +7,7 @@ module Renalware
     # Fetches pratice changes and additions from the NHS ODS API.
     # Called from a rake task.
     # See doc/ods.md
-    class SyncPracticesViaApi
+    class SyncPracticesViaAPI
       def self.call(**args)
         new(**args).call
       end