Merge pull request #2267 from davidmillen50/issue-2241-use-associations-more

chore: use associations for finding workshop sponsors with hosts

Author: olleolleolle

app/models/workshop.rb

@@ -30,8 +30,14 @@ class Workshop < ApplicationRecord
   before_validation :set_date_and_time, :set_end_date_and_time, if: proc { |model| model.chapter_id.present? }
   before_validation :set_opens_at
 
+  def workshop_sponsors_with_host_true
+    Workshop.includes(:workshop_sponsors).flat_map do |workshop|
+      workshop.workshop_sponsors.select { |ws| ws.host == true && ws.workshop_id == id }
+    end
+  end
+
   def host
-    WorkshopSponsor.hosts.for_workshop(id).first&.sponsor
+    workshop_sponsors_with_host_true.first&.sponsor
   end
 
   def waiting_list

app/models/workshop_sponsor.rb

@@ -3,7 +3,4 @@ class WorkshopSponsor < ApplicationRecord
   belongs_to :workshop
 
   validates :sponsor_id, uniqueness: { scope: :workshop_id, message: :already_sponsoring }
-
-  scope :hosts, -> { where('workshop_sponsors.host = ?', true) }
-  scope :for_workshop, ->(workshop_id) { where('workshop_sponsors.workshop_id = ?', workshop_id) }
 end

spec/models/workshop_sponsor_spec.rb

@@ -6,31 +6,4 @@
         .with_message('already a sponsor')
     end
   end
-
-  context '#scopes' do
-    context '#hosts' do
-      it 'includes workshops with hosts' do
-        workshop_sponsor = Fabricate(:workshop_sponsor, host: true)
-
-        expect(WorkshopSponsor.hosts).to include(workshop_sponsor)
-      end
-
-      it 'excludes workshops without hosts' do
-        expect(WorkshopSponsor.hosts).to eq []
-      end
-    end
-
-    context '#for_workshop' do
-      it 'includes sponsors of the workshop' do
-        workshop_sponsor = Fabricate(:workshop_sponsor)
-        expect(WorkshopSponsor.for_workshop(workshop_sponsor.workshop)).to include(workshop_sponsor)
-      end
-
-      it 'excludes sponsors not sponsoring the workshop' do
-        Fabricate(:workshop_sponsor)
-        workshop = Fabricate(:workshop_no_sponsor)
-        expect(WorkshopSponsor.for_workshop(workshop)).to eq []
-      end
-    end
-  end
 end