[Sutton] Only allow bulky if service unit present.

mysociety · Jan 24, 2025 · ed9a799 · ed9a799
1 parent 8f0ac6c
commit ed9a799
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/perllib/FixMyStreet/Cobrand/Kingston.pm b/perllib/FixMyStreet/Cobrand/Kingston.pm
@@ -484,6 +484,18 @@ Kingston starts collections at 6:30am, and lets you cancel up until then.
 
 =cut
 
+sub bulky_allowed_property {
+    my ( $self, $property ) = @_;
+
+    return if $property->{has_no_services};
+    my $cfg = $self->feature('echo');
+
+    my $type = $property->{type_id} || 0;
+    my $valid_type = grep { $_ == $type } @{ $cfg->{bulky_address_types} || [] };
+    my $domestic_farm = $type != 7 || $property->{domestic_refuse_bin};
+    return $self->bulky_enabled && $valid_type && $domestic_farm;
+}
+
 sub bulky_collection_time { { hours => 6, minutes => 30 } }
 sub bulky_cancellation_cutoff_time { { hours => 6, minutes => 30, days_before => 0 } }
 

diff --git a/perllib/FixMyStreet/Cobrand/Sutton.pm b/perllib/FixMyStreet/Cobrand/Sutton.pm
@@ -445,6 +445,14 @@ Sutton starts collections at 6am, and lets you cancel up until 6am.
 
 =cut
 
+sub bulky_allowed_property {
+    my ( $self, $property ) = @_;
+    my $cfg = $self->feature('echo');
+    my $type = $property->{type_id} || 0;
+    my $valid_type = grep { $_ == $type } @{ $cfg->{bulky_address_types} || [] };
+    return $self->bulky_enabled && $property->{has_bulky_service} && $valid_type;
+}
+
 sub bulky_collection_time { { hours => 6, minutes => 0 } }
 sub bulky_cancellation_cutoff_time { { hours => 6, minutes => 0, days_before => 0 } }
 

diff --git a/perllib/FixMyStreet/Roles/Cobrand/SLWP.pm b/perllib/FixMyStreet/Roles/Cobrand/SLWP.pm
@@ -637,18 +637,6 @@ sub bulky_show_location_field_mandatory { 1 }
 
 sub bulky_can_refund { 0 }
 
-sub bulky_allowed_property {
-    my ( $self, $property ) = @_;
-
-    return if $property->{has_no_services};
-    my $cfg = $self->feature('echo');
-
-    my $type = $property->{type_id} || 0;
-    my $valid_type = grep { $_ == $type } @{ $cfg->{bulky_address_types} || [] };
-    my $domestic_farm = $type != 7 || $property->{domestic_refuse_bin};
-    return $self->bulky_enabled && $valid_type && $domestic_farm;
-}
-
 sub collection_date {
     my ($self, $p) = @_;
     return $self->_bulky_date_to_dt($p->get_extra_field_value('Collection_Date'));

diff --git a/t/app/controller/waste_kands_bulky.t b/t/app/controller/waste_kands_bulky.t
@@ -818,7 +818,6 @@ FixMyStreet::override_config {
     );
 
     my $echo = Test::MockModule->new('Integrations::Echo');
-    $echo->mock( 'GetServiceUnitsForObject', sub { [{'ServiceId' => 2238}] } );
     $echo->mock( 'GetTasks',                 sub { [] } );
     $echo->mock( 'GetEventsForObject',       sub { [] } );
 
@@ -877,6 +876,15 @@ FixMyStreet::override_config {
         };
     });
 
+    $echo->mock( 'GetServiceUnitsForObject', sub { [{'ServiceId' => 2238}] } );
+
+    subtest 'No bulky service, no option' => sub {
+        $mech->get_ok('/waste/12346/');
+        $mech->content_lacks('Bulky Waste');
+    };
+
+    $echo->mock( 'GetServiceUnitsForObject', sub { [{'ServiceId' => 2238}, {'ServiceId' => 413}] } );
+
     subtest 'Sutton specific Bulky Waste text' => sub {
         $mech->get_ok('/waste/12346/');
         $mech->content_contains('Bulky Waste');