Reduce default Hackathon validations (#75)

Co-authored-by: Gary Tou <gary@garytou.com>

Author: northeastprince

app/models/hackathon.rb

@@ -2,12 +2,13 @@ class Hackathon < ApplicationRecord
   include Eventable
   include Taggable
 
-  include Status
-  include Named
-  include Regional
-  include Scheduled
   include Applicant
   include Brand
+  include FinanciallyAssisting # depends on Taggable
   include Gathering
+  include Named
+  include Regional
+  include Scheduled
+  include Status
   include Swag
 end

app/models/hackathon/brand.rb

@@ -2,7 +2,7 @@ module Hackathon::Brand
   extend ActiveSupport::Concern
 
   included do
-    validates :website, presence: true, format: URI::DEFAULT_PARSER.make_regexp(%w[http https])
+    validates :website, format: URI::DEFAULT_PARSER.make_regexp(%w[http https]), on: :submit
 
     has_one_attached :logo do |logo|
       logo.variant :small, resize_to_limit: [128, 128]
@@ -13,10 +13,9 @@ module Hackathon::Brand
 
     validates :logo, :banner,
       attached: true, content_type: {in: /\Aimage\/.*\z/, message: "is not an image"},
-      size: {less_than: 25.megabytes, message: "is too powerful (max 25 MB)"}
+      size: {less_than: 25.megabytes, message: "is too powerful (max 25 MB)"},
+      on: :submit
 
     validates :banner, aspect_ratio: :landscape
-
-    validates :high_school_led, :financial_assistance, inclusion: [true, false]
   end
 end

app/models/hackathon/financially_assisting.rb

@@ -0,0 +1,5 @@
+module Hackathon::FinanciallyAssisting
+  def offers_financial_assistance?
+    tagged_with? "Offers Financial Assistance"
+  end
+end

app/models/hackathon/gathering.rb

@@ -4,6 +4,6 @@ module Hackathon::Gathering
   included do
     enum modality: {in_person: 0, online: 1, hybrid: 2}
 
-    validates :expected_attendees, presence: true, numericality: {greater_than: 0}
+    validates :expected_attendees, numericality: {greater_than: 0}, on: :submit
   end
 end

db/migrate/20230726225359_drop_financial_assistance_on_hackathons.rb

@@ -0,0 +1,5 @@
+class DropFinancialAssistanceOnHackathons < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :hackathons, :financial_assistance
+  end
+end

db/migrate/20230728125411_allow_null_on_hackathon_expected_attendees.rb

@@ -0,0 +1,5 @@
+class AllowNullOnHackathonExpectedAttendees < ActiveRecord::Migration[7.0]
+  def change
+    change_column_null :hackathons, :expected_attendees, true
+  end
+end

db/schema.rb

@@ -7,7 +7,6 @@ assemble:
   high_school_led: true
   expected_attendees: 150
   modality: <%= Hackathon.modalities[:in_person] %>
-  financial_assistance: true
   applicant: gary
 zephyr:
   name: The Hacker Zephyr
@@ -18,7 +17,6 @@ zephyr:
   high_school_led: true
   expected_attendees: 50
   modality: <%= Hackathon.modalities[:in_person] %>
-  financial_assistance: true
   applicant: gary
 seattle_hacks:
   name: SeattleHacks
@@ -29,7 +27,6 @@ seattle_hacks:
   high_school_led: true
   expected_attendees: 50
   modality: <%= Hackathon.modalities[:in_person] %>
-  financial_assistance: true
   applicant: gary
   city: Seattle
   province: Washington
@@ -43,7 +40,6 @@ bellevue_hacks:
   high_school_led: true
   expected_attendees: 50
   modality: <%= Hackathon.modalities[:in_person] %>
-  financial_assistance: true
   applicant: gary
   city: Bellevue
   province: Washington

test/fixtures/hackathons.yml

@@ -10,7 +10,6 @@ class Hackathon::RegionalTest < ActiveSupport::TestCase
       high_school_led: true,
       expected_attendees: 20,
       modality: "in_person",
-      financial_assistance: true,
       logo: active_storage_blobs(:assemble_logo),
       banner: active_storage_blobs(:assemble),
       applicant: users(:gary)

test/models/hackathon/regional_test.rb

@@ -2,24 +2,21 @@
 
 class HackathonTest < ActiveSupport::TestCase
   setup do
-    # This contains the bare basics of an instantiable Hackathon object
+    Current.user = users(:gary)
+
     @hackathon = Hackathon.new(
       name: "TestHacks",
       starts_at: Time.now,
       ends_at: 2.days.from_now,
       website: "https://hackclub.com",
-      high_school_led: true,
       expected_attendees: 100,
-      modality: "in_person",
-      financial_assistance: true,
-      logo: active_storage_blobs(:assemble_logo),
-      banner: active_storage_blobs(:assemble),
-      applicant: users(:gary)
+      modality: :in_person
     )
   end
 
   test "creating a hackathon" do
     assert @hackathon.save
+    assert_equal users(:gary), @hackathon.applicant
   end
 
   test "creating a hackathon with invalid dates" do
@@ -28,29 +25,37 @@ class HackathonTest < ActiveSupport::TestCase
       starts_at: Time.now,
       ends_at: 2.days.ago,
       website: "https://hackclub.com",
-      high_school_led: true,
       expected_attendees: 100,
-      modality: "in_person",
-      financial_assistance: true,
-      logo: active_storage_blobs(:assemble_logo),
-      banner: active_storage_blobs(:assemble),
-      applicant: users(:gary)
+      modality: :in_person
     )
 
     assert_not hackathon.save
+
+    hackathon.ends_at = 2.days.from_now
+
+    assert hackathon.save
   end
 
   test "creating a hackathon without an applicant" do
+    Current.user = nil
+
     hackathon = Hackathon.new(
       name: "TestHacks",
+      website: "https://hackclub.com",
       starts_at: Time.now,
       ends_at: 2.days.from_now
     )
 
     assert_not hackathon.save
+
+    Current.user = users(:gary)
+
+    assert hackathon.save
   end
 
-  test "create a hackathon with swag mailing address" do
+  test "creating a hackathon wanting swag mailed" do
+    assert_not @hackathon.requested_swag?
+
     @hackathon.swag_mailing_address_attributes = {
       line1: "123 Test St",
       city: "Test City",
@@ -61,8 +66,4 @@ class HackathonTest < ActiveSupport::TestCase
     assert @hackathon.save
     assert @hackathon.requested_swag?
   end
-
-  test "#requested_swag? without swag mailing address" do
-    assert_not @hackathon.requested_swag?
-  end
 end