sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#6827 API POST/PUT/PATCH/DELETE of field devices

Browse Source
ipeshinskaya/InvoiceTemplate5
Andreas Granig 12 years ago
parent d2a3348a78
commit 976843e55e
5 changed files with 258 additions and 124 deletions
Show Stats Download Patch File Download Diff File

86
lib/NGCP/Panel/Controller/API/PbxDevices.pm
Unescape View File

@ -25,6 +25,39 @@ class_has 'query_params' => (
is => 'ro',
isa => 'ArrayRef',
default => sub {[
{
param => 'customer_id',
description => 'Search for PBX devices belonging to a specific customer',
query => {
first => sub {
my $q = shift;
return { contract_id => $q };
},
second => sub {},
},
},
{
param => 'profile_id',
description => 'Search for PBX devices with a specific autoprovisioning device profile',
query => {
first => sub {
my $q = shift;
return { profile_id => $q };
},
second => sub {},
},
},
{
param => 'identifier',
description => 'Search for PBX devices matching an identifier/MAC pattern (wildcards possible)',
query => {
first => sub {
my $q = shift;
return { identifier => { like => $q } };
},
second => sub {},
},
}
]},
);
@ -152,6 +185,32 @@ sub POST :Allow {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Entry with given 'identifier' already exists.");
last;
}
my $customer_rs = $schema->resultset('contracts')->search({
id => $resource->{customer_id},
status => { '!=' => 'terminated' },
});
if($c->user->roles eq "admin") {
} elsif($c->user->roles eq "reseller") {
$customer_rs = $customer_rs->search({
'contact.reseller_id' => $c->user->reseller_id,
}, {
join => 'contact',
});
}
my $customer = $customer_rs->first;
unless($customer) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid customer_id, does not exist.");
last;
}
my $dev_model = $self->model_from_profile_id($c, $resource->{profile_id});
last unless($dev_model);
unless($dev_model->reseller_id == $customer->contact->reseller_id) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid customer_id and profile_id combination, both must belong to the same reseller.");
last;
}
for my $line ( @{$resource->{lines}} ) {
unless ($line->{subscriber_id} && $line->{subscriber_id} > 0) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid line. Invalid 'subscriber_id'.");
@ -163,30 +222,39 @@ sub POST :Allow {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'subscriber_id'. Could not find subscriber.");
return;
}
$resource->{subscriber_id} = $p_subs->id;
unless ($line->{linerange_id} && $line->{linerange_id} > 0) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid line. Invalid 'linerange_id'.");
$line->{subscriber_id} = $p_subs->id;
unless(defined $line->{linerange}) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid line. Invalid 'linerange'.");
return;
}
my $linerange = $dev_model->autoprov_device_line_ranges->find({
name => $line->{linerange}
});
unless($linerange) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'linerange', does not exist.");
return;
}
my $tmp_linerange = $schema->resultset('autoprov_device_line_ranges')->find($line->{linerange_id});
unless ($tmp_linerange) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'linerange_id'. Could not find autoprov_device_line_range.");
delete $line->{linerange};
$line->{linerange_id} = $linerange->id;
if($line->{key_num} >= $linerange->num_lines) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'key_num', out of range for this linerange.");
return;
}
$line->{line_type} = delete $line->{type};
}
my $device;
try {
$device = $schema->resultset('autoprov_field_devices')->create({
profile_id => $resource->{profile_id},
contract_id => $resource->{contract_id},
contract_id => $customer->id,
identifier => $resource->{identifier},
station_name => $resource->{station_name},
});
for my $line ( @{$resource->{lines}} ) {
$device->create_related("autoprov_field_device_lines", $line); #TODO error check
$device->autoprov_field_device_lines->create($line);
}
} catch($e) {
$c->log->error("failed to create pbxdevice: $e");

32
lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm
Unescape View File

@ -100,15 +100,15 @@ sub PATCH :Allow {
);
last unless $json;
my $dset = $self->item_by_id($c, $id);
last unless $self->resource_exists($c, destinationset => $dset);
my $old_resource = $self->hal_from_item($c, $dset, "destinationsets")->resource;
my $device = $self->item_by_id($c, $id);
last unless $self->resource_exists($c, pbxdevice => $device);
my $old_resource = $self->resource_from_item($c, $device);
my $resource = $self->apply_patch($c, $old_resource, $json);
last unless $resource;
my $form = $self->get_form($c);
$dset = $self->update_item($c, $dset, $old_resource, $resource, $form);
last unless $dset;
$device = $self->update_item($c, $device, $old_resource, $resource, $form);
last unless $device;
$guard->commit;
@ -117,7 +117,7 @@ sub PATCH :Allow {
$c->response->header(Preference_Applied => 'return=minimal');
$c->response->body(q());
} else {
my $hal = $self->hal_from_item($c, $dset, "destinationsets");
my $hal = $self->hal_from_item($c, $device, "pbxdevices");
my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
$hal->http_headers,
), $hal->as_json);
@ -136,19 +136,19 @@ sub PUT :Allow {
my $preference = $self->require_preference($c);
last unless $preference;
my $dset = $self->item_by_id($c, $id);
last unless $self->resource_exists($c, destinationset => $dset);
my $device = $self->item_by_id($c, $id);
last unless $self->resource_exists($c, pbxdevice => $device);
my $resource = $self->get_valid_put_data(
c => $c,
id => $id,
media_type => 'application/json',
);
last unless $resource;
my $old_resource = { $dset->get_inflated_columns };
my $old_resource = $self->resource_from_item($c, $device);
my $form = $self->get_form($c);
$dset = $self->update_item($c, $dset, $old_resource, $resource, $form);
last unless $dset;
$device = $self->update_item($c, $device, $old_resource, $resource, $form);
last unless $device;
$guard->commit;
@ -157,7 +157,7 @@ sub PUT :Allow {
$c->response->header(Preference_Applied => 'return=minimal');
$c->response->body(q());
} else {
my $hal = $self->hal_from_item($c, $dset, "destinationsets");
my $hal = $self->hal_from_item($c, $device, "pbxdevices");
my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
$hal->http_headers,
), $hal->as_json);
@ -173,12 +173,12 @@ 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 $device = $self->item_by_id($c, $id);
last unless $self->resource_exists($c, pbxdevice => $device);
try {
$rule->delete;
$device->delete;
} catch($e) {
$c->log->error("Failed to delete rewriterule with id '$id': $e");
$c->log->error("Failed to delete pbx field device with id '$id': $e");
$self->error($c, HTTP_INTERNAL_SERVER_ERROR, "Internal Server Error");
last;
}

