Merge pull request #1542 from alphagov/change-debate-outcome-sort-order

Sort debated petitions by debate date, not outcome date

Author: pixeltrix

app/helpers/timeline_helper.rb

@@ -37,6 +37,8 @@ def petition_timeline(petition)
       else
         events << PetitionEvent.new(:parliament_did_not_debate, petition.debate_outcome_at, debate_outcome)
       end
+    elsif petition.debated?
+      events << PetitionEvent.new(:parliament_debated_pending_outcome, petition.scheduled_debate_date, petition)
     end
 
     petition.emails.each do |email|

app/models/archived/petition.rb

@@ -58,15 +58,15 @@ class Petition < ActiveRecord::Base
     facet :all, -> { by_most_signatures }
     facet :awaiting_response, -> { awaiting_response.by_waiting_for_response_longest }
     facet :awaiting_debate, -> { awaiting_debate.by_most_relevant_debate_date }
-    facet :with_debate_outcome, -> { with_debate_outcome.by_most_recent_debate_outcome }
+    facet :with_debate_outcome, -> { with_debate_outcome.by_most_recent_debate }
     facet :with_debated_outcome, -> { with_debated_outcome.by_most_recent_debate_outcome }
     facet :published, -> { published.by_most_signatures }
     facet :stopped, -> { stopped.by_most_signatures }
     facet :closed, -> { closed.by_most_signatures }
     facet :rejected, -> { rejected.by_most_signatures }
     facet :hidden, -> { hidden.by_most_recent }
     facet :with_response, -> { with_response.by_most_signatures }
-    facet :debated, -> { debated.by_most_recent_debate_outcome }
+    facet :debated, -> { debated.by_most_recent_debate }
     facet :not_debated, -> { not_debated.by_most_recent_debate_outcome }
     facet :by_most_signatures, -> { by_most_signatures }
     facet :by_created_at, -> { by_created_at }
@@ -111,6 +111,10 @@ def by_most_recently_published
         reorder('published_at DESC NULLS LAST')
       end
 
+      def by_most_recent_debate
+        reorder(scheduled_debate_date: :desc, debate_outcome_at: :desc, created_at: :desc)
+      end
+
       def by_most_recent_debate_outcome
         reorder(debate_outcome_at: :desc, created_at: :desc)
       end

app/models/petition.rb

@@ -63,9 +63,9 @@ class Petition < ActiveRecord::Base
   facet :with_response,        -> { with_response.by_most_recent_response }
 
   facet :awaiting_debate,      -> { awaiting_debate.by_most_relevant_debate_date }
-  facet :with_debate_outcome,  -> { with_debate_outcome.by_most_recent_debate_outcome }
+  facet :with_debate_outcome,  -> { with_debate_outcome.by_most_recent_debate }
   facet :with_debated_outcome, -> { with_debated_outcome.by_most_recent_debate_outcome }
-  facet :debated,              -> { debated.by_most_recent_debate_outcome }
+  facet :debated,              -> { debated.by_most_recent_debate }
   facet :not_debated,          -> { not_debated.by_most_recent_debate_outcome }
 
   facet :collecting_sponsors,  -> { collecting_sponsors.by_most_recent }
@@ -172,6 +172,10 @@ def by_most_recently_published
       reorder('published_at DESC NULLS LAST')
     end
 
+    def by_most_recent_debate
+      reorder(scheduled_debate_date: :desc, debate_outcome_at: :desc, created_at: :desc)
+    end
+
     def by_most_recent_debate_outcome
       reorder(debate_outcome_at: :desc, created_at: :desc)
     end

app/views/petitions/events/_parliament_debated_pending_outcome.html.erb

@@ -0,0 +1,15 @@
+<li id="debate">
+  <%= time_tag(petition.scheduled_debate_date) do %>
+    <strong><%= short_date_format(petition.scheduled_debate_date) %></strong>
+  <% end %>
+
+  <div>
+    <h3>
+      Parliament debated this petition
+    </h3>
+
+    <p>
+      You can watch the debate online on the <a href="https://www.youtube.com/UKParliament">UK Parliament YouTube channel</a>.
+    </p>
+  </div>
+</li>

features/step_definitions/debate_outcome_steps.rb

@@ -10,12 +10,17 @@
     public_engagement_url: "https://committees.parliament.uk/public-engagement",
     debate_summary_url: "https://ukparliament.shorthandstories.com/about-a-petition"
   )
-  @petition.update(debate_outcome_at: debated_days_ago.days.ago)
+
+  @petition.update!(
+    debate_outcome_at: debated_days_ago.days.ago,
+    scheduled_debate_date: debated_days_ago.days.ago.to_date
+  )
 end
 
 Given(/^an archived petition "(.*?)" has been debated (\d+) days ago?$/) do |petition_action, debated_days_ago|
   @petition = FactoryBot.create(:archived_petition, :debated,
     action: petition_action,
+    scheduled_debate_date: debated_days_ago.days.ago.to_date,
     debate_outcome_at: debated_days_ago.days.ago,
     debated_on: debated_days_ago.days.ago.to_date,
     opened_at: debated_days_ago.days.ago - 1.month,