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

create field and route submitter request

parent 9bbebaf4
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@ class V1::UsersController < ApplicationController
include ::SubjectableController
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, :followers]
before_action :authenticate_user!, only: [:create, :update, :destroy, :following, :own_reviews, :received_reviews, :followers, :submitter_request]
before_action :authorize_user, only: [:own_reviews, :received_reviews, :update, :destroy]
# GET /v1/users
......@@ -58,6 +58,13 @@ class V1::UsersController < ApplicationController
render status: :ok
end
# POST /v1/users/submitter_request
# POST /v1/users/submitter_request.json
def submitter_request
current_user.update(submitter_request: User.submitter_requests[:requested])
render status: :ok
end
def following
type = params[:object_type]
is_current = (@user.id == current_user.id) unless current_user.nil?
......
......@@ -78,6 +78,8 @@ class User < ApplicationRecord
validates :terms_of_service, acceptance: true
enum submitter_request: { default: 0, requested: 1, accepted: 2, rejected: 3 }
searchkick language: 'brazilian', match: :word_start, searchable: [:name], callbacks: :async
acts_as_paranoid
......
......@@ -9,7 +9,7 @@ class UserDeviseSerializer < ActiveModel::Serializer
end
attributes :id, :email, :provider, :avatar_file_name, :avatar_content_type, :uid, :name, :avatar_file_size, :avatar_updated_at,
attributes :id, :email, :provider, :avatar_file_name, :avatar_content_type, :uid, :name, :submitter_request, :avatar_file_size, :avatar_updated_at,
:bookmarks_count, :user_category_id, :score, :follows_count, :deleted_at, :description, :likes_count,
:learning_objects_count, :collections_count, :cover_file_name, :cover_content_type, :cover_file_size, :cover_updated_at
end
......@@ -17,6 +17,6 @@ class UserSerializer < ActiveModel::Serializer
object.learning_objects.where('state = ?', LearningObject.states[:published]).count
end
attributes :id, :email, :provider, :name, :description, :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
end
class AddSubmitterRequestToUsers < ActiveRecord::Migration[5.0]
def change
add_column :users, :submitter_request, :integer, default: 0
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment