[% c.loc('Call Forwards') %]
diff --git a/t/api-rest/api-callforwards.t b/t/api-rest/api-callforwards.t
index 1cc1da159b..897c81cc59 100644
--- a/t/api-rest/api-callforwards.t
+++ b/t/api-rest/api-callforwards.t
@@ -38,6 +38,12 @@ $fake_data->set_data_from_script({
priority => "2",
timeout => "300"
},
+ {
+ destination => "customhours",
+ priority => "1",
+ timeout => "300",
+ announcement_id => sub { return shift->get_id('soundhandles_custom_announcements',@_); },
+ },
],
sources => [
{
@@ -68,6 +74,10 @@ $test_machine->methods->{item}->{allowed} = {map {$_ => 1} qw(GET HEAD OPT
$test_machine->DATA_ITEM_STORE($fake_data->process('callforwards'));
$test_machine->form_data_item( );
+my $announcement_id = $test_machine->DATA_ITEM->{cfb}->{destinations}->[2]->{announcement_id};
+ok($announcement_id =~/^\d+$/,"announcement_id should be a positiv integer: $announcement_id");
+
+
SKIP:{
my ($res,$req,$content);
my $cf1 = $test_machine->get_item_hal();
@@ -84,12 +94,17 @@ SKIP:{
(undef, $cf1single) = $test_machine->check_item_get($cf1single_uri,"fetch cf id $cf1_id");
#check cf structure
+ delete $cf1single->{_links};
is(ref $cf1single, "HASH", "cf should be hash");
- ok(exists $cf1single->{cfu}, "cf should have key cfu");
- ok(exists $cf1single->{cfb}, "cf should have key cfb");
- ok(exists $cf1single->{cft}, "cf should have key cft");
- ok(exists $cf1single->{cfna}, "cf should have key cfna");
- ok(exists $cf1single->{cfs}, "cf should have key cfs");
+ my @valid_types = (qw/cfu cfb cft cfna cfs/);
+ my %valid_types;
+ @valid_types{@valid_types} = ( 1 ) x @valid_types;
+ foreach my $type(@valid_types){
+ ok(exists $cf1single->{$type}, "cf should have key $type");
+ }
+ foreach my $test_type (keys %{$cf1single}){
+ ok( exists $valid_types{$test_type} , "check cf against unknown types: $test_type");
+ }
#write cf and check written values
my($cf1_put,$cf1_get) = $test_machine->check_put2get({data_in => $test_machine->DATA_ITEM, uri => $cf1single_uri},undef, 1 );
@@ -101,6 +116,10 @@ SKIP:{
is ($cf1_put->{content}->{cfb}{destinations}->[0]->{destination}, "customhours", "Check customhours destination");
is ($cf1_put->{content}->{cfb}{destinations}->[1]->{destination}, "officehours", "Check customhours destination");
+ is ($cf1_put->{content}->{cfb}{destinations}->[2]->{announcement_id}, $announcement_id, "Check announcement_id after put");
+ is ($cf1_get->{content}->{cfb}{destinations}->[2]->{announcement_id}, $announcement_id, "Check announcement_id after get");
+
+
#write invalid 'timeout'
($res,$content,$req) = $test_machine->request_put({
cfu => {
@@ -137,6 +156,50 @@ SKIP:{
($res,$mod_cf1) = $test_machine->request_patch( [ { op => 'replace', path => '/cfu/destinations/0/timeout', value => 'invalid' } ] );
is($res->code, 422, "check patched invalid status");
+ #5954
+ my $data = {
+ destinations => [
+ {
+ destination => "officehours",
+ timeout => "15",
+ announcement_id => $announcement_id,
+ },
+ ],
+ };
+ ($res,$content,$req) = $test_machine->request_put({
+ data_in => {
+ cfu => $data,
+ },
+ uri => $cf1single_uri,
+ });
+ is ($content->{cfu}->{destinations}->[0]->{announcement_id}, undef, "Check announcement_id after put into other destination (officehours)");
+ #$test_machine->http_code_msg(422, "Check announcement_id for the officehours", $res, $content);#got 200 here
+
+ $data->{destinations}->[0]->{destination} = 'customhours';
+ ($res,$content,$req) = $test_machine->request_put({ cfu => $data}, $cf1single_uri );
+ is($content->{cfu}->{destinations}->[0]->{announcement_id}, $announcement_id, "Check announcement_id after put into correct destination (customhours)");
+
+
+ foreach my $destination (qw/officehours customhours/){
+ $data->{destinations}->[0]->{destination} = $destination;
+ #$data->{destinations}->[0]->{destination} = 'customhours';
+
+ $data->{destinations}->[0]->{announcement_id} = 9999999;
+ ($res,$content,$req) = $test_machine->request_put({ cfu => $data}, $cf1single_uri);
+ $test_machine->http_code_msg(422, "Check absent announcement_id", $res, $content);
+
+ $data->{destinations}->[0]->{announcement_id} = 'aaaaa';
+ ($res,$content,$req) = $test_machine->request_put({ cfu => $data}, $cf1single_uri);
+ $test_machine->http_code_msg(422, "Check invalid announcement_id", $res, $content);
+
+ my $wrong_announcement_hal = $test_machine->get_item_hal('soundhandles', '/api/soundhandles/?group=pbx');
+ $data->{destinations}->[0]->{announcement_id} = $wrong_announcement_hal->{content}->{id};
+ ($res,$content,$req) = $test_machine->request_put({ cfu => $data }, $cf1single_uri );
+ $test_machine->http_code_msg(422, "Check announcement_id from other group", $res, $content);
+ }
+
+ #return initial state:
+ $test_machine->request_put( $cf1single, $cf1single_uri );
}
done_testing;
diff --git a/t/api-rest/api-cfdestinationsets.t b/t/api-rest/api-cfdestinationsets.t
index 0816f9f29f..6dae33936c 100644
--- a/t/api-rest/api-cfdestinationsets.t
+++ b/t/api-rest/api-cfdestinationsets.t
@@ -4,6 +4,7 @@ use warnings;
use Test::More;
use Test::Collection;
use Test::FakeData;
+use Data::Dumper;
my $test_machine = Test::Collection->new(
name => 'cfdestinationsets',
@@ -18,7 +19,14 @@ $fake_data->set_data_from_script({
data => {
destinations => [
{
- destination => "sip:custom-hours\@app.local",
+ destination => "customhours",
+ priority => 1,
+ timeout => 300,
+ announcement_id => sub { return shift->get_id('soundhandles_custom_announcements',@_); },,
+ },
+ #without announcement
+ {
+ destination => "customhours",
priority => 1,
timeout => 300,
}
@@ -94,8 +102,36 @@ SKIP:
($res, $content) = $test_machine->request_get('/api/cftimesets/99987');
is($res->code, 404, "check get nonexistent cftimesets item");
}
+{
+#5954
+ my($res,$content,$req);
+ $test_machine->runas('admin');
+ my $d = $test_machine->check_create_correct( 1, sub{
+ $_[0]->{name} .= '5954' ;
+ } )->[0];
+ ok(exists $d->{content}->{destinations}->[0]->{announcement_id},"Check announcement_id existance");
+
+ my (undef,$announcement_hal) = $test_machine->check_item_get('/api/soundhandles/'.$d->{content}->{destinations}->[0]->{announcement_id});
+ ok($announcement_hal->{group} eq 'custom_announcements', 'Check announcement group' );
+
+ $d->{content}->{destinations}->[0]->{announcement_id} = 'aaa';
+ ($res,$content,$req) = $test_machine->request_put(@$d{qw/content location/});
+ $test_machine->http_code_msg(422, "Check invalid announcement_id", $res, $content);
+
+ $d->{content}->{destinations}->[0]->{announcement_id} = '999999';
+ ($res,$content,$req) = $test_machine->request_put(@$d{qw/content location/});
+ $test_machine->http_code_msg(422, "Check absent announcement_id", $res, $content);
+ my $wrong_announcement_hal = $test_machine->get_item_hal('soundhandles', '/api/soundhandles/?group=pbx');
+ $d->{content}->{destinations}->[0]->{announcement_id} = $wrong_announcement_hal->{content}->{id};
+ ($res,$content,$req) = $test_machine->request_put(@$d{qw/content location/});
+ $test_machine->http_code_msg(422, "Check announcement_id from other group", $res, $content);
+
+}
+$fake_data->clear_test_data_all();
$test_machine->clear_test_data_all();
+undef $fake_data;
+undef $test_machine;
done_testing;
# vim: set tabstop=4 expandtab:
diff --git a/t/lib/Test/Collection.pm b/t/lib/Test/Collection.pm
index c1e85da686..8d083ec2c7 100644
--- a/t/lib/Test/Collection.pm
+++ b/t/lib/Test/Collection.pm
@@ -1022,15 +1022,16 @@ sub check_create_correct{
sub clear_test_data_all{
my($self,$uri,$strict) = @_;
+ my $name = $self->name // '';
my @uris = $uri ? (('ARRAY' eq ref $uri) ? @$uri : ($uri)) : keys %{ $self->DATA_CREATED->{ALL} };
foreach my $del_uri(@uris){
$del_uri = $self->normalize_uri($del_uri);
my($req,$res,$content) = $self->request_delete($del_uri);
if($strict){#for particular deletion test
- $self->http_code_msg(204, "$self->name: check delete item $del_uri",$res,$content);
+ $self->http_code_msg(204, "$name: check delete item $del_uri",$res,$content);
}elsif($res->code == 404){
#todo: if fake data will provide tree of the cascade deletion - it can be checked here, I think
- diag($self->name.": Item $del_uri is absent already.");
+ diag($name.": Item $del_uri is absent already.");
}
}
$self->clear_data_created();
@@ -1150,7 +1151,7 @@ sub resource_clear_file{
sub get_id_from_hal{
my($self,$hal,$name) = @_;
$name //= $self->name;
- my $id = $hal->{_embedded}->{'ngcp:'.$name}->{_links}{self}{href} =~ m!${name}/([0-9]*)$!;
+ (my ($id)) = $hal->{_embedded}->{'ngcp:'.$name}->{_links}{self}{href} =~ m!${name}/([0-9]*)$!;
return $id;
}
sub uri2location{
diff --git a/t/lib/Test/FakeData.pm b/t/lib/Test/FakeData.pm
index 935e514539..5ce456193e 100644
--- a/t/lib/Test/FakeData.pm
+++ b/t/lib/Test/FakeData.pm
@@ -241,6 +241,14 @@ sub build_data{
'no_delete_available' => 1,
'collection' => 'customers',
},
+ 'soundhandles_custom_announcements' => {
+ 'data' => {
+ group => 'custom_announcements',
+ },
+ 'query' => ['group'],
+ 'no_delete_available' => 1,
+ 'collection' => 'soundhandles',
+ },
'billingprofiles' => {
'data' => {
name => 'api_test test profile'.time(),
@@ -471,10 +479,14 @@ sub get_id{
my( $collection_name ) = @_;
$self->load_collection_data($collection_name);
my $res_id;
- if( $self->collection_id_exists($collection_name) ){
- $res_id = $self->get_existent_id($collection_name);
+ if('CODE' eq ref $self->data->{$collection_name}->{get_id}){
+ $res_id = $self->data->{$collection_name}->get_id();
}else{
- $res_id = $self->create(@_);
+ if( $self->collection_id_exists($collection_name) ){
+ $res_id = $self->get_existent_id($collection_name);
+ }else{
+ $res_id = $self->create(@_);
+ }
}
return $res_id;
}