renalware-core 2.0.131 → 2.0.132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35b6c3d73ccaf2718acd3d48e5982b3453521ca161126690a51af0de3bb08733
-  data.tar.gz: e0fcdc5ade9caf2e87745953b7d6c060fabb96720ac90e8978618b36a48d31b5
+  metadata.gz: f670bf5df7603c7132365ac119ae9f6bdbb43dde12a24a04d3d015b5a694626c
+  data.tar.gz: 0a8dde1dd0be593ee8483e01f8128e31f544a1c6eed362fe8fd263e78fd78684
 SHA512:
-  metadata.gz: 645842282347e02444bdd310dc575b72137c3613139a7dee8543b21a085cd6437ec6b521aa66881f097ee17567a58048d118815926b81ca095b560cfe38b4a2c
-  data.tar.gz: 57b3894daa3d58de88660f763d8e4b4a61fb8cad3361210c6567d074d1b8c6ee71a75effaba63cb9ee0905aa9fce3b39d3d564e1de65bcc4ec8029d1833acf72
+  metadata.gz: dc8e11f2b13664bddaabdef7d8bede3f1e2a14bc63862b703a628ad3f8fd6019bcb6d285fd40a81bdd530417ce5c46cbfc8ba8f6a61d5901b7e8523ca783b6a6
+  data.tar.gz: 5d77baac6abc4e238faa59e4147948315beed80cf363fac2b8c6cb88436b44ff8898a668ef71a3c81a5ccc3e8ca520f596a1919a242275c4540128431f7fa46d

data/app/controllers/renalware/admissions/consults_controller.rb

@@ -100,7 +100,8 @@ module Renalware
           .permit(
             :consult_site_id, :hospital_ward_id, :patient_id, :q, :other_site_or_ward,
             :decided_on, :transferred_on, :started_on, :ended_on, :decided_on,
-            :aki_risk, :transfer_priority, :priority, :seen_by_id, :consult_type,
+            :aki_risk, :transfer_priority, :priority, :seen_by_id,
+            :e_alert, :consult_type, :specialty_id,
             :requires_aki_nurse, :description, :contact_number, :rrt
           )
       end

data/app/controllers/renalware/api/ukrdc/patients_controller.rb

@@ -26,7 +26,10 @@ module Renalware
         end
 
         def attempt_to_generate_patient_ukrdc_xml
-          Renalware::UKRDC::XmlRenderer.new(locals: { patient: patient_presenter }).call
+          Renalware::UKRDC::XmlRenderer.new(
+            schema: Renalware::UKRDC::XsdSchema.new,
+            locals: { patient: patient_presenter }
+          ).call
         end
 
         def patient_presenter

data/app/helpers/renalware/definition_list_helper.rb

@@ -14,7 +14,7 @@ module Renalware
 
       def definition(attribute, label = nil)
         text = label || @model_klass.human_attribute_name(attribute)
-        value = public_send(attribute)
+        value = __getobj__.public_send(attribute)
         value = yield(value) if value.present? && block_given?
         capture do
           concat content_tag(:dt, text)

data/app/models/renalware/admissions/consult.rb

@@ -12,9 +12,6 @@ module Renalware
       validates :patient_id, presence: true
       validates :started_on, presence: true
       validates :description, presence: true
