From 14a232991587e6650826a1cafa3543ef3a90cf94 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Mon, 16 Feb 2026 20:36:22 -0500
Subject: [PATCH 01/11] WIP: search boxes filter buttons need js to not show
 previous search in title after clicking

---
 app/frontend/javascript/controllers/collection_controller.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/frontend/javascript/controllers/collection_controller.js b/app/frontend/javascript/controllers/collection_controller.js
index a9faf4c0b..bb43eaa1e 100644
--- a/app/frontend/javascript/controllers/collection_controller.js
+++ b/app/frontend/javascript/controllers/collection_controller.js
@@ -67,6 +67,7 @@ export default class extends Controller {
       input.checked = false;
     });
     // this.element.reset();
+    this.element.reset();
     this.submitForm();
   }
 

From 44e383aea6fbe2cff6ae1392b7373dad85733189 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 15 Feb 2026 17:22:34 +0000
Subject: [PATCH 02/11] Initial plan


From 8cb84e7a3460b92f72ce037d7b31086657e466d1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 15 Feb 2026 17:29:30 +0000
Subject: [PATCH 03/11] Add most_recent sort option for workshops

Co-authored-by: maebeale <7607813+maebeale@users.noreply.github.com>
---
 app/services/workshop_search_service.rb       | 11 +++++++----
 app/views/workshops/_sort_by_options.html.erb |  8 ++++++++
 spec/services/workshop_search_service_spec.rb | 15 +++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/services/workshop_search_service.rb b/app/services/workshop_search_service.rb
index e34c93280..c79162d0d 100644
--- a/app/services/workshop_search_service.rb
+++ b/app/services/workshop_search_service.rb
@@ -228,6 +228,8 @@ def order_by_params
         title ASC
       SQL
       )
+    when "most_recent"
+      @workshops = @workshops.order(created_at: :desc, title: :asc)
     when "led"
       @workshops = @workshops.order(led_count: :desc, title: :asc)
     when "popularity"
@@ -250,10 +252,11 @@ def resolve_ids_order
 
     sort_columns =
       case sort
-      when "created"    then [ :id, :created_at, :year, :month, :title ]
-      when "led"        then [ :id, :led_count, :title ]
-      when "popularity" then [ :id, :bookmarks_count, :title ]
-      when "title"      then [ :id, :title ]
+      when "created"      then [ :id, :created_at, :year, :month, :title ]
+      when "most_recent"  then [ :id, :created_at, :title ]
+      when "led"          then [ :id, :led_count, :title ]
+      when "popularity"   then [ :id, :bookmarks_count, :title ]
+      when "title"        then [ :id, :title ]
       else [ :id, :title ]
       end
 
diff --git a/app/views/workshops/_sort_by_options.html.erb b/app/views/workshops/_sort_by_options.html.erb
index d98edb890..f95ca1110 100644
--- a/app/views/workshops/_sort_by_options.html.erb
+++ b/app/views/workshops/_sort_by_options.html.erb
@@ -6,6 +6,14 @@
   </label>
 </div>
 
+<div class="flex items-center gap-1">
+  <label class="flex items-center gap-1 cursor-pointer">
+    <%= radio_button_tag :sort, "most_recent",
+                         @sort == "most_recent" %>
+    <span class="text-sm">Most recent</span>
+  </label>
+</div>
+
 <div class="flex items-center gap-1">
   <label class="flex items-center gap-1 cursor-pointer">
     <%= radio_button_tag :sort, "title",
diff --git a/spec/services/workshop_search_service_spec.rb b/spec/services/workshop_search_service_spec.rb
index 80a9afade..d20a9e6c6 100644
--- a/spec/services/workshop_search_service_spec.rb
+++ b/spec/services/workshop_search_service_spec.rb
@@ -41,6 +41,21 @@
       end
     end
 
+    context "sorting by most_recent" do
+      it "orders by created_at desc, then title asc" do
+        service = WorkshopSearchService.new({ sort: 'most_recent' }, user: user).call
+        workshops = service.workshops
+
+        # Assert order by created_at (newest first), ignoring year/month
+        expect(workshops.map { |w| [ w.created_at.to_date, w.title ] }).to eq([
+                                                                               [ 2.days.ago.to_date, "Keyword Match" ],
+                                                                               [ 2.days.ago.to_date, "Public Workshop" ],
+                                                                               [ 3.days.ago.to_date, "B Workshop" ],
+                                                                               [ 5.days.ago.to_date, "A Workshop" ]
+                                                                             ])
+      end
+    end
+
     context "sorting by title" do
       it "orders alphabetically by title" do
         service = WorkshopSearchService.new({ sort: 'title' }, user: user).call

