Include contest name in job_entry

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

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index e514970820e95cf2037c49806b0f7b23b13dd33e..984035f3352209e3e4a93ba8504e953288b18c93 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -16,8 +16,8 @@ __PACKAGE__->load_namespaces;
 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dAEmtAexvUaNXLgYz2rNEg
 
 use parent qw/Exporter/;
-our $VERSION = '5999.000_012';
-our @EXPORT = qw/purge/;
+our $VERSION = '5999.000_013';
+our @EXPORT = qw/purge/; ## no critic (ProhibitAutomaticExportation)
 
 use Lingua::EN::Inflect qw/PL_N/;
 use JSON::MaybeXS qw/decode_json/;
@@ -127,7 +127,7 @@ 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({'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};
@@ -150,10 +150,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};
@@ -186,8 +187,9 @@ sub update_status {
 my @PURGE_HOSTS = exists $ENV{PURGE_HOSTS} ? split ' ', $ENV{PURGE_HOSTS} : ();
 my $ht = HTTP::Tiny->new;
 
-sub purge { $ht->request(PURGE => "http://$_$_[0]") for @PURGE_HOSTS }
-
+sub purge {
+       $ht->request(PURGE => "http://$_$_[0]") for @PURGE_HOSTS;
+}
 
 1;