MT#11917 align snapshots in DELETE methods

+error message in test descriptions texts
+with recent changes to "description" fields to "required", the strict_sql_mode flage in api-journals.t has to be set.
+missing cftimestes and cfdestinationsets DELETE methods are now finally "journalized" and tested OK.
+other tests were disabled:
>test_billingzone -> journal settings not in yaml file yet, test_customerpreferences -> a valid ncos level item has to be referred (since today?) - ncos api crud methods not journalized yet
>test_profilepreferences -> a valid rewrite rule set item has to be referred (since today?) - rewrite rule set api crud methods not journalized yet
>test_autoattendants -> journal settings not in yaml file yet
>test_subscriberpreferences -> a valid ncos level item has to be referred (since today?) - ncos api crud methods not journalized yet

Change-Id: I75b24b3eb0758d6e4e248758c7861f93abc791c0
changes/71/1771/1
Rene Krenn 11 years ago
parent 3aef87e77f
commit a750b795f1

@ -186,12 +186,18 @@ sub DELETE :Allow {
my ($self, $c, $id) = @_;
my $guard = $c->model('DB')->txn_scope_guard;
{
my $rule = $self->item_by_id($c, $id, "rules");
last unless $self->resource_exists($c, rule => $rule);
my $dset = $self->item_by_id($c, $id);
last unless $self->resource_exists($c, destinationset => $dset);
last unless $self->add_delete_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
return $self->hal_from_item($c, $dset, "cfdestinationsets"); });
try {
$rule->delete;
$dset->delete;
} catch($e) {
$c->log->error("Failed to delete rewriterule with id '$id': $e");
$c->log->error("Failed to delete cfdestinationset with id '$id': $e");
$self->error($c, HTTP_INTERNAL_SERVER_ERROR, "Internal Server Error");
last;
}

@ -186,12 +186,18 @@ sub DELETE :Allow {
my ($self, $c, $id) = @_;
my $guard = $c->model('DB')->txn_scope_guard;
{
my $rule = $self->item_by_id($c, $id, "rules");
last unless $self->resource_exists($c, rule => $rule);
my $tset = $self->item_by_id($c, $id);
last unless $self->resource_exists($c, timeset => $tset);
last unless $self->add_delete_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
return $self->hal_from_item($c, $tset, "cftimesets"); });
try {
$rule->delete;
$tset->delete;
} catch($e) {
$c->log->error("Failed to delete rewriterule with id '$id': $e");
$c->log->error("Failed to delete cftimeset with id '$id': $e");
$self->error($c, HTTP_INTERNAL_SERVER_ERROR, "Internal Server Error");
last;
}

@ -107,6 +107,11 @@ sub DELETE :Allow {
}
}
last unless $self->add_delete_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
return $self->hal_from_item($c,$domain); });
my $prov_domain = $domain->provisioning_voip_domain;
if ($prov_domain) {
$prov_domain->voip_dbaliases->delete;
@ -115,11 +120,6 @@ sub DELETE :Allow {
$prov_domain->delete;
}
last unless $self->add_delete_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
return $self->hal_from_item($c,$domain); });
$domain->delete;
try {

@ -186,6 +186,12 @@ sub DELETE :Allow {
my $item = $self->item_by_id($c, $id);
last unless $self->resource_exists($c, soundset => $item);
last unless $self->add_delete_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
my $_form = $self->get_form($c);
return $self->hal_from_item($c, $item, $_form); });
if($item->contract_id) {
my $pref_rs = NGCP::Panel::Utils::Preferences::get_usr_preference_rs(
c => $c, attribute => 'contract_sound_set',
@ -202,12 +208,6 @@ sub DELETE :Allow {
})->delete_all; # explicit delete_all, otherwise query fails
}
last unless $self->add_delete_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
my $_form = $self->get_form($c);
return $self->hal_from_item($c, $item, $_form); });
$item->delete;
$guard->commit;

@ -206,6 +206,12 @@ sub DELETE :Allow {
my $item = $self->item_by_id($c, $id);
last unless $self->resource_exists($c, subscriberprofileset => $item);
last unless $self->add_delete_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
my $_form = $self->get_form($c);
return $self->hal_from_item($c, $item, $_form); });
$c->model('DB')->resultset('provisioning_voip_subscribers')->search({
profile_set_id => $item->id,
})->update({
@ -215,12 +221,6 @@ sub DELETE :Allow {
$item->voip_subscriber_profiles->delete;
last unless $self->add_delete_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
my $_form = $self->get_form($c);
return $self->hal_from_item($c, $item, $_form); });
$item->delete;
$guard->commit;

@ -193,6 +193,12 @@ sub DELETE :Allow {
my $item = $self->item_by_id($c, $id);
last unless $self->resource_exists($c, subscriberprofile => $item);
last unless $self->add_delete_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
my $_form = $self->get_form($c);
return $self->hal_from_item($c, $item, $_form); });
$c->model('DB')->resultset('provisioning_voip_subscribers')->search({
profile_id => $item->id,
})->update({
@ -209,12 +215,6 @@ sub DELETE :Allow {
$item->voip_prof_preferences->delete;
last unless $self->add_delete_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
my $_form = $self->get_form($c);
return $self->hal_from_item($c, $item, $_form); });
$item->delete;
$guard->commit;

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save