-      # Currently #consult_type is a string and we are not sure what should be in there
-      # Migrated consults may not have a type so only enforce it creation of new ones.
-      validates :consult_type, presence: true, on: :create
       validates :priority,
                 numericality: {
                   only_integer: true,
@@ -29,6 +26,7 @@ module Renalware
       belongs_to :patient, touch: true
       belongs_to :consult_site, class_name: "Admissions::ConsultSite"
       belongs_to :hospital_ward, class_name: "Hospitals::Ward"
+      belongs_to :specialty, class_name: "Admissions::Specialty"
       belongs_to :seen_by, class_name: "User"
 
       enumerize :transfer_priority, in: %i(unknown necessary desirable potential unnecessary)

data/app/models/renalware/admissions/consult_query.rb

@@ -33,6 +33,7 @@ module Renalware
             .includes(
               :consult_site,
               :created_by,
+              :specialty,
               patient: { current_modality: :description },
               hospital_ward: :hospital_unit
             )

data/app/models/renalware/admissions/specialty.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/admissions"
+
+module Renalware
+  module Admissions
+    class Specialty < ApplicationRecord
+      validates :name, presence: true, uniqueness: true
+
+      scope :ordered, -> { order(position: :asc) }
+
+      def to_s
+        name
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Renalware
     class MDMPatientsQuery
       include ModalityScopes
       include PatientPathologyScopes
-      DEFAULT_SEARCH_PREDICATE = "hgb_date DESC"
+      DEFAULT_SEARCH_PREDICATE = "cre_date DESC"
       attr_reader :q, :relation, :named_filter
 
       def initialize(relation: Transplants::Patient.all, named_filter: nil, q: nil)

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

@@ -66,17 +66,12 @@ 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
+        schema = UKRDC::XsdSchema.new
         patients.find_each do |patient|
           count += 1
           Rails.logger.info count
@@ -92,7 +87,7 @@ module Renalware
           ).call
 
           # Every n patients, force the garbage collector to kick in
-          GC.start if (count % 10).zero?
+          # GC.start if (count % 10).zero?
         end
       end
       # rubocop:enable Metrics/MethodLength

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

@@ -10,7 +10,7 @@ module Renalware
         :patient!,
         :dir!,
         :request_uuid!,
-        :schema,
+        :schema!,
         :changes_since,
         :logger,
         :batch_number,
