renalware-core 2.0.130 → 2.0.131

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da57af35307fc3b61ecd3a63a06fbbc38bcf7b11a50e81b2def0333a5f9cd773
-  data.tar.gz: dce6d2238587ebb06f9b25d2fb4dd90997255eb485af69df9fb0a2ad4ed080a4
+  metadata.gz: 35b6c3d73ccaf2718acd3d48e5982b3453521ca161126690a51af0de3bb08733
+  data.tar.gz: e0fcdc5ade9caf2e87745953b7d6c060fabb96720ac90e8978618b36a48d31b5
 SHA512:
-  metadata.gz: 319282259cb9f86a3d0bbd343b236401accd2bc70be630e152e309de57199a02680f7c27e4f566ad2eb7c8523c18a31641610f683082965f3e6684991c99b65e
-  data.tar.gz: 89d78ef44fc08a1de7e88ddb24f9e6c1f401c0d1481156d6cd3d967b01b130ba12aaf83006dc2183a12128ba702d37e663743776d4eb533ec3ef183be8788f39
+  metadata.gz: 645842282347e02444bdd310dc575b72137c3613139a7dee8543b21a085cd6437ec6b521aa66881f097ee17567a58048d118815926b81ca095b560cfe38b4a2c
+  data.tar.gz: 57b3894daa3d58de88660f763d8e4b4a61fb8cad3361210c6567d074d1b8c6ee71a75effaba63cb9ee0905aa9fce3b39d3d564e1de65bcc4ec8029d1833acf72

data/README.md

@@ -54,8 +54,9 @@ psql template1
 At the psql prompt run the following (replacing `<username>` and `<password>` accordingly):
 
 ```sql
-CREATE USER <username> WITH PASSWORD '<password>';
-ALTER USER <username> SUPERUSER;
+CREATE USER renalware WITH PASSWORD 'renalware';
+ALTER USER renalware WITH SUPERUSER;
+ALTER USER renalware WITH LOGIN;
 ```
 
 ### Configure Ruby

data/app/controllers/renalware/admin/users_controller.rb

@@ -50,6 +50,7 @@ module Renalware
           :unexpire,
           :telephone,
           :consultant,
+          :hidden,
           role_ids: []
         )
     end

data/app/controllers/renalware/medications/prescriptions_controller.rb

@@ -73,7 +73,7 @@ module Renalware
         render :index, locals: locals
       end
 
-      # rubocop:disable Metrics/LineLength
+      # rubocop:disable Layout/LineLength
       def render_prescriptions_list_to_hand_to_patient
         render(
           pdf_options.merge(
@@ -89,7 +89,7 @@ module Renalware
           )
         )
       end
-      # rubocop:enable Metrics/LineLength
+      # rubocop:enable Layout/LineLength
 
       def pdf_filename
         "#{patient.family_name}_#{patient.hospital_identifier&.id}" \

data/app/controllers/renalware/patients/patients_controller.rb

@@ -93,7 +93,7 @@ module Renalware
           :nhs_number, :family_name, :given_name, :sex, :country_of_birth_id,
           :ethnicity_id, :born_on, :paediatric_patient_indicator, :cc_on_all_letters,
           :title, :suffix, :marital_status, :telephone1, :telephone2, :email, :religion_id,
-          :language_id, :cc_decision_on,
+          :language_id, :cc_decision_on, :next_of_kin,
           :local_patient_id, :local_patient_id_2, :local_patient_id_3,
           :local_patient_id_4, :local_patient_id_5, :external_patient_id,
           :send_to_renalreg, :send_to_rpv, :renalreg_decision_on, :rpv_decision_on,

data/app/jobs/renalware/letters/calculate_page_count_job.rb

@@ -29,6 +29,11 @@ module Renalware
 
       def call
         letter.update_column(:page_count, pdf_reader.page_count)
+      rescue StandardError => e
+        # In Wisper async jobs, rescue_from blocks defined on the ApplicationJob class
+        # do not seem to be called, so we need to invoke them ourselves with this call to a fn on
+        # ActiveSupport::Rescuable which is already mixed into ActiveJob::Base.
+        rescue_with_handler(e) || raise
       end
 
       private

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

