[Bristol][Alloy] Adds extra street cleansing categories

Moving from having all street cleansing categories under
one group, to having street cleansing category
in another group.

Specifically, the bike category wants to fit into
the main bike category.

Author: MorayMySoc

perllib/Open311/Endpoint/Integration/UK/Bristol/Alloy.pm

@@ -33,7 +33,12 @@ sub process_attributes {
 
     my $attributes_values = $self->config->{'request_attribute_to_values'};
     my $code = $args->{service_code_alloy};
-    if (grep { $code =~ /$_/ } keys %{$self->config->{service_whitelist}->{'SC-Street Cleansing'}}) {
+    if (grep { $code =~ /$_/ } keys %{
+            {
+                %{$self->config->{service_whitelist}->{'SC-Street Cleansing'} || {} },
+                %{$self->config->{service_whitelist}->{'Abandoned bikes/scooters'} || {} }
+            }
+        }) {
         my $value;
         if ($code eq 'Dead animal') {
             $value = [ $attributes_values->{TypeOfAnimal}->[ $args->{attributes}->{TypeOfAnimal} ] ];

t/open311/endpoint/bristol_alloy.t

@@ -110,6 +110,17 @@ subtest "check service group and category aliases" => sub {
             'type' => 'realtime',
             'service_code' => 'SC-Graffiti_Defect_1'
           },
+          {
+            "description" => "Abandoned private bike/scooter",
+            "service_code" => "Abandoned_private_bike/scooter",
+            "metadata" => "true",
+            "service_name" => "Abandoned private bike/scooter",
+            "groups" => [
+                "Abandoned bikes/scooters"
+            ],
+            "type" => "realtime",
+            "keywords" => ""
+          },
           {
             'service_name' => 'Bin overflowing',
             'metadata' => 'true',
@@ -292,6 +303,22 @@ for my $test (
         },
         expected_design => 'designs_bWCSCStreetCleansingDefect_5e21a98bca315003e0983035',
     },
+    {
+        title => "Bike report",
+        extra_params => {
+            'attribute[SizeOfIssue]' => '1',
+            'attribute[category]' => 'Abandoned_private_bike/scooter',
+            'service_code' => 'Abandoned_private_bike/scooter',
+        },
+        expected => {
+            'attributes_bWCSCStreetCleansingDefectSizeOfIssue_5e21b5ccca31500d1c836be0' => ['5e1f1bf0ca31500c541f82cb'],
+            'attributes_bWCSCStreetCleansingDefectJobType_5e21b5adca31500d1c836bc9' => ['5e2179a3ca315012d099999'],
+            'attributes_bWCSCStreetCleansingDefectFullDetails_5e21b587ca31500cc0a2df3a' => "title\n\ndescription",
+            'attributes_bWCSCStreetCleansingDefectLocality_5e6f97fe4cee260f90aca0d6' => ['5e16fa66ca314f0980300be5'],
+            'attributes_bWCSCStreetCleansingDefectFixMyStreetID_67654e2a1e4316383b73050f' => '123',
+        },
+        expected_design => 'designs_bWCSCStreetCleansingDefect_5e21a98bca315003e0983035',
+    },
 ) {
     subtest $test->{title} => sub {
         my $res = $endpoint->run_test_request(

t/open311/endpoint/bristol_alloy.yml

@@ -15,6 +15,9 @@
       "SC-Fly-Tip Defect": { "alias": "Flytipping" },
       "SC-Graffiti Defect": { "alias": "Graffiti" },
     },
+    "Abandoned bikes/scooters": {
+        "Abandoned private bike/scooter": 1,
+    },
     "SC-Street Cleansing": {
         "alias": "Street cleansing",
         "Bin overflowing": 1,
@@ -86,6 +89,7 @@
       'Bin overflowing': '5e217a6cca315012d0956696',
       'Blood': '5e21782dca315003e09804a2',
       'Dog fouling': '5e2179a3ca315012d0956667',
+      'Abandoned private bike/scooter': '5e2179a3ca315012d099999',
     },
   },