package Gruntmaster::Data;
-use v5.14;
+use 5.014;
use warnings;
use parent qw/Exporter/;
our $VERSION = '5999.000_013';
-our @EXPORT = qw/purge/; ## no critic (ProhibitAutomaticExportation)
+our @EXPORT = qw/purge user_list user_entry problem_list problem_entry contest_list contest_entry contest_full contest_has_problem job_list job_entry job_full create_job standings update_status/; ## no critic (ProhibitAutomaticExportation)
use JSON::MaybeXS qw/decode_json/;
use HTTP::Tiny;
use List::Util qw/sum/;
use SQL::Abstract;
-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;
my %statements = (
job_full_sth => 'SELECT * FROM jobs WHERE id = ?',
);
-sub connect {
- my ($class, @args) = @_;
+our $db;
- my $self = {
- dbis => DBIx::Simple->new(@args),
- };
- $self->{dbis}->keep_statements = 100;
- bless $self, $class
+sub init {
+ $db = DBIx::Simple->new(@_);
+ $db->keep_statements = 100;
};
sub purge;
sub query {
- my ($self, $stat, @extra) = @_;
- $self->{dbis}->query($statements{$stat} // $stat, @extra)
+ my ($stat, @extra) = @_;
+ $db->query($statements{$stat}, @extra)
}
my (%name_cache, %name_cache_time);
use constant NAME_CACHE_MAX_AGE => 5;
sub object_name {
- my ($self, $table, $id) = @_;
+ my ($table, $id) = @_;
$name_cache_time{$table} //= 0;
if (time - $name_cache_time{$table} > NAME_CACHE_MAX_AGE) {
$name_cache_time{$table} = time;
$name_cache{$table} = {};
- $name_cache{$table} = $self->{dbis}->select($table, 'id,name')->map;
+ $name_cache{$table} = $db->select($table, 'id,name')->map;
}
$name_cache{$table}{$id}
}
-sub add_names {
- my ($self, $el) = @_;
+sub add_names ($) { ## no critic (ProhibitSubroutinePrototypes)
+ my ($el) = @_;
if (ref $el eq 'ARRAY') {
- $self->add_names($_) for @$el
+ &add_names ($_) for @$el ## no critic (ProhibitAmpersandSigils)
} else {
for my $object (qw/contest owner problem/) {
my $table = $object eq 'owner' ? 'users' : "${object}s";
- $el->{"${object}_name"} = $self->object_name($table, $el->{$object}) if defined $el->{$object}
+ $el->{"${object}_name"} = object_name $table, $el->{$object} if defined $el->{$object}
}
}
$el
}
-sub user_list {
- my ($self) = @_;
- scalar $self->query('user_list_sth')->hashes
-}
+sub user_list { +{us => scalar query('user_list_sth')->hashes} }
sub user_entry {
- my ($self, $id) = @_;
- my $ret = $self->query('user_entry_sth', $id)->hash;
- $ret->{problems} = $self->query('problem_status_sth', $id)->hashes;
- $ret->{contests} = $self->query('contest_status_sth', $id)->hashes;
+ my ($id) = @_;
+ my $ret = query('user_entry_sth', $id)->hash;
+ $ret->{problems} = add_names query('problem_status_sth', $id)->hashes;
+ $ret->{contests} = add_names query('contest_status_sth', $id)->hashes;
- $self->add_names($ret->{problems});
- $self->add_names($ret->{contests});
$ret;
}
sub problem_list {
- my ($self, %args) = @_;
+ my (%args) = @_;
my @columns = @{PROBLEM_PUBLIC_COLUMNS()};
push @columns, 'solution' if $args{solution};
my %where;
$where{owner} = $args{owner} if $args{owner};
my $table = $args{contest} ? 'problems JOIN contest_problems cp ON cp.problem = id' : 'problems';
- my $ret = $self->{dbis}->select(\$table, \@columns, \%where, 'name')->hashes;
- $self->add_names($ret);
+ my $ret = add_names $db->select(\$table, \@columns, \%where, 'name')->hashes;
my %params;
for (@$ret) {
}
sub problem_entry {
- my ($self, $id, $contest, $user) = @_;
- $contest &&= $self->contest_entry($contest);
- my $ret = $self->query(problem_entry_sth => $id)->hash;
- $self->add_names($ret);
- my $limits = $self->query(limits_sth => $id)->hashes;
+ my ($id, $contest) = @_;
+ $contest = contest_entry ($contest) if $contest;
+ my $ret = add_names query(problem_entry_sth => $id)->hash;
+ my $limits = query(limits_sth => $id)->hashes;
$ret->{limits} = $limits if @$limits;
if ($contest) {
$ret->{contest_start} = $contest->{start};
$ret->{contest_stop} = $contest->{stop};
+ delete $ret->{solution}
}
$ret
}
sub contest_list {
- my ($self) = @_;
- my $ret = $self->query('contest_list_sth')->hashes;
- $self->add_names($ret);
+ my $ret = add_names query('contest_list_sth')->hashes;
my %ret;
for (@$ret) {
}
sub contest_entry {
- my ($self, $id) = @_;
- my $ret = $self->query(contest_entry_sth => $id)->hash;
- $self->add_names($ret);
+ my ($id) = @_;
+ add_names query(contest_entry_sth => $id)->hash;
}
sub contest_full {
- my ($self, $id) = @_;
- scalar $self->query(contest_full_sth => $id)->hash;
+ my ($id) = @_;
+ scalar query(contest_full_sth => $id)->hash;
}
sub contest_has_problem {
- my ($self, $contest, $problem) = @_;
- $self->query('contest_has_problem_sth')->flat
+ my ($contest, $problem) = @_;
+ query('contest_has_problem_sth', $contest, $problem)->flat
}
sub job_list {
- my ($self, %args) = @_;
+ my (%args) = @_;
$args{page} //= 1;
my %where = (
maybe contest => $args{contest},
);
$where{private} = 0 unless $args{private};
- my $rows = $self->{dbis}->select('job_entry', 'COUNT(*)', \%where)->list;
+ my $rows = $db->select('job_entry', 'COUNT(*)', \%where)->list;
my $pages = int (($rows + JOBS_PER_PAGE - 1) / JOBS_PER_PAGE);
- my ($stmt, @bind) = $self->{dbis}->abstract->select('job_entry', '*', \%where, {-desc => 'id'});
- my $jobs = $self->{dbis}->query("$stmt LIMIT " . JOBS_PER_PAGE . ' OFFSET ' . ($args{page} - 1) * JOBS_PER_PAGE, @bind)->hashes;
+ my ($stmt, @bind) = $db->abstract->select('job_entry', '*', \%where, {-desc => 'id'});
+ my $jobs = $db->query("$stmt LIMIT " . JOBS_PER_PAGE . ' OFFSET ' . ($args{page} - 1) * JOBS_PER_PAGE, @bind)->hashes;
my %ret = (
- log => $jobs,
+ log => add_names $jobs,
current_page => $args{page},
last_page => $pages,
);
- $self->add_names($ret{log});
$ret{previous_page} = $args{page} - 1 if $args{page} - 1;
$ret{next_page} = $args{page} + 1 if $args{page} < $pages;
}
sub job_entry {
- my ($self, $id) = @_;
- my $ret = $self->query(job_entry_sth => $id)->hash;
- $ret->{results} &&= decode_json $ret->{results};
- $self->add_names($ret);
+ my ($id) = @_;
+ my $ret = add_names query(job_entry_sth => $id)->hash;
+ $ret->{results} = decode_json $ret->{results} if $ret->{results};
+ $ret
}
sub job_full {
- my ($self, $id) = @_;
- scalar $self->query(job_full_sth => $id)->hash
+ my ($id) = @_;
+ scalar query(job_full_sth => $id)->hash
}
sub create_job {
- my ($self, %args) = @_;
- $self->{dbis}->update('users', {lastjob => time});
+ my (%args) = @_;
+ $db->update('users', {lastjob => time});
purge '/log/';
- scalar $self->{dbis}->insert('jobs', \%args, {returning => 'id'})->list
+ scalar $db->insert('jobs', \%args, {returning => 'id'})->list
}
sub calc_score {
my ($mxscore, $time, $tries, $totaltime) = @_;
my $score = $mxscore;
- $time = 0 if $time < 0;
- $time = 300 if $time > $totaltime;
+ $time = 300 if $time > $totaltime; # uncoverable branch true does not happen anymore (only possible if opens are broken)
$score = ($totaltime - $time) / $totaltime * $score;
$score -= $tries / 10 * $mxscore;
$score = $mxscore * 3 / 10 if $score < $mxscore * 3 / 10;
}
sub standings {
- my ($self, $ct) = @_;
- $ct = $self->contest_entry($ct);
+ my ($ct) = @_;
+ $ct = contest_entry $ct;
- my @problems = $self->query(contest_problems_sth => $ct->{id})->flat;
- my $pblist = $self->problem_list;
- my %values = $self->query('problem_values_sth')->map;
-# $values{$_} = $values{$_}->{value} for keys %values;
+ my @problems = query(contest_problems_sth => $ct->{id})->flat;
+ my $pblist = problem_list;
+ my %values = query('problem_values_sth')->map;
my (%scores, %tries, %opens);
- my $opens = $self->query(opens_sth => $ct->{id});
+ my $opens = query(opens_sth => $ct->{id});
while ($opens->into(my ($problem, $owner, $time))) {
$opens{$problem, $owner} = $time;
}
- my $jobs = $self->{dbis}->select('job_entry', '*', {contest => $ct->{id}}, 'id');
+ my $jobs = $db->select('job_entry', '*', {contest => $ct->{id}}, 'id');
while (my $job = $jobs->hash) {
my $open = $opens{$job->{problem}, $job->{owner}} // $ct->{start};
my $time = $job->{date} - $open;
- next if $time < 0;
+ next if $time < 0; # uncoverable branch true job sent before contest is deprecated
my $value = $values{$job->{problem}};
my $factor = $job->{result} ? 0 : 1;
$factor = $1 / 100 if $job->{result_text} =~ /^(\d+ )/s;
my $user = $_;
+{
user => $user,
- user_name => $self->object_name(users => $user),
+ user_name => object_name(users => $user),
score => sum (values %{$scores{$user}}),
scores => [map { $scores{$user}{$_} // '-'} @problems],
}
$st[$_]->{rank} = $st[$_ - 1]->{rank} + ($st[$_]->{score} < $st[$_ - 1]->{score}) for 1 .. $#st;
+{
st => \@st,
- problems => [map { [ $_, $self->object_name(problems => $_)] } @problems],
+ problems => [map { [ $_, object_name(problems => $_)] } @problems],
}
}
sub update_status {
- my ($self) = @_;
- my $jobs = $self->{dbis}->select('jobs', 'id,owner,problem,result', {}, 'id');
+ my $jobs = $db->select('jobs', 'id,owner,problem,result', {-not_bool => 'private'}, 'id');
my %hash;
while ($jobs->into(my ($id, $owner, $problem, $result))) {
my @contest_statuses = map {
my $ct = $_;
- map { [$ct, $_->{user}, $_->{score}, $_->{rank}] } @{$self->standings($ct)->{st}}
- } $self->{dbis}->select('contests', 'id')->flat;
-
- $self->{dbis}->begin;
- $self->{dbis}->delete('problem_status');
- $self->{dbis}->query('INSERT INTO problem_status (problem,owner,job,solved) VALUES (??)', @$_) for @problem_statuses;
- $self->{dbis}->delete('contest_status');
- $self->{dbis}->query('INSERT INTO contest_status (contest,owner,score,rank) VALUES (??)', @$_) for @contest_statuses;
- $self->{dbis}->commit
+ map { [$ct, $_->{user}, $_->{score}, $_->{rank}] } @{standings($ct)->{st}}
+ } $db->select('contests', 'id')->flat;
+
+ $db->begin;
+ $db->delete('problem_status');
+ $db->query('INSERT INTO problem_status (problem,owner,job,solved) VALUES (??)', @$_) for @problem_statuses;
+ $db->delete('contest_status');
+ $db->query('INSERT INTO contest_status (contest,owner,score,rank) VALUES (??)', @$_) for @contest_statuses;
+ $db->commit
}
my @PURGE_HOSTS = exists $ENV{PURGE_HOSTS} ? split ' ', $ENV{PURGE_HOSTS} : ();
projects / gruntmaster-data.git / blobdiff