@@ -22,7 +22,7 @@ module Renalware
       end
     end
 
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     def shell_to_ghostscript_to_combine_files(filenames, dir, outputfile)
       outputfile = Pathname(outputfile)
       cmd = "gs -dNOPAUSE -sDEVICE=pdfwrite -sOUTPUTFILE=#{outputfile} -dBATCH #{filenames.join(' ')}"
@@ -35,7 +35,7 @@ module Renalware
         raise "Error combining PDFs: #{[err, msg].join(' ')} command: #{cmd}"
       end
     end
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
 
     def move_tempfile_to_output_file(tmp_outfile, output_file)
       FileUtils.mv tmp_outfile.path, output_file

data/app/models/renalware/events/lists/form.rb

@@ -32,7 +32,7 @@ module Renalware
           end
 
           def created_by_options
-            User.excluding_system_user.ordered
+            User.excluding_system_user.picklist
           end
         end
       end

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

@@ -19,7 +19,9 @@ module Renalware
           archive_recipients
           sign(by: by)
           archive_content(by: by)
-          broadcast(:letter_approved, letter)
+          # Cast the letter to the base Letter class in case it becomes a Letters::Completed
+          # before any async listeners have time to process it.
+          broadcast(:letter_approved, letter.becomes(Letters::Letter))
         end
       end
 

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

@@ -28,23 +28,15 @@ module Renalware
 
         private
 
+        # Note we are already in a tx here from the letterlistener, so for safety we call
+        # call #deliver_later and not #deliver; its possible we could get a
+        # LetterIsNotApprovedOrCompletedError error in the mailer we and we don't want that to
+        # roll back the txn. We could possibly use an async Listener and remove the
+        # deliver_later here.
         def email_letter_to_the_patients_practice
-          # Note we cast the letter back to the superclass Letters::Letter here to prevent
-          # GlobalID from trying to load the letter using e.g. Letters::Approved.find(123), because
-          # in the meantime the letter's class might have progressed to Letters::Completed in which
-          # case GlobalId/ ActiveJob would not be able to find the letter!
-          # Casting to Letters::Letter means in the delayed job the handler says e.g.
-          #   - letter:
-          #    _aj_globalid: gid://dummy/Renalware::Letters::Letter/3
-          # which it turns out works fine when the letter is loaded by GlobalId/ActiveJob;
-          # it correctly casts the letter to its STI type e.g. Letters::Approved in the job.
-          # Note we are already in a tx here from the letterlistener so if we for instance
-          # call deliver and not deliver_later, we will get a LetterIsNotApprovedOrCompletedError
-          # error when it looks up the letter as its approved state has not yet been saved.
-          # We could possibly use an async LetterListener and remove the async here.
           Letter.transaction do
             PracticeMailer.patient_letter(
-              letter: letter.becomes(Letter),
+              letter: letter,
               to: practice_email_address
             ).deliver_later # ! see comment
 

data/app/models/renalware/letters/lists/form.rb

@@ -43,11 +43,11 @@ module Renalware
           end
 
           def author_options
-            @author_options ||= User.author.ordered
+            @author_options ||= User.author.picklist
           end
 
           def typist_options
-            @typist_options ||= User.ordered
+            @typist_options ||= User.picklist
           end
 
           def letterhead_options

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

@@ -22,6 +22,7 @@ module Renalware
           letter = LetterPresenterFactory.new(letter)
         end
         PdfLetterCache.fetch(letter, **options) do
+          Rails.logger.info "    Rendering PDF for letter #{letter.id}"
           WickedPdf.new.pdf_from_string(letter.to_html(**options), OPTIONS)
         end
       end

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

@@ -27,7 +27,7 @@ module Renalware
           end
         end
 
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         def shell_to_ghostscript_to_combine_files(filenames, dir, outputfile)
           outputfile = Pathname(outputfile)
           cmd = "gs -dNOPAUSE -sDEVICE=pdfwrite -sOUTPUTFILE=#{outputfile} -dBATCH #{filenames.join(' ')}"
