Skip to content
Snippets Groups Projects
Commit 64ba23bd authored by Marcela Ribeiro de Oliveira's avatar Marcela Ribeiro de Oliveira
Browse files

Merge branch 'user_followers' into 'master'

User followers

See merge request !373
parents 13a5af38 bad33dba
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ class V1::StatisticsController < ApplicationController ...@@ -7,7 +7,7 @@ class V1::StatisticsController < ApplicationController
private private
def count_learning_objects def count_learning_objects
LearningObject.all.count LearningObject.where('state = ?', LearningObject.states[:published]).count
end end
def month_publications def month_publications
......
...@@ -4,8 +4,8 @@ class V1::UsersController < ApplicationController ...@@ -4,8 +4,8 @@ class V1::UsersController < ApplicationController
include ::Paginator include ::Paginator
include ::PublisherController include ::PublisherController
before_action :set_user, only: [:show, :update, :destroy, :following, :own_reviews, :received_reviews] before_action :set_user, only: [:show, :update, :destroy, :following, :own_reviews, :received_reviews, :followers]
before_action :authenticate_user!, only: [:create, :update, :destroy, :following, :own_reviews, :received_reviews] before_action :authenticate_user!, only: [:create, :update, :destroy, :following, :own_reviews, :received_reviews, :followers]
before_action :authorize_user, only: [:own_reviews, :received_reviews] before_action :authorize_user, only: [:own_reviews, :received_reviews]
# GET /v1/users # GET /v1/users
...@@ -70,6 +70,10 @@ class V1::UsersController < ApplicationController ...@@ -70,6 +70,10 @@ class V1::UsersController < ApplicationController
render json: @user.received_reviews render json: @user.received_reviews
end end
def followers
render json: @user.followers
end
private private
def deleted_resource def deleted_resource
......
...@@ -95,6 +95,7 @@ Rails.application.routes.draw do ...@@ -95,6 +95,7 @@ Rails.application.routes.draw do
member do member do
resources :bookmarks, module: 'users', only: [:index, :create, :destroy] resources :bookmarks, module: 'users', only: [:index, :create, :destroy]
get 'following/:object_type', to: 'users#following' get 'following/:object_type', to: 'users#following'
get 'followers', to: 'users#followers'
get 'activities', to: 'activities#user_activities' get 'activities', to: 'activities#user_activities'
get 'reviews/own', to: 'users#own_reviews' get 'reviews/own', to: 'users#own_reviews'
get 'reviews/received', to: 'users#received_reviews' get 'reviews/received', to: 'users#received_reviews'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment