Reduce DBIC dependency

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index f876bae0dba1534ae04fe33e242d923c50323dc7..1af76d0c14072c2696922b3d892e9034fc636df6 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -45,15 +45,13 @@ sub db { $env->{'gruntmaster.dbic'} }
 
 sub remote_user {
        my $user = $env->{REMOTE_USER};
-       $user &&= db->user($user);
+       $user &&= db->user_entry($user);
        $user
 }
 
-sub admin   { remote_user && remote_user->admin }
+sub admin   { remote_user && remote_user->{admin} }
 sub contest { db->contest ($_{contest}) }
 sub problem { db->problem ($_{problem}) }
-sub job     { db->job     ($_{job})     }
-sub user    { db->user    ($_{user})    }
 
 sub redirect { [301, ['X-Forever' => 1, 'Cache-Control' => 'public, max-age=86400', 'Location' => $_[0]], []] }
 sub reply    { [200, ['Content-Type' => 'text/plain; charset=utf-8'], \@_] }
@@ -83,9 +81,9 @@ sub dispatch_request{
                sub (/robots.txt) { NOT_FOUND },
 
                sub (/src/:job) {
-                       return NOT_FOUND if !job;
                        my $job = db->job_full($_{job});
-                       my $isowner = remote_user && remote_user->id eq $job->{owner};
+                       return NOT_FOUND if !$job;
+                       my $isowner = remote_user && remote_user->{id} eq $job->{owner};
                        my $contest = $job->{contest} && db->contest_entry($job->{contest});
                        my $private = $job->{private} || $contest && ($contest->{started} && !$contest->{finished});
                        forbid !$isowner && $private;
@@ -143,11 +141,18 @@ sub dispatch_request{
                        response pb => 'Problems', db->problem_list(%_)
                },
 
-               sub (/us/:user)    { response us_entry => user->name, db->user_entry($_{user}) },
-               sub (/ct/:contest) { response ct_entry => contest->name, db->contest_entry($_{contest}), 60 },
+               sub (/us/:user)    {
+                       my $user = db->user_entry($_{user});
+                       response us_entry => $user->{name}, $user
+               },
+               sub (/ct/:contest) {
+                       my $contest = db->contest_entry($_{contest});
+                       response ct_entry => $contest->{name}, $contest, 60
+               },
                sub (/log/:job)    {
-                       forbid job->private;
-                       response log_entry => "Job  $_{job}", db->job_entry($_{job}), 10
+                       my $job = db->job_entry($_{job});
+                       forbid $job->{private};
+                       response log_entry => "Job  $_{job}", $job, 10
                },
                sub (/pb/:problem + ?contest~) {
                        my (undef, undef, $contest) = @_;
@@ -159,7 +164,7 @@ sub dispatch_request{
                                forbid !remote_user;
                                $privacy = 'private';
                        }
-                       response pb_entry => problem->name, db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id), $_{contest} ? 10 : ();
+                       response pb_entry => problem->name, db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->{id}), $_{contest} ? 10 : ();
                },
                sub (/sol/:problem) {
                        forbid problem->private;
@@ -181,12 +186,11 @@ sub dispatch_request{
                        return reply 'This problem is private' if !admin && $private;
                        return reply 'This problem does not belong to this contest' if contest && !db->contest_problems->find($_{contest}, $_{problem});
                        return reply 'Maximum source size is 10KB' if ($prog ? $prog->size : length $_{source_code}) > 10 * 1024;
-                       return reply 'You must wait 30 seconds between jobs' if !admin && time <= remote_user->lastjob + 30;
-                       remote_user->update({lastjob => time});
+                       return reply 'You must wait 30 seconds between jobs' if !admin && time <= remote_user->{lastjob} + 30;
 
                        my $source = $prog ? read_file $prog->path : $_{source_code};
                        unlink $prog->path if $prog;
-                       my $newjob = db->jobs->create({
+                       my $id = db->create_job(
                                maybe contest => $_{contest},
                                private => $private,
                                date => time,
@@ -194,10 +198,10 @@ sub dispatch_request{
                                format => $_{prog_format},
                                problem => $_{problem},
                                source => $source,
-                               owner => remote_user->id,
-                       });
+                               owner => remote_user->{id},
+                       );
 
-                       [303, [Location => '/log/' . $newjob->id], []]
+                       [303, [Location => '/log/' . $id], []]
                },
        }
 }