renalware-core 2.0.0.pre.beta7 → 2.0.0.pre.beta8

data/db/migrate/20170908155011_add_shortfall_column_to_hd_patient_statistics.rb

@@ -0,0 +1,7 @@
+class AddShortfallColumnToHDPatientStatistics < ActiveRecord::Migration[5.1]
+  def change
+    add_column :hd_patient_statistics,
+               :number_of_sessions_with_dialysis_minutes_shortfall_gt_5_pct,
+               :integer
+  end
+end

data/db/migrate/20170908160250_update_hd_overall_audit_to_version4.rb

@@ -0,0 +1,8 @@
+class UpdateHDOverallAuditToVersion4 < ActiveRecord::Migration[5.1]
+  def change
+    update_view :reporting_hd_overall_audit,
+            materialized: true,
+            version: 4,
+            revert_to_version: 2
+  end
+end

data/db/migrate/20170911133224_add_type_to_messaging_messages.rb

@@ -0,0 +1,16 @@
+class AddTypeToMessagingMessages < ActiveRecord::Migration[5.1]
+
+  def up
+    add_column :messaging_messages, :type, :string, null: true
+    add_index :messaging_messages, :type
+    ActiveRecord::Base.connection.execute(
+      "update messaging_messages set type = 'Renalware::Messaging::Internal::Message' where type is null;"
+    )
+    change_column_null(:messaging_messages, :type, false)
+  end
+
+  def down
+    remove_index :messaging_messages, :type
+    remove_column :messaging_messages, :type
+  end
+end

data/db/migrate/20170912092135_create_letters_electronic_receipts.rb

@@ -0,0 +1,11 @@
+class CreateLettersElectronicReceipts < ActiveRecord::Migration[5.1]
+  def change
+    create_table :letter_electronic_receipts do |t|
+      t.references :letter, index: true, null: false, foreign_key: { to_table: :letter_letters }
+      t.references :recipient, index: true, null: false, foreign_key: { to_table: :users }
+      t.datetime :read_at, null: true, index: true
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20170920113628_create_admissions_requests.rb

@@ -0,0 +1,31 @@
+class CreateAdmissionsRequests < ActiveRecord::Migration[5.1]
+  def change
+    create_table :admission_request_reasons do |t|
+      t.string :description, null: false
+      t.datetime :deleted_at, index: true
+      t.timestamps null: false
+    end
+
+    create_table :admission_requests do |t|
+      t.references :patient, null: false, foreign_key: true
+      t.integer :reason_id, null: false, index: true
+      t.references :hospital_unit, foreign_key: true, index: true
+      t.text :notes
+      t.string :priority, null: false
+      t.integer :position, null: false, default: 0, index: true
+      t.datetime :deleted_at, index: true
+      t.integer :updated_by_id, null: false, index: true
+      t.integer :created_by_id, null: false, index: true
+
+      t.timestamps null: false
+    end
+
+    # We only allow on patient with a current (deleted_at = NULL) row.
+    # Indexing on [:patient_id, :deleted_at] does the trick because deleted_at is not used
+    # in the if its NULL.
+    add_index :admission_requests, [:patient_id, :deleted_at], unique: true
+    add_foreign_key :admission_requests, :users, column: :created_by_id
+    add_foreign_key :admission_requests, :users, column: :updated_by_id
+    add_foreign_key :admission_requests, :admission_request_reasons, column: :reason_id
+  end
+end

data/db/seeds/default/reporting/audits.yml

@@ -39,4 +39,5 @@
       { "title": "% Phosphate < 1.8", "targets": 4, width: "200" },
       { "title": "% w/fistula or graft", "targets": 5, width: "200" },
       { "title": "Avg. missed HD time", "targets": 6, width: "200" }
+      { "title": "% missing >5% HD time", "targets": 7, width: "200" }
     ]}

data/db/views/reporting_hd_overall_audit_v04.sql

