From c7dbb65e2d01e37f276af3db0372123366b3a1a1 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 22 Jun 2020 17:20:10 +0100
Subject: Rewrite open311-update-reports to share code.

Make GetUpdates and GetServiceRequestUpdates share a common base;
spot all visible states.
---
 perllib/Open311/GetServiceRequests.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'perllib/Open311/GetServiceRequests.pm')

diff --git a/perllib/Open311/GetServiceRequests.pm b/perllib/Open311/GetServiceRequests.pm
index e5fd6438e..2545f6f29 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' );
@@ -85,7 +84,7 @@ sub create_problems {
         ->active
         ->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"
-- 
cgit v1.2.3


From 1e7cba67a53eead8cedcbf6aa7af12eb7ff4bf63 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 6 Aug 2020 09:43:53 +0100
Subject: [Open311] use staff categories when fetching reports

At the moment if you fetch a report in a staff category it will still be
created but will be in the Other category. Given that some staff
categories are marked as private this can allow reports that should be
private to be put in a public category.
---
 perllib/Open311/GetServiceRequests.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perllib/Open311/GetServiceRequests.pm')

diff --git a/perllib/Open311/GetServiceRequests.pm b/perllib/Open311/GetServiceRequests.pm
index 2545f6f29..eea7c0f26 100644
--- a/perllib/Open311/GetServiceRequests.pm
+++ b/perllib/Open311/GetServiceRequests.pm
@@ -81,7 +81,7 @@ sub create_problems {
     }
 
     my $contacts = $self->schema->resultset('Contact')
-        ->active
+        ->not_deleted_admin
         ->search( { body_id => $body->id } );
 
     for my $request (@$requests) {
-- 
cgit v1.2.3


From 7135fb0076664cdc13d2af537a2a00b37d61fa54 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 2 Oct 2020 18:51:29 +0100
Subject: Record service as Open311 for pulled-in reports.

---
 perllib/Open311/GetServiceRequests.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'perllib/Open311/GetServiceRequests.pm')

diff --git a/perllib/Open311/GetServiceRequests.pm b/perllib/Open311/GetServiceRequests.pm
index eea7c0f26..7f98bbc4a 100644
--- a/perllib/Open311/GetServiceRequests.pm
+++ b/perllib/Open311/GetServiceRequests.pm
@@ -185,6 +185,7 @@ sub create_problems {
                 send_method_used => 'Open311',
                 category => $contact,
                 send_questionnaire => 0,
+                service => 'Open311',
                 non_public => $non_public,
             }
         );
-- 
cgit v1.2.3