Merge tag 'v3.1' into fiksgatami-devfiksgatami-dev

1 files changed, 3 insertions, 3 deletions

diff --git a/perllib/Open311/GetServiceRequests.pm b/perllib/Open311/GetServiceRequests.pm
index e5fd6438e..7f98bbc4a 100644
--- a/perllib/Open311/GetServiceRequests.pm
+++ b/perllib/Open311/GetServiceRequests.pm
@@ -4,7 +4,6 @@ use Moo;
 use Open311;
 use FixMyStreet::DB;
 use FixMyStreet::MapIt;
-use FixMyStreet::App::Model::PhotoSet;
 use DateTime::Format::W3CDTF;
 
 has system_user => ( is => 'rw' );
@@ -82,10 +81,10 @@ sub create_problems {
     }
 
     my $contacts = $self->schema->resultset('Contact')
-        ->active
+        ->not_deleted_admin
         ->search( { body_id => $body->id } );
 
-    for my $request (@{$requests->{request}}) {
+    for my $request (@$requests) {
         # no point importing if we can't put it on the map
         unless ($request->{service_request_id} && $request->{lat} && $request->{long}) {
             warn "Not creating request '$request->{description}' for @{[$body->name]} as missing one of id, lat or long"
@@ -186,6 +185,7 @@ sub create_problems {
                 send_method_used => 'Open311',
                 category => $contact,
                 send_questionnaire => 0,
+                service => 'Open311',
                 non_public => $non_public,
             }
         );