renalware-core 2.0.148 → 2.0.149

data/app/javascript/renalware/index.js

@@ -20,6 +20,7 @@ import SnippetsController from "./controllers/snippets_controller"
 import LettersFormController from "./controllers/letters/form_controller"
 import PrescriptionsController from "./controllers/medications/prescriptions_controller"
 import ChartsController from "./controllers/charts_controller"
+import SessionController from "./controllers/session_controller"
 
 const application = Application.start()
 application.register("toggle", ToggleController)
@@ -29,5 +30,6 @@ application.register("snippets", SnippetsController)
 application.register("letters-form", LettersFormController)
 application.register("prescriptions", PrescriptionsController)
 application.register("charts", ChartsController)
+application.register("session", SessionController)
 
 window.Chartkick.use(window.Highcharts)

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

@@ -14,7 +14,11 @@ module Renalware
       belongs_to :type, class_name: "Type"
 
       has_document class_name: "Renalware::Accesses::AssessmentDocument"
-      has_paper_trail class_name: "Renalware::Accesses::Version", on: [:create, :update, :destroy]
+
+      has_paper_trail(
+        versions: { class_name: "Renalware::Accesses::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       scope :ordered, -> { order(performed_on: :desc) }
 

data/app/models/renalware/accesses/procedure.rb

@@ -12,7 +12,10 @@ module Renalware
       belongs_to :type, class_name: "Type"
       belongs_to :pd_catheter_insertion_technique, class_name: "CatheterInsertionTechnique"
 
-      has_paper_trail class_name: "Renalware::Accesses::Version", on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Accesses::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       scope :ordered, -> { order(performed_on: :desc) }
 

data/app/models/renalware/accesses/profile.rb

@@ -11,7 +11,10 @@ module Renalware
       belongs_to :patient, touch: true
       belongs_to :type, class_name: "Type"
 
-      has_paper_trail class_name: "Renalware::Accesses::Version", on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Accesses::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       scope :ordered, -> { order(formed_on: :desc) }
       scope :current, lambda {

data/app/models/renalware/clinical/body_composition.rb

@@ -19,7 +19,10 @@ module Renalware
       belongs_to :assessor, class_name: "User", foreign_key: "assessor_id"
       belongs_to :modality_description, class_name: "Modalities::Description"
 
-      has_paper_trail class_name: "Renalware::Clinical::Version", on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Clinical::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       scope :ordered, -> { order(assessed_on: :desc, created_at: :desc) }
 

data/app/models/renalware/clinical/dry_weight.rb

@@ -12,7 +12,10 @@ module Renalware
       belongs_to :patient, class_name: "Renalware::Clinical::Patient", touch: true
       belongs_to :assessor, class_name: "User", foreign_key: "assessor_id"
 
-      has_paper_trail class_name: "Renalware::Clinical::Version", on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Clinical::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       scope :ordered, -> { order(assessed_on: :desc, created_at: :desc) }
 

data/app/models/renalware/clinics/clinic_visit.rb

@@ -7,7 +7,11 @@ module Renalware
   module Clinics
     class ClinicVisit < ApplicationRecord
       self.table_name = :clinic_visits
-      has_paper_trail class_name: "Renalware::Clinics::Version", on: [:create, :update, :destroy]
+
+      has_paper_trail(
+        versions: { class_name: "Renalware::Clinics::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       include Accountable
       include PatientScope

data/app/models/renalware/hd/preference_set.rb

@@ -12,7 +12,10 @@ module Renalware
       belongs_to :hospital_unit, class_name: "Hospitals::Unit"
       belongs_to :schedule_definition, foreign_key: "schedule_definition_id"
 
-      has_paper_trail class_name: "Renalware::HD::Version", on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::HD::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       validates :patient, presence: true
       validates :entered_on, timeliness: { type: :date, allow_blank: true }

data/app/models/renalware/hd/profile.rb

@@ -18,9 +18,12 @@ module Renalware
       belongs_to :named_nurse, class_name: "User", foreign_key: "named_nurse_id"
       belongs_to :transport_decider, class_name: "User", foreign_key: "transport_decider_id"
       belongs_to :schedule_definition, foreign_key: "schedule_definition_id"
-
       has_document class_name: "Renalware::HD::ProfileDocument"
-      has_paper_trail class_name: "Renalware::HD::Version", on: [:create, :update, :destroy]
+
+      has_paper_trail(
+        versions: { class_name: "Renalware::HD::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       validates :patient, presence: true
       validates :prescriber, presence: true

data/app/models/renalware/hd/session.rb

@@ -32,7 +32,10 @@ module Renalware
                dependent: :destroy
       accepts_nested_attributes_for :prescription_administrations
 
-      has_paper_trail class_name: "Renalware::HD::Version", on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::HD::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       before_create :assign_modality
       before_save :compute_duration

data/app/models/renalware/low_clearance/profile.rb

@@ -12,8 +12,11 @@ module Renalware
       belongs_to :patient, touch: true
       belongs_to :referrer
       has_document class_name: "Renalware::LowClearance::ProfileDocument"
-      has_paper_trail class_name: "Renalware::LowClearance::Version",
-                      on: [:create, :update, :destroy]
+
+      has_paper_trail(
+        versions: { class_name: "Renalware::LowClearance::Version" },
+        on: [:create, :update, :destroy]
+      )
     end
   end
 end

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

@@ -10,8 +10,10 @@ module Renalware
 
       attr_accessor :drug_select
 
-      has_paper_trail class_name: "Renalware::Medications::PrescriptionVersion",
-                      on: [:create, :update]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Medications::PrescriptionVersion" },
+        on: [:create, :update]
+      )
 
       belongs_to :patient, touch: true
 

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

@@ -30,10 +30,12 @@ module Renalware
     #         M.position_within_subgroup;
     class CodeGroup < ApplicationRecord
       include Accountable
+
       has_paper_trail(
-        class_name: "Renalware::Pathology::Version",
+        versions: { class_name: "Renalware::Pathology::Version" },
         on: [:create, :update, :destroy]
       )
+
       validates :name, presence: true, uniqueness: true
       validates :description, presence: true
       has_many(

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

@@ -11,7 +11,10 @@ module Renalware
     # determines its order in the subgroup.
     class CodeGroupMembership < ApplicationRecord
       include Accountable
-      has_paper_trail class_name: "Renalware::Pathology::Version", on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Pathology::Version" },
+        on: [:create, :update, :destroy]
+      )
       validates :position_within_subgroup, presence: true
       validates :subgroup, presence: true
       belongs_to :code_group

data/app/models/renalware/patient.rb

@@ -34,7 +34,10 @@ module Renalware
 
     enumerize :marital_status, in: %i(married single divorced widowed)
 
-    has_paper_trail class_name: "Renalware::Patients::Version", on: [:create, :update, :destroy]
+    has_paper_trail(
+      versions: { class_name: "Renalware::Patients::Version" },
+      on: [:create, :update, :destroy]
+    )
 
     serialize :sex, Gender
 

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

@@ -6,7 +6,11 @@ module Renalware
   module Patients
     class Worry < ApplicationRecord
       include Accountable
-      has_paper_trail class_name: "Renalware::Patients::Version", on: [:create, :update, :destroy]
+
+      has_paper_trail(
+        versions: { class_name: "Renalware::Patients::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       belongs_to :patient,
                  class_name: "Renalware::Patient",

data/app/models/renalware/problems/problem.rb

@@ -9,7 +9,11 @@ module Renalware
       include Accountable
 
       acts_as_paranoid
-      has_paper_trail class_name: "Renalware::Problems::Version", on: [:create, :update, :destroy]
+
+      has_paper_trail(
+        versions: { class_name: "Renalware::Problems::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       belongs_to :patient, touch: true
       has_many :notes, -> { ordered }, dependent: :destroy

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

@@ -18,7 +18,10 @@ module Renalware
       scope :today, -> { where(created_at: Time.zone.today.all_day) }
       scope :hotlist, -> { where(hotlist: true) }
 
-      has_paper_trail class_name: "Renalware::Renal::Version", on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Renal::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       ransacker :created_at_casted do |_parent|
         Arel.sql("date(renal_aki_alerts.created_at)")

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

@@ -9,7 +9,10 @@ module Renalware
       include Document::Base
       extend Enumerize
 
-      has_paper_trail class_name: "Renalware::Renal::Version", on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Renal::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       belongs_to :patient, touch: true
       belongs_to :prd_description

data/app/models/renalware/transplants/donation.rb

@@ -12,8 +12,10 @@ module Renalware
       belongs_to :patient, touch: true
       belongs_to :recipient, class_name: "Patient", foreign_key: "recipient_id", touch: true
 
-      has_paper_trail class_name: "Renalware::Transplants::Version",
-                      on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Transplants::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       scope :ordered, -> { order(created_at: :asc) }
       scope :reversed, -> { order(created_at: :desc) }

data/app/models/renalware/transplants/donor_followup.rb

@@ -11,8 +11,10 @@ module Renalware
                  foreign_key: "operation_id",
                  touch: true
 
-      has_paper_trail class_name: "Renalware::Transplants::Version",
-                      on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Transplants::Version" },
+        on: [:create, :update, :destroy]
+      )
 
       validates :last_seen_on, timeliness: { type: :date, allow_blank: true }
       validates :dead_on, timeliness: { type: :date, allow_blank: true }

data/app/models/renalware/transplants/donor_operation.rb

@@ -19,8 +19,10 @@ module Renalware
       scope :ordered, -> { order(performed_on: :asc) }
       scope :reversed, -> { order(performed_on: :desc) }
 
-      has_paper_trail class_name: "Renalware::Transplants::Version",
-                      on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Transplants::Version" },
+        on: [:create, :update, :destroy]
+      )
       has_document class_name: "Renalware::Transplants::DonorOperationDocument"
 
       enumerize :kidney_side, in: %i(left right both)

data/app/models/renalware/transplants/donor_workup.rb

@@ -11,8 +11,10 @@ module Renalware
 
       belongs_to :patient, touch: true
 
-      has_paper_trail class_name: "Renalware::Transplants::Version",
-                      on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Transplants::Version" },
+        on: [:create, :update, :destroy]
+      )
       has_document class_name: "Renalware::Transplants::DonorWorkupDocument"
     end
   end

data/app/models/renalware/transplants/recipient_followup.rb

@@ -28,8 +28,11 @@ module Renalware
                                     reject_if: :all_blank,
                                     allow_destroy: true
 
-      has_paper_trail class_name: "Renalware::Transplants::Version",
-                      on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Transplants::Version" },
+        on: [:create, :update, :destroy]
+      )
+
       has_document class_name: "Renalware::Transplants::RecipientFollowupDocument"
 
       validates :stent_removed_on, timeliness: { type: :date, allow_blank: true }

data/app/models/renalware/transplants/recipient_operation.rb

@@ -19,8 +19,11 @@ module Renalware
       scope :reversed, -> { order(performed_on: :desc) }
       scope :most_recent, -> { order(performed_on: :desc).first }
 
-      has_paper_trail class_name: "Renalware::Transplants::Version",
-                      on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Transplants::Version" },
+        on: [:create, :update, :destroy]
+      )
+
       has_document class_name: "Renalware::Transplants::RecipientOperationDocument"
 
       validates :performed_on, presence: true

data/app/models/renalware/transplants/recipient_workup.rb

@@ -12,8 +12,11 @@ module Renalware
 
       belongs_to :patient, touch: true
 
-      has_paper_trail class_name: "Renalware::Transplants::Version",
-                      on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Transplants::Version" },
+        on: [:create, :update, :destroy]
+      )
+
       has_document class_name: "Renalware::Transplants::RecipientWorkupDocument"
     end
   end

data/app/models/renalware/transplants/registration.rb

@@ -18,8 +18,11 @@ module Renalware
               class_name: "RegistrationStatus",
               foreign_key: "registration_id"
 
-      has_paper_trail class_name: "Renalware::Transplants::Version",
-                      on: [:create, :update, :destroy]
+      has_paper_trail(
+        versions: { class_name: "Renalware::Transplants::Version" },
+        on: [:create, :update, :destroy]
+      )
+
       has_document class_name: "Renalware::Transplants::RegistrationDocument"
 
       accepts_nested_attributes_for :statuses

data/app/models/renalware/transplants/rejection_episode.rb

@@ -7,7 +7,7 @@ module Renalware
     class RejectionEpisode < ApplicationRecord
       include Accountable
       has_paper_trail(
-        class_name: "Renalware::Transplants::Version",
+        versions: { class_name: "Renalware::Transplants::Version" },
         on: [:create, :update, :destroy]
       )
       belongs_to :followup, class_name: "RecipientFollowup", touch: true

data/app/models/renalware/ukrdc/{batch_number.rb → batch.rb}

@@ -4,7 +4,7 @@ require_dependency "renalware/ukrdc"
 
 module Renalware
   module UKRDC
-    class BatchNumber < ApplicationRecord
+    class Batch < ApplicationRecord
       def self.next
         create!
       end

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

@@ -16,9 +16,8 @@ module Renalware
         :patient_ids,
         :changed_since,
         :logger,
-        :request_uuid,
         :timestamp,
-        :batch_number,
+        :batch,
         :summary,
         :force_send
       )
@@ -27,16 +26,15 @@ module Renalware
         @changed_since = Time.zone.parse(changed_since) if changed_since.present?
         @patient_ids = Array(patient_ids)
         @logger = logger || Rails.logger
-        @request_uuid = SecureRandom.uuid # helps group logs together
         @timestamp = Time.zone.now.strftime("%Y%m%d%H%M%S%L")
-        @batch_number ||= BatchNumber.next.number
+        @batch ||= Batch.next
         @summary = ExportSummary.new
         @force_send = force_send
       end
 
       # rubocop:disable Metrics/MethodLength
       def call
-        logger.tagged(request_uuid) do
+        logger.tagged(batch.number) do
           summary.milliseconds_taken = Benchmark.ms do
             create_patient_xml_files
             encrypt_patient_xml_files
@@ -48,7 +46,7 @@ module Renalware
           email_summary
         end
       rescue StandardError => e
-        # TODO: if fails before copying to outgoing then we should roll back BatchNumber
+        # TODO: if fails before copying to outgoing then we should roll back Batch
         Engine.exception_notifier.notify(e)
         raise e
       end
@@ -60,7 +58,7 @@ module Renalware
         @paths ||= begin
           Paths.new(
             timestamp: timestamp,
-            batch_number: batch_number,
+            batch_number: batch.number,
             working_path: config.ukrdc_working_path
           )
         end
@@ -112,8 +110,7 @@ module Renalware
           patient: patient,
           dir: paths.timestamped_xml_folder,
           changes_since: changed_since,
-          request_uuid: request_uuid,
-          batch_number: batch_number,
+          batch: batch,
           logger: logger,
           force_send: force_send,
           schema: schema
@@ -169,7 +166,7 @@ module Renalware
       end
 
       def export_results
-        TransmissionLog.where(request_uuid: request_uuid).group(:status).count(:status).to_h
+        TransmissionLog.where(batch_id: batch.id).group(:status).count(:status).to_h
       end
 
       def encrypt_patient_xml_files