From ead5bc922c436da09c2a3ec0ca34b29e48621fdf Mon Sep 17 00:00:00 2001 From: moshinaan Date: Tue, 17 Mar 2020 02:23:01 +0400 Subject: [PATCH] #Rubocop at work --- tramway-event/app/models/tramway/event/event.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tramway-event/app/models/tramway/event/event.rb b/tramway-event/app/models/tramway/event/event.rb index d48a4486..f3176a05 100644 --- a/tramway-event/app/models/tramway/event/event.rb +++ b/tramway-event/app/models/tramway/event/event.rb @@ -32,9 +32,7 @@ def request_collecting_state return :not_initialized unless request_collecting_begin_date.present? || request_collecting_end_date.present? return :will_begin_soon if request_collecting_begin_date > DateTime.now return :is_over if request_collecting_end_date.present? && request_collecting_end_date.to_date < Date.today - if request_collecting_begin_date&.past? && (request_collecting_end_date&.future? || request_collecting_end_date&.today?) - return :are_being_right_now - end + return :are_being_right_now if request_collecting_begin_date&.past? && (request_collecting_end_date&.future? || request_collecting_end_date&.today?) return :are_being_right_now if request_collecting_begin_date < DateTime.now && !request_collecting_end_date.present? end