Make contest_* only return public columns (all of them but editorial)

[gruntmaster-data.git] / lib / Gruntmaster / Data.pm

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 40751bed17ca6c02cd05b04e8beb3c3f16880630..28b520a69e5b7031e276743ec5f4b2d8754441ed 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -25,6 +25,7 @@ use HTTP::Tiny;
 use PerlX::Maybe qw/maybe/;
 use Sub::Name qw/subname/;
 
+use constant CONTEST_PUBLIC_COLUMNS => [qw/id name description start stop owner/];
 use constant PROBLEM_PUBLIC_COLUMNS => [qw/id author writer level name owner private timeout olimit value/];
 use constant USER_PUBLIC_COLUMNS => [qw/id admin name town university country level/];
 use constant JOBS_PER_PAGE => 10;
@@ -118,7 +119,7 @@ sub problem_entry {
 
 sub contest_list {
        my ($self, %args) = @_;
-       my $rs = $self->contests->search(undef, {order_by => {-desc => 'start'}, prefetch => 'owner'});
+       my $rs = $self->contests->search(undef, {columns => CONTEST_PUBLIC_COLUMNS, order_by => {-desc => 'start'}, prefetch => 'owner'});
        $rs = $rs->search({owner => $args{owner}}) if $args{owner};
        my %params;
        for ($rs->all) {
@@ -131,14 +132,15 @@ sub contest_list {
 
 sub contest_entry {
        my ($self, $id) = @_;
-       my $ct = $self->contest($id);
+       my $ct = $self->contests->find($id,{columns => CONTEST_PUBLIC_COLUMNS});
        +{ $ct->get_columns, started => !$ct->is_pending, finished => $ct->is_finished, owner_name => $ct->owner->name }
 }
 
 sub job_list {
        my ($self, %args) = @_;
        $args{page} //= 1;
-       my $rs = $self->jobs->search({contest => $args{contest}}, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner'], rows => JOBS_PER_PAGE, page => $args{page}});
+       my $rs = $self->jobs->search(undef, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner', 'contest'], rows => JOBS_PER_PAGE, page => $args{page}});
+       $rs = $rs->search({contest => $args{contest} || undef}) if exists $args{contest};
        $rs = $rs->search({'me.private'=> 0})          unless $args{private};
        $rs = $rs->search({'me.owner'  => $args{owner}})   if $args{owner};
        $rs = $rs->search({problem     => $args{problem}}) if $args{problem};
@@ -147,6 +149,7 @@ sub job_list {
                        my %params = $_->get_columns;
                        $params{owner_name}   = $_->owner->name;
                        $params{problem_name} = $_->problem->name;
+                       $params{contest_name} = $_->contest->name if $params{contest};
                        $params{results} &&= decode_json $params{results};
                        $params{size}      = length $params{source};
                        delete $params{source};
@@ -181,8 +184,8 @@ sub update_status {
        for (@jobs) {
                my $pb = $_->get_column('problem');
                $private{$pb} //= $_->problem->is_private;
-               next if !$private{$pb};
-               $hash{$pb, $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1] for @jobs;
+               next if $private{$pb};
+               $hash{$pb, $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1];
        }
 
        my @problem_statuses = map { [split ($;), @{$hash{$_}} ] } keys %hash;