Remove unused pre-screening columns

This removes a number of columns from the pre-screening model which are
no longer used and therefore can be safely removed.

Author: thomasleese

]

@@ -0,0 +1,47 @@
+Simplify pre-screening checks
+
+This updates the designs of the pre-screening checks to match the latest
+designs in the prototype where the process has been simplified to have
+only a single checkbox rather than a checkbox for each question. The
+content has also been refreshed to match the medical guidance.
+
+# Conflicts:
+#	spec/features/e2e_journey_spec.rb
+#	spec/features/hpv_vaccination_administered_spec.rb
+#	spec/features/hpv_vaccination_already_had_spec.rb
+#	spec/features/hpv_vaccination_clinic_spec.rb
+#	spec/features/hpv_vaccination_delayed_spec.rb
+#	spec/features/vaccination_todays_batch_spec.rb
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# interactive rebase in progress; onto 8bf4bba60
+# Last commands done (2 commands done):
+#    pick 8ef13d8e8 Refactor pre-screening feature specs
+#    pick 766d04241 Simplify pre-screening checks
+# Next command to do (1 remaining command):
+#    pick ce12b90dc Remove unused pre-screening columns
+# You are currently rebasing branch 'redesign-pre-screening-single-question' on '8bf4bba60'.
+#
+# Changes to be committed:
+#	modified:   app/components/app_patient_page_component.rb
+#	modified:   app/components/app_vaccinate_form_component.html.erb
+#	modified:   app/controllers/vaccinations_controller.rb
+#	modified:   app/forms/vaccinate_form.rb
+#	modified:   app/models/pre_screening.rb
+#	modified:   config/locales/en.yml
+#	modified:   config/locales/helpers.en.yml
+#	modified:   spec/components/app_patient_page_component_spec.rb
+#	modified:   spec/features/doubles_vaccination_administered_spec.rb
+#	modified:   spec/features/e2e_journey_spec.rb
+#	modified:   spec/features/hpv_vaccination_administered_spec.rb
+#	modified:   spec/features/hpv_vaccination_already_had_spec.rb
+#	modified:   spec/features/hpv_vaccination_clinic_spec.rb
+#	modified:   spec/features/hpv_vaccination_delayed_spec.rb
+#	modified:   spec/features/menacwy_vaccination_administered_spec.rb
+#	modified:   spec/features/pre_screening_spec.rb
+#	modified:   spec/features/td_ipv_vaccination_administered_spec.rb
+#	modified:   spec/features/vaccination_todays_batch_spec.rb
+#	modified:   spec/models/pre_screening_spec.rb
+#

app/forms/vaccinate_form.rb

@@ -62,20 +62,9 @@ def ask_not_pregnant? = programme.td_ipv?
   def pre_screening
     @pre_screening ||=
       patient_session.pre_screenings.build(
-        feeling_well: true,
-        knows_vaccination: true,
-        no_allergies: true,
-        not_already_had: true,
-        not_pregnant: true,
-        not_taking_medication: true,
         notes: pre_screening_notes,
         performed_by: current_user,
-        programme:,
-        session_date_id:
+        programme:
       )
   end
-
-  def session_date_id
-    patient_session.session.session_dates.today.first&.id
-  end
 end

app/models/pre_screening.rb

@@ -4,40 +4,30 @@
 #
 # Table name: pre_screenings
 #
-#  id                    :bigint           not null, primary key
-#  feeling_well          :boolean          not null
-#  knows_vaccination     :boolean          not null
-#  no_allergies          :boolean          not null
-#  not_already_had       :boolean          not null
-#  not_pregnant          :boolean          not null
-#  not_taking_medication :boolean          not null
-#  notes                 :text             default(""), not null
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  patient_session_id    :bigint           not null
-#  performed_by_user_id  :bigint           not null
-#  programme_id          :bigint           not null
-#  session_date_id       :bigint           not null
+#  id                   :bigint           not null, primary key
+#  notes                :text             default(""), not null
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#  patient_session_id   :bigint           not null
+#  performed_by_user_id :bigint           not null
+#  programme_id         :bigint           not null
 #
 # Indexes
 #
 #  index_pre_screenings_on_patient_session_id    (patient_session_id)
 #  index_pre_screenings_on_performed_by_user_id  (performed_by_user_id)
 #  index_pre_screenings_on_programme_id          (programme_id)
