Merge branch 'master' into toshifumi/force_ssl

Author: ShinyaKato

app/controllers/admin/contests_controller.rb

@@ -73,7 +73,7 @@ def update_from_json
         name_en: json[:contest_name] || @contest.name_en
       )
       @contest.problems.destroy_all
-      json[:problems].each.with_index(1) do |problem_json, i|
+      json[:problems].each.with_index do |problem_json, i|
         problem = Problem.create(
           contest_id: @contest.id,
           name_ja: problem_json[:title],
@@ -82,7 +82,7 @@ def update_from_json
           description_en: problem_json[:statement],
           order: i
         )
-        problem_json[:data_sets].each.with_index(1) do |data_set_json, j|
+        problem_json[:data_sets].each.with_index do |data_set_json, j|
           DataSet.create(
             problem_id: problem.id,
             label: data_set_json[:label],

app/models/problem.rb

@@ -1,6 +1,6 @@
 class Problem < ApplicationRecord
   belongs_to :contest
-  has_many :data_sets, dependent: :destroy
+  has_many :data_sets, -> { order(:order) }, dependent: :destroy
   has_many :submissions, through: :data_sets
 
   def name

app/views/admin/contests/json_upload.html.erb

@@ -24,5 +24,6 @@
 
   <div class="actions">
     <%= f.submit %>
+    <p>＊JSONアップロードを行うと、このコンテストのサブミッションデータ等は全て抹消されます。注意してください。</p>
   </div>
 <% end %>

spec/controllers/admin/contests_controller_spec.rb

@@ -105,10 +105,11 @@
         updated_contest = Contest.find_by(id: contest.id)
         expect(response).to redirect_to admin_contest_path(contest)
         expect(updated_contest.name_ja).to eq json[:contest_name]
-        expect(updated_contest.problems.size).to eq 1
-        expect(updated_contest.problems.first.name_ja).to eq 'A + B'
-        expect(updated_contest.problems.first.data_sets.size).to eq 1
-        expect(updated_contest.problems.first.data_sets.first.label).to eq 'Small'
+        expect(updated_contest.problems.size).to eq json[:problems].size
+        expect(updated_contest.problems.first.name_ja).to eq json[:problems].first[:title]
+        expect(updated_contest.problems.first.order).to eq 0
+        expect(updated_contest.problems.first.data_sets.size).to eq json[:problems].first[:data_sets].size
+        expect(updated_contest.problems.first.data_sets.first.label).to eq json[:problems].first[:data_sets].first[:label]
       end
     end