Add an open_time key to problem_entry during contests

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

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 4935e024d2920a8718de26d0d0092a1bee922e16..f9e0639b2aa69df1d68d552e57dae3f75912008c 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -15,10 +15,13 @@ __PACKAGE__->load_namespaces;
 # Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-03-05 13:11:39
 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dAEmtAexvUaNXLgYz2rNEg
 
-our $VERSION = '5999.000_012';
+use parent qw/Exporter/;
+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/;
+use HTTP::Tiny;
 use PerlX::Maybe qw/maybe/;
 use Sub::Name qw/subname/;
 
@@ -64,15 +67,15 @@ sub user_list {
 sub user_entry {
        my ($self, $id) = @_;
        my $user = $self->users->find($id, {columns => USER_PUBLIC_COLUMNS, prefetch => [qw/problem_statuses contest_statuses/]});
-       my @problems = map { {problem => $_->get_column('problem'), solved => $_->solved} } $user->problem_statuses;
-       my @contests = map { {contest => $_->contest->id, contest_name => $_->contest->name, rank => $_->rank, score => $_->score} } $user->contest_statuses->search(undef, {prefetch => 'contest'});
+       my @problems = map { {problem => $_->get_column('problem'), solved => $_->solved} } $user->problem_statuses->search(undef, {order_by => 'problem'});
+       my @contests = map { {contest => $_->contest->id, contest_name => $_->contest->name, rank => $_->rank, score => $_->score} } $user->contest_statuses->search(undef, {prefetch => 'contest', order_by => 'contest.start DESC'});
        +{ $user->get_columns, problems => \@problems, contests => \@contests }
 }
 
 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;
@@ -90,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 => $running || !$contest,
+               $running ? (
+                       contest_start => $contest->start,
+                       contest_stop => $contest->stop,
+                       open_time => $open->time
+               ) : (),
+       }
 }
 
 sub contest_list {
@@ -125,9 +136,10 @@ 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}});
-       $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};
+       $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 {
                        my %params = $_->get_columns;
@@ -147,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};
@@ -180,6 +193,13 @@ sub update_status {
        $self->txn_do($txn);
 }
 
+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;
+}
+
 1;
 
 __END__