From 70cd13112fba718eae3fcb97b226a7c97870c0a8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 15 Feb 2026 19:03:08 +0000
Subject: [PATCH 04/11] Revert most_recent addition - use existing created sort

Co-authored-by: maebeale <7607813+maebeale@users.noreply.github.com>
---
 app/services/workshop_search_service.rb       | 11 ++++-------
 app/views/workshops/_sort_by_options.html.erb |  8 --------
 spec/services/workshop_search_service_spec.rb | 15 ---------------
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/app/services/workshop_search_service.rb b/app/services/workshop_search_service.rb
index c79162d0d..e34c93280 100644
--- a/app/services/workshop_search_service.rb
+++ b/app/services/workshop_search_service.rb
@@ -228,8 +228,6 @@ def order_by_params
         title ASC
       SQL
       )
-    when "most_recent"
-      @workshops = @workshops.order(created_at: :desc, title: :asc)
     when "led"
       @workshops = @workshops.order(led_count: :desc, title: :asc)
     when "popularity"
@@ -252,11 +250,10 @@ def resolve_ids_order
 
     sort_columns =
       case sort
-      when "created"      then [ :id, :created_at, :year, :month, :title ]
-      when "most_recent"  then [ :id, :created_at, :title ]
-      when "led"          then [ :id, :led_count, :title ]
-      when "popularity"   then [ :id, :bookmarks_count, :title ]
-      when "title"        then [ :id, :title ]
+      when "created"    then [ :id, :created_at, :year, :month, :title ]
+      when "led"        then [ :id, :led_count, :title ]
+      when "popularity" then [ :id, :bookmarks_count, :title ]
+      when "title"      then [ :id, :title ]
       else [ :id, :title ]
       end
 
diff --git a/app/views/workshops/_sort_by_options.html.erb b/app/views/workshops/_sort_by_options.html.erb
index f95ca1110..d98edb890 100644
--- a/app/views/workshops/_sort_by_options.html.erb
+++ b/app/views/workshops/_sort_by_options.html.erb
@@ -6,14 +6,6 @@
   </label>
 </div>
 
-<div class="flex items-center gap-1">
-  <label class="flex items-center gap-1 cursor-pointer">
-    <%= radio_button_tag :sort, "most_recent",
-                         @sort == "most_recent" %>
-    <span class="text-sm">Most recent</span>
-  </label>
-</div>
-
 <div class="flex items-center gap-1">
   <label class="flex items-center gap-1 cursor-pointer">
     <%= radio_button_tag :sort, "title",
diff --git a/spec/services/workshop_search_service_spec.rb b/spec/services/workshop_search_service_spec.rb
index d20a9e6c6..80a9afade 100644
--- a/spec/services/workshop_search_service_spec.rb
+++ b/spec/services/workshop_search_service_spec.rb
@@ -41,21 +41,6 @@
       end
     end
 
-    context "sorting by most_recent" do
-      it "orders by created_at desc, then title asc" do
-        service = WorkshopSearchService.new({ sort: 'most_recent' }, user: user).call
-        workshops = service.workshops
-
-        # Assert order by created_at (newest first), ignoring year/month
-        expect(workshops.map { |w| [ w.created_at.to_date, w.title ] }).to eq([
-                                                                               [ 2.days.ago.to_date, "Keyword Match" ],
-                                                                               [ 2.days.ago.to_date, "Public Workshop" ],
-                                                                               [ 3.days.ago.to_date, "B Workshop" ],
-                                                                               [ 5.days.ago.to_date, "A Workshop" ]
-                                                                             ])
-      end
-    end
-
     context "sorting by title" do
       it "orders alphabetically by title" do
         service = WorkshopSearchService.new({ sort: 'title' }, user: user).call

From c433fe4a4ef741fa684e8d85e14cab51acad2341 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Sun, 15 Feb 2026 15:41:32 -0500
Subject: [PATCH 05/11] Adjust sorting settings

