diff --git a/app/controllers/competitions/competitions_controller.rb b/app/controllers/competitions/competitions_controller.rb index 4adfc4cc0..0f0393df1 100644 --- a/app/controllers/competitions/competitions_controller.rb +++ b/app/controllers/competitions/competitions_controller.rb @@ -21,7 +21,7 @@ class Competitions::CompetitionsController < Competitions::BaseController @count = competitions.count competitions = competitions.order(published_at: :desc, online_time: :desc) - @competitions = paginate(competitions.includes(:sponsor_schools, current_stage_section: :competition_stage)) + @competitions = paginate(competitions.includes(sponsor_schools: :school, current_stage_section: :competition_stage)) ids = @competitions.map(&:id) @member_count_map = TeamMember.where(competition_id: ids).group(:competition_id).count diff --git a/app/models/competition.rb b/app/models/competition.rb index b5526f74c..a0eb88857 100644 --- a/app/models/competition.rb +++ b/app/models/competition.rb @@ -43,6 +43,10 @@ class Competition < ApplicationRecord end end + def sponsor_schools_name + sponsor_schools.map{|sponsor| sponsor.school.name} + end + def competition_status if !status com_status = "nearly_published" diff --git a/app/views/competitions/competitions/index.json.jbuilder b/app/views/competitions/competitions/index.json.jbuilder index 40eba2d42..98bc6aee7 100644 --- a/app/views/competitions/competitions/index.json.jbuilder +++ b/app/views/competitions/competitions/index.json.jbuilder @@ -17,7 +17,7 @@ json.competitions do json.end_time competition.end_time&.strftime("%Y-%m-%d") json.enroll_end_time competition.enroll_end_time&.strftime("%Y-%m-%d %H:%M:%S") - json.sponsor_schools competition.sponsor_schools.pluck(:name) + json.sponsor_schools competition.sponsor_schools_name # section = competition.current_stage_section # if section # json.current_stage do