diff --git a/app/controllers/concerns/paginator.rb b/app/controllers/concerns/paginator.rb
index 6d43c864ec23abb2abf307355e7b25e57d16df47..6e8305d33e52f6f21953991762ed150ff54e02bf 100644
--- a/app/controllers/concerns/paginator.rb
+++ b/app/controllers/concerns/paginator.rb
@@ -22,25 +22,44 @@ module Paginator
def paginate(model)
total_count model
- return model.limit(limit).offset(offset) if model.respond_to?('limit')
+ return params_actions(model.limit(limit).offset(offset)) if model.respond_to?('limit')
return model[offset..limit]
end
private
- def limit
- return params[:limit].to_i if !params[:limit].blank?
- return params[:results_per_page].to_i if !params[:results_per_page].blank?
- return 12
- end
+ def limit
+ return params[:limit].to_i if !params[:limit].blank?
+ return params[:results_per_page].to_i if !params[:results_per_page].blank?
+ return 12
+ end
- def offset
- return params[:offset].to_i if !params[:offset].blank?
- return params[:page].to_i*params[:results_per_page].to_i if !params[:page].blank? && !params[:results_per_page].blank?
- return 0
- end
- def total_count(model)
- headers['X-Total-Count'] = model.count
- end
+ def offset
+ return params[:offset].to_i if !params[:offset].blank?
+ return params[:page].to_i*params[:results_per_page].to_i if !params[:page].blank? && !params[:results_per_page].blank?
+ return 0
+ end
+
+
+ def params_actions(model)
+
+ # filtering
+ if !params[:filter].blank?
+ (JSON.parse params[:filter]).each do |key, value|
+ model = model.where("#{key} ILIKE ?", "%#{value}%")
+ end
+ end
+
+ # ordering
+ model = model.order("#{params[:sort]} ASC") if !params[:sort].blank? and params[:order] == 'ASC'
+ model = model.order("#{params[:sort]} DESC") if !params[:sort].blank? and params[:order] == 'DESC'
+
+ return model
+ end
+
+ def total_count(model)
+ headers['X-Total-Count'] = model.count
+ end
+
end
diff --git a/app/controllers/v1/activities_controller.rb b/app/controllers/v1/activities_controller.rb
index dd473e80140b86deff3bf4fb9ab05e588dd001e8..aee3ce94da0db7d7bb22e9b63ec017d2085e12c5 100644
--- a/app/controllers/v1/activities_controller.rb
+++ b/app/controllers/v1/activities_controller.rb
@@ -20,7 +20,9 @@
class V1::ActivitiesController < ApplicationController
include ::ResourceModel
include ::Paginator
+
before_action :authenticate_user!
+ before_action :set_activity, only: [:show]
# GET v1/activities
# GET v1/activities.json
@@ -31,6 +33,13 @@ class V1::ActivitiesController < ApplicationController
render json: activities
end
+ # GET v1/activities/1
+ # GET v1/activities/1.json
+ def show
+ authorize :activity, :show?
+ render json: @activity
+ end
+
# GET v1/users/1/activities
# GET v1/users/1/activities.json
# Render specific user activities
@@ -46,4 +55,11 @@ class V1::ActivitiesController < ApplicationController
activities = paginate current_user.activities_filtered
render json: activities
end
+
+ private
+
+ def set_activity
+ @activity = ::ActivityPolicy::Scope.new(current_user, ::PublicActivity::Activity).resolve.find(params[:id])
+ end
+
end
diff --git a/app/controllers/v1/learning_objects_controller.rb b/app/controllers/v1/learning_objects_controller.rb
index a04c43dd7743427502f4839eace34313467f9a90..ed62d375753834f4b230efb7cee71bcedc1f8736 100644
--- a/app/controllers/v1/learning_objects_controller.rb
+++ b/app/controllers/v1/learning_objects_controller.rb
@@ -142,7 +142,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?
@@ -150,6 +150,7 @@ class V1::LearningObjectsController < ApplicationController
end
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
learning_object.link = nil
end
diff --git a/app/controllers/v1/ratings_controller.rb b/app/controllers/v1/ratings_controller.rb
index 1a2827acf79e465f9635550ad5619b782aa41958..a2928122205f9c2c7ceff5df0074500156632350 100644
--- a/app/controllers/v1/ratings_controller.rb
+++ b/app/controllers/v1/ratings_controller.rb
@@ -19,6 +19,7 @@
class V1::RatingsController < ApplicationController
include ::DeletedObjectsController
+ include ::Paginator
before_action :set_rating, only: [:show, :update, :destroy]
before_action :authenticate_user!, only: [:create, :update, :destroy]
@@ -27,7 +28,8 @@ class V1::RatingsController < ApplicationController
# GET v1/ratings
# GET v1/ratings.json
def index
- render json: Rating.all
+ ratings = paginate Rating
+ render json: ratings
end
# GET v1/ratings/1
diff --git a/app/controllers/v1/scores_controller.rb b/app/controllers/v1/scores_controller.rb
index 0ca1708f4733d9fb12ada86ae5652577e5fa1892..8933ff3863b5c9d364fef14990f954d72505957d 100644
--- a/app/controllers/v1/scores_controller.rb
+++ b/app/controllers/v1/scores_controller.rb
@@ -18,13 +18,18 @@
# along with portalmec. If not, see <http://www.gnu.org/licenses/>.
class V1::ScoresController < ApplicationController
+ include ::Paginator
+
before_action :set_score, only: [:show,:update]
before_action :authenticate_user!, only: [:update]
# GET v1/scores
# GET v1/scores.json
def index
- render json: Score.order(:name).includes(:score_user_categories).sort{|score| score.score_user_categories.size}.reverse
+ params[:sort] = 'name' if params[:sort].blank?
+ params[:order] = 'ASC' if params[:order].blank?
+ scores = paginate Score
+ render json: scores
end
# GET /scores/1
diff --git a/app/policies/activity_policy.rb b/app/policies/activity_policy.rb
index 2d1b16d69fb23d79aba973baff1b2f5db799b38c..77f1602ccf7208b1ad4c3b03766f5b655fec149d 100644
--- a/app/policies/activity_policy.rb
+++ b/app/policies/activity_policy.rb
@@ -41,6 +41,10 @@ class ActivityPolicy < ApplicationPolicy
true
end
+ def show?
+ true
+ end
+
## only user followers can see your activities
def user_activities?
record if user.following? record
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index aff126b4b825c946600d62577120bd6c209a6a04..73c3c00fea6ce6d946f23ec4abe8d64f237b960e 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -36,6 +36,29 @@ class UserSerializer < ActiveModel::Serializer
object.learning_objects.where('state = ?', LearningObject.states[:published]).count
end
- attributes :id, :email, :provider, :name, :description, :submitter_request, :education, :score, :cover, :role_ids, :institution_ids, :avatar, :likes_count, :followed, :complained, :follows_count, :learning_objects_count, :collections_count, :created_at, :updated_at
+ attributes \
+ :id,
+ :email,
+ :provider,
+ :name,
+ :description,
+ :submitter_request,
+ :education,
+ :score,
+ :cover,
+ :role_ids,
+ :institution_ids,
+ :avatar,
+ :likes_count,
+ :followed,
+ :complained,
+ :follows_count,
+ :learning_objects_count,
+ :collections_count,
+ :created_at,
+ :updated_at
+
has_many :subjects
+ has_many :roles
+ has_many :institutions
end
diff --git a/app/services/activities_filter_service.rb b/app/services/activities_filter_service.rb
index 99c8b54ad74acc4ce40f3bd6fafc7e696fe6ca32..4039e123f2acaa4d07f2d6a818c79037dcae9b6d 100644
--- a/app/services/activities_filter_service.rb
+++ b/app/services/activities_filter_service.rb
@@ -21,7 +21,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
diff --git a/config/routes.rb b/config/routes.rb
index 9e6acb6386e8fb3ea34dfa2a0f440c178a6b1103..28b21e698767ef8a086bd083a2cfa225e502ee3d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -123,7 +123,7 @@ Rails.application.routes.draw do
end
namespace :v1 do
- resources :activities, only: :index
+ resources :activities, only: [:index, :show]
resources :feed, only: [:index]
resources :users, concerns: [:followable, :deletable, :publisher, :versionable] do