Include limit overrides in problem_entry

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

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 28b520a69e5b7031e276743ec5f4b2d8754441ed..fbfabcff39fc6a7d67f325f0662d0d90fba83f12 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -37,7 +37,7 @@ sub dynsub{
 }
 
 BEGIN {
-       for my $rs (qw/contest contest_problem job open problem user problem_status contest_status/) {
+       for my $rs (qw/contest contest_problem job open limit problem user problem_status contest_status/) {
                my $rsname = ucfirst $rs;
                $rsname =~ s/_([a-z])/\u$1/gs;
                dynsub PL_N($rs) => sub { $_[0]->resultset($rsname)              };
@@ -56,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 {
@@ -78,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} ;
@@ -97,6 +98,10 @@ sub problem_entry {
        push @columns, 'statement';
        push @columns, 'solution' unless $running;
        my $pb = $self->problems->find($id, {columns => \@columns, prefetch => 'owner'});
+       my @limits = map { +{
+               format  => $_->format,
+               timeout => $_->timeout,
+       } } $self->limits->search({problem => $id});
        my $open;
        $open = $self->opens->find_or_create({
                contest => $contest,
@@ -107,6 +112,7 @@ sub problem_entry {
        $contest &&= $self->contest($contest);
        +{
                $pb->get_columns,
+               @limits ? (limits => \@limits) : (),
                owner_name => $pb->owner->name,
                cansubmit => !$contest || !$contest->is_finished,
                $running ? (
@@ -144,6 +150,7 @@ sub job_list {
        $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;
@@ -177,13 +184,13 @@ sub job_entry {
 
 sub update_status {
        my ($self) = @_;
-       my @jobs = $self->jobs->search({'me.private' => 0}, {cache => 1, prefetch => 'problem'})->all;
+       my @jobs = $self->jobs->search({'me.private' => 0}, {cache => 1, prefetch => 'problem', order_by => 'me.id'})->all;
 
        my %private;
        my %hash;
        for (@jobs) {
                my $pb = $_->get_column('problem');
-               $private{$pb} //= $_->problem->is_private;
+               $private{$pb} //= $_->problem->private;
                next if $private{$pb};
                $hash{$pb, $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1];
        }