Skip to content

[Dumfries] Setting 'responsibility' on the extras of an update #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MorayMySoc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Dumfries] Setting 'responsibility' on the extras of an update #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 32 additions & 9 deletions perllib/Open311/Endpoint/Integration/UK/Dumfries.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,15 +266,7 @@ sub _get_inspection_updates_design {
if ($mapping && $mapping->{extra_attributes} && $mapping->{extra_attributes}{latest_inspection_time}) {
my $latest_inspection = $self->_find_latest_inspection($report);
if ($latest_inspection) {
my $inspection_attrs = $self->alloy->attributes_to_hash($latest_inspection);
my $completion_time = $inspection_attrs->{attributes_tasksCompletionTime};

if ($completion_time) {
$completion_time = $completion_time->[0] if ref $completion_time eq 'ARRAY';
$update->{extras}{latest_inspection_time} = $completion_time;
} else {
$update->{extras}{latest_inspection_time} = 'NOT COMPLETE';
}
$self->_set_extras_on_fetched_updates($latest_inspection, $update);
}
}
}
Expand All @@ -283,6 +275,37 @@ sub _get_inspection_updates_design {
return (\@updates, $items_by_id);
}

=head2 _set_extras_on_fetched_updates

Use the latest inspection to add 'extras' to an update so that we can
carry forward extra information to be shown on FMS

=cut


sub _set_extras_on_fetched_updates {
my ($self, $latest_inspection, $update) = @_;

my $inspection_attrs = $self->alloy->attributes_to_hash($latest_inspection);
my $completion_time = $inspection_attrs->{attributes_tasksCompletionTime};

if ($completion_time) {
$completion_time = $completion_time->[0] if ref $completion_time eq 'ARRAY';
$update->{extras}{latest_inspection_time} = $completion_time;
} else {
$update->{extras}{latest_inspection_time} = 'NOT COMPLETE';
}

my $mapping = $self->config->{other_responsibility_mapping};
if (

@davea davea May 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If other_responsibility_mapping isn't set in config this prints a bunch of warnings, maybe we should check for $mapping too?

$mapping && (my $responsibility = $inspection_attrs->{ $mapping->{'highway'} } || $inspection_attrs->{ $mapping->{'streetlight'} })
)
{
$responsibility = $responsibility->[0] if ref $responsibility eq 'ARRAY';
$update->{extras}{responsibility} = $mapping->{'fields'}{$responsibility} || '';
};
}

=head2 get_photo

Fetch a photo from Alloy by its file item ID.
Expand Down
11 changes: 11 additions & 0 deletions t/open311/endpoint/dumfries_alloy.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use JSON::MaybeXS;
use Path::Tiny;
use YAML::XS qw(LoadFile);
use Data::Dumper;
use DateTime;

BEGIN { $ENV{TEST_MODE} = 1; }

Expand Down Expand Up @@ -434,6 +435,16 @@ subtest 'priority pulled through' => sub {
}, 'Inspection update has correct data with priority';
};

subtest 'extras set on updates' => sub {
my $dumfries = Open311::Endpoint::Integration::UK::Dummy->new;
my $update = Open311::Endpoint::Service::Request::Update::mySociety->new('service_request_id' => '63ee34826965f30390f01cda', 'external_status_code' => '1212aad:1234ade:987ffa', 'description' => '', 'updated_datetime' => DateTime->today(), 'update_id' => 'test_id', 'status' => 'not_councils_responsibility');
my $latest_report = { 'attributes' => [ { "attributeCode" => "attributes_hWY3rdPartyResponsibility", "value" => [ "66e81123d77d63bb1e210d26" ] } ] };

$dumfries->_set_extras_on_fetched_updates($latest_report, $update);
is $update->extras->{responsibility}, 'Scottish Water', '3rd party added to responsibility';
is $update->extras->{latest_inspection_time}, 'NOT COMPLETE', 'latest_inspection_time set';
};

subtest 'defect updates include priority from extra_attributes' => sub {
my $res = $endpoint->run_test_request(
GET => '/servicerequestupdates.json?start_date=2025-12-25T00:00:00Z&end_date=2025-12-26T00:00:00Z'
Expand Down
8 changes: 8 additions & 0 deletions t/open311/endpoint/dumfries_alloy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ inspection_attribute_mapping:
extra_attributes:
priority: root.attributes_serviceEnquiryHWYPriority_652e86d3737fc1d2c84c720b.attributes_itemsTitle

# Mapping of Alloy 3rd party assignees
other_responsibility_mapping:
highway: attributes_hWY3rdPartyResponsibility
streetlight: attributes_STL3rdPartyResponsibility
fields:
66e81123d77d63bb1e210d26: 'Scottish Water'
66e8138277068653dfdaac90: 'Other'

# Mapping from incoming Open311 update parameters to inspection attributes
update_to_inspection_attribute_mapping:
updated_datetime: attributes_tasksRaisedTime
Expand Down
Loading