From 1d5335c782600569d7c4d8d595cb3c873361c07a Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 7 Nov 2018 18:25:02 +0100
Subject: [PATCH] Display last milestones image

Also adds a second order to ensure the order to display milestones with same publication date is always the same
---
 app/helpers/budget_executions_helper.rb   | 4 ++--
 app/models/budget/investment/milestone.rb | 2 +-
 spec/features/budgets/executions_spec.rb  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/helpers/budget_executions_helper.rb b/app/helpers/budget_executions_helper.rb
index d1b6ab15d..d77867052 100644
--- a/app/helpers/budget_executions_helper.rb
+++ b/app/helpers/budget_executions_helper.rb
@@ -7,8 +7,8 @@ module BudgetExecutionsHelper
   end
 
   def first_milestone_with_image(investment)
-    investment.milestones.order(publication_date: :asc, created_at: :asc)
-                         .select{ |milestone| milestone.image.present? }.first
+    investment.milestones.order_by_publication_date
+                         .select{ |milestone| milestone.image.present? }.last
   end
 
 end
diff --git a/app/models/budget/investment/milestone.rb b/app/models/budget/investment/milestone.rb
index 562be54b8..f59705ede 100644
--- a/app/models/budget/investment/milestone.rb
+++ b/app/models/budget/investment/milestone.rb
@@ -17,7 +17,7 @@ class Budget
       validates :publication_date, presence: true
       validate :description_or_status_present?
 
-      scope :order_by_publication_date, -> { order(publication_date: :asc) }
+      scope :order_by_publication_date, -> { order(publication_date: :asc, created_at: :asc) }
       scope :published,                 -> { where("publication_date <= ?", Date.current) }
       scope :with_status,               -> { where("status_id IS NOT NULL") }
 
diff --git a/spec/features/budgets/executions_spec.rb b/spec/features/budgets/executions_spec.rb
index f3f6a1432..e9b2dbb50 100644
--- a/spec/features/budgets/executions_spec.rb
+++ b/spec/features/budgets/executions_spec.rb
@@ -100,7 +100,7 @@ feature 'Executions' do
       expect(page).to have_css("img[alt='#{investment4.title}']")
     end
 
-    scenario "renders first milestone's image if investment has multiple milestones with images associated" do
+    scenario "renders last milestone's image if investment has multiple milestones with images associated" do
       milestone1 = create(:budget_investment_milestone, investment: investment1,
                                                         publication_date: Date.yesterday)
 
@@ -122,7 +122,7 @@ feature 'Executions' do
       click_link 'Milestones'
 
       expect(page).to have_content(investment1.title)
-      expect(page).to have_css("img[alt='#{milestone2.image.title}']")
+      expect(page).to have_css("img[alt='#{milestone3.image.title}']")
     end
 
   end