Merge pull request codebar#2304 from davidmillen50/issue-2267-fix-workshop-sponsor-query

fix: workshop models workshop sponsors with host query

Author: olleolleolle

app/models/workshop.rb

@@ -31,7 +31,18 @@ class Workshop < ApplicationRecord
   before_validation :set_opens_at
 
   def host
-    WorkshopSponsor.hosts.for_workshop(id).first&.sponsor
+    sql = <<~SQL
+      SELECT sponsors.*
+      FROM sponsors
+      LEFT JOIN workshop_sponsors ON workshop_sponsors.sponsor_id = sponsors.id
+      WHERE workshop_sponsors.workshop_id = ?
+        AND workshop_sponsors.host = TRUE
+        AND sponsors.id = workshop_sponsors.sponsor_id
+      ORDER BY sponsors.updated_at DESC, workshop_sponsors.id ASC
+      LIMIT 1
+    SQL
+
+    Sponsor.find_by_sql([sql, id]).first
   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