Do not include statement in problem_list

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

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index aa3a5337cada23a424263b507b230677a625607b..6cdf3f52104c6c11a2ecd960c6a42efe7111128a 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -16,7 +16,7 @@ __PACKAGE__->load_namespaces;
 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dAEmtAexvUaNXLgYz2rNEg
 
 use parent qw/Exporter/;
-our $VERSION = '5999.000_012';
+our $VERSION = '5999.000_013';
 our @EXPORT = qw/purge/; ## no critic (ProhibitAutomaticExportation)
 
 use Lingua::EN::Inflect qw/PL_N/;
@@ -25,7 +25,7 @@ use HTTP::Tiny;
 use PerlX::Maybe qw/maybe/;
 use Sub::Name qw/subname/;
 
-use constant PROBLEM_PUBLIC_COLUMNS => [qw/id author writer level name owner private statement timeout olimit value/];
+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 JOBS_PER_PAGE => 10;
 
@@ -75,7 +75,7 @@ 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'});
-       $rs = $rs->search({-or => ['contest_problems.contest' => undef, 'contest.stop' => {'<=', time}], 'me.private' => 0}, {join => {'contest_problems' => 'contest'}, distinct => 1}) unless $args{contest};
+       $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};
        my %params;
@@ -91,18 +91,27 @@ 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'});
-       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 +136,10 @@ sub contest_entry {
 sub job_list {
        my ($self, %args) = @_;
        $args{page} //= 1;
-       my $rs = $self->jobs->search({'me.private' => 0}, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner'], rows => JOBS_PER_PAGE, page => $args{page}});
-       $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};
+       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({problem     => $args{problem}}) if $args{problem};
        return {
                log => [map {
                        my %params = $_->get_columns;
@@ -150,10 +159,11 @@ sub job_list {
 
 sub job_entry {
        my ($self, $id) = @_;
-       my $job = $self->jobs->find($id, {prefetch => ['problem', 'owner']});
+       my $job = $self->jobs->find($id, {prefetch => ['problem', 'owner', 'contest']});
        my %params = $job->get_columns;
        $params{owner_name}   = $job->owner->name;
        $params{problem_name} = $job->problem->name;
+       $params{contest_name} = $job->contest->name if $params{contest};
        $params{results} &&= decode_json $params{results};
        $params{size}      = length $params{source};
        delete $params{source};