-#  index_pre_screenings_on_session_date_id       (session_date_id)
 #
 # Foreign Keys
 #
 #  fk_rails_...  (patient_session_id => patient_sessions.id)
 #  fk_rails_...  (performed_by_user_id => users.id)
 #  fk_rails_...  (programme_id => programmes.id)
-#  fk_rails_...  (session_date_id => session_dates.id)
 #
 class PreScreening < ApplicationRecord
   audited associated_with: :patient_session
 
   belongs_to :patient_session
-  belongs_to :session_date
   belongs_to :programme
   belongs_to :performed_by,
              class_name: "User",

app/models/session_date.rb

@@ -22,7 +22,6 @@ class SessionDate < ApplicationRecord
   belongs_to :session
 
   has_many :session_attendances, dependent: :restrict_with_error
-  has_many :pre_screenings, dependent: :restrict_with_error
 
   scope :for_session, -> { where("session_id = sessions.id") }
 

db/migrate/20250505193919_remove_from_pre_screenings.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class RemoveFromPreScreenings < ActiveRecord::Migration[8.0]
+  def up
+    change_table :pre_screenings, bulk: true do |t|
+      t.remove :feeling_well,
+               :knows_vaccination,
+               :no_allergies,
+               :not_already_had,
+               :not_pregnant,
+               :not_taking_medication
+      t.remove_references :session_date
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_04_29_140846) do
+ActiveRecord::Schema[8.0].define(version: 2025_05_05_193919) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
   enable_extension "pg_trgm"
@@ -631,21 +631,13 @@
   create_table "pre_screenings", force: :cascade do |t|
     t.bigint "patient_session_id", null: false
     t.bigint "performed_by_user_id", null: false
-    t.boolean "knows_vaccination", null: false
-    t.boolean "not_already_had", null: false
-    t.boolean "feeling_well", null: false
-    t.boolean "no_allergies", null: false
     t.text "notes", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.bigint "programme_id", null: false
-    t.boolean "not_taking_medication", null: false
-    t.boolean "not_pregnant", null: false
-    t.bigint "session_date_id", null: false
     t.index ["patient_session_id"], name: "index_pre_screenings_on_patient_session_id"
     t.index ["performed_by_user_id"], name: "index_pre_screenings_on_performed_by_user_id"
     t.index ["programme_id"], name: "index_pre_screenings_on_programme_id"
-    t.index ["session_date_id"], name: "index_pre_screenings_on_session_date_id"
   end
 
   create_table "programmes", force: :cascade do |t|
@@ -910,7 +902,6 @@
   add_foreign_key "patients", "organisations"
   add_foreign_key "pre_screenings", "patient_sessions"
   add_foreign_key "pre_screenings", "programmes"
-  add_foreign_key "pre_screenings", "session_dates"
   add_foreign_key "pre_screenings", "users", column: "performed_by_user_id"
   add_foreign_key "school_move_log_entries", "locations", column: "school_id"
   add_foreign_key "school_move_log_entries", "patients"

spec/components/app_activity_log_component_spec.rb

