A start_date and an end_date was only producing one confirmed condition

in the where clause as they were overwriting each other. This now
handles start and end date explicitely to generate the correct search
criteria

Fixes #310

1 files changed, 8 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm
index 34e2b7cd3..14b790db8 100644
--- a/perllib/FixMyStreet/App/Controller/Open311.pm
+++ b/perllib/FixMyStreet/App/Controller/Open311.pm
@@ -319,8 +319,6 @@ sub get_requests : Private {
         service_request_id => [ '=', 'id' ],
         service_code       => [ '=', 'category' ],
         status             => [ 'IN', 'state' ],
-        start_date         => [ '>=', 'confirmed' ],
-        end_date           => [ '<', 'confirmed' ],
         agency_responsible => [ '~', 'council' ],
         interface_used     => [ '=', 'service' ],
         has_photo          => [ '=', 'photo' ],
@@ -365,6 +363,14 @@ sub get_requests : Private {
         $criteria->{$key} = { $op, $value };
     }
 
+    if ( $c->req->param('start_date') and $c->req->param('end_date') ) {
+        $criteria->{confirmed} = [ '-and' => { '>=', $c->req->param('start_date') }, { '<', $c->req->param('end_date') } ];
+    } elsif ( $c->req->param('start_date') ) {
+        $criteria->{confirmed} = { '>=', $c->req->param('start_date') };
+    } elsif ( $c->req->param('end_date') ) {
+        $criteria->{confirmed} = { '<', $c->req->param('end_date') };
+    }
+
     if ('rss' eq $c->stash->{format}) {
         $c->stash->{type} = 'new_problems';
         $c->forward( '/rss/lookup_type' );