Changeset 406 for veekun/trunk/lib/Vee/Controller/Forum/Post.pm

Timestamp:

02/08/08 02:44:39 (2 years ago)

Author:

eevee

Message:

Database refactoring. Renamed columns and tables to be more consistent and more readable. (#58)

Files:

• veekun/trunk/lib/Vee/Controller/Forum/Post.pm (modified) (8 diffs)

veekun/trunk/lib/Vee/Controller/Forum/Post.pm

@@ -51 +51 @@
 sub utils : LocalRegex('^(\d*)/(delete|undelete|nuke)') : Args(0) {
     my ( $self, $c ) = @_;
-    my ($postid, $method) = @{ $c->req->captures };
-    
-    my $forumid = undef;
+    my ($post_id, $method) = @{ $c->req->captures };
+    
+    my $forum_id = undef;
     # This is the post to be deleted, as well as the entire result set of things to be modified
-    my $post = $c->model('DBIC::Posts')->find({ 'me.id' => $postid }, { prefetch => ['user', { 'thread' => 'forum' }], })
-        or $c->vee_abort("There is no post with id of ", $postid, ". Perhaps another admin nuked it?");
-    $c->vee_abort("The post with id of ", $postid, " has already been ", $method, "d.")
+    my $post = $c->model('DBIC::Posts')->find({ 'me.id' => $post_id }, { prefetch => ['user', { 'thread' => 'forum' }], })
+        or $c->vee_abort("There is no post with id of ", $post_id, ". Perhaps another admin nuked it?");
+    $c->vee_abort("The post with id of ", $post_id, " has already been ", $method, "d.")
         if (($post->flags =~ /deleted/ && $method eq 'delete') || ($post->flags !~ /deleted/ && $method eq 'undelete'));
     $c->vee_abort("You don't have permission to ", $method, " this post.")
-        unless (($c->user->obj->id == $post->userid && $method ne 'nuke') || $c->can_i("post$method"));
+        unless (($c->user->obj->id == $post->user_id && $method ne 'nuke') || $c->can_i("post$method"));
 
     # Do everything in a transaction for rollback purposes
@@ -66 +66 @@
         my ($thread, $forum, $user) = ($post->thread, $post->thread->forum, $post->user);
         # If any of the post (or thread) counts are 0 or less, this will break. Of course, if that's the case, something is broken
-        return undef unless (($forum->postct >= 0 || $forum->threadct >= 0 || $thread->postct >= 0 || $user->postct >= 0) || ($method eq 'undelete'));
-        my $thread_postct = $c->model('DBIC::Posts')->count({ 'me.threadid' => $post->threadid, 'me.flags' => { '!=', 'deleted' } });
+        return undef unless (($forum->post_count >= 0 || $forum->thread_count >= 0 || $thread->post_count >= 0 || $user->post_count >= 0) || ($method eq 'undelete'));
+        my $thread_postct = $c->model('DBIC::Posts')->count({ 'me.thread_id' => $post->thread_id, 'me.flags' => { '!=', 'deleted' } });
         # Unfortunately, this must be done here, since this needs to include deleted posts as well
-        my ($lastpostid, $lasttime) = ((map {($_->id)} $c->model('DBIC::Posts')->search({ 'thread.forumid' => $forum->id, 'me.threadid' => $post->threadid }, { prefetch => 'thread', columns => [qw/me.id me.threadid thread.forumid/], order_by => 'me.time DESC' })), undef);
-
-        if ($method eq 'nuke') { $c->model('DBIC::Posts')->search({ 'me.id' => $postid})->delete; }
+        my ($last_post_id, $last_post_time) = ((map {($_->id)} $c->model('DBIC::Posts')->search({ 'thread.forum_id' => $forum->id, 'me.thread_id' => $post->thread_id }, { prefetch => 'thread', columns => [qw/me.id me.thread_id thread.forum_id/], order_by => 'me.time DESC' })), undef);
+
+        if ($method eq 'nuke') { $c->model('DBIC::Posts')->search({ 'me.id' => $post_id })->delete; }
         else { toggleflag( $post, 'deleted' ) or return undef; } 
 
         # If there's only one post left, delete the thread as well
-        if ($thread_postct > 1 && $lastpostid == $post->id) {
-            ($lasttime, $lastpostid) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forumid' => $forum->id, 'me.threadid' => $post->threadid, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' });
+        if ($thread_postct > 1 && $last_post_id == $post->id) {
+            ($last_post_time, $last_post_id) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forum_id' => $forum->id, 'me.thread_id' => $post->thread_id, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' });
         } elsif ($thread_postct <= 1) {
             #try moving this elsewhere later, i hate it here
-            if ($method eq 'nuke') { $c->model('DBIC::Threads')->search({ 'me.id' => $post->threadid })->delete; }
+            if ($method eq 'nuke') { $c->model('DBIC::Threads')->search({ 'me.id' => $post->thread_id })->delete; }
             elsif (($method eq 'undelete' && $thread_postct == 0) || ($method eq 'delete' && $thread_postct <= 1)) {
                 toggleflag( $thread, 'deleted' ) or return undef;
             }
-            ($lasttime, $lastpostid) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forumid' => $forum->id, 'thread.flags' => { '!=', 'deleted' }, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' });
-            $forumid = $forum->id;
-            $lastpostid = 0 unless $lastpostid;
+            ($last_post_time, $last_post_id) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forum_id' => $forum->id, 'thread.flags' => { '!=', 'deleted' }, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' });
+            $forum_id = $forum->id;
+            $last_post_id = 0 unless $last_post_id;
         }
             
         if (($method eq 'nuke' && $post->flags !~ /deleted/) || ($method eq 'delete')) { 
-            $thread->postct($thread->postct - 1);
-            $forum->postct($forum->postct - 1);
-            $forum->threadct($forum->threadct - 1) unless ($thread_postct > 1);
-            $user->postct($user->postct - 1);
+            $thread->post_count($thread->post_count - 1);
+            $forum->post_count($forum->post_count - 1);
+            $forum->thread_count($forum->thread_count - 1) unless ($thread_postct > 1);
+            $user->post_count($user->post_count - 1);
         } elsif ($method eq 'undelete') {
-            $thread->postct($thread->postct + 1);
-            $forum->postct($forum->postct + 1);
-            $forum->threadct($forum->threadct + 1) unless ($thread_postct > 1);
-            $user->postct($user->postct + 1);
-        }
-        # Only update lastpost and lasttime if this is actually the last post
-        if ($lasttime && $post->id == $thread->lastpostid) {
-            $thread->lastpostid($lastpostid);
-            $thread->lasttime($lasttime);
+            $thread->post_count($thread->post_count + 1);
+            $forum->post_count($forum->post_count + 1);
+            $forum->thread_count($forum->thread_count + 1) unless ($thread_postct > 1);
+            $user->post_count($user->post_count + 1);
+        }
+        # Only update last post and time if this is actually the last post
+        if ($last_post_time && $post->id == $thread->last_post_id) {
+            $thread->last_post_id($last_post_id);
+            $thread->last_post_time($last_post_time);
         }
         # Needs to be done here, in case the deleted post is the last post in a forum :(
