Include the validator warnings in the mail to WRT

thewca · Jan 13, 2019 · 941856e · 941856e
1 parent 3840fb5
commit 941856e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/WcaOnRails/app/controllers/results_submission_controller.rb b/WcaOnRails/app/controllers/results_submission_controller.rb
@@ -48,7 +48,8 @@ def create
       @competition.update!(results_submitted_at: Time.now)
       redirect_to competition_path(@competition)
     else
-      @results_validator = CompetitionResultsValidator.new(@competition.id)
+      flash[:danger] = "Submitted results contain errors."
+      @results_validator = @results_submission.results_validator
       render :new
     end
   end

diff --git a/WcaOnRails/app/models/results_submission.rb b/WcaOnRails/app/models/results_submission.rb
@@ -12,13 +12,16 @@ class ResultsSubmission
   validates :schedule_url, presence: true, url: true
 
   validate do
-    results_validator = CompetitionResultsValidator.new(competition_id)
     if results_validator.total_errors != 0
       # this shouldn't actually happen through a "normal" usage of the website
       errors.add(:message, "submitted results contain errors")
     end
   end
 
+  def results_validator
+    @results_validator ||= CompetitionResultsValidator.new(competition_id)
+  end
+
   # FIXME: what is this used for?
   def ==(other)
     self.class == other.class && self.state == other.state

diff --git a/WcaOnRails/app/views/competitions_mailer/results_submitted.erb b/WcaOnRails/app/views/competitions_mailer/results_submitted.erb
@@ -17,6 +17,24 @@
   The Delegate has confirmed the competition's events page and the competition's schedule page reflect what happened during the competition.
 </p>
 
+<p>
+  <% if @results_submission.results_validator.total_warnings == 0 %>
+    The competition results had no warning.
+  <% else %>
+    Please find below the list of warnings for the competition's results:
+    <% @results_submission.results_validator.warnings.each do |type, warnings| %>
+      <% if warnings.any? %>
+        <br/>Warnings detected in <%= type %>
+        <ul>
+          <% warnings.each do |warning| %>
+            <li><%= warning %></li>
+          <% end %>
+        </ul>
+      <% end %>
+    <% end %>
+  <% end %>
+</p>
+
 <p>Here's a message from <%= @submitter_user.name %>:</p>
 
 <blockquote><%= md @results_submission.message %></blockquote>