renalware-core 2.0.64 → 2.0.67

data/db/migrate/20180718172750_update_audit_letters_authors_to_version_3.rb

@@ -1,17 +1,19 @@
 class UpdateAuditLettersAuthorsToVersion3 < ActiveRecord::Migration[5.1]
   def change
-    update_view :reporting_main_authors_audit,
-                materialized: true,
-                version: 3,
-                revert_to_version: 2
+    within_renalware_schema do
+      update_view :reporting_main_authors_audit,
+                  materialized: true,
+                  version: 3,
+                  revert_to_version: 2
 
-    reversible do |direction|
-      direction.up {
-        connection.execute("refresh materialized view reporting_main_authors_audit;")
-      }
-      direction.down {
-        connection.execute("refresh materialized view reporting_main_authors_audit;")
-      }
+      reversible do |direction|
+        direction.up {
+          connection.execute("refresh materialized view reporting_main_authors_audit;")
+        }
+        direction.down {
+          connection.execute("refresh materialized view reporting_main_authors_audit;")
+        }
+      end
     end
   end
 end

data/db/migrate/20180725132557_add_days_text_to_hd_schedule_definitions.rb

@@ -1,27 +1,29 @@
 class AddDaysTextToHDScheduleDefinitions < ActiveRecord::Migration[5.1]
   def change
-    add_column :hd_schedule_definitions, :days_text, :text
-    add_column :hd_schedule_definitions, :sort_order, :integer, null: false, default: 0
+    within_renalware_schema do
+      add_column :hd_schedule_definitions, :days_text, :text
+      add_column :hd_schedule_definitions, :sort_order, :integer, null: false, default: 0
 
-    reversible do |direction|
-      direction.up do
-        sql = <<-SQL
-        update hd_schedule_definitions set days_text = 'Mon Wed Fri' where days::text = '{1,3,5}';
-        update hd_schedule_definitions set days_text = 'Tue Thu Sat' where days::text = '{2,4,6}';
-        SQL
-        connection.execute(sql)
+      reversible do |direction|
+        direction.up do
+          sql = <<-SQL
+          update hd_schedule_definitions set days_text = 'Mon Wed Fri' where days::text = '{1,3,5}';
+          update hd_schedule_definitions set days_text = 'Tue Thu Sat' where days::text = '{2,4,6}';
+          SQL
+          connection.execute(sql)
+        end
       end
-    end
 
-    add_column :hd_diurnal_period_codes, :sort_order, :integer, default: 0, null: false
-    reversible do |direction|
-      direction.up {
-        connection.execute(<<-SQL)
-          update hd_diurnal_period_codes set sort_order = 1 where code = 'am';
-          update hd_diurnal_period_codes set sort_order = 2 where code = 'pm';
-          update hd_diurnal_period_codes set sort_order = 3 where code = 'eve';
-        SQL
-      }
+      add_column :hd_diurnal_period_codes, :sort_order, :integer, default: 0, null: false
+      reversible do |direction|
+        direction.up {
+          connection.execute(<<-SQL)
+            update hd_diurnal_period_codes set sort_order = 1 where code = 'am';
+            update hd_diurnal_period_codes set sort_order = 2 where code = 'pm';
+            update hd_diurnal_period_codes set sort_order = 3 where code = 'eve';
+          SQL
+        }
+      end
     end
   end
 end

data/db/migrate/20180725132808_create_hd_schedule_definition_filters_view.rb

@@ -1,5 +1,7 @@
 class CreateHDScheduleDefinitionFiltersView < ActiveRecord::Migration[5.1]
   def change
-    create_view :hd_schedule_definition_filters
+    within_renalware_schema do
+      create_view :hd_schedule_definition_filters
+    end
   end
 end

data/db/migrate/20180730154454_add_external_session_id_to_hd_transmission_logs.rb

@@ -1,9 +1,11 @@
 class AddExternalSessionIdToHDTransmissionLogs < ActiveRecord::Migration[5.1]
   def change
-    add_column :hd_transmission_logs,
-               :external_session_id,
-               :string,
-               index: true
-    add_reference :hd_transmission_logs, :session, index: true, null: true
+    within_renalware_schema do
+      add_column :hd_transmission_logs,
+                :external_session_id,
+                :string,
+                index: true
+      add_reference :hd_transmission_logs, :session, index: true, null: true
+    end
   end
 end

data/db/migrate/20180802103013_add_hd_mdm_missing_indexes.rb

@@ -1,8 +1,10 @@
 class AddHDMDMMissingIndexes < ActiveRecord::Migration[5.1]
   def change