66
lib/NGCP/Panel/Form/Customer/PbxFieldDeviceAPI.pm
Unescape View File

@ -6,8 +6,16 @@ use Moose::Util::TypeConstraints;
use HTML::FormHandler::Widget::Block::Bootstrap;
has_field 'profile_id' => (
has_field 'customer' => (
type => '+NGCP::Panel::Field::CustomerContract',
label => 'Customer',
validate_when_empty => 1,
element_attr => {
rel => ['tooltip'],
title => ['The customer contract this device is belonging to.']
},
);
has_field 'profile' => (
type => 'Compound',
);
@ -16,12 +24,6 @@ has_field 'profile.id' => (
required => 1,
label => 'Device Profile',
);
has_field 'contract' => (
type => 'Compound',
);
has_field 'contract.id' => (
type => 'Text',
);
has_field 'identifier' => (
type => 'Text',
@ -46,65 +48,57 @@ has_field 'lines' => (
controls_div => 1,
},
wrapper_class => [qw/hfh-rep-block/],
element_attr => {
rel => ['tooltip'],
title => ["The lines for this pbx device. Required keys are 'linerange' (name of range to use), 'key_num' (key number in line range, starting from 0), 'type' (one of 'private', 'shared', 'blf'), 'subscriber_id' (the subscriber mapped to this key)."],
},
);
has_field 'lines.id' => (
type => 'Hidden',
has_field 'lines.linerange' => (
type => 'Text',
required => 1,
label => 'Linerange',
element_attr => {
rel => ['tooltip'],
title => ['The linerange name to use.'],
},
);
has_field 'lines.subscriber_id' => (
type => '+NGCP::Panel::Field::PosInteger',
required => 1,
label => 'Subscriber',
options_method => \&build_subscribers,
element_attr => {
rel => ['tooltip'],
title => ['The subscriber to use on this line/key'],
},
);
has_field 'lines.line' => (
type => 'Select',
has_field 'lines.key_num' => (
type => '+NGCP::Panel::Field::PosInteger',
required => 1,
label => 'Line/Key',
label => 'Line/Key Number (starting from 0)',
element_attr => {
rel => ['tooltip'],
title => ['The line/key to use'],
title => ['The line/key to use (starting from 0)'],
},
);
sub validate_line_line {
my ($self, $field) = @_;
$field->clear_errors;
unless($field->value =~ /^\d+\.\d+\.\d+$/) {
my $err_msg = 'Invalid line value';
$field->add_error($err_msg);
}
return;
}
has_field 'lines.type' => (
type => 'Select',
required => 1,
label => 'Line/Key Type',
options => [],
no_option_validation => 1,
options => [
{ label => "private", value => "private" },
{ label => "shared", value => "shared" },
{ label => "blf", value => "blf" },
],
element_attr => {
rel => ['tooltip'],
title => ['The type of feature to use on this line/key'],
},
element_class => [qw/ngcp-linetype-select/],
);
sub validate_line_type {
my ($self, $field) = @_;
$field->clear_errors;
unless($field->value eq 'private' ||
$field->value eq 'shared' ||
$field->value eq 'blf') {
my $err_msg = 'Invalid line type, must be private, shared or blf';
$field->add_error($err_msg);
}
return;
}
1;
# vim: set tabstop=4 expandtab:

1
lib/NGCP/Panel/Role/API.pm
Unescape View File

@ -424,6 +424,7 @@ around 'item_rs' => sub {
foreach my $param(keys $c->req->query_params) {
my @p = grep { $_->{param} eq $param } @{ $self->query_params };
my $q = $c->req->query_params->{$param}; # TODO: arrayref?
$q =~ s/\*/\%/g;
if(@p) {
$item_rs = $item_rs->search($p[0]->{query}->{first}($q), $p[0]->{query}->{second}($q));
}

197
lib/NGCP/Panel/Role/API/PbxDevices.pm
Unescape View File

@ -24,18 +24,6 @@ sub hal_from_item {
my $form;
my $type = 'pbxdevices';
my %resource = $item->get_inflated_columns;
my @lines;
for my $line ($item->autoprov_field_device_lines->all) {
my $p_subs = $line->provisioning_voip_subscriber;
my $b_subs = $p_subs ? $p_subs->voip_subscriber : undef;
push @lines, {
($line->get_inflated_columns),
$b_subs ? (subscriber_id => $b_subs->id) : (),
};
}
my $hal = Data::HAL->new(
links => [
Data::HAL::Link->new(
@ -53,8 +41,36 @@ sub hal_from_item {
],
relation => 'ngcp:'.$self->resource_name,
);
use DDP; p %resource;
$form //= $self->get_form($c);
my $resource = $self->resource_from_item($c, $item);
$hal->resource($resource);
return $hal;
}
sub resource_from_item {
my ($self, $c, $item) = @_;
my %resource = $item->get_inflated_columns;
my @lines;
for my $line ($item->autoprov_field_device_lines->all) {
my $p_subs = $line->provisioning_voip_subscriber;
my $b_subs = $p_subs ? $p_subs->voip_subscriber : undef;
my $line_attr = { $line->get_inflated_columns };
foreach my $f(qw/id device_id linerange_id linerange_num/) {
delete $line_attr->{$f};
}
foreach my $f(qw/key_num/) {
$line_attr->{$f} = int($line_attr->{$f});
}
$line_attr->{subscriber_id} = int($b_subs->id)
if($b_subs);
$line_attr->{linerange} = $line->autoprov_device_line_range->name;
$line_attr->{type} = delete $line_attr->{line_type};
push @lines, $line_attr;
}
$resource{customer_id} = delete $resource{contract_id};
my $form = $self->get_form($c);
return unless $self->validate_form(
c => $c,
form => $form,
@ -62,9 +78,8 @@ sub hal_from_item {
run => 0,
);
$resource{lines} = \@lines;
p %resource;
$hal->resource(\%resource);
return $hal;
$resource{id} = int($item->id);
return \%resource;
}
sub item_rs {
@ -98,64 +113,120 @@ sub update_item {
resource => $resource,
);
if (! exists $resource->{destinations} ) {
$resource->{destinations} = [];
my $iden_device = $schema->resultset('autoprov_field_devices')->find({identifier => $resource->{identifier}});
if($iden_device && $iden_device->id != $item->id) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Entry with given 'identifier' already exists.");
return;
}
if (ref $resource->{destinations} ne "ARRAY") {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid field 'destinations'. Must be an array.");
my $customer_rs = $schema->resultset('contracts')->search({
id => $resource->{customer_id},
status => { '!=' => 'terminated' },
});
if($c->user->roles eq "admin") {
} elsif($c->user->roles eq "reseller") {
$customer_rs = $customer_rs->search({
'contact.reseller_id' => $c->user->reseller_id,
}, {
join => 'contact',
});
}
my $customer = $customer_rs->first;
unless($customer) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid customer_id, does not exist.");
return;
}
for my $d (@{ $resource->{destinations} }) {
if (exists $d->{timeout} && ! $d->{timeout}->is_integer) {
$c->log->error("Invalid field 'timeout'.");
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid field 'timeout'.");
$resource->{contract_id} = delete $resource->{customer_id};
my $dev_model = $self->model_from_profile_id($c, $resource->{profile_id});
return unless($dev_model);
unless($dev_model->reseller_id == $customer->contact->reseller_id) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid customer_id and profile_id combination, both must belong to the same reseller.");
return;
}
my @oldlines = $item->autoprov_field_device_lines->all;
my $i = 0;
for my $line ( @{$resource->{lines}} ) {
my $oldline = delete $oldlines[$i++];
unless ($line->{subscriber_id} && $line->{subscriber_id} > 0) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid line. Invalid 'subscriber_id'.");
return;
}
my $b_subs = $schema->resultset('voip_subscribers')->find($line->{subscriber_id});
my $p_subs = $b_subs ? $b_subs->provisioning_voip_subscriber : undef;
unless ($p_subs) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'subscriber_id'. Could not find subscriber.");
return;
}
$line->{subscriber_id} = $p_subs->id;
unless(defined $line->{linerange}) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid line. Invalid 'linerange'.");
return;
}
my $linerange = $dev_model->autoprov_device_line_ranges->find({
name => $line->{linerange}
});
unless($linerange) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'linerange', does not exist.");
return;
}
delete $line->{linerange};
$line->{linerange_id} = $linerange->id;
if($line->{key_num} >= $linerange->num_lines) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'key_num', out of range for this linerange.");
return;
}
$line->{line_type} = delete $line->{type};
if($oldline) {
$oldline->update($line);
} else {
$item->autoprov_field_device_lines->create($line);
}
}
foreach my $oldline(@oldlines) {
$oldline->delete if($oldline);
}
my $lines = delete $resource->{lines};
$item->update($resource);
return $item;
}
my $b_subscriber = $schema->resultset('voip_subscribers')->find($resource->{subscriber_id});
unless ($b_subscriber) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'subscriber_id'.");
sub model_from_profile_id {
my ($self, $c, $profile_id) = @_;
my $profile_rs = $c->model('DB')->resultset('autoprov_profiles')->search({
id => $profile_id,
});
if($c->user->roles eq "admin") {
} elsif($c->user->roles eq "reseller") {
$profile_rs = $profile_rs->search({
reseller_id => $c->user->reseller_id,
});
}
my $profile = $profile_rs->first;
unless($profile) {
$c->log->error("failed to find device profile with id 'profile_id'");
$self->error($c, HTTP_INTERNAL_SERVER_ERROR, "Invalid profile_id, device profile does not exist.");
return;
}
my $subscriber = $b_subscriber->provisioning_voip_subscriber;
unless($subscriber) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid subscriber.");
last;
my $config = $profile->config;
unless($config) {
$c->log->error("device profile with id '" . $profile->id . "' doesn't have a config");
$self->error($c, HTTP_INTERNAL_SERVER_ERROR, "Invalid profile_id, device profile does not have a config.");
return;
}
try {
my $primary_nr_rs = $b_subscriber->primary_number;
my $number;
if ($primary_nr_rs) {
$number = $primary_nr_rs->cc . ($primary_nr_rs->ac //'') . $primary_nr_rs->sn;
} else {
$number = ''
}
my $domain = $subscriber->domain->domain // '';
$item->update({
name => $resource->{name},
subscriber_id => $subscriber->id,
})->discard_changes;
$item->voip_cf_destinations->delete;
for my $d ( @{$resource->{destinations}} ) {
delete $d->{destination_set_id};
$d->{destination} = NGCP::Panel::Utils::Subscriber::field_to_destination(
destination => $d->{destination},
number => $number,
domain => $domain,
uri => $d->{destination},
);
$item->create_related("voip_cf_destinations", $d);
}
} catch($e) {
$c->log->error("failed to create cfdestinationset: $e");
$self->error($c, HTTP_INTERNAL_SERVER_ERROR, "Failed to create cfdestinationset.");
unless($config->device) {
$c->log->error("device config id '" . $config->id . "' doesn't have a device model");
$self->error($c, HTTP_INTERNAL_SERVER_ERROR, "Invalid profile_id, device profile config does not have a device model.");
return;
};
}
return $item;
return $config->device;
}
1;

Write Preview
Loading…
Cancel
Save