Merge pull request #6412 from NHSDigital/consent-notification-team-location-2

Author: thomasleese

app/models/consent_notification.rb

@@ -11,7 +11,7 @@
 #  patient_id       :bigint           not null
 #  sent_by_user_id  :bigint
 #  session_id       :bigint
-#  team_location_id :bigint
+#  team_location_id :bigint           not null
 #
 # Indexes
 #
@@ -35,29 +35,13 @@ class ConsentNotification < ApplicationRecord
 
   belongs_to :patient
   belongs_to :session, optional: true
-  belongs_to :team_location, optional: true
+  belongs_to :team_location
 
-  scope :left_joins_session_team_location, -> { joins(<<-SQL) }
-    LEFT JOIN sessions
-    ON sessions.id = consent_notifications.session_id
-    LEFT JOIN team_locations AS session_team_locations
-    ON session_team_locations.id = sessions.team_location_id
-  SQL
+  has_one :team, through: :team_location
 
   scope :for_academic_year,
         ->(academic_year) do
-          joined_scope =
-            left_joins(:team_location).left_joins_session_team_location
-
-          joined_scope.where(
-            "session_team_locations.academic_year = ?",
-            academic_year
-          ).or(
-            joined_scope.where(
-              "team_locations.academic_year = ?",
-              academic_year
-            )
-          )
+          joins(:team_location).where(team_locations: { academic_year: })
         end
 
   enum :type,
@@ -66,9 +50,7 @@ class ConsentNotification < ApplicationRecord
 
   scope :reminder, -> { initial_reminder.or(subsequent_reminder) }
 
-  def team = (team_location || session).team
-
-  def academic_year = (team_location || session).academic_year
+  delegate :academic_year, to: :team_location
 
   def reminder? = initial_reminder? || subsequent_reminder?
 

db/migrate/20260324115708_make_consent_notification_team_location_not_null.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MakeConsentNotificationTeamLocationNotNull < ActiveRecord::Migration[8.1]
+  def change
+    change_column_null :consent_notifications, :team_location_id, false
+  end
+end

db/schema.rb

@@ -295,7 +295,7 @@
     t.datetime "sent_at", default: -> { "CURRENT_TIMESTAMP" }, null: false
     t.bigint "sent_by_user_id"
     t.bigint "session_id"
-    t.bigint "team_location_id"
+    t.bigint "team_location_id", null: false
     t.integer "type", null: false
     t.index ["patient_id"], name: "index_consent_notifications_on_patient_id"
     t.index ["programme_types"], name: "index_consent_notifications_on_programme_types", using: :gin

spec/factories/consent_notifications.rb

@@ -11,7 +11,7 @@
 #  patient_id       :bigint           not null
 #  sent_by_user_id  :bigint
 #  session_id       :bigint
-#  team_location_id :bigint
+#  team_location_id :bigint           not null
 #
 # Indexes
 #

spec/models/consent_notification_spec.rb

@@ -11,7 +11,7 @@
 #  patient_id       :bigint           not null
 #  sent_by_user_id  :bigint
 #  session_id       :bigint
-#  team_location_id :bigint
+#  team_location_id :bigint           not null
 #
 # Indexes
 #
@@ -31,6 +31,6 @@
   describe "associations" do
     it { should belong_to(:patient) }
     it { should belong_to(:session).optional(true) }
-    it { should belong_to(:team_location).optional(true) }
+    it { should belong_to(:team_location) }
   end
 end