remove get_post function

Author: lloydzhou

controller.php

@@ -89,6 +89,10 @@ public function view($id){
         $this->initSilder();
         $this->render('post.html');
     }
+    public function delete($id, $router){
+        (new Post())->find(intval($id))->delete();
+        $router->error(302, '/posts');
+    }
     public function create($router, $user_id, $category_id, $category, $title, $content, $tag){
         if ($user_id){
             if ($category){

index.php

@@ -35,7 +35,7 @@
 })
 ->error(405, function($message){
     header("Location: /posts", true, 302);
-    die('aaa');
+    die('405');
 })
 ->delete('/uninstall', function($router){
     @unlink('blog.db');
@@ -68,12 +68,7 @@
 ->get('/posts', array(new PostController(), 'listall'))
 ->get('/post/create', array(new PostController(), 'create'), 'auth')
 ->post('/post/create', array(new PostController(), 'create'), 'auth')
-->get('/post/:id/delete', function($id, $router){
-    $post = get_post($id);
-    $post->updateTag('');
-    $post->delete();
-    $router->error(302, '/posts');
-}, 'auth')
+->get('/post/:id/delete', array(new PostController(), 'delete'), 'auth')
 ->get('/post/:id/edit', array(new PostController, 'edit'), 'auth')
 ->post('/post/:id/edit', array(new PostController, 'edit'), 'auth')
 ->get('/post/:id/view', array(new PostController, 'view'))

model.php

@@ -104,10 +104,4 @@ class Post2Tag extends ActiveRecord{
     );
 }
 
-function get_post($id=null){
-    return (new Post())->eq('id', (int)($id?$id:1))->find();
-}
-function get_user($id=null){
-    return (new User())->eq('id', (int)($id?$id:1))->find();
-}
 

test/BlogTest.php

@@ -81,7 +81,6 @@ public function testPosts(){
     public function testPostDelete($postId){
         $response = $this->getRequest()->get('http://127.0.0.1:8889/post/'. $postId. '/delete');
         $this->assertEquals(302, $response->getHttpCode());
-        $this->assertEquals(302, $response->getHttpCode());
         $this->assertEmpty($response->getContent());
         $this->assertEquals('/posts', $response->getHeader()->getLocation());
     }