Merge branch 'dietary-restrictions' of github.com:mikej/codebar-planner into dietary-restrictions

mikej · mikej · commit 577c05e4c2d9 · 2025-08-26T17:28:44.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -117,6 +117,5 @@ group :production do
 end
 
 gem 'rollbar'
-gem 'skylight'
 
 gem "carrierwave-aws", "~> 1.6"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -479,8 +479,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
-    skylight (6.0.4)
-      activesupport (>= 5.2.0)
     slop (3.6.0)
     snaky_hash (2.0.1)
       hashie
@@ -607,7 +605,6 @@ DEPENDENCIES
   simple_form
   simplecov
   simplecov-lcov
-  skylight
   sprockets-rails
   stimulus-rails
   stripe
diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb
@@ -1,4 +1,4 @@
-class Admin::AnnouncementsController < Admin::ApplicationController
+class Admin::AnnouncementsController < SuperAdmin::ApplicationController
   before_action :set_announcement, only: %i[update edit]
 
   def index
diff --git a/app/models/workshop.rb b/app/models/workshop.rb
@@ -30,14 +30,8 @@ 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
-    workshop_sponsors_with_host_true.first&.sponsor
+    WorkshopSponsor.hosts.for_workshop(id).first&.sponsor
   end
 
   def waiting_list
diff --git a/app/models/workshop_sponsor.rb b/app/models/workshop_sponsor.rb
@@ -3,4 +3,7 @@ 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
diff --git a/config/application.rb b/config/application.rb
@@ -53,9 +53,6 @@ class Application < Rails::Application
     # Related to https://stackoverflow.com/questions/72970170/upgrading-to-rails-6-1-6-1-causes-psychdisallowedclass-tried-to-load-unspecif
     # and https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
     config.active_record.yaml_column_permitted_classes = [Symbol, Date, Time, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone, ActiveSupport::HashWithIndifferentAccess]
-    # Allow Skylight to show insights from local development.
-    # More info at https://skylight.io/support/environments
-    config.skylight.environments << 'development'
 
     config.active_record.belongs_to_required_by_default = true
   end
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -82,7 +82,7 @@ en:
   homepage:
     title: Homepage
     intro: "<strong>codebar</strong> is a charity that facilitates the growth of a diverse tech community by running free regular programming workshops for minority groups in tech."
-    explanation: "Our goal is to enable minority group members to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
+    explanation: "Our goal is to enable people from underrepresented groups to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from diverse backgrounds—some aspiring to become full-time developers, while others simply want to learn the basics of coding in a supportive environment."
@@ -339,7 +339,7 @@ en:
     new:
       intro_html: "We provide a welcoming, inclusive, and supportive learning environment, with a strict zero-tolerance policy for any form of harassment or inappropriate behavior. Please take a moment to review our <a href='%{link}'>code of conduct</a> before signing up."
       students:
-        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented minority groups."
+        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented groups."
         github: "When you click the sign-up button, you'll be redirected to GitHub. After logging in with your GitHub account, you'll return to the codebar website. If you don’t have an account yet, creating one is quick and easy—and it will be useful as you begin your coding journey!"
       invitations: "Invitations are sent out periodically, so don't worry if you don't receive one as soon as you register."
   terms_and_conditions:
diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml
@@ -48,7 +48,7 @@ en-AU:
         format: '%u%n'
   homepage:
     intro: "<strong>codebar</strong> is a charity that facilitates the growth of a diverse tech community by running free regular programming workshops for minority groups in tech."
-    explanation: "Our goal is to enable minority group members to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
+    explanation: "Our goal is to enable people from underrepresented groups to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from diverse backgrounds—some aspiring to become full-time developers, while others simply want to learn the basics of coding in a supportive environment."
@@ -228,7 +228,7 @@ en-AU:
     new:
       intro_html: "We provide a welcoming, inclusive, and supportive learning environment, with a strict zero-tolerance policy for any form of harassment or inappropriate behavior. Please take a moment to review our <a href='%{link}'>code of conduct</a> before signing up."
       students:
-        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented minority groups."
+        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented groups."
         github: "When you click the sign-up button, you'll be redirected to GitHub. After logging in with your GitHub account, you'll return to the codebar website. If you don’t have an account yet, creating one is quick and easy—and it will be useful as you begin your coding journey!"
       invitations: "Invitations are sent out periodically, so don't worry if you don't receive one as soon as you register."
   footer:
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
@@ -47,8 +47,8 @@ en-GB:
         precision: 0
         format: '%u%n'
   homepage:
-    intro: "<strong>codebar</strong> is a charity that facilitates the growth of a diverse tech community by running free regular programming workshops for minority groups in tech."
-    explanation: "Our goal is to enable minority group members to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
+    intro: "<strong>codebar</strong> is a charity that facilitates the growth of a diverse tech community by running free regular programming workshops for underrepresented groups in tech."
+    explanation: "Our goal is to enable people from underrepresented groups to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from diverse backgrounds—some aspiring to become full-time developers, while others simply want to learn the basics of coding in a supportive environment."
@@ -228,7 +228,7 @@ en-GB:
     new:
       intro_html: "We provide a welcoming, inclusive, and supportive learning environment, with a strict zero-tolerance policy for any form of harassment or inappropriate behavior. Please take a moment to review our <a href='%{link}'>code of conduct</a> before signing up."
       students:
