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

MT#6195 API: rename rewrite -> rewriterulesets

Browse Source
agranig/selfsignup
Gerhard Jungwirth 11 years ago
parent 83fa4552f2
commit 11e421dc08
4 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File

8
lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm
Unescape View File

@ -26,9 +26,9 @@ class_has 'api_description' => (
with 'NGCP::Panel::Role::API';
with 'NGCP::Panel::Role::API::RewriteRuleSets';
class_has('resource_name', is => 'ro', default => 'rewrite');
class_has('dispatch_path', is => 'ro', default => '/api/rewrite/');
class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-rewrite');
class_has('resource_name', is => 'ro', default => 'rewriterulesets');
class_has('dispatch_path', is => 'ro', default => '/api/rewriterulesets/');
class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-rewriterulesets');
__PACKAGE__->config(
action => {
@ -65,7 +65,7 @@ sub GET :Allow {
});
my (@embedded, @links);
for my $set ($rwr_set->search({}, {order_by => {-asc => 'me.id'}})->all) {
push @embedded, $self->hal_from_item($c, $set, "rewrite");
push @embedded, $self->hal_from_item($c, $set, "rewriterulesets");
push @links, Data::HAL::Link->new(
relation => 'ngcp:'.$self->resource_name,
href => sprintf('%s%d', $self->dispatch_path, $set->id),

12
lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm
Unescape View File

@ -19,9 +19,9 @@ require Catalyst::ActionRole::RequireSSL;
with 'NGCP::Panel::Role::API';
with 'NGCP::Panel::Role::API::RewriteRuleSets';
class_has('resource_name', is => 'ro', default => 'rewrite');
class_has('dispatch_path', is => 'ro', default => '/api/rewrite/');
class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-rewrite');
class_has('resource_name', is => 'ro', default => 'rewriterulesets');
class_has('dispatch_path', is => 'ro', default => '/api/rewriterulesets/');
class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-rewriterulesets');
__PACKAGE__->config(
action => {
@ -52,7 +52,7 @@ sub GET :Allow {
my $ruleset = $self->item_by_id($c, $id, "rulesets");
last unless $self->resource_exists($c, ruleset => $ruleset);
my $hal = $self->hal_from_item($c, $ruleset, "rewrite");
my $hal = $self->hal_from_item($c, $ruleset, "rewriterulesets");
my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
(map { # XXX Data::HAL must be able to generate links with multiple relations
@ -118,7 +118,7 @@ sub PATCH :Allow {
$c->response->header(Preference_Applied => 'return=minimal');
$c->response->body(q());
} else {
my $hal = $self->hal_from_item($c, $ruleset, "rulesets");
my $hal = $self->hal_from_item($c, $ruleset, "rewriterulesets");
my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
$hal->http_headers,
), $hal->as_json);
@ -158,7 +158,7 @@ sub PUT :Allow {
$c->response->header(Preference_Applied => 'return=minimal');
$c->response->body(q());
} else {
my $hal = $self->hal_from_item($c, $ruleset, "rulesets");
my $hal = $self->hal_from_item($c, $ruleset, "rewriterulesets");
my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
$hal->http_headers,
), $hal->as_json);

6
lib/NGCP/Panel/Role/API/RewriteRuleSets.pm
Unescape View File

@ -69,12 +69,6 @@ sub item_rs {
} else {
return;
}
} elsif($type eq "rules") {
if($c->user->roles eq "admin") {
$item_rs = $c->model('DB')->resultset('voip_rewrite_rules');
} else {
return;
}
} else {
die "You should not reach this";
}

10
lib/NGCP/Panel/Role/API/RewriteRules.pm
Unescape View File

@ -39,7 +39,7 @@ sub hal_from_item {
Data::HAL::Link->new(relation => 'profile', href => 'http://purl.org/sipwise/ngcp-api/'),
Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->id)),
Data::HAL::Link->new(relation => "ngcp:$type", href => sprintf("/api/%s/%d", $type, $item->id)),
Data::HAL::Link->new(relation => "ngcp:rewrite", href => sprintf("/api/rewrite/%d", $item->set_id)), #TODO: naming?
Data::HAL::Link->new(relation => "ngcp:rewriterulesets", href => sprintf("/api/rewriterulesets/%d", $item->set_id)),
],
relation => 'ngcp:'.$self->resource_name,
);
@ -59,13 +59,7 @@ sub item_rs {
my ($self, $c, $type) = @_;
my $item_rs;
if($type eq "rulesets") {
if($c->user->roles eq "admin") {
$item_rs = $c->model('DB')->resultset('voip_rewrite_rule_sets');
} else {
return;
}
} elsif($type eq "rules") {
if($type eq "rules") {
if($c->user->roles eq "admin") {
$item_rs = $c->model('DB')->resultset('voip_rewrite_rules');
} else {

Write Preview
Loading…
Cancel
Save