-    add_index :modality_modalities, :ended_on
-    add_index :modality_descriptions, :name
-    add_index :transplant_registration_statuses, :terminated_on
-    add_index :transplant_registration_statuses, :started_on
+    within_renalware_schema do
+      add_index :modality_modalities, :ended_on
+      add_index :modality_descriptions, :name
+      add_index :transplant_registration_statuses, :terminated_on
+      add_index :transplant_registration_statuses, :started_on
+    end
   end
 end

data/db/migrate/20180802132417_add_missing_indexes_2.rb

@@ -1,18 +1,20 @@
 class AddMissingIndexes2 < ActiveRecord::Migration[5.1]
   def change
-    # These indexes where missed as we had used the add_column method passing in index: true
-    # but that is not supported so no index was created
-    add_index :addresses, :country_id
-    add_index :patients, :country_of_birth_id
-    add_index :patients, :sent_to_ukrdc_at
-    add_index :patients, :send_to_renalreg
-    add_index :patients, :send_to_rpv
-    add_index :patient_bookmarks, :urgent
-    add_index :letter_recipients, :emailed_at
-    add_index :letter_recipients, :printed_at
-    add_index :hospital_wards, :code
-    add_index :feed_messages, :patient_identifier
-    add_index :access_procedures, :performed_by
-    add_index :patient_ethnicities, :cfh_name
+    within_renalware_schema do
+      # These indexes where missed as we had used the add_column method passing in index: true
+      # but that is not supported so no index was created
+      add_index :addresses, :country_id
+      add_index :patients, :country_of_birth_id
+      add_index :patients, :sent_to_ukrdc_at
+      add_index :patients, :send_to_renalreg
+      add_index :patients, :send_to_rpv
+      add_index :patient_bookmarks, :urgent
+      add_index :letter_recipients, :emailed_at
+      add_index :letter_recipients, :printed_at
+      add_index :hospital_wards, :code
+      add_index :feed_messages, :patient_identifier
+      add_index :access_procedures, :performed_by
+      add_index :patient_ethnicities, :cfh_name
+    end
   end
 end

data/db/migrate/20180802144507_add_missing_foreign_key_indexes.rb

@@ -1,17 +1,19 @@
 class AddMissingForeignKeyIndexes < ActiveRecord::Migration[5.1]
   # Found using https://github.com/gregnavis/active_record_doctor
   def change
-    add_index :drug_types_drugs, :drug_type_id
-    add_index :hd_stations, :location_id
-    add_index :letter_contacts, :patient_id
-    add_index :messaging_messages, :replying_to_message_id
-    add_index :pathology_observation_descriptions, :measurement_unit_id
-    add_index :patient_bookmarks, :user_id
-    add_index(
-      :pd_peritonitis_episode_types, :peritonitis_episode_type_description_id,
-      name: "index_pd_peritonitis_episode_types_description_id"
-    )
-    add_index :pd_pet_adequacy_results, :patient_id
-    add_index :roles_users, :role_id
+    within_renalware_schema do
+      add_index :drug_types_drugs, :drug_type_id
+      add_index :hd_stations, :location_id
+      add_index :letter_contacts, :patient_id
+      add_index :messaging_messages, :replying_to_message_id
+      add_index :pathology_observation_descriptions, :measurement_unit_id
+      add_index :patient_bookmarks, :user_id
+      add_index(
+        :pd_peritonitis_episode_types, :peritonitis_episode_type_description_id,
+        name: "index_pd_peritonitis_episode_types_description_id"
+      )
+      add_index :pd_pet_adequacy_results, :patient_id
+      add_index :roles_users, :role_id
+    end
   end
 end

data/db/migrate/20180803131157_add_uuid_to_hd_transmission_logs.rb

@@ -1,5 +1,11 @@
 class AddUuidToHDTransmissionLogs < ActiveRecord::Migration[5.1]
   def change
-    add_column :hd_transmission_logs, :uuid, :uuid, default: "uuid_generate_v4()", null: false
+    within_renalware_schema do
+      add_column :hd_transmission_logs,
+                 :uuid,
+                 :uuid,
+                 default: "uuid_generate_v4()",
+                 null: false
+    end
   end
 end

data/db/migrate/20180814103916_create_index_on_lower_patient_family_name.rb

@@ -1,7 +1,9 @@
 class CreateIndexOnLowerPatientFamilyName < ActiveRecord::Migration[5.1]
   def change
-    add_index :patients,
-            "lower(family_name), given_name",
-            name: "idx_patients_on_lower_family_name"
+    within_renalware_schema do
+      add_index :patients,
+              "lower(family_name), given_name",
+              name: "idx_patients_on_lower_family_name"
+    end
   end
 end

