X-Git-Url: http://git.ieval.ro/?p=gruntmaster-data.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FData.pm;h=c46a358964777ec70df4fbfdb0a2b129b104de7d;hp=1e268aff8308473da98619446f4c130e2490eaae;hb=625a7bd077ef2781d055a77bffa19dd9d6c0d1f2;hpb=26d60269bc13d62a648cf4772f2b58f87bbcd2f3

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 1e268af..c46a358 100644
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -15,10 +15,11 @@ __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_007';
+our $VERSION = '5999.000_012';
 
 use Lingua::EN::Inflect qw/PL_N/;
-use JSON qw/decode_json/;
+use JSON::MaybeXS qw/decode_json/;
+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/];
@@ -27,27 +28,35 @@ use constant JOBS_PER_PAGE => 10;
 
 sub dynsub{
 	our ($name, $sub) = @_;
-	no strict 'refs';
+	no strict 'refs'; ## no critic (Strict)
 	*$name = subname $name => $sub
 }
 
 BEGIN {
-	for my $rs (qw/contest contest_problem job open problem user/) {
+	for my $rs (qw/contest contest_problem job open problem user problem_status contest_status/) {
 		my $rsname = ucfirst $rs;
-		$rsname =~ s/_([a-z])/\u$1/g;
+		$rsname =~ s/_([a-z])/\u$1/gs;
 		dynsub PL_N($rs) => sub { $_[0]->resultset($rsname)              };
 		dynsub      $rs  => sub { $_[0]->resultset($rsname)->find($_[1]) };
 	}
 }
 
 sub user_list {
-	my $rs = $_[0]->users->search(undef, {order_by => 'name', columns => USER_PUBLIC_COLUMNS});
-	[ map +{ $_->get_columns }, $rs->all ]
+	my $rs = $_[0]->users->search(undef, {columns => USER_PUBLIC_COLUMNS, prefetch => [qw/problem_statuses contest_statuses/]} );
+	[ sort { $b->{solved} <=> $a->{solved} or $b->{attempted} <=> $a->{attempted} } map { ## no critic (ProhibitReverseSort)
+		my $solved    = $_->problem_statuses->count(solved => 1);
+		my $attempted = $_->problem_statuses->count(solved => 0);
+		my $contests  = $_->contest_statuses->count;
+		+{ $_->get_columns, solved => $solved, attempted => $attempted, contests => $contests }
+	} $rs->all ]
 }
 
 sub user_entry {
 	my ($self, $id) = @_;
-	+{ $self->users->find($id, {columns => USER_PUBLIC_COLUMNS})->get_columns }
+	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'});
+	+{ $user->get_columns, problems => \@problems, contests => \@contests }
 }
 
 sub problem_list {
@@ -60,16 +69,18 @@ sub problem_list {
 	$params{contest} = $args{contest} if $args{contest};
 	for ($rs->all) {
 		$params{$_->level} //= [];
-		push $params{$_->level}, {$_->get_columns, owner_name => $_->owner->name} ;
+		push @{$params{$_->level}}, {$_->get_columns, owner_name => $_->owner->name} ;
 	}
 	\%params
 }
 
 sub problem_entry {
 	my ($self, $id, $contest, $user) = @_;
-	my $pb = $self->problems->find($id, {columns => PROBLEM_PUBLIC_COLUMNS, prefetch => 'owner'});
 	my $running = $contest && $self->contest($contest)->is_running;
-	eval {
+	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,
@@ -77,7 +88,8 @@ sub problem_entry {
 			time => time,
 		})
 	} if $running;
-	+{ $pb->get_columns, owner_name => $pb->owner->name, cansubmit => $contest ? $running : 1 }
+	$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) : () }
 }
 
 sub contest_list {
@@ -88,7 +100,7 @@ sub contest_list {
 	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, started => !$_->is_pending, owner_name => $_->owner->name };
 	}
 	\%params
 }
@@ -102,19 +114,25 @@ 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, offset => ($args{page} - 1) * JOBS_PER_PAGE});
-	$rs = $rs->search({owner   => $args{owner}})   if $args{owner};
-	$rs = $rs->search({contest => $args{contest}}) if $args{contest};
-	$rs = $rs->search({problem => $args{problem}}) if $args{problem};
-	[map {
-		my %params = $_->get_columns;
-		$params{owner_name}   = $_->owner->name;
-		$params{problem_name} = $_->problem->name;
-		$params{results} &&= decode_json $params{results};
-		$params{size}      = length $params{source};
-		delete $params{source};
-		\%params
-	} $rs->all]
+	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};
+	return {
+		log => [map {
+			my %params = $_->get_columns;
+			$params{owner_name}   = $_->owner->name;
+			$params{problem_name} = $_->problem->name;
+			$params{results} &&= decode_json $params{results};
+			$params{size}      = length $params{source};
+			delete $params{source};
+			\%params
+		} $rs->all],
+		current_page => $rs->pager->current_page,
+		maybe previous_page => $rs->pager->previous_page,
+		maybe next_page => $rs->pager->next_page,
+		maybe last_page => $rs->pager->last_page,
+	}
 }
 
 sub job_entry {
@@ -129,6 +147,29 @@ sub job_entry {
 	\%params
 }
 
+sub update_status {
+	my ($self) = @_;
+	my @jobs = $self->jobs->search(undef, {cache => 1})->all;
+
+	my %hash;
+	$hash{$_->get_column('problem'), $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1] for @jobs;
+	my @problem_statuses = map { [split ($;), @{$hash{$_}} ] } keys %hash;
+
+	my @contest_statuses = map {
+		my $contest = $_->id;
+		map { [$contest, $_->{user}, $_->{score}, $_->{rank}] } $_->standings
+	} $self->contests->all;
+
+	my $txn = sub {
+		$self->problem_statuses->delete;
+		$self->problem_statuses->populate([[qw/problem owner job solved/], @problem_statuses]);
+		$self->contest_statuses->delete;
+		$self->contest_statuses->populate([[qw/contest owner score rank/], @contest_statuses]);
+	};
+
+	$self->txn_do($txn);
+}
+
 1;
 
 __END__