From db01d4ee6e1aec434cb258f4e85c5be8642ed511 Mon Sep 17 00:00:00 2001
From: junv <wahyd4@gmail.com>
Date: Wed, 19 Aug 2015 23:24:47 +0800
Subject: [PATCH] make dashboard works

---
 app/controllers/api/v1/dashboard_controller.rb | 8 +++++---
 app/serializers/article_serializer.rb          | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/v1/dashboard_controller.rb b/app/controllers/api/v1/dashboard_controller.rb
index 3e42b25..9a2b17d 100644
--- a/app/controllers/api/v1/dashboard_controller.rb
+++ b/app/controllers/api/v1/dashboard_controller.rb
@@ -1,11 +1,13 @@
 class Api::V1::DashboardController < Api::V1::ApplicationController
 
+  skip_before_action :authenticate_user_from_token, only: [:top]
+
   def top
     case params[:type]
-      when 'article'
-        render json: Article.order(:view_account).page(params[:page]), each_serializer: ArticleSerializer
       when 'web_page'
-        render json: WebPage.order(:view_account).page(params[:page]), each_serializer: WebPageSerializer
+        render json: Post.where(type: 'WebPage').order(:viewed_times).page(params[:page]), each_serializer: WebPageSerializer
+      else
+        render json: Post.where(type: 'Article').order(:viewed_times).page(params[:page]), each_serializer: ArticleSerializer
     end
 
   end
diff --git a/app/serializers/article_serializer.rb b/app/serializers/article_serializer.rb
index 73e5f39..7855ceb 100644
--- a/app/serializers/article_serializer.rb
+++ b/app/serializers/article_serializer.rb
@@ -1,13 +1,13 @@
 class ArticleSerializer < ActiveModel::Serializer
 
-  attributes :id, :view_account, :title, :url, :author
+  attributes :id, :viewed_times, :title, :url
 
   def title
     object.try(:name)
   end
 
   def view_account
-    object.view_account || 0
+    object.viewed_times || 0
   end
 
 end