重构数据库增加tag

Author: shellus

app/Category.php

@@ -50,7 +50,7 @@ protected static function boot()
 
     public function articles()
     {
-        return $this->belongsToMany('App\Article')->withTimestamps();
+        return $this->belongsToMany('App\Article', 'article_category', 'category_id', 'article_id')->withTimestamps();
     }
 
     public function showUrl(){

app/Http/Controllers/ArticleController.php

@@ -4,7 +4,9 @@
 
 use App\Article;
 use App\ArticleVote;
+use App\Category;
 use App\SearchHistory;
+use App\Tag;
 use Illuminate\Http\Request;
 
 use App\Http\Requests;
@@ -60,6 +62,27 @@ public function index()
         //
     }
 
+    public function tagIndex($id){
+        $articles = Tag::findOrFail($id)->articles()->orderBy('articles.updated_at', 'DESC')->paginate(20);
+
+        $articles->load(['comments' => function ($query) {
+//            $query->selectRaw('min(id) as id, article_id, count(*) as comments_count');
+//            $query->groupBy('article_id');
+            $query->orderBy('created_at','DESC');
+        }]);
+        return view('article.index', ['articles' => $articles]);
+    }
+    public function categoryIndex($id){
+        $articles = Category::findOrFail($id)->articles()->orderBy('articles.updated_at', 'DESC')->paginate(20);
+
+        $articles->load(['comments' => function ($query) {
+//            $query->selectRaw('min(id) as id, article_id, count(*) as comments_count');
+//            $query->groupBy('article_id');
+            $query->orderBy('created_at','DESC');
+        }]);
+        return view('article.index', ['articles' => $articles]);
+    }
+
     /**
      * Show the form for creating a new resource.
      *

app/Http/Controllers/CategoryController.php

@@ -69,14 +69,6 @@ public function store(Request $request)
      */
     public function show($id)
     {
-        $articles = Category::findOrFail($id)->articles()->orderBy('articles.updated_at', 'DESC')->paginate(20);
-
-        $articles->load(['comments' => function ($query) {
-//            $query->selectRaw('min(id) as id, article_id, count(*) as comments_count');
-//            $query->groupBy('article_id');
-            $query->orderBy('created_at','DESC');
-        }]);
-        return view('article.index', ['articles' => $articles]);
     }
 
     /**

app/Http/Controllers/TagController.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class TagController extends Controller
+{
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}

app/Tag.php

@@ -28,5 +28,7 @@ public function __construct(array $attributes = [])
         $attributes['type'] = 'tag';
         parent::__construct($attributes);
     }
-
+    public function showUrl(){
+        return route('tag.show', [$this -> id]);
+    }
 }

database/migrations/2016_11_15_072716_create_files_table.php renamed to database/migrations/2016_08_15_072716_create_files_table.php

@@ -17,10 +17,14 @@ public function up()
             $table->increments('id');
             $table->string('title');
             $table->string('slug')->default('');
+            $table->string('type')->default('category'); // or 'tag'
             $table->string('description')->default('');  // 指导资源分类者的标签介绍
             $table->integer('parent_id')->default(0)->unsigned();
+            $table->integer('logo_id')->nullable()->unsigned();
             $table->timestamps();
 
+            $table->foreign('logo_id')->references('id')->on('files')
+                ->onUpdate('cascade')->onDelete('cascade');
         });
     }
 

database/migrations/2016_09_24_114036_categories.php

@@ -24,7 +24,7 @@ public function up()
             $table->foreign('category_id')->references('id')->on('categories')
                 ->onUpdate('cascade')->onDelete('cascade');
 
-            $table->index(['article_id', 'category_id']);
+            $table->unique(['article_id', 'category_id']);
         });
     }