renalware-core 2.0.44 → 2.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f0786caf2cbce2b717b9cdac406185a53787547dea6a7e7effed98ed09fdca0
-  data.tar.gz: cb9bcf041a6eb26dcad74880db20ae844fdbf5fe4a5cc0b4a5362a849f322a9f
+  metadata.gz: 1a1c9ca94f32bd1524f80152063a831f780ac70f397b086d5c76b923834a13c4
+  data.tar.gz: 103a797720d5e2dd3bd4f130c7bfe784a34cb28e1576898c5ca3a4653e1a8d5b
 SHA512:
-  metadata.gz: bb3f0f9ffadb729f50b5b39ad3f0f067827eee607a29f5254a606b551a21dded6cbebb587bcf9d63d4efd31e35b8fc7962671e5b0be904d790f5193ab2f1bb45
-  data.tar.gz: 37b69cc689c4bd52d1ef7b2e3ce241f36e65e767527606d1fe94230ef6c8d12b081eedc762d198aefef252fe0066cc51f2fd3e127052ac583620d0be4cd0af1e
+  metadata.gz: 6500f6621008bb20a91c3853a54637e8a4c66eaace10a8d11528c2d35876c4723b408952933f0bf9dfd62bd12f1f48d14d9a2c78e8995de28a3c9e2c98e79abe
+  data.tar.gz: 2cc83be3409bdc4e0b72e00d69d8bbad46ad678198bc754633a15b95abe1e202431618df4e6eb8ccdf1599ff8015ca7f3f606a9f32d016947a03e4dd5712666e

data/app/assets/stylesheets/renalware/application.scss

@@ -6,6 +6,7 @@
     *= require_self
 */
 
+@import "font-awesome-sprockets";
 @import "font-awesome";
 @import "foundation-datepicker";
 @import "dataTables/jquery.dataTables.foundation";

data/app/assets/stylesheets/renalware/modules/_clinical.scss

