X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FData.pm;h=2422e77e5f0a57d0dce196dbc9921fc3dd124169;hb=adb42d4d148fdb3dd145e4a7452b7b7eda88f66c;hp=e8ce571cba8c3b378300f18e965c36afb34e9e88;hpb=3473324bb17b1f31ce24bd465ded432c1c9f2f5b;p=gruntmaster-data.git

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index e8ce571..2422e77 100644
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -15,10 +15,10 @@ __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_008';
+our $VERSION = '5999.000_011';
 
 use Lingua::EN::Inflect qw/PL_N/;
-use JSON qw/decode_json/;
+use JSON::MaybeXS qw/decode_json/;
 use List::Util qw/sum/;
 use PerlX::Maybe qw/maybe/;
 use Sub::Name qw/subname/;
@@ -29,26 +29,19 @@ 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]) };
 	}
 }
 
-use constant LEVEL_VALUES => {
-	beginner => 100,
-	easy => 250,
-	medium => 500,
-	hard => 1000,
-};
-
 sub calc_score{
 	my ($mxscore, $time, $tries, $totaltime) = @_;
 	my $score = $mxscore;
@@ -71,21 +64,21 @@ sub standings {
 			my $open = $self->opens->find($ct->id, $job->problem->id, $job->owner->id);
 			my $time = $job->date - ($open ? $open->time : $ct->start);
 			next if $time < 0;
-			my $value = $job->problem->value // LEVEL_VALUES->{$job->problem->level};
+			my $value = $job->problem->value;
 			my $factor = $job->result ? 0 : 1;
-			$factor = $1 / 100 if $job->result_text =~ /^(\d+ )/;
+			$factor = $1 / 100 if $job->result_text =~ /^(\d+ )/s;
 			$scores{$job->owner->id}{$job->problem->id} = int ($factor * calc_score ($value, $time, $tries{$job->owner->id}{$job->problem->id}++, $ct->stop - $ct->start));
 		} else {
-			no warnings 'numeric';
+			no warnings 'numeric'; ## no critic (ProhibitNoWarnings)
 			$scores{$job->owner->id}{$job->problem->id} = 0 + $job->result_text || ($job->result ? 0 : 100)
 		}
 	}
 
-	my @st = sort { $b->{score} <=> $a->{score} or $a->{user}->id cmp $b->{user}->id} map {
+	my @st = sort { $b->{score} <=> $a->{score} or $a->{user}->id cmp $b->{user}->id} map { ## no critic (ProhibitReverseSortBlock)
 		my $user = $_;
 		+{
 			user => $self->user($user),
-			score => sum (values $scores{$user}),
+			score => sum (values %{$scores{$user}}),
 			scores => [map { $scores{$user}{$_->id} // '-'} @problems],
 			problems => $ct,
 		}
@@ -98,12 +91,15 @@ sub standings {
 
 sub user_list {
 	my $rs = $_[0]->users->search(undef, {order_by => 'name', columns => USER_PUBLIC_COLUMNS});
-	[ map +{ $_->get_columns }, $rs->all ]
+	[ map { { $_->get_columns } } $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 => $_->get_column('contest'), rank => $_->rank, score => $_->score} } $user->contest_statuses;
+	+{ $user->get_columns, problems => \@problems, contests => \@contests }
 }
 
 sub problem_list {
@@ -116,16 +112,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,
@@ -133,7 +131,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 {
@@ -144,7 +143,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
 }
@@ -191,6 +190,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')} = [$_, $_->result ? 1 : 0] for @jobs;
+	my @problem_statuses = map { [split ($;), @{$hash{$_}} ] } keys %hash;
+
+	my @contest_statuses = map {
+		my $contest = $_->id;
+		my @standings = $self->standings($contest);
+		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__