---
 app/controllers/concerns/ahoy_tracking.rb     |  2 +-
 app/controllers/workshops_controller.rb       |  4 +--
 app/views/workshops/_filters.html.erb         | 14 ++++----
 spec/services/workshop_search_service_spec.rb | 35 +++++++++++++++++++
 4 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/app/controllers/concerns/ahoy_tracking.rb b/app/controllers/concerns/ahoy_tracking.rb
index f74a1e771..cbc7441da 100644
--- a/app/controllers/concerns/ahoy_tracking.rb
+++ b/app/controllers/concerns/ahoy_tracking.rb
@@ -14,7 +14,7 @@ def track_index_intent(resource_class, scope, params)
       if scope.respond_to?(:total_entries) # will_paginate
         scope.total_entries
       elsif scope.respond_to?(:count)
-        count = scope.count
+        count = scope.unscope(:select).count
         count.is_a?(Hash) ? count.size : count
       else
         0
diff --git a/app/controllers/workshops_controller.rb b/app/controllers/workshops_controller.rb
index 01fbcf61a..6dd38ac80 100644
--- a/app/controllers/workshops_controller.rb
+++ b/app/controllers/workshops_controller.rb
@@ -4,8 +4,8 @@ class WorkshopsController < ApplicationController
 
   def index
     authorize!
-    @category_types = CategoryType.published.order(:name).decorate
-    @sectors        = Sector.published
+    @category_types = CategoryType.published.where(story_specific: false).order(:name).decorate
+    @sectors        = Sector.published.order(:name)
     @windows_types  = WindowsType.all
 
     if turbo_frame_request?
diff --git a/app/views/workshops/_filters.html.erb b/app/views/workshops/_filters.html.erb
index 9dc442319..880deae7b 100644
--- a/app/views/workshops/_filters.html.erb
+++ b/app/views/workshops/_filters.html.erb
@@ -24,6 +24,13 @@
 
 <div class="grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-4 gap-4 overflow-visible p-4">
 
+  <%= render "dropdown_filter",
+             dom_id_prefix: "windows-types",
+             label_text: "Windows Type",
+             items: @windows_types,
+             label_method: :short_name,
+             param_name: :windows_types %>
+
   <%= render "categories_fields", category_types: @category_types %>
 
   <%= render "dropdown_filter",
@@ -32,12 +39,5 @@
              items: @sectors.reject { |sector| sector.name == "Other" },
              param_name: :sectors %>
 
-  <%= render "dropdown_filter",
-             dom_id_prefix: "windows-types",
-             label_text: "Windows Type",
-             items: @windows_types,
-             label_method: :short_name,
-             param_name: :windows_types %>
-
   <%= render "inactive_fields" if allowed_to?(:manage?, Workshop) %>
 </div>
diff --git a/spec/services/workshop_search_service_spec.rb b/spec/services/workshop_search_service_spec.rb
index 80a9afade..de1e0406e 100644
--- a/spec/services/workshop_search_service_spec.rb
+++ b/spec/services/workshop_search_service_spec.rb
@@ -49,6 +49,41 @@
       end
     end
 
+    context "sorting by title ignores punctuation" do
+      let!(:hyphenated)  { create(:workshop, :published, title: "Self-Care Workshop") }
+      let!(:spaced)      { create(:workshop, :published, title: "Self Care Zen") }
+      let!(:quoted)      { create(:workshop, :published, title: '"I Am" Mandalas') }
+      let!(:numbered)    { create(:workshop, :published, title: "100 New Ideas") }
+      let!(:lowercase)   { create(:workshop, :published, title: "a lowercase title") }
+
+      it "sorts case-insensitively" do
+        service = WorkshopSearchService.new({ sort: "title" }, user: user).call
+        titles = service.workshops.map(&:title)
+
+        lowercase_idx = titles.index("a lowercase title")
+        b_workshop_idx = titles.index("B Workshop")
+        expect(lowercase_idx).to be < b_workshop_idx
+      end
+
+      it "sorts numbers before letters" do
+        service = WorkshopSearchService.new({ sort: "title" }, user: user).call
+        titles = service.workshops.map(&:title)
+
+        numbered_idx = titles.index("100 New Ideas")
+        quoted_idx = titles.index('"I Am" Mandalas')
+        expect(numbered_idx).to be < quoted_idx
+      end
+
+      it "sorts hyphenated and spaced titles adjacently" do
+        service = WorkshopSearchService.new({ sort: "title" }, user: user).call
+        titles = service.workshops.map(&:title)
+
+        care_idx = titles.index("Self-Care Workshop")
+        zen_idx = titles.index("Self Care Zen")
+        expect((care_idx - zen_idx).abs).to eq(1)
+      end
+    end
+
     context "sorting by led" do
       it "orders descending by led_count then title" do
         service = WorkshopSearchService.new({ sort: 'led' }, user: user).call

