Merge branch 'bexley-ww-remove-clinical-waste' into commercial-staging

mysociety · May 14, 2024 · c210879 · c210879
2 parents ce7d2de + 3bd3565
commit c210879
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/perllib/FixMyStreet/Cobrand/Bexley/Waste.pm b/perllib/FixMyStreet/Cobrand/Bexley/Waste.pm
@@ -126,6 +126,9 @@ sub bin_services_for_address {
     for my $service (@$site_services) {
         next if !$service->{NextCollectionDate};
 
+        my $container = $containers->{ $service->{ServiceItemName} };
+        next unless $container;
+
         my $next_dt = eval {
             DateTime::Format::W3CDTF->parse_datetime(
                 $service->{NextCollectionDate} );
@@ -158,16 +161,12 @@ sub bin_services_for_address {
             next if $now_dt > $to_dt;
         }
 
-        my $containers = $self->_containers($property);
-
         my ($round) = split / /, $service->{RoundSchedule};
         my $filtered_service = {
             id             => $service->{SiteServiceID},
             service_id     => $service->{ServiceItemName},
-            service_name =>
-                $containers->{ $service->{ServiceItemName} }{name},
-            service_description =>
-                $containers->{ $service->{ServiceItemName} }{description},
+            service_name        => $container->{name},
+            service_description => $container->{description},
             round_schedule => $service->{RoundSchedule},
             round          => $round,
             next           => {
@@ -657,10 +656,6 @@ For:
 HTML
 
     return {
-        'CW-SACK' => {
-            name        => 'Clinical Waste Sack(s)',
-            description => 'Clinical waste',
-        },
         'FO-140' => {
             name => 'Communal Food Bin',
             description => 'Food waste',

diff --git a/t/app/controller/waste_bexley.t b/t/app/controller/waste_bexley.t
@@ -859,6 +859,14 @@ sub _site_collections {
 
                 RoundSchedule => 'RND-8-9 Mon, RND-8-9 Wed',
             },
+            # CW-SACK (Clinical waste) is not in container list so won't be shown
+            {
+                SiteServiceID          => 99,
+                ServiceItemDescription => 'Clinical Waste Sack',
+                ServiceItemName        => 'CW-SACK',
+
+                NextCollectionDate   => '2024-04-01T00:00:00',
+            },
         ],
         10003 => [
             {   SiteServiceID          => 1000,