Merge pull request #1824 from rockandror/user-recomendations

User recomendations

app/controllers/concerns/commentable_actions.rb

@@ -4,17 +4,22 @@ module CommentableActions
   include Search
 
   def index
-    @resources = @search_terms.present? ? resource_model.search(@search_terms) : resource_model.all
-    @resources = @advanced_search_terms.present? ? @resources.filter(@advanced_search_terms) : @resources
+    @resources = resource_model.all
 
+    @resources = @current_order == "recommendations" && current_user.present? ? @resources.recommendations(current_user) : @resources.for_render
+    @resources = @resources.search(@search_terms) if @search_terms.present?
+    @resources = @advanced_search_terms.present? ? @resources.filter(@advanced_search_terms) : @resources
     @resources = @resources.tagged_with(@tag_filter) if @tag_filter
-    @resources = @resources.page(params[:page]).for_render.send("sort_by_#{@current_order}")
+
+    @resources = @resources.page(params[:page]).send("sort_by_#{@current_order}")
+
     index_customization if index_customization.present?
 
     @tag_cloud = tag_cloud
     @banners = Banner.with_active
 
     set_resource_votes(@resources)
+
     set_resources_instance
   end
 

app/controllers/debates_controller.rb

@@ -10,7 +10,7 @@ class DebatesController < ApplicationController
 
   invisible_captcha only: [:create, :update], honeypot: :subtitle
 
-  has_orders %w{hot_score confidence_score created_at relevance}, only: :index
+  has_orders ->(c) { Debate.debates_orders(c.current_user) }, only: :index
   has_orders %w{most_voted newest oldest}, only: :show
 
   load_and_authorize_resource

app/controllers/notifications_controller.rb

@@ -11,7 +11,7 @@ class NotificationsController < ApplicationController
 
   def show
     @notification = current_user.notifications.find(params[:id])
-    redirect_to url_for(@notification.linkable_resource)
+    redirect_to linkable_resource_path(@notification)
   end
 
   def mark_all_as_read
@@ -25,4 +25,13 @@ class NotificationsController < ApplicationController
       @notification.mark_as_read
     end
 
+    def linkable_resource_path(notification)
+      case notification.linkable_resource.class.name
+      when "Budget::Investment"
+        budget_investment_path @notification.linkable_resource.budget, @notification.linkable_resource
+      else
+        url_for @notification.linkable_resource
+      end
+    end
+
 end

app/controllers/proposals_controller.rb

@@ -9,7 +9,7 @@ class ProposalsController < ApplicationController
 
   invisible_captcha only: [:create, :update], honeypot: :subtitle
 
-  has_orders %w{hot_score confidence_score created_at relevance archival_date}, only: :index
+  has_orders ->(c) { Proposal.proposals_orders(c.current_user) }, only: :index
   has_orders %w{most_voted newest oldest}, only: :show
 
   load_and_authorize_resource
@@ -113,7 +113,7 @@ class ProposalsController < ApplicationController
     end
 
     def load_featured
-      return unless !@advanced_search_terms && @search_terms.blank? && @tag_filter.blank? && params[:retired].blank?
+      return unless !@advanced_search_terms && @search_terms.blank? && @tag_filter.blank? && params[:retired].blank? && @current_order != "recommendations"
       @featured_proposals = Proposal.not_archived.sort_by_confidence_score.limit(3)
       if @featured_proposals.present?
         set_featured_proposal_votes(@featured_proposals)

app/controllers/welcome_controller.rb

@@ -1,12 +1,10 @@
 class WelcomeController < ApplicationController
   skip_authorization_check
+  before_action :set_user_recommendations, only: :index, if: :current_user
 
   layout "devise", only: [:welcome, :verification]
 
   def index
-    if current_user
-      redirect_to :proposals
-    end
   end
 
   def welcome
@@ -16,4 +14,11 @@ class WelcomeController < ApplicationController
     redirect_to verification_path if signed_in?
   end
 
+  private
+
+  def set_user_recommendations
+    @recommended_debates = Debate.recommendations(current_user).sort_by_recommendations.limit(3)
+    @recommended_proposals = Proposal.recommendations(current_user).sort_by_recommendations.limit(3)
+  end
+
 end