Merge branch 'add-submitters' into 'master'

Add submitters

See merge request portalmec/portalmec!480

app/controllers/v1/users_controller.rb

@@ -24,11 +24,11 @@ class V1::UsersController < ApplicationController
   include ::PublisherController
 	include ::SubjectableController
 
-  before_action :set_user, only: [:show, :update, :destroy, :following, :own_reviews, :received_reviews, :followers, :approve_request]
+  before_action :set_user, only: [:show, :update, :destroy, :following, :own_reviews, :received_reviews, :followers, :approve_request, :add_submitter]
   before_action :set_new_user, only: [:upload_requests]
   before_action :authenticate_user!, only: [:create, :update, :destroy, :following,
-                :own_reviews, :received_reviews, :followers, :submitter_request, :upload_requests, :approve_request]
-  before_action :authorize_user, only: [:own_reviews, :received_reviews, :update, :destroy, :upload_requests, :approve_request]
+                :own_reviews, :received_reviews, :followers, :submitter_request, :upload_requests, :approve_request, :add_submitter]
+  before_action :authorize_user, only: [:own_reviews, :received_reviews, :update, :destroy, :upload_requests, :approve_request, :add_submitter]
 
   # GET /v1/users
   # GET /v1/users.json
@@ -97,6 +97,25 @@ class V1::UsersController < ApplicationController
     render json: users
   end
 
+  # POST /v1/users/:id/add_submitter
+  # POST /v1/users/:id/add_submitter.json
+  def add_submitter
+    if !approve_params.to_s.blank?
+      if approve_params
+        @user.submitter_request = User.submitter_requests[:accepted]
+        @user.roles << Role.where(name: "submitter")
+        @user.save
+        render status: :ok
+      else
+        @user.update(submitter_request: User.submitter_requests[:rejected])
+        render status: :ok
+      end
+    else
+      render status: :forbidden
+    end
+  end
+
+
   # POST /v1/users/:id/approve_request
   # POST /v1/users/:id/approve_request.json
   def approve_request

app/policies/user_policy.rb

@@ -55,6 +55,10 @@ class UserPolicy < ApplicationPolicy
     record if user.is_supervisor?
   end
 
+  def add_submitter?
+    record if user.is_supervisor?
+  end
+
   def authorized_user?
     return false if ( record.is_admin? && !user.is_admin? )
     if ( record.is_editor? )

config/routes.rb

@@ -139,6 +139,7 @@ Rails.application.routes.draw do
         get 'reviews/own', to: 'users#own_reviews'
         get 'reviews/received', to: 'users#received_reviews'
         post 'approve_request', to: 'users#approve_request'
+        post 'add_submitter', to: 'users#add_submitter'
       end
       collection do
         get 'upload_requests'

spec/acceptance/users_spec.rb

@@ -372,8 +372,8 @@ resource 'Users' do
     let(:raw_post) {params.to_json}
 
     before do
-      @user = create(:user, )
-          @user.update(submitter_request: User.submitter_requests[:requested])
+      @user = create(:user)
+      @user.update(submitter_request: User.submitter_requests[:requested])
     end
 
     example 'Approve a submitter request' do
@@ -381,4 +381,24 @@ resource 'Users' do
       expect(status).to eq(200)
     end
   end
+
+  post '/v1/users/:id/add_submitter' do
+    include_context "authenticate_user_supervisor"
+
+    parameter :id, 'The id of the user who asked to be a submitter'
+    parameter :approves, 'If the user can be a submitter or not'
+
+    let(:id) {@user.id}
+    let(:approves) { true }
+    let(:raw_post) {params.to_json}
+
+    before do
+      @user = create(:user)
+    end
+
+    example 'Add an user submitter' do
+      do_request
+      expect(status).to eq(200)
+    end
+  end
 end