data/db/migrate/20180815144429_update_hd_overall_audit_to_version_8.rb

@@ -1,6 +1,10 @@
 class UpdateHDOverallAuditToVersion8 < ActiveRecord::Migration[5.1]
-  update_view :reporting_hd_overall_audit,
-              materialized: true,
-              version: 8,
-              revert_to_version: 7
+  def change
+    within_renalware_schema do
+      update_view :reporting_hd_overall_audit,
+                  materialized: true,
+                  version: 8,
+                  revert_to_version: 7
+    end
+  end
 end

data/db/migrate/20180831134926_create_daily_reports.rb

@@ -1,11 +1,8 @@
 class CreateDailyReports < ActiveRecord::Migration[5.1]
   def change
-    reversible do |direction|
-      direction.up { connection.execute("SET SEARCH_PATH=renalware,public;") }
-      direction.down { connection.execute("SET SEARCH_PATH=renalware,public;") }
+    within_renalware_schema do
+      create_view :reporting_daily_pathology
+      create_view :reporting_daily_letters
     end
-
-    create_view :reporting_daily_pathology
-    create_view :reporting_daily_letters
   end
 end

data/db/migrate/20180907100545_add_page_count_to_letters.rb

@@ -1,5 +1,7 @@
 class AddPageCountToLetters < ActiveRecord::Migration[5.1]
   def change
-    add_column :letter_letters, :page_count, :integer
+    within_renalware_schema do
+      add_column :letter_letters, :page_count, :integer
+    end
   end
 end

data/db/migrate/20181001162513_add_active_to_hospital_wards.rb

@@ -1,5 +1,7 @@
 class AddActiveToHospitalWards < ActiveRecord::Migration[5.1]
   def change
-    add_column :hospital_wards, :active, :boolean, default: true, null: false
+    within_renalware_schema do
+      add_column :hospital_wards, :active, :boolean, default: true, null: false
+    end
   end
 end

data/db/migrate/20181008144324_update_daily_letters_report_view_to_version_2.rb

@@ -1,6 +1,4 @@
 class UpdateDailyLettersReportViewToVersion2 < ActiveRecord::Migration[5.2]