From 824bde82d6e8625deea414d2bceeb40cbb6d92e6 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Sun, 15 Feb 2026 15:41:50 -0500
Subject: [PATCH 06/11] Change Windows Type to Windows Audience

---
 app/views/workshops/_filters.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/workshops/_filters.html.erb b/app/views/workshops/_filters.html.erb
index 880deae7b..924e40804 100644
--- a/app/views/workshops/_filters.html.erb
+++ b/app/views/workshops/_filters.html.erb
@@ -26,7 +26,7 @@
 
   <%= render "dropdown_filter",
              dom_id_prefix: "windows-types",
-             label_text: "Windows Type",
+             label_text: "Windows Audience",
              items: @windows_types,
              label_method: :short_name,
              param_name: :windows_types %>

From 8a351bce11dde8426d9dc99eb6c2a898809f858e Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Sun, 15 Feb 2026 15:43:23 -0500
Subject: [PATCH 07/11] Change default workshops sort to title instead of
 Newest

---
 app/services/workshop_search_service.rb       | 2 +-
 spec/services/workshop_search_service_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/services/workshop_search_service.rb b/app/services/workshop_search_service.rb
index e34c93280..2b8f7a5c8 100644
--- a/app/services/workshop_search_service.rb
+++ b/app/services/workshop_search_service.rb
@@ -29,7 +29,7 @@ def call
 
   # Compute the effective sort
   def default_sort
-    params[:sort].presence || "created"
+    params[:sort].presence || "title"
     # return params[:sort] if params[:sort].present?
     # return 'keywords' if params[:query].present? # only when returning weighted results from # search_by_query
     # 'title'
diff --git a/spec/services/workshop_search_service_spec.rb b/spec/services/workshop_search_service_spec.rb
index de1e0406e..cb6549b0e 100644
--- a/spec/services/workshop_search_service_spec.rb
+++ b/spec/services/workshop_search_service_spec.rb
@@ -160,9 +160,9 @@
         expect(service.sort).to eq('keywords')
       end
 
-      it "defaults to created if no query or sort is provided" do
+      it "defaults to title if no query or sort is provided" do
         service = WorkshopSearchService.new({}, user: user).call
-        expect(service.sort).to eq('created')
+        expect(service.sort).to eq('title')
       end
     end
 

From 0b1a544ff7c82d907a9d13843fbbcb6a0c3c7548 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Sun, 15 Feb 2026 16:04:58 -0500
Subject: [PATCH 08/11] merge

---
 app/models/affiliation.rb                     |  1 +
 ...null_constraints_to_organization_people.rb | 28 +++++++++++++++++++
 spec/models/affiliation_spec.rb               |  2 +-
 spec/system/workshops_spec.rb                 |  2 +-
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20260215205007_add_not_null_constraints_to_organization_people.rb

diff --git a/app/models/affiliation.rb b/app/models/affiliation.rb
index 4cb45c248..659c8e75a 100644
--- a/app/models/affiliation.rb
+++ b/app/models/affiliation.rb
@@ -4,6 +4,7 @@ class Affiliation < ApplicationRecord
 
   # Validations
   validates_presence_of :organization_id
+  validates_presence_of :person_id
 
   # Enum
   enum :position, { default: 0, liaison: 1, leader: 2, assistant: 3 }
