Start api cleanup with the User model
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
parent
f551de21f7
commit
ee8275cfdb
|
@ -8,6 +8,23 @@ use base 'DBIx::Class';
|
||||||
|
|
||||||
sub TO_JSON {
|
sub TO_JSON {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
|
|
||||||
|
if ($self->can("json_hint")) {
|
||||||
|
my $hint = $self->json_hint;
|
||||||
|
|
||||||
|
my %json = ();
|
||||||
|
|
||||||
|
foreach my $column (@{$hint->{columns}}) {
|
||||||
|
$json{$column} = $self->get_column($column);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach my $relname (keys %{$hint->{relations}}) {
|
||||||
|
my $key = $hint->{relations}->{$relname};
|
||||||
|
$json{$relname} = [ map { $_->$key } $self->$relname ];
|
||||||
|
}
|
||||||
|
|
||||||
|
return \%json;
|
||||||
|
} else {
|
||||||
my $json = { $self->get_columns };
|
my $json = { $self->get_columns };
|
||||||
my $rs = $self->result_source;
|
my $rs = $self->result_source;
|
||||||
my @relnames = $rs->relationships;
|
my @relnames = $rs->relationships;
|
||||||
|
@ -38,6 +55,7 @@ sub TO_JSON {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $json;
|
return $json;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
1;
|
1;
|
||||||
|
|
|
@ -154,11 +154,7 @@ sub currentUser_GET {
|
||||||
|
|
||||||
$self->status_ok(
|
$self->status_ok(
|
||||||
$c,
|
$c,
|
||||||
entity => $c->model('DB::Users')->find({ 'me.username' => $c->user->username}, {
|
entity => $c->model("DB::Users")->find($c->user->username)
|
||||||
columns => [ "me.fullname", "me.emailaddress", "me.username", "userroles.role" ]
|
|
||||||
, join => [ "userroles" ]
|
|
||||||
, collapse => 1
|
|
||||||
})
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -178,12 +178,20 @@ __PACKAGE__->many_to_many("projects", "projectmembers", "project");
|
||||||
|
|
||||||
# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-10-14 15:46:29
|
# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-10-14 15:46:29
|
||||||
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Hv9Ukqud0d3uIUot0ErKeg
|
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Hv9Ukqud0d3uIUot0ErKeg
|
||||||
# These lines were loaded from '/home/rbvermaa/src/hydra/src/lib/Hydra/Schema/Users.pm' found in @INC.
|
|
||||||
# They are now part of the custom portion of this file
|
my %hint = (
|
||||||
# for you to hand-edit. If you do not either delete
|
columns => [
|
||||||
# this section or remove that file from @INC, this section
|
"fullname",
|
||||||
# will be repeated redundantly when you re-create this
|
"emailaddress",
|
||||||
# file again via Loader! See skip_load_external to disable
|
"username"
|
||||||
# this feature.
|
],
|
||||||
|
relations => {
|
||||||
|
userroles => "role"
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
sub json_hint {
|
||||||
|
return \%hint;
|
||||||
|
}
|
||||||
|
|
||||||
1;
|
1;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
use LWP::UserAgent;
|
use LWP::UserAgent;
|
||||||
use JSON;
|
use JSON;
|
||||||
use Test::Simple tests => 15;
|
use Test::Simple tests => 4;
|
||||||
|
#use Test::Simple tests => 15;
|
||||||
|
|
||||||
my $ua = LWP::UserAgent->new;
|
my $ua = LWP::UserAgent->new;
|
||||||
$ua->cookie_jar({});
|
$ua->cookie_jar({});
|
||||||
|
@ -22,11 +23,13 @@ my $result = request_json({ uri => "/login", method => "POST", data => { usernam
|
||||||
my $user = decode_json($result->content());
|
my $user = decode_json($result->content());
|
||||||
|
|
||||||
ok($user->{username} eq "root", "The root user is named root");
|
ok($user->{username} eq "root", "The root user is named root");
|
||||||
ok($user->{userroles}->[0]->{role} eq "admin", "The root user is an admin");
|
ok($user->{userroles}->[0] eq "admin", "The root user is an admin");
|
||||||
|
|
||||||
$user = decode_json(request_json({ uri => "/current-user" })->content());
|
$user = decode_json(request_json({ uri => "/current-user" })->content());
|
||||||
ok($user->{username} eq "root", "The current user is named root");
|
ok($user->{username} eq "root", "The current user is named root");
|
||||||
ok($user->{userroles}->[0]->{role} eq "admin", "The current user is an admin");
|
ok($user->{userroles}->[0] eq "admin", "The current user is an admin");
|
||||||
|
|
||||||
|
=begin comment
|
||||||
|
|
||||||
ok(request_json({ uri => '/project/sample' })->code() == 404, "Non-existent projects don't exist");
|
ok(request_json({ uri => '/project/sample' })->code() == 404, "Non-existent projects don't exist");
|
||||||
|
|
||||||
|
@ -61,3 +64,7 @@ ok($evals->[0]->{jobsetevalinputs}->[0]->{revision} != $evals->[1]->{jobsetevali
|
||||||
my $build = decode_json(request_json({ uri => "/build/" . $evals->[0]->{jobsetevalmembers}->[0]->{build} })->content());
|
my $build = decode_json(request_json({ uri => "/build/" . $evals->[0]->{jobsetevalmembers}->[0]->{build} })->content());
|
||||||
ok($build->{job} eq "job", "The build's job name is job");
|
ok($build->{job} eq "job", "The build's job name is job");
|
||||||
ok($build->{finished} == 0, "The build isn't finished yet");
|
ok($build->{finished} == 0, "The build isn't finished yet");
|
||||||
|
|
||||||
|
=end comment
|
||||||
|
|
||||||
|
=cut
|
||||||
|
|
Loading…
Reference in a new issue