@@ -0,0 +1,13 @@
+SELECT
+  units.name,
+  count(stats.id) AS patient_count,
+  0 as percentage_hb_gt_100,
+  0 as percentage_urr_gt_65,
+  0 as percentage_phosphate_lt_1_8,
+  0 as percentage_access_fistula_or_graft,
+  0 as avg_missed_hd_time,
+  ROUND(100*SUM(number_of_sessions_with_dialysis_minutes_shortfall_gt_5_pct)/COUNT(stats.id),1)
+    as pct_shortfall_gt_5_pct
+  FROM (hd_patient_statistics stats
+  JOIN hospital_units units ON ((units.id = stats.hospital_unit_id)))
+  GROUP BY units.name;

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.0.pre.beta7".freeze
+  VERSION = "2.0.0.pre.beta8".freeze
 end

data/lib/subscription_registry.rb

@@ -24,7 +24,7 @@ require "set"
 #
 #    SubscriptionRegistry.instance.register(OtherModule::Broadcaster, Listener)
 #
-# Then in the other module, subscribe listeners registred above to the broadcaster.
+# Then in the other module, subscribe listeners registered above to the broadcaster.
 #
 #    broadcaster = SubscriptionRegistry.instance.subscribe_listeners_to(Broadcaster.new)
 #

data/spec/factories/accesses/plans.rb

@@ -1,11 +1,10 @@
 FactoryGirl.define do
   factory :access_plan, class: Renalware::Accesses::Plan do
+    accountable
     association :patient, factory: :accesses_patient
     association :plan_type, factory: :access_plan_type
     notes "Lorem ipsum dolor sit amet.."
-    created_by { Renalware::User.first || create(:user) }
-    updated_by { Renalware::User.first || create(:user) }
-    decided_by { Renalware::User.first || create(:user) }
+    decided_by { accountable_actor }
     terminated_at nil
   end
 end

data/spec/factories/accesses/profiles.rb

@@ -1,11 +1,10 @@
 FactoryGirl.define do
   factory :access_profile, class: Renalware::Accesses::Profile do
+    accountable
     patient
     type { create(:access_type) }
     side :right
     formed_on { Time.zone.today }
-    association :created_by,  factory: :user
-    association :updated_by,  factory: :user
 
     trait :current do
       started_on { 1.day.ago }

data/spec/factories/admissions/request_reasons.rb

@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :admissions_request_reason, class: "Renalware::Admissions::RequestReason" do
+    initialize_with do
+      Renalware::Admissions::RequestReason.find_or_create_by!(description: description)
+    end
+    description "AKI"
+  end
+end

data/spec/factories/admissions/requests.rb

@@ -0,0 +1,9 @@
+
+FactoryGirl.define do
+  factory :admissions_request, class: "Renalware::Admissions::Request" do
+    accountable
+    association :reason, factory: :admissions_request_reason
+    patient { create(:patient, by: accountable_actor) }
+    priority :low
+  end
+end

data/spec/factories/clinical/body_compositions.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :body_composition, class: "Renalware::Clinical::BodyComposition" do
+    accountable
     patient
-
     assessed_on 1.week.ago
     overhydration "19.1"
     volume_of_distribution "52.1"
@@ -15,9 +15,6 @@ FactoryGirl.define do
     adipose_tissue_mass "15.1"
     body_cell_mass "53.1"
     quality_of_reading "65.123"
-
-    association :assessor, factory: :user
-    association :created_by, factory: :user
-    association :updated_by, factory: :user
+    assessor { accountable_actor }
   end
 end

data/spec/factories/clinical/dry_weights.rb

@@ -1,11 +1,10 @@
 FactoryGirl.define do
   factory :dry_weight, class: "Renalware::Clinical::DryWeight" do
+    accountable
     patient
 
     assessed_on 1.week.ago
     weight 156.1
-    association :assessor, factory: :user
-    association :created_by,  factory: :user
-    association :updated_by,  factory: :user
+    assessor { accountable_actor }
   end
 end