@@ -102,15 +102,6 @@ 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(
           schema: schema,

data/app/models/renalware/ukrdc/housekeeping/remove_stale_files.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/ukrdc"
+
+module Renalware
+  module UKRDC
+    module Housekeeping
+      class RemoveStaleFiles
+        def self.call
+          new.call
+        end
+
+        def call
+          return unless Renalware.config.ukrdc_remove_stale_outgoing_files
+
+          remove_stale_outgoing_files
+        end
+
+        private
+
+        class OutgoingXmlFile
+          pattr_initialize :filename
+
+          # Returns the integer batch number from the file name
+          # e.g. 13 from /var/ukrdc/outgoing/RJZ_000040_1234606005.gpg
+          def batch_number
+            matches = filename.match(/\w*_(\d{6})_/)
+            return unless matches
+
+            matches[1].to_i
+          end
+        end
+
+        def remove_stale_outgoing_files
+          log "Remove stale outgoing files"
+          log "Keeping files in batches #{batch_numbers_to_keep.join(', ')}"
+
+          Dir.glob(glob_pattern).each do |filename|
+            FileUtils.rm filename if remove_file?(filename)
+          end
+        end
+
+        # Pattern to use to find batch-numbered files in the outgoing directory
+        def glob_pattern
+          outgoing_path.join("*.gpg")
+        end
+
+        def outgoing_path
+          Pathname(Renalware.config.ukrdc_working_path).join("outgoing")
+        end
+
+        def number_of_batches_to_keep
+          Renalware.config.ukrdc_number_of_archived_folders_to_keep.to_i
+        end
+
+        # Returns the ids of a few of the most recent BatchNumbers rows (ie the batch number) that
+        # we should not delete - these being the most recent ones
+        def batch_numbers_to_keep
+          @batch_numbers_to_keep ||= begin
+            BatchNumber
+              .limit(number_of_batches_to_keep)
+              .order(created_at: :desc)
+              .pluck(:id)
+          end
+        end
+
+        def remove_file?(filename)
+          !batch_numbers_to_keep.include?(
+            OutgoingXmlFile.new(filename).batch_number
+          )
+        end
+
+        def log(msg)
+          Rails.logger.info(" " + msg)
+        end
+      end
+    end
+  end
+end

data/app/models/renalware/ukrdc/treatment_timeline/generate_treatments.rb

@@ -28,7 +28,7 @@ module Renalware
             .where("send_to_renalreg = true or send_to_rpv = true")
         end
 
-        # rubocop:disable Rails/Output, Metrics/AbcSize
+        # rubocop:disable Rails/Output
         def generate_treatments
           PrepareTables.call
           Rails.logger.info "#{patient_scope.count} patients"
@@ -36,10 +36,10 @@ module Renalware
             print "\n#{patient.id}: "
             GenerateTimeline.new(patient).call
             # Start gargbage collection periodically to prevent server ram issues.
-            GC.start if (index % 50).zero?
+            # GC.start if (index % 50).zero?
           end
         end
-        # rubocop:enable Rails/Output, Metrics/AbcSize
+        # rubocop:enable Rails/Output
 
         def log(msg)
           Rails.logger.info(msg)

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

@@ -7,7 +7,7 @@ module Renalware
   module UKRDC
     class XmlRenderer
       DEFAULT_TEMPLATE = "/renalware/api/ukrdc/patients/show"
-      attr_reader :template, :errors, :locals
+      attr_reader :template, :errors, :locals, :schema
 
       class Success < Renalware::Success
         alias xml object
@@ -19,7 +19,7 @@ module Renalware
 
       # Schema is an instance of Nokogiri::XML::Schema passed in for optimisation reasons.
       # If it is not passed in we create it.
-      def initialize(schema: nil, template: nil, locals: {})
+      def initialize(schema:, template: nil, locals: {})
         @template = template || DEFAULT_TEMPLATE
         @schema = schema
         @locals = locals
@@ -47,7 +47,7 @@ module Renalware
 
       # Returns an array of SchemaValidation errors
       def validation_errors
-        @validation_errors ||= schema.validate(Nokogiri::XML(xml))
+        @validation_errors ||= schema.validate(xml)
       end
 
       private
@@ -58,16 +58,6 @@ module Renalware
           instruct[:encoding] = "UTF-8"
         end
       end
-
-      # It is more performant if schema is passed in in the ctor - but if it isn't we create it.
-      def schema
-        @schema ||= begin
-          Rails.logger.warn "Creating JIT 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
     end
   end
 end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/ukrdc"
+
+module Renalware
+  module UKRDC
+    class XsdSchema
+      def validate(xml)
+        schema.validate(Nokogiri::XML(xml))
+      end
+
+      private
+
+      def schema
+        @schema ||= begin
+          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
+    end
+  end
+end

data/app/views/renalware/admissions/consults/_form.html.slim

@@ -29,6 +29,10 @@
 
   = f.input :other_site_or_ward, wrapper: :horizontal_medium
   = f.input :started_on, as: :date_picker, wrapper: :horizontal_datepicker
+  = f.input :e_alert
+  = f.association(:specialty,
+                  wrapper: :horizontal_medium,
+                  collection: Renalware::Admissions::Specialty.ordered)
   = f.input :consult_type, wrapper: :horizontal_medium
   = f.input :decided_on, as: :date_picker, wrapper: :horizontal_datepicker
   = f.input :transfer_priority, include_blank: false, wrapper: :horizontal_small

data/app/views/renalware/admissions/consults/_table.html.slim

@@ -123,6 +123,12 @@
                 dd= consult.patient_current_modality
                 dt Description
                 dd= simple_format consult.description
+                dt E-Alert
+                dd= yes_no consult.e_alert
+                dt Specialty
+                dd= consult.specialty
+                dt Specialty notes
+                dd= consult.consult_type
 
         / When printing we just show the notes on the second row
         tr.print-only.child-row

data/app/views/renalware/admissions/requests/_request.html.slim

@@ -8,14 +8,15 @@ ruby:
   td(class="sortable-position-for-model-id-#{request.id}")= request.position
   td.priority
     span= request.priority.text
-  td= request.reason.description
+  td.col-width-medium-with-ellipsis= request.reason.description
   td= default_patient_link(patient)
   td= patient.nhs_number
   td= patient.hospital_identifiers
-  td= request.hospital_unit&.name
+  td.col-width-medium-with-ellipsis= request.hospital_unit&.name
   td.col-width-medium-with-ellipsis(title=request.notes)
     = request.notes
   td(title=editing_history)= l(request.created_at)
+  td.col-width-medium-with-ellipsis=request.created_by
   td
     = link_to admissions_request_path(request),
               remote: true,

data/app/views/renalware/admissions/requests/_table.html.slim

@@ -1,6 +1,6 @@
 table.admissions_requests
   thead
-    th Rank
+    th.col-width-tiny Rank
     th Priority
     th Reason
     th Patient
@@ -9,6 +9,7 @@ table.admissions_requests
     th Location
     th Notes
     th.col-width-date-time Created
+    th Created by
     th.col-width-small
     th
   = content_tag(:tbody,

data/config/locales/renalware/admissions/consults.en.yml

@@ -8,7 +8,8 @@ en:
         referred_on: Referal date
         hospital_unit: Unit
         hospital_ward: Ward
-        consult_type: Type
+        e_alert: E-Alert
+        consult_type: Specialty notes
         contact_number: Bleep/Ext
         other_site_or_ward: Other site or ward
         rrt: RRT?

data/db/migrate/20150514113239_devise_create_users.rb

@@ -37,8 +37,9 @@ class DeviseCreateUsers < ActiveRecord::Migration[4.2]
       t.string :signature
 
       ## Non-devise - account expiry
-      t.datetime :last_activity_at, :datetime
-      t.datetime :expired_at, :datetime
+      t.datetime :last_activity_at
+      t.datetime :expired_at
+      t.datetime :datetime # will be removed later
 
       ## Non-devise - job title
       t.string :professional_position
@@ -51,15 +52,9 @@ class DeviseCreateUsers < ActiveRecord::Migration[4.2]
 
     add_index :users, :email,                unique: true
     add_index :users, :reset_password_token, unique: true
-    # add_index :users, :confirmation_token,   unique: true
-    # add_index :users, :unlock_token,         unique: true
-
     add_index :users, :username, unique: true
-
-    add_index   :users, :last_activity_at
-    add_index   :users, :expired_at
-
-    add_index  :users, :approved
-
+    add_index :users, :last_activity_at
+    add_index :users, :expired_at
+    add_index :users, :approved
   end
 end

data/db/migrate/20190325134823_create_patients_master_index.rb

@@ -2,7 +2,6 @@ class CreatePatientsMasterIndex < ActiveRecord::Migration[5.2]
   def change
     create_table :patient_master_index do |t|
       t.references :patient, null: true, foreign_key: true
-      t.timestamps null: false
       t.string :nhs_number, index: true
       t.string :hospital_number, index: true
       t.string :title

data/db/migrate/20190718091430_add_code_to_modality_descriptions.rb

@@ -2,7 +2,7 @@ class AddCodeToModalityDescriptions < ActiveRecord::Migration[5.2]
   def change
     within_renalware_schema do
       add_column :modality_descriptions, :code, :string
-      add_index  :modality_descriptions, :code, unique: true
+      add_index :modality_descriptions, :code, unique: true
     end
   end
 end

data/db/migrate/20200110153522_add_ealert_to_admission_consults.rb

@@ -0,0 +1,7 @@
+class AddEalertToAdmissionConsults < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :admission_consults, :e_alert, :boolean, null: false, default: false
+    end
+  end
+end

data/db/migrate/20200110160241_create_admission_specialties.rb

@@ -0,0 +1,19 @@
+class CreateAdmissionSpecialties < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :admission_specialties do |t|
+        t.string :name, null: false, index: { unique: true }
+        t.integer :position, null: false, default: 0
+        t.timestamps null: false
+      end
+
+      add_reference(
+        :admission_consults,
+        :specialty,
+        foreign_key: { to_table: :admission_specialties },
+        index: true,
+        null: true
+      )
+    end
+  end
+end

data/db/seeds/default/patients/surveys/pos_s_questions.csv

@@ -16,8 +16,8 @@
 "YSQ15",15,"Feeling depressed","^[0-4]$"
 "YSQ16",16,"Changes in skin","^[0-4]$"
 "YSQ17",17,"Diarrhoea","^[0-4]$"
-"YSQ18",18,"<Question text> as entered by user","^[0-4]$"
-"YSQ19",19,"<Question text> as entered by user","^[0-4]$"
-"YSQ20",20,"<Question text> as entered by user","^[0-4]$"
+"YSQ18",18,"Symptom as entered by user","^[0-4]$"
+"YSQ19",19,"Symptom as entered by user","^[0-4]$"
+"YSQ20",20,"Symptom as entered by user","^[0-4]$"
 "YSQ21",21,"Symptom that has affected the patient most",
 "YSQ22",22,"Symptom that has improved the most",

data/lib/renalware/configuration.rb

@@ -68,7 +68,10 @@ module Renalware
     end
     config_accessor(:ukrdc_site_code) { ENV.fetch("UKRDC_PREFIX", "RJZ") }
     config_accessor(:ukrdc_number_of_archived_folders_to_keep) do
-      ENV.fetch("UKRDC_NUMBER_OF_ARCHIVED_FOLDERS_TO_KEEP", "3")
+      ENV.fetch("UKRDC_NUMBER_OF_ARCHIVED_FOLDERS_TO_KEEP", "7")
+    end
+    config_accessor(:ukrdc_remove_stale_outgoing_files) do
+      ENV.fetch("UKRDC_REMOVE_STALE_OUTGOING_FILES", "true") == "true"
     end
 
     # To use a date other that the default changes_since date when

data/lib/renalware/version.rb

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

data/lib/tasks/spec.rake

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require "rspec/core/rake_task"
-
 #
 # These tasks run the turnip (migrated from cucumber) features.
 #
 namespace :spec do
   namespace :acceptance do
-    pattern = "spec/acceptance/features/**/*.feature"
+    ENV["RACK_ENV"] = ENV["RAILS_ENV"] = "test"
+    require "rspec/core/rake_task"
+    pattern = "./spec/acceptance/renalware/features/**/*.feature"
 
     # domain features are those that do not exercise the UI
     # Usage:
@@ -20,8 +20,8 @@ namespace :spec do
     # Usage:
     #   bundle exec rake spec:acceptance:web
     RSpec::Core::RakeTask.new(:web) do |t|
-      t.pattern = "spec/acceptance/features/**/*.feature"
-      t.rspec_opts = "--tag web" # targets features with the @web tag only
+      t.pattern = "./spec/acceptance/renalware/features/**/*.feature"
+      t.rspec_opts = "--tag web --require spec_helper" # targets features with the @web tag only
       ENV["TURNIP_WEB"] = "1" # triggers inclusion of web_steps
     end
 

data/lib/tasks/ukrdc.rake

@@ -32,12 +32,28 @@ namespace :ukrdc do
     logger           = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
     logger.level     = Logger::INFO
     Rails.logger     = logger
+
+    PROFILE = nil
+    if PROFILE
+      require "ruby-prof"
+      RubyProf.start
+    end
     # Renalware::UKRDC::TreatmentTimeline::GenerateTreatments.call
     Renalware::UKRDC::CreateEncryptedPatientXMLFiles.new(
       changed_since: ENV["changed_since"],
       patient_ids: ENV.fetch("patient_ids", "").split(",").map(&:to_i),
       force_send: ENV["force_send"] == "true"
     ).call
+
+    if PROFILE
+      result = RubyProf.stop
+      pretty = RubyProf::FlatPrinter.new(result)
+      pretty.print(STDOUT)
+      # printer.print(STDOUT, {})
+      # printer = RubyProf::GraphPrinter.new(result)
+      # printer = RubyProf::GraphHtmlPrinter.new(result)
+      # printer.print(STDOUT, min_percent: 5)
+    end
   end
 
   desc "Regenerates the ukrdc_treatments table ready for exporting to UKRDC in another task"
@@ -54,6 +70,7 @@ namespace :ukrdc do
     Rails.logger     = logger
     logger.info "UKRDC housekeeping"
     Renalware::UKRDC::Housekeeping::RemoveOldExportArchiveFolders.call
+    Renalware::UKRDC::Housekeeping::RemoveStaleFiles.call
   end
 
   task import: :environment do

data/spec/factories/admissions/specialties.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :admissions_specialty, class: "Renalware::Admissions::Specialty" do
+    initialize_with do
+      Renalware::Admissions::Specialty.find_or_create_by!(name: name)
+    end
+    name { "Other" }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.131
+  version: 2.0.132
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component
@@ -574,16 +574,16 @@ dependencies:
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 9.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 9.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
@@ -618,14 +618,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
@@ -668,6 +668,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: rack-attack
   requirement: !ruby/object:Gem::Requirement
@@ -686,14 +700,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
@@ -1474,6 +1488,7 @@ files:
 - app/models/renalware/admissions/consult_site.rb
 - app/models/renalware/admissions/request.rb
 - app/models/renalware/admissions/request_reason.rb
+- app/models/renalware/admissions/specialty.rb
 - app/models/renalware/api.rb
 - app/models/renalware/clinical.rb
 - app/models/renalware/clinical/allergy.rb
@@ -1946,6 +1961,7 @@ files:
 - app/models/renalware/ukrdc/export_summary.rb
 - app/models/renalware/ukrdc/filename.rb
 - app/models/renalware/ukrdc/housekeeping/remove_old_export_archive_folders.rb
+- app/models/renalware/ukrdc/housekeeping/remove_stale_files.rb
 - app/models/renalware/ukrdc/incoming/file_list.rb
 - app/models/renalware/ukrdc/incoming/import_survey.rb
 - app/models/renalware/ukrdc/incoming/import_surveys.rb
@@ -2003,6 +2019,7 @@ files:
 - app/models/renalware/ukrdc/treatment_timeline/transfer_out/generator.rb
 - app/models/renalware/ukrdc/treatment_timeline/transplant/generator.rb
 - app/models/renalware/ukrdc/xml_renderer.rb
+- app/models/renalware/ukrdc/xsd_schema.rb
 - app/models/renalware/user.rb
 - app/models/renalware/version.rb
 - app/models/renalware/virology.rb
@@ -3766,6 +3783,8 @@ files:
 - db/migrate/20191219145651_add_hidden_to_users.rb
 - db/migrate/20200106073329_add_next_of_kin_to_patients.rb
 - db/migrate/20200106210851_create_case_insensitive_index_on_patients.rb
+- db/migrate/20200110153522_add_ealert_to_admission_consults.rb
+- db/migrate/20200110160241_create_admission_specialties.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3975,6 +3994,7 @@ files:
 - spec/factories/admissions/consults.rb
 - spec/factories/admissions/request_reasons.rb
 - spec/factories/admissions/requests.rb
+- spec/factories/admissions/specialties.rb
 - spec/factories/clinical/allergies.rb
 - spec/factories/clinical/body_compositions.rb
 - spec/factories/clinical/dry_weights.rb
@@ -4181,7 +4201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Renalware core functionality as a mountable engine.