3 files changed, 29 insertions, 28 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm b/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
index d965dd8f2..0026acb9c 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
@@ -5,6 +5,7 @@ use namespace::autoclean;
 use DateTime;
 use Try::Tiny;
 use FixMyStreet::Integrations::ExorRDI;
+use FixMyStreet::DateRange;
 
 BEGIN { extends 'Catalyst::Controller'; }
 
@@ -43,15 +44,16 @@ sub download : Path('download') : Args(0) {
         $c->detach( '/page_error_404_not_found', [] );
     }
 
-    my $parser = DateTime::Format::Strptime->new( pattern => '%Y-%m-%d' );
-    my $start_date = $parser-> parse_datetime ( $c->get_param('start_date') );
-    my $end_date = $parser-> parse_datetime ( $c->get_param('end_date') ) ;
-    my $one_day = DateTime::Duration->new( days => 1 );
+    my $range = FixMyStreet::DateRange->new(
+        start_date => $c->get_param('start_date'),
+        end_date => $c->get_param('end_date'),
+        parser => DateTime::Format::Strptime->new( pattern => '%Y-%m-%d' ),
+    );
 
     my $params = {
-        start_date => $start_date,
-        inspection_date => $start_date,
-        end_date => $end_date + $one_day,
+        start_date => $range->start,
+        inspection_date => $range->start,
+        end_date => $range->end,
         user => $c->get_param('user_id'),
         mark_as_processed => 0,
     };
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;
diff --git a/perllib/FixMyStreet/App/Controller/JSON.pm b/perllib/FixMyStreet/App/Controller/JSON.pm
index 762e3c115..e1e135054 100644
--- a/perllib/FixMyStreet/App/Controller/JSON.pm
+++ b/perllib/FixMyStreet/App/Controller/JSON.pm
@@ -8,6 +8,7 @@ use JSON::MaybeXS;
 use DateTime;
 use DateTime::Format::ISO8601;
 use List::MoreUtils 'uniq';
+use FixMyStreet::DateRange;
 
 =head1 NAME
 
@@ -50,16 +51,19 @@ sub problems : Local {
     }
 
     # convert the dates to datetimes and trap errors
-    my $iso8601  = DateTime::Format::ISO8601->new;
-    my $start_dt = eval { $iso8601->parse_datetime($start_date); };
-    my $end_dt   = eval { $iso8601->parse_datetime($end_date); };
-    unless ( $start_dt && $end_dt ) {
+    my $range = FixMyStreet::DateRange->new(
+        start_date => $start_date,
+        end_date => $end_date,
+        parser => DateTime::Format::ISO8601->new,
+        formatter => $c->model('DB')->schema->storage->datetime_parser,
+    );
+    unless ($range->start && $range->end) {
         $c->stash->{error} = 'Invalid dates supplied';
         return;
     }
 
     # check that the dates are sane
-    if ( $start_dt > $end_dt ) {
+    if ($range->start >= $range->end) {
         $c->stash->{error} = 'Start date after end date';
         return;
     }
@@ -80,14 +84,8 @@ sub problems : Local {
         $date_col = 'lastupdate';
     }
 
-    my $dt_parser = $c->model('DB')->schema->storage->datetime_parser;
-
-    my $one_day = DateTime::Duration->new( days => 1 );
     my $query = {
-        $date_col => {
-            '>=' => $dt_parser->format_datetime($start_dt),
-            '<=' => $dt_parser->format_datetime($end_dt + $one_day),
-        },
+        $date_col => $range->sql,
         state => [ @state ],
     };
     $query->{category} = $category if $category;