Bump version and update Changes

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

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 023966f71e263315316fe5d1dd76a6d06d47032a..c46a358964777ec70df4fbfdb0a2b129b104de7d 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -15,11 +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_011';
+our $VERSION = '5999.000_012';
 
 use Lingua::EN::Inflect qw/PL_N/;
 use JSON::MaybeXS qw/decode_json/;
-use List::Util qw/sum/;
 use PerlX::Maybe qw/maybe/;
 use Sub::Name qw/subname/;
 
@@ -42,54 +41,14 @@ BEGIN {
        }
 }
 
-sub calc_score{
-       my ($mxscore, $time, $tries, $totaltime) = @_;
-       my $score = $mxscore;
-       $time = 0 if $time < 0;
-       $time = 300 if $time > $totaltime;
-       $score = ($totaltime - $time) / $totaltime * $score;
-       $score -= $tries / 10 * $mxscore;
-       $score = $mxscore * 3 / 10 if $score < $mxscore * 3 / 10;
-       int $score + 0.5
-}
-
-sub standings {
-       my ($self, $ct) = @_;
-       my $ctobj = $self->contest($ct);
-
-       my @problems = map { $_->rawproblem } $self->contest_problems->search({contest => $ct}, {qw/join problem order_by problem.level/});
-       my (%scores, %tries, %opens);
-       $opens{$_->rawproblem, $_->rawowner} = $_ for $self->opens->search({contest => $ct});
-       for my $job ($self->jobs->search({contest => $ct}, {qw/order_by me.id prefetch/ => [qw/problem/]})) {
-               my $open = $opens{$job->rawproblem, $job->rawowner};
-               my $time = $job->date - ($open ? $open->time : $ctobj->start);
-               next if $time < 0;
-               my $value = $job->problem->value;
-               my $factor = $job->result ? 0 : 1;
-               $factor = $1 / 100 if $job->result_text =~ /^(\d+ )/s;
-               $scores{$job->rawowner}{$job->rawproblem} = int ($factor * calc_score ($value, $time, $tries{$job->rawowner}{$job->rawproblem}++, $ctobj->stop - $ctobj->start));
-       }
-
-       my %user_to_name = map { $_ => $_->name } $self->users->all;
-
-       my @st = sort { $b->{score} <=> $a->{score} or $a->{user} cmp $b->{user} } map { ## no critic (ProhibitReverseSortBlock)
-               my $user = $_;
-               +{
-                       user => $user,
-                       user_name => $user_to_name{$user},
-                       score => sum (values %{$scores{$user}}),
-                       scores => [map { $scores{$user}{$_} // '-'} @problems],
-               }
-       } keys %scores;
-
-       $st[0]->{rank} = 1;
-       $st[$_]->{rank} = $st[$_ - 1]->{rank} + ($st[$_]->{score} < $st[$_ - 1]->{score}) for 1 .. $#st;
-       @st
-}
-
 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 {
@@ -198,8 +157,7 @@ sub update_status {
 
        my @contest_statuses = map {
                my $contest = $_->id;
-               my @standings = $self->standings($contest);
-               map { [$contest, $_->{user}, $_->{score}, $_->{rank}] } @standings;
+               map { [$contest, $_->{user}, $_->{score}, $_->{rank}] } $_->standings
        } $self->contests->all;
 
        my $txn = sub {