Add DateRange class.

This simplifies the places where a date range is used;
it also makes Dashboard date parsing more flexible.

1 files changed, 10 insertions, 9 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index 5bc82444d..a7de23ce3 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -7,6 +7,7 @@ use JSON::MaybeXS;
 use Path::Tiny;
 use Text::CSV;
 use Time::Piece;
+use FixMyStreet::DateRange;
 
 BEGIN { extends 'Catalyst::Controller'; }
 
@@ -161,16 +162,16 @@ sub construct_rs_filter : Private {
         $where{"$table_name.state"} = [ FixMyStreet::DB::Result::Problem->visible_states() ];
     }
 
-    my $dtf = $c->model('DB')->storage->datetime_parser;
-
-    my $start_date = $dtf->parse_datetime($c->stash->{start_date});
-    $where{"$table_name.confirmed"} = { '>=', $dtf->format_datetime($start_date) };
+    my $days30 = DateTime->now(time_zone => FixMyStreet->time_zone || FixMyStreet->local_time_zone)->subtract(days => 30);
+    $days30->truncate( to => 'day' );
 
-    if (my $end_date = $c->stash->{end_date}) {
-        my $one_day = DateTime::Duration->new( days => 1 );
-        $end_date = $dtf->parse_datetime($end_date) + $one_day;
-        $where{"$table_name.confirmed"} = [ -and => $where{"$table_name.confirmed"}, { '<', $dtf->format_datetime($end_date) } ];
-    }
+    my $range = FixMyStreet::DateRange->new(
+        start_date => $c->stash->{start_date},
+        start_default => $days30,
+        end_date => $c->stash->{end_date},
+        formatter => $c->model('DB')->storage->datetime_parser,
+    );
+    $where{"$table_name.confirmed"} = $range->sql;
 
     $c->stash->{params} = \%where;
     my $rs = $updates ? $c->cobrand->updates : $c->cobrand->problems;