-        $forum->lastpostid($lastpostid) if $post->id == $forum->lastpostid;
+        $forum->last_post_id($last_post_id) if $post->id == $forum->last_post_id;
         $thread->update if ($method ne 'nuke');
         $forum->update;
@@ -114 +114 @@
 
     $c->error("This error message should never be displayed unless someone is screwing with things; sorry.") unless $action;
-    $c->res->redirect("/forum/" . (($forumid) ? "$forumid" : "post/$postid"));
+    $c->res->redirect("/forum/" . (($forum_id) ? "$forum_id" : "post/$post_id"));
 }
 
@@ -125 +125 @@
 sub edits : LocalRegex('^(\d*)/edits') {
     my ($self, $c) = @_;
-    my ($s, $postid) = ($c->stash, $c->req->captures->[0]);
+    my ($s, $post_id) = ($c->stash, $c->req->captures->[0]);
     
     $c->vee_abort("You don't have permission to view post edits.") unless ($c->can_i('post_edits'));
 
-    my $post   = $c->model('DBIC::Posts')->find({ 'me.id' => $postid}, { prefetch => [qw/user edits/, { thread => 'forum' }], order_by => 'edits.time DESC' });
+    my $post   = $c->model('DBIC::Posts')->find({ 'me.id' => $post_id}, { prefetch => [qw/user edits/, { thread => 'forum' }], order_by => 'edits.time DESC' });
     
     $s->{post}      = $post;
@@ -143 +143 @@
 
 my $reply_fields = {
-    message => { type => 'textarea', rows => '10', cols => '100' },
+    content => { type => 'textarea', rows => '10', cols => '100' },
     id => { type => 'hidden' },
 };
@@ -149 +149 @@
 sub edit : LocalRegex('^(\d*)/edit') : Args(0) {
     my ($self, $c) = @_;
-    my ($s, $postid) = ($c->stash, $c->req->captures->[0]);
-    
-    my $post_rs = $c->model('DBIC::Posts')->search({ 'me.id' => $postid }, { prefetch => 'user' })->single;
+    my ($s, $post_id) = ($c->stash, $c->req->captures->[0]);
+    
+    my $post_rs = $c->model('DBIC::Posts')->search({ 'me.id' => $post_id }, { prefetch => 'user' })->single;
     $c->vee_abort("You must be logged in to edit posts.") unless $c->user;
-    $c->vee_abort("You don't have permission to edit posts.") unless ($c->can_i('post_edit') || $c->user->obj->id == $post_rs->userid);
+    $c->vee_abort("You don't have permission to edit posts.") unless ($c->can_i('post_edit') || $c->user->obj->id == $post_rs->user_id);
     
     # Form submited stuff
     if ('post' eq lc $c->req->params->{submit}) {
-        my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{message} );
+        my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{content} );
         if (@bbcode_errors) {
             $c->vee_abort("Your post contains invalid bbcode.  Please go back and fix it.");
@@ -164 +164 @@
         
         # If post wasn't edited, don't do anything further; results in redirect only
-        unless ($parsed_message eq $post_rs->message) {
+        unless ($parsed_message eq $post_rs->content) {
             my $post = $c->model('DBIC')->schema->txn_do( sub {
                 my $edit = $c->model('DBIC::Edits')->create({
-                    postid     => $post_rs->id,
-                    userid     => $c->user->obj->id,
-                    time       => time,
-                    oldmessage => $post_rs->message,
+                    post_id     => $post_rs->id,
+                    user_id     => $c->user->obj->id,
+                    time        => time,
+                    old_content => $post_rs->content,
                 });
                 
-                $post_rs->lasteditid( $edit->id );
-                $post_rs->message( $parsed_message );
+                $post_rs->last_edit_id( $edit->id );
+                $post_rs->content($parsed_message);
                 $post_rs->update;
                 
@@ -189 +189 @@
         copy_params => 1,
     );
-    $form->force( id => $post_rs->threadid );
-    $form->force( message => $c->req->params->{message} || $post_rs->message || '' );
+    $form->force( id => $post_rs->thread_id );
+    $form->force( content => $c->req->params->{content} || $post_rs->content || '' );
     
     $s->{page_header} = "Edit Post";