From b1222b19351782561817a138a1f1071c99a2e65c Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Mon, 31 Mar 2025 15:53:49 +0100
Subject: [PATCH] Fix date range logic in
 generate_different_date_within_collection_year method

---
 app/helpers/collection_time_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/collection_time_helper.rb b/app/helpers/collection_time_helper.rb
index 5b356772f..e12083076 100644
--- a/app/helpers/collection_time_helper.rb
+++ b/app/helpers/collection_time_helper.rb
@@ -55,8 +55,8 @@ module CollectionTimeHelper
   end
 
   def generate_different_date_within_collection_year(date, start_date_override = nil, end_date_override = nil)
-    start_date = start_date_override || collection_start_date(date).to_date
-    end_date = end_date_override || collection_end_date(date).to_date
+    start_date = [start_date_override || collection_start_date(date).to_date, collection_start_date(date).to_date].max.to_date
+    end_date = [end_date_override || collection_end_date(date).to_date, collection_end_date(date).to_date].min.to_date
     ((start_date..end_date).to_a - [date.to_date]).sample
   end
 end