[Bromley] Check service unit as well as property.

If someone else in a block of flats has reported a missed collection,
others in the same service unit should not be able to report also.

Fixes https://github.com/mysociety/fixmystreet-commercial/issues/1945

2 files changed, 44 insertions, 29 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index e84ea6f30..d91570f83 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -523,7 +523,7 @@ sub bin_services_for_address {
     my $result = $echo->GetServiceUnitsForObject($property->{uprn});
     return [] unless @$result;
 
-    my $events = $echo->GetEventsForObject($property->{id});
+    my $events = $echo->GetEventsForObject('PointAddress', $property->{id});
     my $open = $self->_parse_open_events($events);
 
     my @out;
@@ -536,13 +536,16 @@ sub bin_services_for_address {
 
         next unless $schedules->{next} or $schedules->{last};
 
+        my $events = $echo->GetEventsForObject('ServiceUnit', $_->{Id});
+        my $open_unit = $self->_parse_open_events($events);
+
         my $containers = $service_to_containers{$_->{ServiceId}};
         my ($open_request) = grep { $_ } map { $open->{request}->{$_} } @$containers;
         my $row = {
             id => $_->{Id},
             service_id => $_->{ServiceId},
             service_name => $service_name_override{$_->{ServiceId}} || $_->{ServiceName},
-            report_open => $open->{missed}->{$_->{ServiceId}},
+            report_open => $open->{missed}->{$_->{ServiceId}} || $open_unit->{missed}->{$_->{ServiceId}},
             request_allowed => $request_allowed{$_->{ServiceId}},
             request_open => $open_request,
             request_containers => $containers,
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index c9eab0cfc..ec21da8fa 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -90,13 +90,16 @@ sub GetTasks {
     }
 
     return [
-        { Ref => { Value => { anyType => [ 123, 456 ] } }, CompletedDate => undef },
         {
-            Ref => { Value => { anyType => [ 234, 567 ] } },
+            Ref => { Value => { anyType => [ 123, 456 ] } },
             State => { Name => 'Completed' },
             Resolution => { Name => 'Wrong Bin Out' },
             CompletedDate => { DateTime => '2020-05-27T10:00:00Z' }
         },
+        {
+            Ref => { Value => { anyType => [ 234, 567 ] } },
+            CompletedDate => undef
+        },
         { Ref => { Value => { anyType => [ 345, 678 ] } }, CompletedDate => undef },
         { Ref => { Value => { anyType => [ 456, 789 ] } }, CompletedDate => undef },
     ] if $self->sample_data;
@@ -319,41 +322,50 @@ sub GetEventType {
 }
 
 sub GetEventsForObject {
-    my ($self, $id, $type) = @_;
+    my ($self, $type, $id, $event_type) = @_;
     my $from = DateTime->now->set_time_zone(FixMyStreet->local_time_zone)->subtract(months => 3);
-    return [ {
-        # Missed collection for service 542 (food waste)
-        EventTypeId => 2100,
-        ServiceId => 542,
-    }, { # And a gate not closed
-        EventTypeId => 2118,
-        ServiceId => 542,
-    }, {
-        # Request for a new paper container
-        EventTypeId => 2104,
-        Data => { ExtensibleDatum => [
-            { Value => 2, DatatypeName => 'Source' },
-            {
-                ChildData => { ExtensibleDatum => [
-                    { Value => 1, DatatypeName => 'Action' },
-                    { Value => 12, DatatypeName => 'Container Type' },
-                ] },
-            },
-        ] },
-        ServiceId => 535,
-    } ] if $self->sample_data;
+    if ($self->sample_data) {
+        return [ {
+            # Missed collection for service 542 (food waste)
+            EventTypeId => 2100,
+            ServiceId => 542,
+        }, { # And a gate not closed
+            EventTypeId => 2118,
+            ServiceId => 542,
+        }, {
+            # Request for a new paper container
+            EventTypeId => 2104,
+            Data => { ExtensibleDatum => [
+                { Value => 2, DatatypeName => 'Source' },
+                {
+                    ChildData => { ExtensibleDatum => [
+                        { Value => 1, DatatypeName => 'Action' },
+                        { Value => 12, DatatypeName => 'Container Type' },
+                    ] },
+                },
+            ] },
+            ServiceId => 535,
+        } ] if $type eq 'PointAddress';
+        return [ {
+            # Missed collection for service 537 (paper)
+            EventTypeId => 2099,
+            ServiceId => 537,
+        } ] if $type eq 'ServiceUnit' && $id == 1002;
+        return [];
+    }
+
     # uncoverable statement
     my $res = $self->call('GetEventsForObject',
         objectRef => ixhash(
             Key => 'Id',
-            Type => 'PointAddress',
+            Type => $type,
             Value => { 'msArray:anyType' => $id },
         ),
         query => ixhash(
-            $type ? (EventTypeRef => ixhash(
+            $event_type ? (EventTypeRef => ixhash(
                 Key => 'Id',
                 Type => 'EventType',
-                Value => { 'msArray:anyType' => $type },
+                Value => { 'msArray:anyType' => $event_type },
             )) : (),
             From => dt_to_hash($from),
         ),