-  include MigrationHelper
-
   def change
     within_renalware_schema do
       update_view(

data/db/migrate/20181008145159_create_reporting_daily_ukrdc_view.rb

@@ -1,8 +1,4 @@
-require "migration_helper"
-
 class CreateReportingDailyUKRDCView < ActiveRecord::Migration[5.2]
-  include MigrationHelper
-
   def change
     within_renalware_schema do
       create_view :reporting_daily_ukrdc

data/db/migrate/20181013115138_update_reporting_daily_pathology_view_to_v2.rb

@@ -1,6 +1,4 @@
 class UpdateReportingDailyPathologyViewToV2 < ActiveRecord::Migration[5.2]
-  include MigrationHelper
-
   def change
     within_renalware_schema do
       update_view(

data/db/migrate/20181025170410_add_ukrdc_helper_column_to_patients.rb

@@ -1,6 +1,4 @@
 class AddUKRDCHelperColumnToPatients < ActiveRecord::Migration[5.2]
-  include MigrationHelper
-
   def change
     within_renalware_schema do
       add_column :patients, :checked_for_ukrdc_changes_at, :datetime

data/db/migrate/20181026145459_create_ukrdc_batch_numbers.rb

@@ -1,8 +1,10 @@
 class CreateUKRDCBatchNumbers < ActiveRecord::Migration[5.2]
   def change
-    create_table "renalware.ukrdc_batch_numbers" do |t|
-      # no other columns, we just use the id as the batch number when sending data to the UKRDC.
-      t.timestamps null: false
+    within_renalware_schema do
+      create_table :ukrdc_batch_numbers do |t|
+        # no other columns, we just use the id as the batch number when sending data to the UKRDC.
+        t.timestamps null: false
+      end
     end
   end
 end

data/db/migrate/20181106133500_update_hd_overall_audit_to_version_9.rb

@@ -1,6 +1,4 @@
 class UpdateHDOverallAuditToVersion9 < ActiveRecord::Migration[5.1]
-  include MigrationHelper
-
   def change
     within_renalware_schema do
       update_view :reporting_hd_overall_audit,

data/db/migrate/20181109110616_create_hd_grouped_transmission_logs_view.rb

@@ -1,6 +1,4 @@
 class CreateHDGroupedTransmissionLogsView < ActiveRecord::Migration[5.2]
-  include MigrationHelper
-
   def change
     within_renalware_schema do
       create_view :hd_grouped_transmission_logs

data/db/migrate/20181126090401_add_warnings_to_hd_transmission_logs.rb

@@ -0,0 +1,7 @@
+class AddWarningsToHDTransmissionLogs < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :hd_transmission_logs, :warnings, :string, array: true, default: []
+    end
+  end
+end

data/db/migrate/20181126123745_refresh_hd_grouped_transmission_logs_view.rb

@@ -0,0 +1,8 @@
+class RefreshHDGroupedTransmissionLogsView < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      drop_view :hd_grouped_transmission_logs
+      create_view :hd_grouped_transmission_logs
+    end
+  end
+end

data/db/migrate/20181217124025_change_ukrdc_transmission_log_error_type.rb

@@ -0,0 +1,15 @@
+class ChangeUKRDCTransmissionLogErrorType < ActiveRecord::Migration[5.2]
+  def up
+    within_renalware_schema do
+      change_column(:ukrdc_transmission_logs, :error, "text[] USING (string_to_array(error, ','))")
+      change_column_default(:ukrdc_transmission_logs, :error, [])
+    end
+  end
+
+  def down
+    within_renalware_schema do
+      change_column(:ukrdc_transmission_logs, :error, :text, array: false)
+      change_column_default(:ukrdc_transmission_logs, :error, nil)
+    end
+  end
+end

data/db/seeds/default/practices/nhs_practices_sample.csv

@@ -1,6 +1,6 @@
 "code","name","street_1","street_2","town","postcode"
-"603698","GWENT FHSA","UNKNOWN","","","CF1 3PY"
-"608698","WEST GLAM FHSA","UNKNOWN","","","CF1 3PY"
+"A03698","GWENT FHSA","UNKNOWN","","","CF1 3PY"
+"A08698","WEST GLAM FHSA","UNKNOWN","","","CF1 3PY"
 "A81001","THE HEALTH CENTRE","LAWSON STREET","STOCKTON","CLEVELAND","TS18 1HU"
 "A81002","QUEENS PARK MEDICAL CTR","FARRER STREET","STOCKTON ON TEES","CLEVELAND","TS18 2AW"
 "A81003","THE HEALTH CENTRE","VICTORIA ROAD","HARTLEPOOL","CLEVELAND","TS26 8DB"

data/db/seeds/default/practices/primary_care_physicians_sample.csv

@@ -189,5 +189,5 @@
 61261,"A81020","G9809758","BARTON HR",22
 62169,"A81001","G9906600","OLIVER G",3
 62195,"A81012","G9906868","ADEBAYO AO",14
-62558,603698,"G9986039","GWENT DOCTORS",1
-62563,608698,"G9986084","WEST DOCTORS",2
+62558,A03698,"G9986039","GWENT DOCTORS",1
+62563,A08698,"G9986084","WEST DOCTORS",2

data/lib/core_extensions/active_record/migration_helpers.rb

@@ -3,6 +3,48 @@
 module CoreExtensions
   module ActiveRecord
     module MigrationHelpers
+      # Used in migrations to ensure the objects created/updated/found are in the correct schema.
+      # We ensure that the original schema_search_path defined in the database.yml in the host app
+      # is restored - this particularyl important for migations in an engine.
+      #
+      # Within this renalware core engine, use:
+      #
+      # def change
+      #   within_renalware_schema do
+      #     ...make database changes
+      #     ...any new objects will be created in the renalware schema
+      #   end
+      # end
+      #
+      # Within another engine eg renalware-diaverum:
+      #
+      # def change
+      #   within_renalware_schema(:diaverum) do
+      #     ...make database changes
+      #     ...any new objects will be created in the renalware_diaverum schema
+      #   end
+      # end
+      #
+      # If using from a host app eg renalware_blt (actualy this is optional):
+      #
+      # def change
+      #   within_renalware_schema(:blt) do
+      #     ...make database changes
+      #     ...any new objects will be created in the renalware_blt schema
+      #   end
+      # end
+      def within_renalware_schema(suffix: nil)
+        schemas = if suffix.present?
+                    "renalware_#{suffix},renalware,public"
+                  else
+                    "renalware,public"
+                  end
+        original_schema_search_path = connection.schema_search_path
+        connection.schema_search_path = schemas
+        yield if block_given?
+        connection.schema_search_path = original_schema_search_path
+      end
+
       # Can be called from a migration to load in a function from a sql file
       # at e.g. db/functions/my_function_v01.sql
       #
@@ -59,4 +101,4 @@ module CoreExtensions
   end
 end
 
-ActiveRecord::Migration[5.1].send(:prepend, CoreExtensions::ActiveRecord::MigrationHelpers)
+ActiveRecord::Migration.send(:prepend, CoreExtensions::ActiveRecord::MigrationHelpers)