-        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented minority groups."
+        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented groups."
         github: "When you click the sign-up button, you'll be redirected to GitHub. After logging in with your GitHub account, you'll return to the codebar website. If you don’t have an account yet, creating one is quick and easy—and it will be useful as you begin your coding journey!"
       invitations: "Invitations are sent out periodically, so don't worry if you don't receive one as soon as you register."
   footer:
diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
@@ -48,7 +48,7 @@ en-US:
         format: '%u%n'
   homepage:
     intro: "<strong>codebar</strong> is a charity that facilitates the growth of a diverse tech community by running free regular programming workshops for minority groups in tech."
-    explanation: "Our goal is to enable minority group members to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
+    explanation: "Our goal is to enable people from underrepresented groups to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from diverse backgrounds—some aspiring to become full-time developers, while others simply want to learn the basics of coding in a supportive environment."
@@ -226,7 +226,7 @@ en-US:
     new:
       intro_html: "We provide a welcoming, inclusive, and supportive learning environment, with a strict zero-tolerance policy for any form of harassment or inappropriate behavior. Please take a moment to review our <a href='%{link}'>code of conduct</a> before signing up."
       students:
-        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented minority groups."
+        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented groups."
         github: "When you click the sign-up button, you'll be redirected to GitHub. After logging in with your GitHub account, you'll return to the codebar website. If you don’t have an account yet, creating one is quick and easy—and it will be useful as you begin your coding journey!"
       invitations: "Invitations are sent out periodically, so don't worry if you don't receive one as soon as you register."
   footer:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
@@ -48,7 +48,7 @@ fi:
         format: '%u%n'
   homepage:
     intro: "<strong>codebar</strong> is a charity that facilitates the growth of a diverse tech community by running free regular programming workshops for minority groups in tech."
-    explanation: "Our goal is to enable minority group members to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
+    explanation: "Our goal is to enable people from underrepresented groups to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from diverse backgrounds—some aspiring to become full-time developers, while others simply want to learn the basics of coding in a supportive environment."
@@ -228,7 +228,7 @@ fi:
     new:
       intro_html: "We provide a welcoming, inclusive, and supportive learning environment, with a strict zero-tolerance policy for any form of harassment or inappropriate behavior. Please take a moment to review our <a href='%{link}'>code of conduct</a> before signing up."
       students:
-        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented minority groups."
+        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented groups."
         github: "When you click the sign-up button, you'll be redirected to GitHub. After logging in with your GitHub account, you'll return to the codebar website. If you don’t have an account yet, creating one is quick and easy—and it will be useful as you begin your coding journey!"
       invitations: "Invitations are sent out periodically, so don't worry if you don't receive one as soon as you register."
   footer:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -47,7 +47,7 @@ fr:
         format: '%u%n'
   homepage:
     intro: "<strong>codebar</strong> is a charity that facilitates the growth of a diverse tech community by running free regular programming workshops for minority groups in tech."
-    explanation: "Our goal is to enable minority group members to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
+    explanation: "Our goal is to enable people from underrepresented groups to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from diverse backgrounds—some aspiring to become full-time developers, while others simply want to learn the basics of coding in a supportive environment."
diff --git a/config/locales/no.yml b/config/locales/no.yml
@@ -48,7 +48,7 @@
         format: '%u%n'
   homepage:
     intro: "<strong>codebar</strong> is a charity that facilitates the growth of a diverse tech community by running free regular programming workshops for minority groups in tech."
-    explanation: "Our goal is to enable minority group members to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
+    explanation: "Our goal is to enable people from underrepresented groups to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible."
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from diverse backgrounds—some aspiring to become full-time developers, while others simply want to learn the basics of coding in a supportive environment."
@@ -228,7 +228,7 @@
     new:
       intro_html: "We provide a welcoming, inclusive, and supportive learning environment, with a strict zero-tolerance policy for any form of harassment or inappropriate behavior. Please take a moment to review our <a href='${link}'>code of conduct</a> before signing up."
       students:
-        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented minority groups."
+        intro_html: "If you’re interested in attending as a student, be sure to check our <a href='%{link}'>eligibility criteria</a>. Our workshops and events are exclusively for women, non-binary, LGBTQ+ members, and people from underrepresented groups."
         github: "When you click the sign-up button, you'll be redirected to GitHub. After logging in with your GitHub account, you'll return to the codebar website. If you don’t have an account yet, creating one is quick and easy—and it will be useful as you begin your coding journey!"
       invitations: "Invitations are sent out periodically, so don't worry if you don't receive one as soon as you register."
   footer:
diff --git a/spec/models/workshop_sponsor_spec.rb b/spec/models/workshop_sponsor_spec.rb
@@ -6,4 +6,31 @@
         .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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class Admin::AnnouncementsController < Admin::ApplicationController`
	`1`	`+class Admin::AnnouncementsController < SuperAdmin::ApplicationController`
`2`	`2`	`before_action :set_announcement, only: %i[update edit]`
`3`	`3`
`4`	`4`	`def index`