@@ -194,7 +194,9 @@ article.clinical-allergies {
           border-left: 1px solid $winter-sky;
           white-space: nowrap;
 
-          .fa {
+          .fa,
+          .fas,
+          .far {
             color: $light-grey;
             &:hover {
               color: $white;

data/app/assets/stylesheets/renalware/modules/_patients.scss

@@ -194,7 +194,6 @@ ul.provider {
             padding-right: 0.4rem;
             display: inline-block;
             font-size: 0.9em;
-            font-weight: normal;
             color: lighten($nhs-blue, 35%);
 
             @media print {

data/app/assets/stylesheets/renalware/modules/_snippets.scss

@@ -138,7 +138,9 @@
       background-color: #ddd;
       border-radius: 4px 5px 0 0;
 
-      .fa {
+      .fa,
+      .far,
+      .fas {
         margin-right: 7px;
       }
 

data/app/assets/stylesheets/renalware/partials/_button.scss

@@ -27,14 +27,18 @@
     background-color: $nhs-blue;
   }
 
-  i.fa {
+  i.fa,
+  i.fas,
+  i.far {
     margin-right: .5rem;
   }
 
   &.with-icon {
     padding-left: 0.7rem;
 
-    i.fa {
+    i.fa,
+    i.fas,
+    i.far  {
       font-size: 1.1rem;
       margin-right: 0.6rem;
     }

data/app/assets/stylesheets/renalware/partials/_tables.scss

@@ -188,7 +188,7 @@ table {
 
     &.col-width-date-time {
       width: 9.5rem;
-      min-width: 9.4rem;
+      min-width: 9.5rem;
     }
 
     &.col-width-reference-without-prefix {

data/app/assets/stylesheets/renalware/partials/_tabs.scss

@@ -58,7 +58,9 @@
       outline-style: none;
     }
 
-    .fa {
+    .fa,
+    .fas,
+    .far {
       margin-right: 7px;
     }
 

data/app/assets/stylesheets/renalware/table_pdf.scss

@@ -123,7 +123,7 @@ a:visited {
 
     &.col-width-date-time {
       width: 9.5rem;
-      min-width: 9.3rem;
+      min-width: 9.5rem;
     }
 
     &.col-width-reference-without-prefix {

data/app/controllers/renalware/clinics/appointments_controller.rb

@@ -50,9 +50,7 @@ module Renalware
       end
 
       def query_params
-        params
-          .fetch(:q, {})
-          .merge(page: page, per_page: per_page)
+        params.fetch(:q, {})
       end
 
       def appointment_params

data/app/controllers/renalware/clinics/visits_controller.rb

@@ -5,11 +5,10 @@ module Renalware
   module Clinics
     class VisitsController < BaseController
       include Renalware::Concerns::Pageable
-      PER_PAGE = 25
 
       def index
         visits_query = VisitQuery.new(query_params)
-        visits = visits_query.call.page(page).per(PER_PAGE)
+        visits = visits_query.call.page(page).per(per_page)
         authorize visits
 
         render locals: {
@@ -23,9 +22,7 @@ module Renalware
       private
 
       def query_params
-        params
-          .fetch(:q, {})
-          .merge(page: page, per_page: per_page)
+        params.fetch(:q, {})
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Renalware
       def show
         authorize Worry, :index?
         query = WorryQuery.new(query_params)
-        worries = query.call
+        worries = query.call.page(page).per(per_page)
         render locals: {
           query: query.search,
           worries: worries,
@@ -21,9 +21,7 @@ module Renalware
       private
 
       def query_params
-        params
-          .fetch(:q, {})
-          .merge(page: page, per_page: per_page)
+        params.fetch(:q, {})
       end
     end
   end

data/app/controllers/renalware/renal/aki_alerts_controller.rb

@@ -27,7 +27,7 @@ module Renalware
       def update
         authorize alert
         if alert.update(aki_alert_params.merge(by: current_user))
-          redirect_to renal_aki_alerts_path(named_filter: :today)
+          redirect_to renal_aki_alerts_path
         else
           render_edit(alert)
         end
@@ -60,7 +60,6 @@ module Renalware
       def search_form
         @search_form ||= begin
           options = params.key?(:q) ? search_params : {}
-          options[:named_filter] = named_filter
           AKIAlertSearchForm.new(options)
         end
       end
@@ -89,11 +88,7 @@ module Renalware
       end
 
       def path_params
-        params.permit([:controller, :action, :named_filter])
-      end
-
-      def named_filter
-        params[:named_filter]
+        params.permit([:controller, :action])
       end
     end
   end

data/app/documents/renalware/dated_confirmation.rb

@@ -8,7 +8,7 @@ module Renalware
     attribute :confirmed_on, Date
 
     validates :confirmed_on, timeliness: { type: :date, allow_blank: true }
-    validates :confirmed_on, presence: true, if: ->(o) { o.status.try(:yes?) }
+    validates :confirmed_on, presence: true, if: ->(obj) { obj.status.try(:yes?) }
 
     def to_s
       datestamp = confirmed_on.present? ? "(#{I18n.l(confirmed_on)})" : nil

data/app/documents/renalware/transplants/recipient_operation_document.rb

@@ -49,7 +49,7 @@ module Renalware
         validates :warm_ischaemic_time_in_minutes, numericality: { allow_blank: true }
         validates :ukt_cause_of_death_other,
                   presence: true,
-                  if: ->(o) { o.ukt_cause_of_death.try(:text) =~ /specify/ }
+                  if: ->(obj) { obj.ukt_cause_of_death.try(:text) =~ /specify/ }
       end
       attribute :cadaveric_donor, CadavericDonor
 

data/app/helpers/renalware/drugs_helper.rb

@@ -3,9 +3,12 @@
 module Renalware
   module DrugsHelper
     def drug_select_options
-      options_for_select Drugs::Type.all
-                                    .reject{ |r| r.name == "Peritonitis" }
-                                    .map { |dt| [dt.name, dt.name.downcase] }
+      options_for_select(
+        Drugs::Type
+          .all
+          .reject{ |dt| dt.name == "Peritonitis" }
+          .map { |dt| [dt.name, dt.name.downcase] }
+      )
     end
 
     def drug_types_colour_tag(drug_types)

data/app/helpers/renalware/primary_care_physicians_helper.rb

@@ -25,7 +25,9 @@ module Renalware
     end
 
     def practices_list(practices)
-      practice_links = practices.map { |p| link_to(p.name, "#", title: format_address(p.address)) }
+      practice_links = practices.map do |prac|
+        link_to(prac.name, "#", title: format_address(prac.address))
+      end
       practice_links.join(tag(:br)).html_safe
     end
   end

data/app/jobs/refresh_materialized_view_job.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+#
+# Refresh a materialized view asynchronously via the delayed_job queue.
+# If no view_name supplied, refresh all materialized views
+#
+class RefreshMaterializedViewJob < ApplicationJob
+  queue_with_priority 6
+
+  def perform(view_name: nil)
+    conn = ActiveRecord::Base.connection
+    if view_name.present?
+      Rails.logger.info("Refreshing materialized view #{view_name}...")
+      conn.execute("REFRESH MATERIALIZED VIEW #{view_name};")
+    else
+      Rails.logger.info("Refreshing all materialized views...")
+      conn.execute("SELECT refresh_all_matierialized_views();")
+    end
+  end
+end

data/app/jobs/renalware/hd/generate_monthly_statistics.rb

@@ -6,6 +6,8 @@ require "month_period"
 # for each HD patient.
 module Renalware
   module HD
+    # TODO: not sure this needs to be a job - doesn't seem to be used as such
+    # instead is invoked directly
     class GenerateMonthlyStatistics < ApplicationJob
       queue_as :hd_patient_statistics
       queue_with_priority 1
@@ -29,6 +31,7 @@ module Renalware
             year: period.year
           )
         end
+
         Rails.logger.info(
           "Enqueued GenerateMonthlyStatisticsForPatientJob jobs for "\
           "#{patients_with_a_closed_hd_session_in_period.length} patients"

data/app/mailers/renalware/previews/report_preview.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/reporting"
+
+module Renalware
+  module Reporting
+    # Preview all emails at http://localhost:3000/rails/mailers/report
+    class ReportPreview < ActionMailer::Preview
+      def daily_summary
+        Reporting::ReportMailer.daily_summary
+      end
+    end
+  end
+end

data/app/mailers/renalware/reporting/report_mailer.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/reporting"
+
+module Renalware
+  module Reporting
+    class ReportMailer < ApplicationMailer
+      def daily_summary(to: "dev@airslie.com")
+        mail(
+          to: Array(to),
+          subject: "Renalware daily summary #{I18n.l(Time.zone.today)}"
+        ) do |format|
+          format.text { render(locals: { view_data: view_data }) }
+          format.html { render(locals: { view_data: view_data }) }
+        end
+      end
+
+      private
+
+      # Piggybacks on the reporting mechanism used elswhere for generating reports from json.
+      #
+      # returns e.g.
+      # {
+      #   "reporting_daily_letters" => {
+      #     "runat" => "2018-08-31T16:51:58.939876+00:00",
+      #      "data" => [
+      #         [0] {
+      #             "letters_created_today" => 0,
+      #             "letters_printed_today" => 0
+      #         }
+      #     ]
+      #   },
+      #   "another_view" :...
+      # }
+      def view_data
+        reporting_daily_views.each_with_object({}) do |view_name, hash|
+          hash[view_name] = JSON.parse(
+            Reporting::FetchAuditJson.call(view_name)
+          ).with_indifferent_access
+        end
+      end
+
+      # returns eg ["reporting_daily_pathology", "reporting_daily_letters"]
+      def reporting_daily_views
+        result = ActiveRecord::Base.connection.execute(<<-SQL)
+          SELECT relname FROM pg_class
+          WHERE relkind = 'v'
+          AND relname like 'reporting_daily_%'
+          AND relnamespace IN (
+            SELECT oid FROM pg_namespace WHERE nspname = 'renalware'
+          ) order by relname desc;
+        SQL
+        result.values.flatten
+      end
+    end
+  end
+end

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

@@ -7,6 +7,28 @@ module Renalware
     include Wisper::Publisher
     extend ActiveSupport::Concern
 
+    class Subscriber
+      attr_reader :klass_name, :async
+      alias_method :async?, :async
+
+      def initialize(klass_name, async: false)
+        @klass_name = klass_name
+        @async = async
+      end
+
+      # Note that when using the wisper-activejob gem (so we can use delayed_job for instance)
+      # we subscribe the class not an instance, and the subscriber must have class
+      # methods matching the event names it wants to handle.
+      # https://github.com/krisleech/wisper-activejob
+      def instance
+        async? ? klass : klass.new
+      end
+
+      def klass
+        klass_name.to_s.constantize
+      end
+    end
+
     # Subscribes any listeners configured in Renalware.config.broadcast_subscription_map
     # to the current instance.
     #
@@ -25,10 +47,12 @@ module Renalware
     # See https://github.com/krisleech/wisper
     #
     def broadcasting_to_configured_subscribers
-      subscribers = Renalware.config.broadcast_subscription_map[self.class.name]
-      Array(subscribers).each{ |listener|
-        subscribe(listener.to_s.constantize.new)
-      }
+      subscribers = Array(Renalware.config.broadcast_subscription_map[self.class.name])
+      subscribers.each do |subscriber|
+        # Support String subscribers eg a simple class name as well as Subscriber instances.
+        subscriber = Subscriber.new(subscriber) unless subscriber.respond_to?(:klass)
+        subscribe(subscriber.instance, async: subscriber.async?)
+      end
       self
     end
   end

data/app/models/renalware/patients/worry_query.rb

@@ -17,8 +17,6 @@ module Renalware
           .result
           .includes(:created_by, patient: { current_modality: [:description] })
           .order(created_at: :asc)
-          .page(query_params[:page])
-          .per(query_params[:per_page])
       end
 
       def search

data/app/models/renalware/renal/aki_alert_search_form.rb

@@ -14,7 +14,6 @@ module Renalware
       attribute :term, String
       attribute :on_hotlist, String
       attribute :s, String
-      attribute :named_filter, String
 
       def query
         @query ||= begin
@@ -24,8 +23,7 @@ module Renalware
             hospital_ward_id_eq: hospital_ward_id,
             action_id_eq: action,
             hotlist_eq: on_hotlist,
-            s: s,
-            named_filter: named_filter
+            s: s
           }
           AKIAlertQuery.new(options)
         end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/ukrdc"
+require "gpg_encrypt_folder"
 
 module Renalware
   module UKRDC
@@ -25,6 +26,7 @@ module Renalware
 
       private
 
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def send_patients
         logger.info("Generating XML files for #{patient_ids&.any? ? patient_ids : 'all'} patients")
         query = Renalware::UKRDC::PatientsQuery.new.call(changed_since: changed_since)
@@ -47,9 +49,11 @@ module Renalware
               logger: logger
             ).call
           end
+          encrypt_xml_files_in(dir)
         end
         logger.info("Files saved to #{folder_name}")
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def gpg_encrypt(filepath, output_filepath)
         path_to_key = File.open(Rails.root.join("key.gpg"))
@@ -69,7 +73,6 @@ module Renalware
 
       def within_new_folder
         dir = Pathname(File.join("/var", "ukrdc", timestamp))
-        FileUtils.mkdir_p dir
         FileUtils.mkdir_p File.join(dir, "xml")
         FileUtils.mkdir_p File.join(dir, "encrypted")
         yield dir if block_given?
@@ -78,6 +81,7 @@ module Renalware
 
       def filepath_for(patient, dir, sub_folder)
         raise(ArgumentError, "Patient has no ukrdc_external_id") if patient.ukrdc_external_id.blank?
+
         filename = "#{patient.ukrdc_external_id}.xml"
         File.join(dir, sub_folder.to_s, filename)
       end
@@ -88,6 +92,26 @@ module Renalware
         results = TransmissionLog.where(request_uuid: request_uuid).group(:status).count(:status)
         results.to_h.map{ |key, value| logger.info("#{key}: #{value}") }
       end
+
+      def encrypt_xml_files_in(dir)
+        logger.info "Encrypting..."
+        GpgEncryptFolder.new(folder: dir, options: gpg_options).call
+      end
+
+      def config
+        Renalware.config
+      end
+
+      def gpg_options
+        GpgOptions.new(
+          recipient: config.ukrdc_gpg_recipient,
+          keyring: config.ukrdc_gpg_keyring,
+          homedir: config.ukrdc_gpg_homedir,
+          filename_transform: lambda do |filename|
+            filename.to_s.gsub("/xml/", "/encrypted/") + ".enc"
+          end
+        )
+      end
     end
   end
 end