Always filter job log entries by contest

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

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index fabdbecb9d0b25262dd42542186c3adfb507bd90..4cb6512965869fe4adcb56561bcb44823040cc68 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -93,16 +93,24 @@ sub problem_entry {
        my $columns = PROBLEM_PUBLIC_COLUMNS;
        push @$columns, 'solution' unless $running;
        my $pb = $self->problems->find($id, {columns => $columns, prefetch => 'owner'});
-       eval { ## no critic (RequireCheckingReturnValueOfEval)
-               $self->opens->create({
-                       contest => $contest,
-                       problem => $id,
-                       owner => $user,
-                       time => time,
-               })
-       } if $running;
+       my $open;
+       $open = $self->opens->find_or_create({
+               contest => $contest,
+               problem => $id,
+               owner => $user,
+               time => time,
+       }) if $running;
        $contest &&= $self->contest($contest);
-       +{ $pb->get_columns, owner_name => $pb->owner->name, cansubmit => $contest ? $running : 1, $running ? (contest_start => $contest->start, contest_stop => $contest->stop) : () }
+       +{
+               $pb->get_columns,
+               owner_name => $pb->owner->name,
+               cansubmit => !$contest || !$contest->is_finished,
+               $running ? (
+                       contest_start => $contest->start,
+                       contest_stop => $contest->stop,
+                       open_time => $open->time
+               ) : (),
+       }
 }
 
 sub contest_list {
@@ -127,10 +135,9 @@ sub contest_entry {
 sub job_list {
        my ($self, %args) = @_;
        $args{page} //= 1;
-       my $rs = $self->jobs->search(undef, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner'], rows => JOBS_PER_PAGE, page => $args{page}});
+       my $rs = $self->jobs->search({contest => $args{contest}}, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner'], rows => JOBS_PER_PAGE, page => $args{page}});
        $rs = $rs->search({'me.private'=> 0})          unless $args{private};
        $rs = $rs->search({'me.owner'  => $args{owner}})   if $args{owner};
-       $rs = $rs->search({contest     => $args{contest}}) if $args{contest};
        $rs = $rs->search({problem     => $args{problem}}) if $args{problem};
        return {
                log => [map {