data/spec/factories/clinics/clinic_visits.rb

@@ -1,5 +1,6 @@
 FactoryGirl.define do
   factory :clinic_visit, class: "Renalware::Clinics::ClinicVisit" do
+    accountable
     patient
     date Time.zone.today
     time Time.zone.now
@@ -9,8 +10,6 @@ FactoryGirl.define do
     pulse 100
     systolic_bp 112
     diastolic_bp 71
-    clinic
-    association :created_by, factory: :user
-    association :updated_by, factory: :user
+    clinic { create(:clinic, consultant: accountable_actor) }
   end
 end

data/spec/factories/directory/people.rb

@@ -1,9 +1,8 @@
 FactoryGirl.define do
   factory :directory_person, class: "Renalware::Directory::Person" do
+    accountable
     given_name   { Faker::Name.first_name }
     family_name  { Faker::Name.last_name }
     title        { Faker::Name.prefix }
-    association :created_by, factory: :user
-    association :updated_by, factory: :user
   end
 end

data/spec/factories/events/events.rb

@@ -1,12 +1,11 @@
 FactoryGirl.define do
   factory :event, class: "Renalware::Events::Event" do
+    accountable
     patient
     event_type factory: :events_type
     date_time Time.zone.now
     description "Needs blood sample taken."
     notes "Would like son to accompany them on clinic visit."
-    association :created_by, factory: :user
-    association :updated_by, factory: :user
 
     factory :simple_event, class: "Renalware::Events::Simple" do
 

data/spec/factories/hd/preference_sets.rb

@@ -1,10 +1,9 @@
 FactoryGirl.define do
   factory :hd_preference_set, class: "Renalware::HD::PreferenceSet" do
+    accountable
     patient
     association :hospital_unit, factory: :hospital_unit
     schedule :mon_wed_fri_pm
     other_schedule ""
-    association :created_by,  factory: :user
-    association :updated_by,  factory: :user
   end
 end

data/spec/factories/hd/profiles.rb

@@ -1,11 +1,10 @@
 FactoryGirl.define do
   factory :hd_profile, class: "Renalware::HD::Profile" do
+    accountable
     patient
     active true
     association :hospital_unit, factory: :hospital_unit