@@ -40,7 +40,7 @@ module Renalware
             raise "Error combining PDFs: #{[err, msg].join(' ')} command: #{cmd}"
           end
         end
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
 
         def move_tempfile_to_output_file(tmp_outfile, output_file)
           FileUtils.mv tmp_outfile.path, output_file

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

@@ -16,7 +16,9 @@ module Renalware
           milligram
           millilitre
           nanogram
+          patch
           puff
+          sachet
           tab
           tablet
           unit

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

@@ -28,11 +28,19 @@ module Renalware
       end
 
       # For a ModalityDescription with type Renalware::HD::ModalityDescription
-      # this will return "HD"
+      # this will return "hd"
       def namespace
         return if type.blank?
 
-        type.gsub("::", "").gsub(/^Renalware/, "").gsub(/ModalityDescription$/, "").underscore
+        namespace_raw.underscore
+      end
+
+      # For a ModalityDescription with type Renalware::HD::ModalityDescription
+      # this will return "HD"
+      def namespace_raw
+        return if type.blank?
+
+        type.gsub("::", "").gsub(/^Renalware/, "").gsub(/ModalityDescription$/, "")
       end
     end
   end

data/app/models/renalware/pd/apd/glucose_calculator.rb

@@ -44,11 +44,11 @@ module Renalware
           end
         end
 
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         def glucose_for_bag(bag)
           (((bag.volume.to_f * bag.days_per_week.to_f) / available_overnight_volume.to_f) * overnight_volume) / 7
         end
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
 
         def available_overnight_volume
           @available_overnight_volume ||= AvailableOvernightVolume.new(regime: regime).value

data/app/models/renalware/system/update_user.rb

@@ -20,11 +20,13 @@ module Renalware
 
       private
 
+      # rubocop:disable Metrics/AbcSize
       def update!(params)
         User.transaction do
           approve if can_approve?(params)
           unexpire if can_unexpire?(params)
           user.consultant = true?(params[:consultant])
+          user.hidden = true?(params[:hidden])
           authorise(params)
           user.telephone = params[:telephone]
           user.save!
@@ -32,6 +34,7 @@ module Renalware
       rescue ActiveRecord::RecordInvalid
         false
       end
+      # rubocop:enable Metrics/AbcSize
 
       def notify!
         notifications.each { |n| n.public_send(delivery_method) } if notifications.any?

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

@@ -10,7 +10,7 @@ module Renalware
     # about them. Encrypt the xml files and copy to an outgoing folder
     # which might for example be a symlink to an outgoing folder in /media/ukrdc which in turn
     # is mount on a remote share for example on an SFTP server.
