From 1a1fb8f4ff28e8443cf4153e59fc80ffff3cb7bc Mon Sep 17 00:00:00 2001 From: Kirill Solomko Date: Fri, 2 Dec 2022 11:13:54 +0100 Subject: [PATCH] MT#56087 fix /api/callforwards sets auto creation * with PUT/PATCH data source and bnumber quick sets are correctly automatically created now Change-Id: Ia6f3be8958081f1611a1473b35c73826a9ed8784 (cherry picked from commit e2afe2ea06d128c4c2f56807d834eea49f53316c) --- lib/NGCP/Panel/Role/API/CallForwards.pm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/NGCP/Panel/Role/API/CallForwards.pm b/lib/NGCP/Panel/Role/API/CallForwards.pm index fb65dabe59..1cf5adab7a 100644 --- a/lib/NGCP/Panel/Role/API/CallForwards.pm +++ b/lib/NGCP/Panel/Role/API/CallForwards.pm @@ -292,7 +292,12 @@ sub update_item { } } else { if ((defined $resource->{$type}{sources}) && @{ $resource->{$type}{sources}}) { - $sset = $mapping->create_related('source_set', {'name' => "quickset_$type", subscriber_id => $prov_subscriber_id,} ); + $sset = $mapping->create_related('source_set', { + name => "quickset_$type", + subscriber_id => $prov_subscriber_id, + mode => $resource->{$type}{sources_mode}, + is_regex => $resource->{$type}{sources_is_regex}, + }); $mapping->update({source_set_id => $sset->id}); } } @@ -307,7 +312,12 @@ sub update_item { } } else { if ((defined $resource->{$type}{bnumbers}) && @{ $resource->{$type}{bnumbers}}) { - $bset = $mapping->create_related('bnumber_set', {'name' => "quickset_$type", subscriber_id => $prov_subscriber_id,} ); + $bset = $mapping->create_related('bnumber_set', { + name => "quickset_$type", + subscriber_id => $prov_subscriber_id, + mode => $resource->{$type}{bnumbers_mode}, + is_regex => $resource->{$type}{bnumbers_is_regex}, + }); $mapping->update({bnumber_set_id => $bset->id}); } } @@ -325,6 +335,7 @@ sub update_item { ); $dset->voip_cf_destinations->update_or_create($d); } + for my $t (@{ $resource->{$type}{times} }) { delete $t->{time_set_id}; $tset->voip_cf_periods->update_or_create($t);