renalware-core 2.0.43 → 2.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb0aa2a964b933379fa9c6a72eb9570f4b6251f4d124fa6377fb2b6083deb8dd
-  data.tar.gz: bf7030934f456717a02fd899f7dfc530cdbde2e1a62cdaaa640ec268d68033ce
+  metadata.gz: 1f0786caf2cbce2b717b9cdac406185a53787547dea6a7e7effed98ed09fdca0
+  data.tar.gz: cb9bcf041a6eb26dcad74880db20ae844fdbf5fe4a5cc0b4a5362a849f322a9f
 SHA512:
-  metadata.gz: c4348f2ff8acd6513e6dfd056ae78de44655f115f3ed5d56bfed7ee85169958a3a464e59a28af2920698177b018f3ee31b19adc520168dabe9a147160a9883fe
-  data.tar.gz: 2199399c9b5e3a4dd703c41492c048f59248f02c48b09541925e8baae20cf7c5f58c741368d6e1d21e174d6b16af34e787316379c6535d71d724066ba26aad74
+  metadata.gz: bb3f0f9ffadb729f50b5b39ad3f0f067827eee607a29f5254a606b551a21dded6cbebb587bcf9d63d4efd31e35b8fc7962671e5b0be904d790f5193ab2f1bb45
+  data.tar.gz: 37b69cc689c4bd52d1ef7b2e3ce241f36e65e767527606d1fe94230ef6c8d12b081eedc762d198aefef252fe0066cc51f2fd3e127052ac583620d0be4cd0af1e

data/app/jobs/feed_job.rb

@@ -4,7 +4,7 @@
 # into the `delayed_jobs` table:
 #
 #     handler: {see h7_message_example.yml}
-#     run_at: {current_time}
+#     run_at: {current_time e.g. NOW() AT TIME ZONE 'UTC'}
 #
 # Notes:
 #
@@ -15,7 +15,26 @@ FeedJob = Struct.new(:raw_message) do
   def perform
     Renalware::Feeds
       .message_processor
-      .broadcasting_to_configured_subscribers
       .call(raw_message)
   end
+
+  def max_attempts
+    4
+  end
+
+  def destroy_failed_jobs?
+    false
+  end
+
+  # Reschedule after an error. No point trying straight away, so try at these intervals:
+  # After attempt no.  Wait for hours
+  # ---------------------------
+  # 1                  2
+  # 2                  17
+  # 3                  82
+  # Then give up.
+  # Note e.g. attempts**4 == attempts to the power of 4 == 81
+  def reschedule_at(current_time, attempts)
+    current_time + ((attempts**4) + 1).hours
+  end
 end

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

@@ -7,6 +7,8 @@ require "month_period"
 module Renalware
   module HD
     class GenerateMonthlyStatistics < ApplicationJob
+      queue_as :hd_patient_statistics
+      queue_with_priority 1
       attr_reader :period
 
       def initialize(month: nil, year: nil)

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

@@ -5,6 +5,7 @@ require "month_period"
 module Renalware
   module HD
     class GenerateMonthlyStatisticsForPatientJob < ApplicationJob
+      queue_with_priority 2
       queue_as :hd_patient_statistics
 
       # :reek:UtilityFunction

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

@@ -7,6 +7,7 @@ module Renalware
   module HD
     class UpdateRollingPatientStatisticsJob < ApplicationJob
       queue_as :hd_patient_statistics
+      queue_with_priority 1
 
       # :reek:UtilityFunction
       def perform(patient)

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

@@ -5,7 +5,12 @@ require "fileutils"
 
 module Renalware
   module Letters
+    # Used for example in a host app like renalware-kch to generate a PDF letter for saving to
+    # the electronic public register
     class SavePdfLetterToFileJob < ApplicationJob
+      queue_as :pdf_generation
+      queue_with_priority 1
+
       def perform(letter:, file_path:)
         file_path = Pathname(file_path)
         create_folder_if_not_exists(file_path)

data/app/jobs/renalware/reporting/refresh_audit_data_job.rb

@@ -6,6 +6,7 @@ module Renalware
   module Reporting
     class RefreshAuditDataJob < ApplicationJob
       queue_as :reporting
+      queue_with_priority 1
 
       # :reek:UtilityFunction
       def perform(audit)

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