-    #
+    # rubocop:disable Metrics/ClassLength:
     class CreateEncryptedPatientXMLFiles
       attr_reader(
         :patient_ids,
@@ -34,6 +34,7 @@ module Renalware
         @force_send = force_send
       end
 
+      # rubocop:disable Metrics/MethodLength
       def call
         logger.tagged(request_uuid) do
           summary.milliseconds_taken = Benchmark.ms do
@@ -51,6 +52,7 @@ module Renalware
         Engine.exception_notifier.notify(e)
         raise e
       end
+      # rubocop:enable Metrics/MethodLength
 
       private
 
@@ -64,12 +66,20 @@ module Renalware
         end
       end
 
+      def schema
+        xsd_path = File.join(Renalware::Engine.root, "vendor/xsd/ukrdc/Schema/UKRDC.xsd")
+        xsddoc = Nokogiri::XML(File.read(xsd_path), xsd_path)
+        Nokogiri::XML::Schema.from_document(xsddoc)
+      end
+
+      # rubocop:disable Metrics/MethodLength
       def create_patient_xml_files
         count = 0
         patients = ukrdc_patients_who_have_changed_since_last_send
         summary.num_changed_patients = patients.count
         patients.find_each do |patient|
           count += 1
+          Rails.logger.info count
           CreatePatientXMLFile.new(
             patient: patient,
             dir: paths.timestamped_xml_folder,
@@ -77,13 +87,15 @@ module Renalware
             request_uuid: request_uuid,
             batch_number: batch_number,
             logger: logger,
-            force_send: force_send
+            force_send: force_send,
+            schema: schema
           ).call
 
           # Every n patients, force the garbage collector to kick in
           GC.start if (count % 10).zero?
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def build_summary
         summary.count_of_files_in_outgoing_folder = count_of_files_in_outgoing_folder
@@ -115,14 +127,12 @@ module Renalware
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
-      # rubocop:disable Metrics/AbcSize
       def print_summary
         logger.info("Files saved to #{summary.archive_folder}")
         logger.info "*** Summary ***"
         logger.info "Took #{summary.milliseconds_taken.to_i / 1000} seconds"
         summary.results.map { |key, value| logger.info("#{key}: #{value}") }
       end
-      # rubocop:enable Metrics/AbcSize
 
       def email_summary
         UKRDC::SummaryMailer.export_summary(
@@ -166,5 +176,6 @@ module Renalware
         )
       end
     end
+    # rubocop:enable Metrics/ClassLength:
   end
 end

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

@@ -10,6 +10,7 @@ module Renalware
         :patient!,
         :dir!,
         :request_uuid!,
+        :schema,
         :changes_since,
         :logger,
         :batch_number,
@@ -18,7 +19,7 @@ module Renalware
         :force_send
       ]
 
-      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       # If force_send is true then send all files even if they have not changed since the last
       # send. This is primarily for debugging and testing phases with UKRDC
       def call
@@ -39,7 +40,7 @@ module Renalware
           logger.info "    Status: #{log.status}"
         end
       end
-      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       private
 
@@ -101,8 +102,20 @@ module Renalware
         nil
       end
 
+      def schema
+        @schema ||= begin
+          Rails.logger.info "Creating Nokogiri::XML::Schema"
+          xsd_path = File.join(Renalware::Engine.root, "vendor/xsd/ukrdc/Schema/UKRDC.xsd")
+          xsddoc = Nokogiri::XML(File.read(xsd_path), xsd_path)
+          Nokogiri::XML::Schema.from_document(xsddoc)
+        end
+      end
+
       def default_renderer
-        Renalware::UKRDC::XmlRenderer.new(locals: { patient: presenter_for(patient) })
+        Renalware::UKRDC::XmlRenderer.new(
+          schema: schema,
+          locals: { patient: presenter_for(patient) }
+        )
       end
 
       def presenter_for(patient)

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Renalware
+  module UKRDC
+    module Outgoing
+      module Rendering
+        class Address < Rendering::Base
+          pattr_initialize [:address!]
+
+          def xml
+            address_element
+          end
+
+          private
+
+          def address_element
+            create_node("Address") do |elem|
+              elem[:use] = "H"
+              elem << create_node("Street", address.street)
+              elem << create_node("Town", address.town)
+              elem << create_node("County", address.county)
+              elem << create_node("Postcode", address.postcode&.strip)
+              elem << country_element
+            end
+          end
+
+          def country_element
+            create_node("Country") do |elem|
+              elem << create_node(:CodingStandard, "ISO3166-1")
+              elem << create_node(:Code, address&.country&.alpha3)
+              elem << create_node(:Description, address&.country&.to_s)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Renalware
+  module UKRDC
+    module Outgoing
+      module Rendering
+        class Allergy < Rendering::Base
+          pattr_initialize [:allergy!]
+
+          def xml
+            allergy_element
+          end
+
+          private
+
+          def allergy_element
+            create_node("Allergy") do |elem|
+              create_node("Allergy") # this is correct, see schema
+              elem << Rendering::Clinician.new(user: allergy.updated_by).xml
+              elem << create_node("FreeTextAllergy", allergy.description)
+            end
+          end
+        end
+      end
+    end
+  end
+end