@@ -394,7 +394,6 @@
     before do
       create(
         :pre_screening,
-        :allows_vaccination,
         performed_by: user,
         patient_session:,
         notes: "Some notes",

spec/components/app_patient_page_component_spec.rb

@@ -129,25 +129,14 @@
   describe "#default_vaccinate_form" do
     subject(:vaccinate_form) { component.default_vaccinate_form }
 
-    context "when a pre-screening from today's session and programme exists" do
-      let(:today) { Date.current }
-      let(:patient_session) do
-        create(:patient_session, :session_in_progress, programmes:)
-      end
-      let(:session_date_today) { SessionDate.find_or_create_by(value: today) }
+    let(:patient_session) { create(:patient_session, programmes:) }
 
+    context "when a pre-screening from today's session and programme exists" do
       before do
         create(
           :pre_screening,
           patient_session:,
           programme: programmes.first,
-          session_date: session_date_today,
-          feeling_well: true,
-          knows_vaccination: true,
-          no_allergies: true,
-          not_already_had: true,
-          not_pregnant: true,
-          not_taking_medication: true,
           notes: "Today's prescreening"
         )
       end
@@ -162,24 +151,11 @@
     end
 
     context "when a pre-screening from today's session and different programme exists" do
-      let(:today) { Date.current }
-      let(:patient_session) do
-        create(:patient_session, :session_in_progress, programmes:)
-      end
-      let(:session_date_today) { SessionDate.find_or_create_by(value: today) }
-
       before do
         create(
           :pre_screening,
           patient_session:,
           programme: programmes.second,
-          session_date: session_date_today,
-          feeling_well: true,
-          knows_vaccination: true,
-          no_allergies: true,
-          not_already_had: true,
-          not_pregnant: true,
-          not_taking_medication: true,
           notes: "Today's prescreening"
         )
       end
@@ -194,24 +170,12 @@
     end
 
     context "when a pre-screening from yesterday's session and programme exists" do
-      subject(:vaccinate_form) { component.default_vaccinate_form }
-
-      let(:today) { Date.current }
-      let(:patient_session) do
-        create(:patient_session, :session_in_progress, programmes:)
-      end
-      let(:session_date_yesterday) { create(:session_date, value: today - 1) }
-      let(:pre_screening_yesterday) do
+      before do
         create(
           :pre_screening,
           patient_session:,
-          session_date: session_date_yesterday,
-          feeling_well: true,
-          knows_vaccination: true,
-          no_allergies: true,
-          not_already_had: true,
-          not_pregnant: true,
-          not_taking_medication: true,
+          programme: programmes.first,
+          created_at: 1.day.ago,
           notes: "Yesterday's prescreening"
         )
       end

spec/components/app_triage_notes_component_spec.rb

@@ -69,7 +69,6 @@
     before do
       create(
         :pre_screening,
-        :allows_vaccination,
         patient_session:,
         notes: "Some notes",
         performed_by:,

spec/factories/pre_screenings.rb

@@ -4,60 +4,31 @@
 #
 # Table name: pre_screenings
 #
-#  id                    :bigint           not null, primary key
-#  feeling_well          :boolean          not null
-#  knows_vaccination     :boolean          not null
-#  no_allergies          :boolean          not null
-#  not_already_had       :boolean          not null
-#  not_pregnant          :boolean          not null
-#  not_taking_medication :boolean          not null
-#  notes                 :text             default(""), not null
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  patient_session_id    :bigint           not null
-#  performed_by_user_id  :bigint           not null
-#  programme_id          :bigint           not null
-#  session_date_id       :bigint           not null
+#  id                   :bigint           not null, primary key
+#  notes                :text             default(""), not null
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#  patient_session_id   :bigint           not null
+#  performed_by_user_id :bigint           not null
+#  programme_id         :bigint           not null
 #
 # Indexes
 #
 #  index_pre_screenings_on_patient_session_id    (patient_session_id)
 #  index_pre_screenings_on_performed_by_user_id  (performed_by_user_id)
 #  index_pre_screenings_on_programme_id          (programme_id)
-#  index_pre_screenings_on_session_date_id       (session_date_id)
 #
 # Foreign Keys
 #
 #  fk_rails_...  (patient_session_id => patient_sessions.id)
 #  fk_rails_...  (performed_by_user_id => users.id)
 #  fk_rails_...  (programme_id => programmes.id)
-#  fk_rails_...  (session_date_id => session_dates.id)
 #
 FactoryBot.define do
   factory :pre_screening do
     patient_session
     programme { patient_session.programmes.first }
-    session_date { patient_session.session.session_dates.first }
     performed_by
-
-    trait :allows_vaccination do
-      knows_vaccination { true }
-      not_already_had { true }
-      feeling_well { true }
-      no_allergies { true }
-      not_taking_medication { true }
-      not_pregnant { true }
-      notes { "Fine to vaccinate" }
-    end
-
-    trait :prevents_vaccination do
-      knows_vaccination { false }
-      not_already_had { false }
-      feeling_well { false }
-      no_allergies { false }
-      not_taking_medication { false }
-      not_pregnant { false }
-      notes { "Not safe to vaccinate" }
-    end
+    notes { "Fine to vaccinate" }
   end
 end