Skip private jobs in update_status without dying

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

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index fd61a21ad8e63a7631e3547796cf7ef29118182d..447a9f4119adaf77b2e07a156ec43af084741f8f 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -74,7 +74,9 @@ sub user_entry {
 
 sub problem_list {
        my ($self, %args) = @_;
-       my $rs = $self->problems->search(undef, {order_by => 'me.name', columns => PROBLEM_PUBLIC_COLUMNS, prefetch => 'owner'});
+       my @columns = @{PROBLEM_PUBLIC_COLUMNS()};
+       push @columns, 'solution' if $args{solution} && $args{contest} && !$self->contest($args{contest})->is_running;
+       my $rs = $self->problems->search(undef, {order_by => 'me.name', columns => \@columns, prefetch => 'owner'});
        $rs = $rs->search({-or => ['contest_problems.contest' => undef, 'contest.stop' => {'<=', time}], 'me.private' => 0}, {join => {'contest_problems' => 'contest'}, distinct => 1}) unless $args{contest} || $args{private};
        $rs = $rs->search({'contest_problems.contest' => $args{contest}}, {join => 'contest_problems'}) if $args{contest};
        $rs = $rs->search({'me.owner' => $args{owner}}) if $args{owner};
@@ -90,10 +92,10 @@ sub problem_list {
 sub problem_entry {
        my ($self, $id, $contest, $user) = @_;
        my $running = $contest && $self->contest($contest)->is_running;
-       my $columns = PROBLEM_PUBLIC_COLUMNS;
-       push @$columns, 'statement';
-       push @$columns, 'solution' unless $running;
-       my $pb = $self->problems->find($id, {columns => $columns, prefetch => 'owner'});
+       my @columns = @{PROBLEM_PUBLIC_COLUMNS()};
+       push @columns, 'statement';
+       push @columns, 'solution' unless $running;
+       my $pb = $self->problems->find($id, {columns => \@columns, prefetch => 'owner'});
        my $open;
        $open = $self->opens->find_or_create({
                contest => $contest,
@@ -172,10 +174,14 @@ sub job_entry {
 
 sub update_status {
        my ($self) = @_;
-       my @jobs = $self->jobs->search(undef, {cache => 1})->all;
+       my @jobs = $self->jobs->search({'me.private' => 0}, {cache => 1, prefetch => 'problem'})->all;
 
        my %hash;
-       $hash{$_->get_column('problem'), $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1] for @jobs;
+       for (@jobs) {
+               next if !$_->problem->is_in_archive;
+               $hash{$_->get_column('problem'), $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1] for @jobs;
+       }
+
        my @problem_statuses = map { [split ($;), @{$hash{$_}} ] } keys %hash;
 
        my @contest_statuses = map {