Merged main

app/controllers/admin/regions/challenges_controller.rb

@@ -126,7 +126,7 @@ def challenge_params
     params.require(:challenge).permit(
       :name, :short_desc, :long_desc, :eligibility, :video_url, :approved,
       :banner_image, :image, :pdf, :pdf_preview, :nation_wide, :teaser,
-      :outcome_expectations, :sponsor_values
+      :outcome_expectations, :sponsor_values,
     )
   end
 end

app/controllers/challenges_controller.rb

@@ -74,9 +74,8 @@ def check_competition_start!
     @challenge = Challenge.find_by identifier: params[:identifier]
     @challenge = Challenge.find(params[:identifier]) if @challenge.nil?
     @region = @challenge.region
-    return if  @region.is_show == 1 || @competition.started?(@region.time_zone) ||
+    return if @region.is_show == 1 || @competition.started?(@region.time_zone) ||
       (@region.international? && @competition.started?(FIRST_COMPETITION_TIME_ZONE))
-
 
     flash[:alert] = 'Challenges will become visible at the start of the competition'
     redirect_to root_path

app/controllers/regions_controller.rb

@@ -81,7 +81,7 @@ def check_show
   end
 
   def eligible_locations
-    #@eligible_locations = [
+    # @eligible_locations = [
     #  {label: 'NSW', path: 'new_south_wales_2024'},
     #  {label: 'QLD', path: 'queensland_2024'},
     #  {label: 'VIC', path: 'victoria_2024'},
@@ -91,16 +91,15 @@ def eligible_locations
     #  {label: 'Australia', path: 'australia2024'},
     #  {label: 'New Zealand', path: 'new_zealand2024'},
     #  {label: 'International', path: 'international_2024'},
-    #]
+    # ]
 
     regions = @competition.regions.order(:category, :name)
 
     @eligible_locations = regions.map do |region|
       {
         label: region.name,
-        path: region.identifier
+        path: region.identifier,
       }
     end
-
   end
 end

app/models/entry.rb

@@ -120,7 +120,7 @@ def average_score
       total_score += score
       voted += 1
     end
-    return (total_score / voted) unless voted.zero?
+    (total_score / voted) unless voted.zero?
   end
 
   # Returns a count of the number of judges that have completed votes for an

app/models/team.rb

@@ -143,14 +143,12 @@ def available_checkpoints(challenge)
   # taking into only challenges already entered.
   # ENHANCEMENT: Move to controller or helper.
   def admin_available_checkpoints(_challenge)
-    valid_checkpoints = []
-    competition.checkpoints.each do |checkpoint|
+    competition.checkpoints.map do |checkpoint|
       # ERROR: Not working correctly at the moment
       # next if checkpoint.limit_reached?(self, challenge_region)
 
-      valid_checkpoints << checkpoint
+      checkpoint
     end
-    valid_checkpoints
   end
 
   # Returns true if all the checkpoints have passed for a given team. false
@@ -179,10 +177,9 @@ def available_challenges(challenge_type)
   # for.
   # ENHANCEMENT: Move to active record query.
   def member_competition_events
-    events = []
     comp = competition
-    confirmed_members.each do |user|
-      events << user.participating_competition_event(comp)
+    events = confirmed_members.map do |user|
+      user.participating_competition_event(comp)
     end
     events.uniq
   end

app/models/user.rb

@@ -194,7 +194,8 @@ def category
     return 'Participant' if participant?
     return 'Mentor' if mentor?
     return 'Industry' if industry?
-    return 'Support' if support?
+
+    'Support' if support?
   end
 
   enum region: {

app/services/demographics_report.rb

@@ -11,7 +11,8 @@ def initialize(competition, fieldtype)
     @profiles = @competition.profiles.preload(:employment_status).compact
   end
 
-  def report # rubocop:disable
+  # rubocop:disable
+  def report
     grouped_data = case @fieldtype
     when 'age'
       @profiles.group_by(&:age)

app/services/mailing_list_export.rb

@@ -34,23 +34,22 @@ def to_csv
   def to_csv_by_date
     CSV.generate do |csv|
       csv << (USER_COLUMNS2 + ['region'])
-      
+
       # Collect all users across all regions
       all_users = competition.regions.flat_map do |region|
         region_users_all(region)
       end.uniq
-  
+
       # Sort users by ID in descending order
       sorted_users = all_users.sort_by(&:id).reverse
-  
+
       # Write sorted users to CSV
       sorted_users.each do |user|
         # Assuming you still want to include the region for each user
         region_name = competition.regions.find { |region| region_users_all(region).include?(user) }&.name
         csv << (user.attributes.values_at(*USER_COLUMNS2) + [region_name])
       end
     end
-
   end
 
   private
@@ -62,8 +61,6 @@ def region_users(region)
   end
 
   def region_users_all(region)
-    region.events.preload(:users).map do |event|
-      event.users
-    end.flatten.uniq
+    region.events.preload(:users).map(&:users).flatten.uniq
   end
 end