Rename PatientSession::RegistrationStatus

thomasleese · thomasleese · commit c91a04b9e46d · 2025-09-08T08:58:07.000+01:00
This renames the model in preparation for replacing its association with
`PatientSession` to associations with the `Patient` and the `Session`
separately.

Jira-Issue: MAV-1821
diff --git a/app/controllers/sessions/register_controller.rb b/app/controllers/sessions/register_controller.rb
@@ -11,7 +11,7 @@ class Sessions::RegisterController < ApplicationController
   layout "full"
 
   def show
-    @statuses = PatientSession::RegistrationStatus.statuses.keys
+    @statuses = Patient::RegistrationStatus.statuses.keys
 
     scope =
       @session.patient_sessions.includes_programmes.includes(
diff --git a/app/lib/status_updater.rb b/app/lib/status_updater.rb
@@ -49,13 +49,13 @@ def update_consent_statuses!
   end
 
   def update_registration_statuses!
-    PatientSession::RegistrationStatus.import!(
+    Patient::RegistrationStatus.import!(
       %i[patient_session_id],
       registration_statuses_to_import,
       on_duplicate_key_ignore: true
     )
 
-    PatientSession::RegistrationStatus
+    Patient::RegistrationStatus
       .where(patient_session_id: patient_sessions.select(:id))
       .includes(
         :session_attendances,
@@ -68,7 +68,7 @@ def update_registration_statuses!
       .find_in_batches(batch_size: 10_000) do |batch|
         batch.each(&:assign_status)
 
-        PatientSession::RegistrationStatus.import!(
+        Patient::RegistrationStatus.import!(
           batch.select(&:changed?),
           on_duplicate_key_update: {
             conflict_target: [:id],
diff --git a/app/models/patient/registration_status.rb b/app/models/patient/registration_status.rb
@@ -2,22 +2,22 @@
 
 # == Schema Information
 #
-# Table name: patient_session_registration_statuses
+# Table name: patient_registration_statuses
 #
 #  id                 :bigint           not null, primary key
 #  status             :integer          default("unknown"), not null
 #  patient_session_id :bigint           not null
 #
 # Indexes
 #
-#  idx_on_patient_session_id_438fc21144                   (patient_session_id) UNIQUE
-#  index_patient_session_registration_statuses_on_status  (status)
+#  index_patient_registration_statuses_on_patient_session_id  (patient_session_id) UNIQUE
+#  index_patient_registration_statuses_on_status              (status)
 #
 # Foreign Keys
 #
 #  fk_rails_...  (patient_session_id => patient_sessions.id) ON DELETE => cascade
 #
-class PatientSession::RegistrationStatus < ApplicationRecord
+class Patient::RegistrationStatus < ApplicationRecord
   belongs_to :patient_session
 
   has_one :patient, through: :patient_session
diff --git a/app/models/patient_session.rb b/app/models/patient_session.rb
@@ -44,7 +44,7 @@ class PatientSession < ApplicationRecord
   belongs_to :patient
   belongs_to :session
 
-  has_one :registration_status
+  has_one :registration_status, class_name: "Patient::RegistrationStatus"
 
   has_one :location, through: :session
   has_one :subteam, through: :session
@@ -187,7 +187,7 @@ class PatientSession < ApplicationRecord
   scope :has_registration_status,
         ->(status) do
           where(
-            PatientSession::RegistrationStatus
+            Patient::RegistrationStatus
               .where("patient_session_id = patient_sessions.id")
               .where(status:)
               .arel
diff --git a/db/migrate/20250822153422_rename_patient_session_registration_status.rb b/db/migrate/20250822153422_rename_patient_session_registration_status.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RenamePatientSessionRegistrationStatus < ActiveRecord::Migration[8.0]
+  def change
+    rename_table :patient_session_registration_statuses,
+                 :patient_registration_statuses
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -618,11 +618,11 @@
     t.index ["status"], name: "index_patient_consent_statuses_on_status"
   end
 
-  create_table "patient_session_registration_statuses", force: :cascade do |t|
+  create_table "patient_registration_statuses", force: :cascade do |t|
     t.bigint "patient_session_id", null: false
     t.integer "status", default: 0, null: false
-    t.index ["patient_session_id"], name: "idx_on_patient_session_id_438fc21144", unique: true
-    t.index ["status"], name: "index_patient_session_registration_statuses_on_status"
+    t.index ["patient_session_id"], name: "index_patient_registration_statuses_on_patient_session_id", unique: true
+    t.index ["status"], name: "index_patient_registration_statuses_on_status"
   end
 
   create_table "patient_sessions", force: :cascade do |t|
@@ -1123,7 +1123,7 @@
   add_foreign_key "patient_changesets", "patients"
   add_foreign_key "patient_consent_statuses", "patients", on_delete: :cascade
   add_foreign_key "patient_consent_statuses", "programmes"
-  add_foreign_key "patient_session_registration_statuses", "patient_sessions", on_delete: :cascade
+  add_foreign_key "patient_registration_statuses", "patient_sessions", on_delete: :cascade
   add_foreign_key "patient_sessions", "patients"
   add_foreign_key "patient_sessions", "sessions"
   add_foreign_key "patient_specific_directions", "patients"
diff --git a/spec/factories/patient_registration_statuses.rb b/spec/factories/patient_registration_statuses.rb
@@ -2,24 +2,23 @@
 
 # == Schema Information
 #
-# Table name: patient_session_registration_statuses
+# Table name: patient_registration_statuses
 #
 #  id                 :bigint           not null, primary key
 #  status             :integer          default("unknown"), not null
 #  patient_session_id :bigint           not null
 #
 # Indexes
 #
-#  idx_on_patient_session_id_438fc21144                   (patient_session_id) UNIQUE
-#  index_patient_session_registration_statuses_on_status  (status)
+#  index_patient_registration_statuses_on_patient_session_id  (patient_session_id) UNIQUE
+#  index_patient_registration_statuses_on_status              (status)
 #
 # Foreign Keys
 #
 #  fk_rails_...  (patient_session_id => patient_sessions.id) ON DELETE => cascade
 #
 FactoryBot.define do
-  factory :patient_session_registration_status,
-          class: "PatientSession::RegistrationStatus" do
+  factory :patient_registration_status, class: "Patient::RegistrationStatus" do
     patient_session
 
     traits_for_enum :status
diff --git a/spec/factories/patient_sessions.rb b/spec/factories/patient_sessions.rb
@@ -44,17 +44,14 @@
 
     trait :unknown_attendance do
       registration_status do
-        association(
-          :patient_session_registration_status,
-          patient_session: instance
-        )
+        association(:patient_registration_status, patient_session: instance)
       end
     end
 
     trait :in_attendance do
       registration_status do
         association(
-          :patient_session_registration_status,
+          :patient_registration_status,
           :attending,
           patient_session: instance
         )
diff --git a/spec/factories/patients.rb b/spec/factories/patients.rb
@@ -137,11 +137,7 @@
             patient:,
             session: evaluator.session
           )
-          create(
-            :patient_session_registration_status,
-            :attending,
-            patient_session:
-          )
+          create(:patient_registration_status, :attending, patient_session:)
         end
       end
     end
diff --git a/spec/features/doubles_vaccination_cannot_record_as_admin_spec.rb b/spec/features/doubles_vaccination_cannot_record_as_admin_spec.rb
@@ -20,7 +20,7 @@ def given_i_am_signed_in_as_an_admin
       create(:patient, :consent_given_triage_not_needed, session: @session)
 
     create(
-      :patient_session_registration_status,
+      :patient_registration_status,
       patient_session:
         @patient.patient_sessions.includes(session: :session_dates).first
     )
diff --git a/spec/lib/status_updater_spec.rb b/spec/lib/status_updater_spec.rb
@@ -16,7 +16,7 @@
     end
 
     it "doesn't create any registration statuses" do
-      expect { call }.not_to change(PatientSession::RegistrationStatus, :count)
+      expect { call }.not_to change(Patient::RegistrationStatus, :count)
     end
 
     it "doesn't create any triage statuses" do
@@ -102,7 +102,7 @@
     end
 
     it "doesn't create any registration statuses" do
-      expect { call }.not_to change(PatientSession::RegistrationStatus, :count)
+      expect { call }.not_to change(Patient::RegistrationStatus, :count)
     end
 
     it "doesn't create any triage statuses" do
diff --git a/spec/models/patient/registration_status_spec.rb b/spec/models/patient/registration_status_spec.rb
@@ -2,24 +2,24 @@
 
 # == Schema Information
 #
-# Table name: patient_session_registration_statuses
+# Table name: patient_registration_statuses
 #
 #  id                 :bigint           not null, primary key
 #  status             :integer          default("unknown"), not null
 #  patient_session_id :bigint           not null
 #
 # Indexes
 #
-#  idx_on_patient_session_id_438fc21144                   (patient_session_id) UNIQUE
-#  index_patient_session_registration_statuses_on_status  (status)
+#  index_patient_registration_statuses_on_patient_session_id  (patient_session_id) UNIQUE
+#  index_patient_registration_statuses_on_status              (status)
 #
 # Foreign Keys
 #
 #  fk_rails_...  (patient_session_id => patient_sessions.id) ON DELETE => cascade
 #
-describe PatientSession::RegistrationStatus do
-  subject(:patient_session_registration_status) do
-    build(:patient_session_registration_status, patient_session:)
+describe Patient::RegistrationStatus do
+  subject(:patient_registration_status) do
+    build(:patient_registration_status, patient_session:)
   end
 
   around { |example| travel_to(Date.new(2025, 8, 31)) { example.run } }
@@ -34,9 +34,9 @@
   let(:patient_session) { create(:patient_session, patient:, session:) }
 
   it do
-    expect(patient_session_registration_status).to define_enum_for(
-      :status
-    ).with_values(%i[unknown attending not_attending completed])
+    expect(patient_registration_status).to define_enum_for(:status).with_values(
+      %i[unknown attending not_attending completed]
+    )
   end
 
   describe "associations" do
@@ -47,12 +47,12 @@
     subject do
       described_class
         .includes(:session_attendances)
-        .find(patient_session_registration_status.id)
+        .find(patient_registration_status.id)
         .session_attendance
     end
 
-    let(:patient_session_registration_status) do
-      create(:patient_session_registration_status, patient_session:)
+    let(:patient_registration_status) do
+      create(:patient_registration_status, patient_session:)
     end
 
     context "with no attendances" do
@@ -89,7 +89,7 @@
   end
 
   describe "#status" do
-    subject { patient_session_registration_status.assign_status }
+    subject { patient_registration_status.assign_status }
 
     context "with no session attendance" do
       it { should be(:unknown) }

Original file line number	Diff line number	Diff line change
`@@ -2,22 +2,22 @@`
`2`	`2`
`3`	`3`	`# == Schema Information`
`4`	`4`	`#`
`5`		`-# Table name: patient_session_registration_statuses`
	`5`	`+# Table name: patient_registration_statuses`
`6`	`6`	`#`
`7`	`7`	`# id :bigint not null, primary key`
`8`	`8`	`# status :integer default("unknown"), not null`
`9`	`9`	`# patient_session_id :bigint not null`
`10`	`10`	`#`
`11`	`11`	`# Indexes`
`12`	`12`	`#`
`13`		`-# idx_on_patient_session_id_438fc21144 (patient_session_id) UNIQUE`
`14`		`-# index_patient_session_registration_statuses_on_status (status)`
	`13`	`+# index_patient_registration_statuses_on_patient_session_id (patient_session_id) UNIQUE`
	`14`	`+# index_patient_registration_statuses_on_status (status)`
`15`	`15`	`#`
`16`	`16`	`# Foreign Keys`
`17`	`17`	`#`
`18`	`18`	`# fk_rails_... (patient_session_id => patient_sessions.id) ON DELETE => cascade`
`19`	`19`	`#`
`20`		`-class PatientSession::RegistrationStatus < ApplicationRecord`
	`20`	`+class Patient::RegistrationStatus < ApplicationRecord`
`21`	`21`	`belongs_to :patient_session`
`22`	`22`
`23`	`23`	`has_one :patient, through: :patient_session`
Original file line number	Diff line number	Diff line change
`@@ -2,24 +2,23 @@`
`2`	`2`
`3`	`3`	`# == Schema Information`
`4`	`4`	`#`
`5`		`-# Table name: patient_session_registration_statuses`
	`5`	`+# Table name: patient_registration_statuses`
`6`	`6`	`#`
`7`	`7`	`# id :bigint not null, primary key`
`8`	`8`	`# status :integer default("unknown"), not null`
`9`	`9`	`# patient_session_id :bigint not null`
`10`	`10`	`#`
`11`	`11`	`# Indexes`
`12`	`12`	`#`
`13`		`-# idx_on_patient_session_id_438fc21144 (patient_session_id) UNIQUE`
`14`		`-# index_patient_session_registration_statuses_on_status (status)`
	`13`	`+# index_patient_registration_statuses_on_patient_session_id (patient_session_id) UNIQUE`
	`14`	`+# index_patient_registration_statuses_on_status (status)`
`15`	`15`	`#`
`16`	`16`	`# Foreign Keys`
`17`	`17`	`#`
`18`	`18`	`# fk_rails_... (patient_session_id => patient_sessions.id) ON DELETE => cascade`
`19`	`19`	`#`
`20`	`20`	`FactoryBot.define do`
`21`		`- factory :patient_session_registration_status,`
`22`		`- class: "PatientSession::RegistrationStatus" do`
	`21`	`+ factory :patient_registration_status, class: "Patient::RegistrationStatus" do`
`23`	`22`	`patient_session`
`24`	`23`
`25`	`24`	`traits_for_enum :status`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ def given_i_am_signed_in_as_an_admin`
`20`	`20`	`create(:patient, :consent_given_triage_not_needed, session: @session)`
`21`	`21`
`22`	`22`	`create(`
`23`		`- :patient_session_registration_status,`
	`23`	`+ :patient_registration_status,`
`24`	`24`	`patient_session:`
`25`	`25`	`@patient.patient_sessions.includes(session: :session_dates).first`
`26`	`26`	`)`