From d33cd1cc475706f333eb8e3bcc304ce77b9c2340 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 1 May 2026 16:51:58 +0100 Subject: [PATCH] [Kingston] [Sutton] Staff user in CSV export. --- perllib/FixMyStreet/Roles/Cobrand/KingstonSutton.pm | 5 +++++ t/app/controller/waste_kingston.t | 2 ++ 2 files changed, 7 insertions(+) diff --git a/perllib/FixMyStreet/Roles/Cobrand/KingstonSutton.pm b/perllib/FixMyStreet/Roles/Cobrand/KingstonSutton.pm index 97734fa4284..5344c730d7a 100644 --- a/perllib/FixMyStreet/Roles/Cobrand/KingstonSutton.pm +++ b/perllib/FixMyStreet/Roles/Cobrand/KingstonSutton.pm @@ -238,6 +238,7 @@ sub dashboard_export_problems_add_columns { uprn => 'UPRN', user_email => 'User Email', user_phone => 'User Phone', + staff_user => 'Staff User', payment_method => 'Payment method', payment_reference => 'Payment reference', payment => 'Payment', @@ -256,6 +257,8 @@ sub dashboard_export_problems_add_columns { join => 'user', }); + my $user_lookup = $self->csv_staff_users; + $csv->csv_extra_data(sub { my $report = shift; @@ -265,6 +268,7 @@ sub dashboard_export_problems_add_columns { } else { my @fields = @{ $report->get_extra_fields() }; %fields = map { $_->{name} => $_->{value} } @fields; + $fields{contributed_by} = $report->get_extra_metadata('contributed_by'); } my $detail = $csv->dbi ? $report->{detail} : $report->detail; @@ -281,6 +285,7 @@ sub dashboard_export_problems_add_columns { user_email => $report->user->email || '', user_phone => $report->user->phone || '', payment_reference => $report->get_extra_metadata('payment_reference') || '', + staff_user => $self->csv_staff_user_lookup($fields{contributed_by}, $user_lookup), ), payment_method => $fields{payment_method} || '', payment => $fields{payment}, diff --git a/t/app/controller/waste_kingston.t b/t/app/controller/waste_kingston.t index a125dda278b..b055e94bde8 100644 --- a/t/app/controller/waste_kingston.t +++ b/t/app/controller/waste_kingston.t @@ -1238,6 +1238,7 @@ FixMyStreet::override_config { $mech->content_contains('a_user_2@example.net'); $mech->content_contains('unconfirmed'); $mech->content_contains('4000,,1500,1915,1,2'); # Fee/fee/fee/bin/current/sub + $mech->content_contains('a_user@example.net,,pkg-tappcontrollerwaste_kingstont-staff@example.org'); }; subtest 'check CSV pregeneration' => sub { @@ -1252,6 +1253,7 @@ FixMyStreet::override_config { $mech->content_contains('a_user_2@example.net'); $mech->content_contains('unconfirmed'); $mech->content_contains('4000,,1500,1915,1,2'); # Fee/fee/fee/bin/current/sub + $mech->content_contains('a_user@example.net,,pkg-tappcontrollerwaste_kingstont-staff@example.org'); }; subtest 'check new sub price changes at fixed time' => sub {