@@ -38,6 +38,7 @@ module Renalware
 
       def sanitize_query(query)
         query
+          .to_s
           .strip
           .tr(",", " ")
           .gsub("  ", " ")

data/app/models/renalware/feeds.rb

@@ -15,10 +15,14 @@ module Renalware
       @message_processor ||= build_message_processor
     end
 
+    # Note we are using both the SubscriptionRegistry (which we think is not thread safe)
+    # as does not store the registry in TLS (?) and also the newer subscription_map
+    # We need to consolidate these.
     def build_message_processor
       SubscriptionRegistry
         .instance
         .subscribe_listeners_to(MessageProcessor.new)
+        .broadcasting_to_configured_subscribers
     end
   end
 end

data/app/models/renalware/pd/assessment.rb

@@ -51,7 +51,9 @@ module Renalware
         attribute :bowel_disease_notes
         attribute :added_comments
 
-        validates :assessed_on, presence: true
+        validates :assessed_on, presence: true, timeliness: { type: :date }
+        validates :home_visit_on, timeliness: { type: :date, allow_blank: true }
+        validates :access_clinic_on, timeliness: { type: :date, allow_blank: true }
       end
       has_document
     end

data/app/views/renalware/pd/assessments/_list.html.slim

@@ -23,8 +23,8 @@ article.pd_assessments
             - if policy(assessment).show?
               = link_to("View", [patient, assessment])
           td= l(assessment.created_at)
-          td= l(document.assessed_on)
+          td= document.assessed_on.is_a?(Date) ? l(document.assessed_on) : document.assessed_on
           td= document.assessor
           td= document.had_home_visit&.text
-          td= l(document.home_visit_on)
+          td= document.home_visit_on.is_a?(Date) ? l(document.home_visit_on) : document.home_visit_on
           td

data/app/views/renalware/pd/assessments/show.html.slim

@@ -8,10 +8,10 @@
   article.pd_assessment_document
     header
     = definition_list_for(assessment.document, size: :xlarge) do |list|
-      = list.definition(:assessed_on) { |value| l(value) }
+      = list.definition(:assessed_on) { |value| value.is_a?(Date) ? l(value) : value }
       = list.definition(:assessor)
       = list.definition(:had_home_visit, &:text)
-      = list.definition(:home_visit_on) { |value| l(value) }
+      = list.definition(:home_visit_on) { |value| value.is_a?(Date) ? l(value) : value }
       = list.definition(:housing_type, &:text)
       = list.definition(:occupant_notes)
       = list.definition(:exchange_area)
@@ -37,7 +37,7 @@
       = list.definition(:insertion_discussed, &:text)
       = list.definition(:method_chosen, &:text)
       = list.definition(:access_clinic_referral, &:text)
-      = list.definition(:access_clinic_on) { |value| l(value) }
+      = list.definition(:access_clinic_on) { |value| value.is_a?(Date) ? l(value) : value }
       = list.definition(:abdo_assessor)
       = list.definition(:bowel_disease, &:text)
       = list.definition(:bowel_disease_notes)

data/config/initializers/delayed_job.rb

@@ -2,5 +2,10 @@
 
 Delayed::Worker.logger = Logger.new(Rails.root.join("log", "delayed_job.log"))
 Delayed::Worker.destroy_failed_jobs = false
-Delayed::Worker.max_attempts = 10
-Delayed::Worker.max_run_time = 4.hours
+Delayed::Worker.max_attempts = 10 # overridden e.g. in FeedJob
+Delayed::Worker.max_run_time = 2.hours
+Delayed::Worker.read_ahead = 10
+Delayed::Worker.sleep_delay = 15 # Also affects how long it takes delayed_job to stop on Crl+C
+Delayed::Worker.default_priority = 5 # use a lower number to get preferential treatment
+# Will only raise an exception on TERM signals but INT will wait for the current job to finish.
+Delayed::Worker.raise_signal_exceptions = :term

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.43"
+  VERSION = "2.0.44"
 end

data/spec/factories/messaging/internal/messages.rb

@@ -4,6 +4,7 @@ FactoryBot.define do
   factory :internal_message, class: "Renalware::Messaging::Internal::Message" do
     body { "The body" }
     subject { "The subject" }
+
     urgent { false }
     association :author, factory: :author
     sent_at { Time.zone.now }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.43
+  version: 2.0.44
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type