Simplify problem_list condition

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

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 28b520a69e5b7031e276743ec5f4b2d8754441ed..60ab3e53e4e1a94b6e042e7816cc93e8e1135ee9 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -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} ;
@@ -177,7 +178,7 @@ 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;