diff --git a/db/migrate/20260215205007_add_not_null_constraints_to_organization_people.rb b/db/migrate/20260215205007_add_not_null_constraints_to_organization_people.rb
new file mode 100644
index 000000000..9bf923e39
--- /dev/null
+++ b/db/migrate/20260215205007_add_not_null_constraints_to_organization_people.rb
@@ -0,0 +1,28 @@
+class AddNotNullConstraintsToOrganizationPeople < ActiveRecord::Migration[8.1]
+  def up
+    # Clean up any orphaned records before adding constraints
+    OrganizationPerson.where(organization_id: nil).destroy_all
+    OrganizationPerson.where(person_id: nil).destroy_all
+
+    change_column_null :organization_people, :organization_id, false
+    change_column_null :organization_people, :person_id, false
+
+    # Fix column type so foreign key can be added (people.id is int, not bigint)
+    change_column :organization_people, :person_id, :integer, null: false
+
+    unless foreign_key_exists?(:organization_people, :people, column: :person_id)
+      add_foreign_key :organization_people, :people, column: :person_id
+    end
+  end
+
+  def down
+    change_column_null :organization_people, :organization_id, true
+    change_column_null :organization_people, :person_id, true
+
+    if foreign_key_exists?(:organization_people, :people, column: :person_id)
+      remove_foreign_key :organization_people, :people, column: :person_id
+    end
+
+    change_column :organization_people, :person_id, :bigint
+  end
+end
diff --git a/spec/models/affiliation_spec.rb b/spec/models/affiliation_spec.rb
index 4f1002993..1f2ac7d79 100644
--- a/spec/models/affiliation_spec.rb
+++ b/spec/models/affiliation_spec.rb
@@ -11,7 +11,7 @@
       build(:affiliation, organization: create(:organization), person: create(:person))
     end
     it { should validate_presence_of(:organization_id) }
-    it { should belong_to(:person) }
+    it { should validate_presence_of(:person_id) }
   end
 
   describe 'enums' do
diff --git a/spec/system/workshops_spec.rb b/spec/system/workshops_spec.rb
index a0fbf8f93..38c76cd18 100644
--- a/spec/system/workshops_spec.rb
+++ b/spec/system/workshops_spec.rb
@@ -36,7 +36,7 @@
         fill_in 'query', with: 'best workshop'
 
         # Open the dropdown
-        click_on "Windows Type"  # this clicks the <button> text/label
+        click_on "Windows Audience"  # this clicks the <button> text/label
         check("windows_types_#{adult_window.id}")
 
         expect(page).to have_content(workshop_world.title)

From 7322b6eba9d9dd2c2f8d7c0adc56d6afe9e1b79a Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Mon, 16 Feb 2026 23:06:16 -0500
Subject: [PATCH 09/11] Remove redundant person_id presence validation from
 Affiliation

belongs_to :person already enforces presence in Rails 5+.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 app/models/affiliation.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/affiliation.rb b/app/models/affiliation.rb
index 659c8e75a..4cb45c248 100644
--- a/app/models/affiliation.rb
+++ b/app/models/affiliation.rb
@@ -4,7 +4,6 @@ class Affiliation < ApplicationRecord
 
   # Validations
   validates_presence_of :organization_id
-  validates_presence_of :person_id
 
   # Enum
   enum :position, { default: 0, liaison: 1, leader: 2, assistant: 3 }

From c1d6d072aaee7f0234ddbcf0fae1c12d610f9c5b Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Mon, 16 Feb 2026 23:36:17 -0500
Subject: [PATCH 10/11] Fix default title sort UI and update affiliations
 migration

- Set @sort on initial page load so Title radio is selected by default
- Remove fallback that always checked Newest radio when no sort param
- Rename migration from organization_people to affiliations table

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 app/controllers/workshops_controller.rb       |  1 +
 app/views/workshops/_sort_by_options.html.erb |  2 +-
 ...null_constraints_to_organization_people.rb | 28 -------------------
 ...dd_not_null_constraints_to_affiliations.rb | 28 +++++++++++++++++++
 db/schema.rb                                  |  2 +-
 5 files changed, 31 insertions(+), 30 deletions(-)
 delete mode 100644 db/migrate/20260215205007_add_not_null_constraints_to_organization_people.rb
 create mode 100644 db/migrate/20260216231506_add_not_null_constraints_to_affiliations.rb

diff --git a/app/controllers/workshops_controller.rb b/app/controllers/workshops_controller.rb
index 6dd38ac80..3d17352c7 100644
--- a/app/controllers/workshops_controller.rb
+++ b/app/controllers/workshops_controller.rb
@@ -21,6 +21,7 @@ def index
 
       render :workshop_results
     else
+      @sort = params[:sort].presence || "title"
       render :index
     end
   end
