Changeset 406 for veekun/trunk/lib/Vee/Controller/Forum/Create.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/Create.pm (modified) (13 diffs)

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

@@ -50 +50 @@
 
     # TODO: make these redir to an actual post page when one exists
-    $c->vee_abort('Please enter a message.') unless $c->req->params->{message} =~ /\S/;
+    $c->vee_abort('Please enter a message.') unless $c->req->params->{content} =~ /\S/;
     $c->vee_abort('No thread id specified.  This should not happen.  Sorry?') unless $c->req->params->{id};
 
@@ -60 +60 @@
     }
 
-    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.");
@@ -73 +73 @@
     # TODO: apply this to thread creation too?  not as common..  and merge as well?
     my $last_post = $c->model('DBIC::Posts')->search({
-        threadid => $thread->id,
-        time     => { '>=', time - $c->site_opts->{post_automerge_time} },
+        thread_id => $thread->id,
+        time      => { '>=', time - $c->site_opts->{post_automerge_time} },
     }, {
-        order_by => 'time DESC',
+        order_by  => 'time DESC',
     })->single;
 
     my $post;
     # only do merging/prevention if the last post is this user's        
-    if ($last_post and $last_post->userid == $c->user->obj->id and $last_post->flags !~ /deleted/) {
-        if ($last_post->message eq $parsed_message) {
+    if ($last_post and $last_post->user_id == $c->user->obj->id and $last_post->flags !~ /deleted/) {
+        if ($last_post->content eq $parsed_message) {
             $c->vee_abort("You have already posted that message recently.");
         }
@@ -90 +90 @@
         $post = $c->model('DBIC')->schema->txn_do( sub {
             my $edit = $c->model('DBIC::Edits')->create({
-                postid     => $last_post->id,
-                userid     => $c->user->obj->id,
-                time       => time,
-                oldmessage => $last_post->message,
+                post_id     => $last_post->id,
+                user_id     => $c->user->obj->id,
+                time        => time,
+                old_content => $last_post->content,
             });
-            $last_post->message(
-                $last_post->message .
+            $last_post->content(
+                $last_post->content .
                 "\n[hr][i]Automerged:[/i]\n" .
                 $parsed_message
             );
-            $last_post->lasteditid( $edit->id );
+            $last_post->last_edit_id( $edit->id );
             $last_post->time( time );
             $last_post->update;
 
-            $thread->lastpostid( $last_post->id );
-            $thread->lasttime( time );
+            $thread->last_post_id( $last_post->id );
+            $thread->last_post_time( time );
             $thread->update;
 
@@ -114 +114 @@
         $post = $c->model('DBIC')->schema->txn_do( sub {
             my $post = $c->model('DBIC::Posts')->create({
-                threadid => $thread->id,
-                userid   => $c->user->obj->id,
-                time     => time,
-                format   => 'bbcode',
-                message  => $parsed_message,
+                thread_id => $thread->id,
+                user_id   => $c->user->obj->id,
+                time      => time,
+                format    => 'bbcode',
+                content   => $parsed_message,
             });
             # update thread's last-post stats
-            $thread->lastpostid( $post->id );
-            $thread->lasttime( time );
-            $thread->postct( $thread->postct + 1 );
+            $thread->last_post_id( $post->id );
+            $thread->last_post_time( time );
+            $thread->post_count( $thread->post_count + 1 );
             $thread->update;
             # update forum's last-post stats
-            $thread->forum->lastpostid( $post->id );
-            $thread->forum->postct( $thread->forum->postct + 1 );
+            $thread->forum->last_post_id( $post->id );
+            $thread->forum->post_count( $thread->forum->post_count + 1 );
             $thread->forum->update;
             # update user's postcount
-            $c->user->obj->postct( $c->user->postct + 1 );
+            $c->user->obj->post_count( $c->user->post_count + 1 );
             $c->user->obj->update;
             return $post;
@@ -149 +149 @@
     my $s = $c->stash;
 
-    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.");
@@ -156 +156 @@
     
     my $rows = $c->site_opts->{page_sizes}{posts_preview};
-    my $offset = $c->model('DBIC::Posts')->count({ threadid => $thread->id }, { order_by => 'me.time ASC' } );
+    my $offset = $c->model('DBIC::Posts')->count({ thread_id => $thread->id }, { order_by => 'me.time ASC' } );
     $offset = $offset - $rows;
 
-    my $posts_rs = $c->model('DBIC::Posts')->search({ threadid => $thread->id }, {
+    my $posts_rs = $c->model('DBIC::Posts')->search({ thread_id => $thread->id }, {
         order_by => 'me.time ASC',
         offset   => $offset,
@@ -167 +167 @@
     # form generation stuff
     my $reply_fields = {
-        message => { type => 'textarea', rows => '10', cols => '100' },
+        content => { type => 'textarea', rows => '10', cols => '100' },
         id => { type => 'hidden' },
     };
@@ -207 +207 @@
 
     # TODO: make these redir to an actual post page when one exists
-    $c->vee_abort("You must enter a message.") unless $c->req->params->{message} =~ /\S/;
+    $c->vee_abort("You must enter a message.") unless $c->req->params->{content} =~ /\S/;
     $c->vee_abort("You must enter a subject.") unless $c->req->params->{subject} =~ /\S/;
     
-    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->detach('thread_preview');
@@ -229 +229 @@
     my $thread = $c->model('DBIC')->schema->txn_do( sub {
         my $thread = $c->model('DBIC::Threads')->create({
-            forumid     => $forum->id,
-            subject     => $subject,
-            firstpostid => 0,
-            lastpostid  => 0,
-            lasttime    => time,
-            postct      => 1,
-            blurb       => $blurb,
+            forum_id       => $forum->id,
+            subject        => $subject,
+            first_post_id  => 0,
+            last_post_id   => 0,
+            last_post_time => time,
+            post_count     => 1,
+            blurb          => $blurb,
         });
         # create the post
         my $post = $c->model('DBIC::Posts')->create({
-            threadid => $thread->id,
-            userid   => $c->user->obj->id,
-            time     => time,
-            format   => 'bbcode',
-            message  => Vee::Utils::fix_newlines( $parsed_message ),
+            thread_id => $thread->id,
+            user_id   => $c->user->obj->id,
+            time      => time,
+            format    => 'bbcode',
+            content   => Vee::Utils::fix_newlines( $parsed_message ),
         });
         # update thread's last-post stats
-        $thread->firstpostid( $post->id );
-        $thread->lastpostid( $post->id );
+        $thread->first_post_id( $post->id );
+        $thread->last_post_id( $post->id );
         $thread->update;
         # update forum's last-post stats
-        $forum->lastpostid( $post->id );
-        $forum->postct( $forum->postct + 1 );
-        $forum->threadct( $forum->threadct + 1 );
+        $forum->last_post_id( $post->id );
+        $forum->post_count( $forum->post_count + 1 );
+        $forum->thread_count( $forum->thread_count + 1 );
         $forum->update;
         # update user's postcount
-        $c->user->obj->postct( $c->user->postct + 1 );
+        $c->user->obj->post_count( $c->user->post_count + 1 );
         $c->user->obj->update;
         return $thread;
@@ -275 +275 @@
     my $subject = $c->req->params->{subject};
     my $blurb   = $c->req->params->{blurb};
-    my $message = $c->req->params->{message};
+    my $content = $c->req->params->{content};
     my $forum = $c->model('DBIC::Forums')->find( $c->req->params->{id} )
         or $c->vee_abort('There is no forum with an id of ', $c->req->params->{id}, '.  It may have been deleted while you were typing?');
@@ -283 +283 @@
     }
     
-    my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $message );
+    my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode($content);
     if (@bbcode_errors) {
         $c->vee_abort("Your post contains invalid bbcode.  Please fix it.");
@@ -290 +290 @@
     # form generation stuff
     my $reply_fields = {
-        message => { type => 'textarea', rows => '10', cols => '100' },
+        content => { type => 'textarea', rows => '10', cols => '100' },
         id => { type => 'hidden' },
         subject => { type => 'text', maxlength => 48 },