From Redis to Postgres - Part 1 (Getting started)

[gruntmaster-page.git] / lib / Gruntmaster / Page / St.pm

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 22d6e30ca323697feabf8ee7e8d769a9994a7566..2d7b23831f29cb08420ae5d04f90dc1b9d07279c 100644 (file)
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -10,13 +10,11 @@ use constant LEVEL_VALUES => {
 };
 
 sub calc_score{
-       my ($user, $problem, $date, $tries, $totaltime) = @_;
-       my $mxscore = LEVEL_VALUES->{problem_level($problem)};
+       my ($mxscore, $time, $tries, $totaltime) = @_;
        my $score = $mxscore;
-       my $timetaken = $date - get_open($problem, $user);
-       $timetaken = 0 if $timetaken < 0;
-       $timetaken = 300 if $timetaken > $totaltime;
-       $score = ($totaltime - $timetaken) / $totaltime * $score;
+       $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
@@ -25,45 +23,38 @@ sub calc_score{
 sub _generate{
        my ($self, $htc, $lang, $env, $ct) = @_;
        debug $env => "language is '$lang' and contest is '$ct'";
-       my ($totaltime, $start);
 
-       local $Gruntmaster::Data::contest;
-       if ($ct) {
-               $start = contest_start ($ct);
-               $totaltime = contest_end ($ct) - $start;
-               $Gruntmaster::Data::contest = $ct;
-       }
+       $ct &&= db($env)->contest($ct);
 
-       my @problems = problems;
-       @problems = sort @problems;
+       my @problems = map { $_->problem } db($env)->contest_problems->search({contest => $ct->id}, {qw/join problem order_by problem.level/});
        my (%scores, %tries);
-       for (1 .. jobcard) {
-               next unless defined job_user && defined job_problem && defined job_result;
-               next if $Gruntmaster::Data::contest && job_date() < $start;
-
-               if ($Gruntmaster::Data::contest) {
-                       $scores{job_user()}{job_problem()} = job_result() ? 0 : calc_score (job_user(), job_problem(), job_date(), $tries{job_user()}{job_problem()}, $totaltime);
-                       $tries{job_user()}{job_problem()}++;
+       for my $job (db($env)->jobs->search({contest => $ct->id})) {
+
+               if ($ct) {
+                       my $time = $job->date - $ct->start;
+                       next if $time < 0;
+                       my $value = $job->problem->value // LEVEL_VALUES->{$job->problem->level};
+                       $scores{$job->owner->id}{$job->problem->id} = $job->result ? 0 : calc_score ($value, $time, $tries{$job->owner}{$job->problem}, $ct->stop - $ct->start);
+                       $tries{$job->owner->id}{$job->problem->id}++;
                } else {
                        no warnings 'numeric';
-                       $scores{job_user()}{job_problem()} = 0 + job_result_text() || (job_result() ? 0 : 100)
+                       $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} cmp $b->{user}} map {
                my $user = $_;
                +{
-                       user => $user,
-                       name => do {local $Gruntmaster::Data::contest; user_name $user},
+                       user => db($env)->user($user),
                        score => sum (values $scores{$user}),
-                       scores => [map { $scores{$user}{$_} // '-'} @problems],
-                       problems => $Gruntmaster::Data::contest,
+                       scores => [map { $scores{$user}{$_->id} // '-'} @problems],
+                       problems => $ct,
                }
        } keys %scores;
 
        $st[0]->{rank} = 1;
        $st[$_]->{rank} = $st[$_ - 1]->{rank} + ($st[$_]->{score} < $st[$_ - 1]->{score}) for 1 .. $#st;
-       $htc->param(problems => [map { problem_name } @problems ]) if $Gruntmaster::Data::contest;
+       $htc->param(problems => \@problems) if $ct;
        $htc->param(st => \@st);
 }