-    association :prescriber, factory: :user
-    association :created_by,  factory: :user
-    association :updated_by,  factory: :user
+    prescriber { accountable_actor }
 
     document {
       {

data/spec/factories/hd/sessions.rb

@@ -1,9 +1,10 @@
 FactoryGirl.define do
   factory :hd_session, class: "Renalware::HD::Session::Open" do
+    accountable
     association :patient, factory: :hd_patient
     association :hospital_unit, factory: :hospital_unit
-    association :signed_on_by, factory: :user
-    association :created_by, factory: :user
+
+    signed_on_by { accountable_actor }
 
     performed_on 1.week.ago
     notes "Some notes"
@@ -24,7 +25,7 @@ FactoryGirl.define do
       start_time "11:00"
       end_time "16:00"
       signed_off_at { 1.day.ago }
-      association :signed_off_by, factory: :user
+      signed_off_by { accountable_actor }
 
       after(:build) do |session|
         session.document = build(:hd_session_document).marshal_dump

data/spec/factories/letters/electronic_receipts.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :letter_electronic_receipt, class: "Renalware::Letters::ElectronicReceipt" do
+    association :letter, factory: :letter
+    association :recipient, factory: :user
+  end
+end

data/spec/factories/letters/letters.rb

@@ -1,14 +1,14 @@
 FactoryGirl.define do
   factory :letter, class: "Renalware::Letters::Letter" do
+    accountable
+
     issued_on Time.zone.today
     description "This is a custom description"
     body "I am pleased to report a marked improvement in her condition."
 
-    association :author, factory: [:user, :author]
     association :letterhead, factory: [:letter_letterhead]
 
-    association :created_by, factory: :user
-    association :updated_by, factory: :user
+    author { accountable_actor }
 
     factory :draft_letter, class: "Renalware::Letters::Letter::Draft" do
     end

data/spec/factories/medications/prescription.rb

@@ -1,5 +1,6 @@
 FactoryGirl.define do
   factory :prescription, class: "Renalware::Medications::Prescription" do
+    accountable
     patient
     drug
     dose_amount "20"
@@ -9,8 +10,6 @@ FactoryGirl.define do
     notes "with food"
     provider 0
     prescribed_on 2.weeks.ago
-    association :created_by, factory: :user
-    association :updated_by, factory: :user
 
     before(:create) { |prescription| prescription.treatable ||= prescription.patient }
   end

data/spec/factories/medications/prescription_terminations.rb

@@ -1,7 +1,6 @@
 FactoryGirl.define do
   factory :prescription_termination, class: "Renalware::Medications::PrescriptionTermination" do
+    accountable
     terminated_on "2016-07-26"
-    association :created_by, factory: :user
-    association :updated_by, factory: :user
   end
 end

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

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :internal_author,
+          class: "Renalware::Messaging::Internal::Author",
+          parent: :user
+end

data/spec/factories/messaging/{message.rb → internal/messages.rb}

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :internal_message, class: "Renalware::Messaging::Message" do
+  factory :internal_message, class: "Renalware::Messaging::Internal::Message" do
     body "The body"
     subject "The subject"
     urgent false

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

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :internal_receipt, class: "Renalware::Messaging::Internal::Receipt" do
+    association :recipient, factory: :internal_recipient
+    read_at nil
+    association :message, factory: :internal_message
+  end
+end

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

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :internal_recipient,
+          class: "Renalware::Messaging::Internal::Recipient",
+          parent: :user
+end

data/spec/factories/modalities/modalities.rb

@@ -1,13 +1,11 @@
 FactoryGirl.define do
   factory :modality, class: "Renalware::Modalities::Modality" do
+    accountable
     patient
     association :description, factory: :modality_description
     association :reason, factory: :modality_reason
     started_on Date.parse("2015-04-01")
 
-    association :created_by, factory: :user
-    association :updated_by, factory: :user
-
     trait :terminated do
       state "terminated"
     end

data/spec/factories/pathology/requests/request.rb

@@ -1,10 +1,8 @@
 FactoryGirl.define do
   factory :pathology_requests_request, class: "Renalware::Pathology::Requests::Request" do
+    accountable
     telephone Faker::PhoneNumber.phone_number
     template Renalware::Pathology::Requests::Request::TEMPLATES.sample
     high_risk [true, false].sample
-
-    association :created_by,  factory: :user
-    association :updated_by,  factory: :user
   end
 end

data/spec/factories/patients/alerts.rb

@@ -1,8 +1,7 @@
 FactoryGirl.define do
   factory :patient_alert, class: "Renalware::Patients::Alert" do
+    accountable
     notes Faker::Lorem.sentence
     urgent true
-    association :created_by, factory: :user
-    association :updated_by, factory: :user
   end
 end

data/spec/factories/patients/patients.rb

@@ -8,6 +8,7 @@ FactoryGirl.define do
   end
 
   factory :patient, class: "Renalware::Patient" do
+    accountable
     nhs_number
     secure_id { SecureRandom.base58(24) }
     local_patient_id
@@ -16,11 +17,8 @@ FactoryGirl.define do
     born_on "01/01/1988"
     paediatric_patient_indicator "0"
     sex "M"
-    ethnicity
     died_on nil
     first_cause_id nil
-    association :created_by, factory: :user
-    association :updated_by, factory: :user
 
     # ensures addressable_type and addressable_id work is assigned, using
     # FactoryGirl's simple assoc method does not work
@@ -28,5 +26,9 @@ FactoryGirl.define do
     before(:create) do |patient|
       patient.build_current_address(attributes_for(:address))
     end
+
+    trait :with_ethnicity do
+      ethnicity factory: :ethnicity
+    end
   end
 end