X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FData.pm;h=50dcfd57d1a407e8da7611515b3691fe66ae0b4f;hb=e1250e203047d108bef4640e19d1384a503826e0;hp=aad2dde0fc6eefde3f869e829c1ba07135717e16;hpb=9e130d3b6dcf583ba2a156ff5742945d4e250961;p=gruntmaster-data.git

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index aad2dde..50dcfd5 100644
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -25,9 +25,10 @@ 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 USER_PUBLIC_COLUMNS => [qw/id admin name town university level/];
-use constant JOBS_PER_PAGE => 10;
+use constant CONTEST_PUBLIC_COLUMNS => [qw/id name description start stop owner/];
+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 country level/];
+use constant JOBS_PER_PAGE => 50;
 
 sub dynsub{
 	our ($name, $sub) = @_;
@@ -36,7 +37,7 @@ sub dynsub{
 }
 
 BEGIN {
-	for my $rs (qw/contest contest_problem job open problem user problem_status contest_status/) {
+	for my $rs (qw/contest contest_problem job open limit problem user problem_status contest_status/) {
 		my $rsname = ucfirst $rs;
 		$rsname =~ s/_([a-z])/\u$1/gs;
 		dynsub PL_N($rs) => sub { $_[0]->resultset($rsname)              };
@@ -55,13 +56,16 @@ 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 ]
+	my @users = sort { $b->{solved} <=> $a->{solved} or $b->{attempted} <=> $a->{attempted} } ## no critic (ProhibitReverseSort)
+		map {
+			my $id = $_->id;
+			+{ $_->get_columns,
+			   solved => ($solved{$id} // 0),
+			   attempted => ($attempted{$id} // 0),
+			   contests => ($contests{$id} // 0) }
+		} $rs->all;
+	@users = @users[0 .. 199] if @users > 200;
+	\@users
 }
 
 sub user_entry {
@@ -74,12 +78,14 @@ 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};
+	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({'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} ;
@@ -90,52 +96,69 @@ sub problem_list {
 sub problem_entry {
 	my ($self, $id, $contest, $user) = @_;
 	my $running = $contest && $self->contest($contest)->is_running;
-	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 @columns = @{PROBLEM_PUBLIC_COLUMNS()};
+	push @columns, 'statement';
+	push @columns, 'solution' unless $running;
+	my $pb = $self->problems->find($id, {columns => \@columns, prefetch => 'owner'});
+	my @limits = map { +{
+		format  => $_->format,
+		timeout => $_->timeout,
+	} } $self->limits->search({problem => $id});
+	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,
+		@limits ? (limits => \@limits) : (),
+		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 {
 	my ($self, %args) = @_;
-	my $rs = $self->contests->search(undef, {order_by => {-desc => 'start'}, prefetch => 'owner'});
+	my $rs = $self->contests->search(undef, {columns => CONTEST_PUBLIC_COLUMNS, order_by => {-desc => 'start'}, prefetch => 'owner'});
 	$rs = $rs->search({owner => $args{owner}}) if $args{owner};
 	my %params;
 	for ($rs->all) {
 		my $state = $_->is_pending ? 'pending' : $_->is_running ? 'running' : 'finished';
 		$params{$state} //= [];
-		push @{$params{$state}}, { $_->get_columns, started => !$_->is_pending, owner_name => $_->owner->name };
+		push @{$params{$state}}, { $_->get_columns, owner_name => $_->owner->name };
 	}
 	\%params
 }
 
 sub contest_entry {
 	my ($self, $id) = @_;
-	my $ct = $self->contest($id);
-	+{ $ct->get_columns, started => !$ct->is_pending, owner_name => $ct->owner->name }
+	my $ct = $self->contests->find($id,{columns => CONTEST_PUBLIC_COLUMNS});
+	+{ $ct->get_columns, started => !$ct->is_pending, finished => $ct->is_finished, owner_name => $ct->owner->name }
 }
 
 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(undef, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner', 'contest'], rows => JOBS_PER_PAGE, page => $args{page}});
+	$rs = $rs->search({contest => $args{contest} || undef}) if exists $args{contest};
+	$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};
+	$rs = $rs->search({result      => $args{result}})  if defined $args{result};
 	return {
 		log => [map {
 			my %params = $_->get_columns;
 			$params{owner_name}   = $_->owner->name;
 			$params{problem_name} = $_->problem->name;
+			$params{contest_name} = $_->contest->name if $params{contest};
 			$params{results} &&= decode_json $params{results};
 			$params{size}      = length $params{source};
 			delete $params{source};
@@ -150,10 +173,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};
@@ -162,10 +186,17 @@ sub job_entry {
 
 sub update_status {
 	my ($self) = @_;
-	my @jobs = $self->jobs->search(undef, {cache => 1})->all;
+	my @jobs = $self->jobs->search({'me.private' => 0}, {cache => 1, prefetch => 'problem', order_by => 'me.id'})->all;
 
+	my %private;
 	my %hash;
-	$hash{$_->get_column('problem'), $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1] for @jobs;
+	for (@jobs) {
+		my $pb = $_->get_column('problem');
+		$private{$pb} //= $_->problem->private;
+		next if $private{$pb};
+		$hash{$pb, $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1];
+	}
+
 	my @problem_statuses = map { [split ($;), @{$hash{$_}} ] } keys %hash;
 
 	my @contest_statuses = map {