diff --git a/app/views/workshops/_sort_by_options.html.erb b/app/views/workshops/_sort_by_options.html.erb
index d98edb890..4a4707faa 100644
--- a/app/views/workshops/_sort_by_options.html.erb
+++ b/app/views/workshops/_sort_by_options.html.erb
@@ -1,7 +1,7 @@
 <div class="flex items-center gap-1">
   <label class="flex items-center gap-1 cursor-pointer">
     <%= radio_button_tag :sort, "created",
-                         @sort == "created" || !params[:sort].present? %>
+                         @sort == "created" %>
     <span class="text-sm">Newest</span>
   </label>
 </div>
diff --git a/db/migrate/20260215205007_add_not_null_constraints_to_organization_people.rb b/db/migrate/20260215205007_add_not_null_constraints_to_organization_people.rb
deleted file mode 100644
index 9bf923e39..000000000
--- a/db/migrate/20260215205007_add_not_null_constraints_to_organization_people.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-class AddNotNullConstraintsToOrganizationPeople < ActiveRecord::Migration[8.1]
-  def up
-    # Clean up any orphaned records before adding constraints
-    OrganizationPerson.where(organization_id: nil).destroy_all
-    OrganizationPerson.where(person_id: nil).destroy_all
-
-    change_column_null :organization_people, :organization_id, false
-    change_column_null :organization_people, :person_id, false
-
-    # Fix column type so foreign key can be added (people.id is int, not bigint)
-    change_column :organization_people, :person_id, :integer, null: false
-
-    unless foreign_key_exists?(:organization_people, :people, column: :person_id)
-      add_foreign_key :organization_people, :people, column: :person_id
-    end
-  end
-
-  def down
-    change_column_null :organization_people, :organization_id, true
-    change_column_null :organization_people, :person_id, true
-
-    if foreign_key_exists?(:organization_people, :people, column: :person_id)
-      remove_foreign_key :organization_people, :people, column: :person_id
-    end
-
-    change_column :organization_people, :person_id, :bigint
-  end
-end
diff --git a/db/migrate/20260216231506_add_not_null_constraints_to_affiliations.rb b/db/migrate/20260216231506_add_not_null_constraints_to_affiliations.rb
new file mode 100644
index 000000000..03db06f2f
--- /dev/null
+++ b/db/migrate/20260216231506_add_not_null_constraints_to_affiliations.rb
@@ -0,0 +1,28 @@
+class AddNotNullConstraintsToAffiliations < ActiveRecord::Migration[8.1]
+  def up
+    # Clean up any orphaned records before adding constraints
+    Affiliation.where(organization_id: nil).destroy_all
+    Affiliation.where(person_id: nil).destroy_all
+
+    change_column_null :affiliations, :organization_id, false
+    change_column_null :affiliations, :person_id, false
+
+    # Fix column type so foreign key can be added (people.id is int, not bigint)
+    change_column :affiliations, :person_id, :integer, null: false
+
+    unless foreign_key_exists?(:affiliations, :people, column: :person_id)
+      add_foreign_key :affiliations, :people, column: :person_id
+    end
+  end
+
+  def down
+    change_column_null :affiliations, :organization_id, true
+    change_column_null :affiliations, :person_id, true
+
+    if foreign_key_exists?(:affiliations, :people, column: :person_id)
+      remove_foreign_key :affiliations, :people, column: :person_id
+    end
+
+    change_column :affiliations, :person_id, :bigint
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 033518e80..068772f11 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2026_02_16_120927) do
+ActiveRecord::Schema[8.1].define(version: 2026_02_16_231506) do
   create_table "action_text_mentions", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.bigint "action_text_rich_text_id", null: false
     t.datetime "created_at", null: false

From 9b9b1430dbcc035dfc10eb7f44d624b7ff37f4fc Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Tue, 17 Feb 2026 00:25:25 -0500
Subject: [PATCH 11/11] Comment out test for validation we removed to support
 nested attrs better

---
 spec/models/affiliation_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/affiliation_spec.rb b/spec/models/affiliation_spec.rb
index 1f2ac7d79..5cec19a27 100644
--- a/spec/models/affiliation_spec.rb
+++ b/spec/models/affiliation_spec.rb
@@ -11,7 +11,7 @@
       build(:affiliation, organization: create(:organization), person: create(:person))
     end
     it { should validate_presence_of(:organization_id) }
-    it { should validate_presence_of(:person_id) }
+    # it { should validate_presence_of(:person_id) } # we needed to not have this to support nested attrs
   end
 
   describe 'enums' do