Allow filtering job_list by result

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

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 16a6176fcf65e6b0cf8c5c5d41590d5e6bdb6c7e..69e5d02826ac127f68ecd8ee97b9d9022b14d2ff 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;
@@ -55,13 +56,14 @@ sub user_list {
        }
        $contests{$_->rawowner}++ for $self->contest_statuses->all;
 
-       [ sort { $b->{solved} <=> $a->{solved} or $b->{attempted} <=> $a->{attempted} } map { ## no critic (ProhibitReverseSort)
-               my $id = $_->id;
-               +{ $_->get_columns,
-                  solved => ($solved{$id} // 0),
-                  attempted => ($attempted{$id} // 0),
-                  contests => ($contests{$id} // 0) }
-       } $rs->all ]
+       [ sort { $b->{solved} <=> $a->{solved} or $b->{attempted} <=> $a->{attempted} } ## no critic (ProhibitReverseSort)
+               grep { $_->{solved} || $_->{attempted} } map {
+                       my $id = $_->id;
+                       +{ $_->get_columns,
+                          solved => ($solved{$id} // 0),
+                          attempted => ($attempted{$id} // 0),
+                          contests => ($contests{$id} // 0) }
+               } $rs->all ]
 }
 
 sub user_entry {
@@ -77,11 +79,11 @@ sub problem_list {
        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({'private' => 0}) 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};
        my %params;
-       $params{contest} = $args{contest} if $args{contest};
+       $params{contest} = $args{contest} if $args{contest} && $self->contest($args{contest})->is_running;
        for ($rs->all) {
                $params{$_->level} //= [];
                push @{$params{$_->level}}, {$_->get_columns, owner_name => $_->owner->name} ;
@@ -118,7 +120,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,22 +133,25 @@ sub contest_list {
 
 sub contest_entry {
        my ($self, $id) = @_;
-       my $ct = $self->contest($id);
-       +{ $ct->get_columns, started => !$ct->is_pending, owner_name => $ct->owner->name }
+       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};
+       $rs = $rs->search({result      => $args{result}})  if defined $args{result};
        return {
                log => [map {
                        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};
@@ -174,10 +179,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', order_by => 'me.id'})->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];
+       }
+
        my @problem_statuses = map { [split ($;), @{$hash{$_}} ] } keys %hash;
 
        my @contest_statuses = map {