diff --git a/app/controllers/v1/users/bookmarks_controller.rb b/app/controllers/v1/users/bookmarks_controller.rb index c6a46257061d3450f62fb73ee87c60efe2aca9d4..0f92db501e9f44daee18c55fed16151326622a03 100644 --- a/app/controllers/v1/users/bookmarks_controller.rb +++ b/app/controllers/v1/users/bookmarks_controller.rb @@ -33,7 +33,7 @@ class V1::Users::BookmarksController < ApplicationController end def set_user - @user = User.find(params[:id]) + @user = User.find(params[:user_id]) end def find_object diff --git a/app/serializers/follow_serializer.rb b/app/serializers/follow_serializer.rb index 5e6713abf9f7f862c4dc02b568ce156503730dd5..5cf3d5147a7441062d416159021903f862ff01f8 100644 --- a/app/serializers/follow_serializer.rb +++ b/app/serializers/follow_serializer.rb @@ -1,4 +1,9 @@ class FollowSerializer < ActiveModel::Serializer cache key: 'follow', expires_in: 24.hours - attributes :id, :user_id, :followable + + def follower + object.user + end + + attributes :id, :follower, :followable end diff --git a/config/routes.rb b/config/routes.rb index 222f2bd8e6727c844215ee0955020bda88f694a4..bf6e24c69db14c16ee3a9580e62b5f469d4e1a3d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -91,8 +91,8 @@ Rails.application.routes.draw do resources :feed, only: [:index] resources :users, concerns: [:followable, :deletable, :publisher, :versionable] do + resources :bookmarks, module: 'users', only: [:index, :create, :destroy] member do - resources :bookmarks, module: 'users', only: [:index, :create, :destroy] get 'following/:object_type', to: 'users#following' get 'followers', to: 'users#followers' get 'activities', to: 'activities#user_activities'