Skip private jobs in update_status faster

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

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 6cdf3f52104c6c11a2ecd960c6a42efe7111128a..ed40c3744ca5582ee3fb6001a31512548bf7c3ff 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -26,7 +26,7 @@ use PerlX::Maybe qw/maybe/;
 use Sub::Name qw/subname/;
 
 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 level/];
+use constant USER_PUBLIC_COLUMNS => [qw/id admin name town university country level/];
 use constant JOBS_PER_PAGE => 10;
 
 sub dynsub{
@@ -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,
@@ -122,7 +124,7 @@ sub contest_list {
        for ($rs->all) {
                my $state = $_->is_pending ? 'pending' : $_->is_running ? 'running' : 'finished';
                $params{$state} //= [];
-               push @{$params{$state}}, { $_->get_columns, started => !$_->is_pending, owner_name => $_->owner->name };
+               push @{$params{$state}}, { $_->get_columns, owner_name => $_->owner->name };
        }
        \%params
 }
@@ -172,10 +174,17 @@ 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 %private;
        my %hash;
-       $hash{$_->get_column('problem'), $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1] for @jobs;
+       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;
+       }
+
        my @problem_statuses = map { [split ($;), @{$hash{$_}} ] } keys %hash;
 
        my @contest_statuses = map {