select and sort activities

app/controllers/v1/feed_controller.rb

@@ -17,7 +17,8 @@ class V1::FeedController < ApplicationController
     current_user.watching.each do |watching|
       activities.push(*watching.activities_filtered.to_a)
     end
-    activities
+    activities.sort_by! { |activity| activity.created_at }
+    activities.reverse
   end
 
 end

app/controllers/v1/learning_objects_controller.rb

@@ -111,7 +111,7 @@ class V1::LearningObjectsController < ApplicationController
     params[:learning_object].permit(subjects: [], educational_stages: [], tags: [:name])
   end
 
-  def learning_object_associations(learning_object, change_object_type_id)
+  def learning_object_associations(learning_object, change_object_type_id=false)
     if extra_params[:tags] == []
       current_user.untag(learning_object, with: @learning_object.tags.map { |t| t['name'] })
     elsif !extra_params[:tags].nil?
@@ -120,7 +120,7 @@ class V1::LearningObjectsController < ApplicationController
     learning_object.add_subjects(ids: extra_params[:subjects]) unless extra_params[:subjects].nil?
     learning_object.add_educational_stages(ids: extra_params[:educational_stages]) unless extra_params[:educational_stages].nil?
 
-    if change_object_type_id   
+    if change_object_type_id
       learning_object.link = nil
     end
   end

app/services/activities_filter_service.rb

@@ -2,7 +2,9 @@ module ActivitiesFilterService
 
   def activities_filtered
     if !self.try(:draft?)
-      self.activities.where(key: activities_filter)
+      acts = self.activities.where(key: activities_filter)
+      ret = acts.select { |a| a.trackable != nil || a.key =~ /.\.destroy/ }
+      ret
     else
       []
     end