From 5b3927c26ad221608cf2461753b2b3451cc28ebc Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Thu, 13 Dec 2018 07:21:12 +0500
Subject: [PATCH] Move passport routes

---
 .../{ => staff}/passports_controller.rb         | 17 ++++++++++-------
 app/policies/passport_confirmation_policy.rb    |  2 +-
 app/policies/{ => staff}/passport_policy.rb     |  2 +-
 .../passport_confirmations/index.html.erb       |  5 +++--
 .../{ => staff}/passports/_nav_tabs.html.erb    |  4 ++--
 app/views/{ => staff}/passports/index.html.erb  |  4 ++--
 app/views/{ => staff}/passports/new.html.erb    |  2 +-
 app/views/{ => staff}/passports/show.html.erb   |  2 +-
 config/routes.rb                                |  4 ++--
 features/desktop/passport_creation.feature      |  4 ++--
 .../{ => staff}/passport_policy_spec.rb         |  2 +-
 .../{ => staff}/passports/create_spec.rb        |  6 +++---
 .../{ => staff}/passports/index_spec.rb         |  4 ++--
 spec/requests/{ => staff}/passports/new_spec.rb |  4 ++--
 .../requests/{ => staff}/passports/show_spec.rb |  4 ++--
 15 files changed, 35 insertions(+), 31 deletions(-)
 rename app/controllers/{ => staff}/passports_controller.rb (57%)
 rename app/policies/{ => staff}/passport_policy.rb (89%)
 rename app/views/{ => staff}/passports/_nav_tabs.html.erb (92%)
 rename app/views/{ => staff}/passports/index.html.erb (94%)
 rename app/views/{ => staff}/passports/new.html.erb (94%)
 rename app/views/{ => staff}/passports/show.html.erb (96%)
 rename spec/policies/{ => staff}/passport_policy_spec.rb (92%)
 rename spec/requests/{ => staff}/passports/create_spec.rb (80%)
 rename spec/requests/{ => staff}/passports/index_spec.rb (86%)
 rename spec/requests/{ => staff}/passports/new_spec.rb (65%)
 rename spec/requests/{ => staff}/passports/show_spec.rb (96%)

diff --git a/app/controllers/passports_controller.rb b/app/controllers/staff/passports_controller.rb
similarity index 57%
rename from app/controllers/passports_controller.rb
rename to app/controllers/staff/passports_controller.rb
index 2b87744..0b1ac9a 100644
--- a/app/controllers/passports_controller.rb
+++ b/app/controllers/staff/passports_controller.rb
@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
-class PassportsController < ApplicationController
+class Staff::PassportsController < ApplicationController
   before_action :set_passport, except: %i[index new create]
 
   # GET /passports
   def index
-    @passports = policy_scope(Passport)
+    @passports = policy_scope(
+      Passport,
+      policy_scope_class: Staff::PassportPolicy::Scope,
+    )
   end
 
   # GET /passports/:id
   def show
-    authorize @passport
+    authorize [:staff, @passport]
     @passport.passport_maps.build if @passport.passport_map.nil?
   end
 
@@ -19,18 +22,18 @@ class PassportsController < ApplicationController
     @passport = Passport.new
     @passport.passport_maps.build
 
-    authorize @passport
+    authorize [:staff, @passport]
   end
 
   # POST /passports
   def create
-    @passport = Passport.new permitted_attributes Passport
+    @passport = Passport.new permitted_attributes [:staff, Passport]
 
-    authorize @passport
+    authorize [:staff, @passport]
 
     return render :new unless @passport.save
 
-    redirect_to @passport
+    redirect_to [:staff, @passport]
   end
 
 private
diff --git a/app/policies/passport_confirmation_policy.rb b/app/policies/passport_confirmation_policy.rb
index 0d1822f..588264d 100644
--- a/app/policies/passport_confirmation_policy.rb
+++ b/app/policies/passport_confirmation_policy.rb
@@ -5,7 +5,7 @@ class PassportConfirmationPolicy < ApplicationPolicy
     return false if record.passport.nil?
     return false if record.account != context.account
 
-    policy(record.passport).show?
+    policy([:staff, record.passport]).show?
   end
 
   class Scope < Scope
diff --git a/app/policies/passport_policy.rb b/app/policies/staff/passport_policy.rb
similarity index 89%
rename from app/policies/passport_policy.rb
rename to app/policies/staff/passport_policy.rb
index 0d2fb0f..fd2ee96 100644
--- a/app/policies/passport_policy.rb
+++ b/app/policies/staff/passport_policy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class PassportPolicy < ApplicationPolicy
+class Staff::PassportPolicy < ApplicationPolicy
   def show?
     true
   end
diff --git a/app/views/passports/passport_confirmations/index.html.erb b/app/views/passports/passport_confirmations/index.html.erb
index 2e9df6f..fdf5a60 100644
--- a/app/views/passports/passport_confirmations/index.html.erb
+++ b/app/views/passports/passport_confirmations/index.html.erb
@@ -1,6 +1,7 @@
 <div class="container">
-  <%= render partial: 'passports/nav_tabs', locals: { passport: @passport,
-                                            tab: :confirmations } %>
+  <%= render partial: 'staff/passports/nav_tabs',
+             locals: { passport: @passport,
+                       tab: :confirmations } %>
 
   <% if @passport.can_have_confirmations? && current_account %>
     <div class="mb-3">
diff --git a/app/views/passports/_nav_tabs.html.erb b/app/views/staff/passports/_nav_tabs.html.erb
similarity index 92%
rename from app/views/passports/_nav_tabs.html.erb
rename to app/views/staff/passports/_nav_tabs.html.erb
index 5cd7e7f..43d7a3b 100644
--- a/app/views/passports/_nav_tabs.html.erb
+++ b/app/views/staff/passports/_nav_tabs.html.erb
@@ -2,7 +2,7 @@
   <ul class="nav nav-tabs d-none d-sm-flex">
     <li class="nav-item">
       <%= link_to translate(:overview, scope: %i[nav_tabs passport]),
-                  passport,
+                  [:staff, passport],
                   class: "nav-link #{:active if tab == :overview}" %>
     </li>
     <li class="nav-item">
@@ -15,7 +15,7 @@
   <ul class="nav flex-column nav-pills d-flex d-sm-none">
     <li class="nav-item">
       <%= link_to translate(:overview, scope: %i[nav_tabs passport]),
-                  passport,
+                  [:staff, passport],
                   class: "nav-link #{:active if tab == :overview}" %>
     </li>
     <li class="nav-item">
diff --git a/app/views/passports/index.html.erb b/app/views/staff/passports/index.html.erb
similarity index 94%
rename from app/views/passports/index.html.erb
rename to app/views/staff/passports/index.html.erb
index 79e6e87..0f2ba79 100644
--- a/app/views/passports/index.html.erb
+++ b/app/views/staff/passports/index.html.erb
@@ -40,8 +40,8 @@
             <%= truncate passport.passport_map&.place_of_birth, length: 15 %>
           </td>
           <td>
-            <% if policy(passport).show? %>
-              <%= link_to passport_path(passport),
+            <% if policy([:staff, passport]).show? %>
+              <%= link_to staff_passport_path(passport),
                           role: :button, class: 'btn btn-light btn-sm' do %>
                 <i class="far fa-eye"></i>
               <% end %>
diff --git a/app/views/passports/new.html.erb b/app/views/staff/passports/new.html.erb
similarity index 94%
rename from app/views/passports/new.html.erb
rename to app/views/staff/passports/new.html.erb
index a1b6277..a80d98b 100644
--- a/app/views/passports/new.html.erb
+++ b/app/views/staff/passports/new.html.erb
@@ -1,5 +1,5 @@
 <div class="container">
-  <%= simple_form_for @passport, wrapper: :horizontal_form do |f| %>
+  <%= simple_form_for [:staff, @passport], wrapper: :horizontal_form do |f| %>
     <div class="row">
       <div class="col-md-6">
         <%= f.simple_fields_for :passport_maps do |ff| %>
diff --git a/app/views/passports/show.html.erb b/app/views/staff/passports/show.html.erb
similarity index 96%
rename from app/views/passports/show.html.erb
rename to app/views/staff/passports/show.html.erb
index 5107014..6753b70 100644
--- a/app/views/passports/show.html.erb
+++ b/app/views/staff/passports/show.html.erb
@@ -47,7 +47,7 @@
     <hr/>
   <% end %>
 
-  <%= simple_form_for @passport, wrapper: :horizontal_form, defaults: { readonly: true } do |f| %>
+  <%= simple_form_for [:staff, @passport], wrapper: :horizontal_form, defaults: { readonly: true } do |f| %>
     <div class="row">
       <div class="col-md-6">
         <%= f.simple_fields_for :passport_maps do |ff| %>
diff --git a/config/routes.rb b/config/routes.rb
index 623323f..a3942e7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,8 +16,6 @@ Rails.application.routes.draw do
 
   resources :membership_apps, only: %i[show new create]
 
-  resources :passports, only: %i[index show new create]
-
   resources :passports, only: [] do
     resources :passport_confirmations,
               controller: 'passports/passport_confirmations',
@@ -36,6 +34,8 @@ Rails.application.routes.draw do
 
     get '/sidekiq', to: redirect('/', status: 307), as: :forbidden_sidekiq
 
+    resources :passports, only: %i[index show new create]
+
     resources :telegram_chats, only: %i[index show]
   end
 
diff --git a/features/desktop/passport_creation.feature b/features/desktop/passport_creation.feature
index aa82670..c76c1ca 100644
--- a/features/desktop/passport_creation.feature
+++ b/features/desktop/passport_creation.feature
@@ -1,6 +1,6 @@
 Feature: Passport creation
   Background:
-    Given I visit "/passports/new"
+    Given I visit "/staff/passports/new"
 
   Scenario: all fields are filled
     Given I want to create the following passport:
@@ -37,4 +37,4 @@ Feature: Passport creation
   Scenario: only image is uploaded, no fields are filled
     When I upload "passport_image_1.jpg" as "Изображения"
     And I click the passport creation button
-    Then I am at "/passports/\d+"
+    Then I am at "/staff/passports/\d+"
diff --git a/spec/policies/passport_policy_spec.rb b/spec/policies/staff/passport_policy_spec.rb
similarity index 92%
rename from spec/policies/passport_policy_spec.rb
rename to spec/policies/staff/passport_policy_spec.rb
index 3ec5d5e..12d191d 100644
--- a/spec/policies/passport_policy_spec.rb
+++ b/spec/policies/staff/passport_policy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe PassportPolicy do
+RSpec.describe Staff::PassportPolicy do
   permissions '.scope' do
     pending "add some examples to (or delete) #{__FILE__}"
   end
diff --git a/spec/requests/passports/create_spec.rb b/spec/requests/staff/passports/create_spec.rb
similarity index 80%
rename from spec/requests/passports/create_spec.rb
rename to spec/requests/staff/passports/create_spec.rb
index 0700dec..d607003 100644
--- a/spec/requests/passports/create_spec.rb
+++ b/spec/requests/staff/passports/create_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'POST /passports' do
+RSpec.describe 'POST /staff/passports' do
   let(:passport_plain_attributes) { attributes_for :empty_passport }
 
   let :passport_all_attributes do
@@ -16,7 +16,7 @@ RSpec.describe 'POST /passports' do
   end
 
   def make_request
-    post '/passports', params: { passport: passport_all_attributes }
+    post '/staff/passports', params: { passport: passport_all_attributes }
   end
 
   specify do
@@ -27,7 +27,7 @@ RSpec.describe 'POST /passports' do
     before { make_request }
 
     specify do
-      expect(response).to redirect_to Passport.last
+      expect(response).to redirect_to [:staff, Passport.last]
     end
 
     specify do
diff --git a/spec/requests/passports/index_spec.rb b/spec/requests/staff/passports/index_spec.rb
similarity index 86%
rename from spec/requests/passports/index_spec.rb
rename to spec/requests/staff/passports/index_spec.rb
index 96a54f1..df3f3f7 100644
--- a/spec/requests/passports/index_spec.rb
+++ b/spec/requests/staff/passports/index_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'GET /passports' do
+RSpec.describe 'GET /staff/passports' do
   before do
     create :empty_passport
     create :passport_with_passport_map
@@ -12,7 +12,7 @@ RSpec.describe 'GET /passports' do
     create :passport_with_enough_confirmations
     create :confirmed_passport
 
-    get '/passports'
+    get '/staff/passports'
   end
 
   specify do
diff --git a/spec/requests/passports/new_spec.rb b/spec/requests/staff/passports/new_spec.rb
similarity index 65%
rename from spec/requests/passports/new_spec.rb
rename to spec/requests/staff/passports/new_spec.rb
index ad73d99..1b5faf8 100644
--- a/spec/requests/passports/new_spec.rb
+++ b/spec/requests/staff/passports/new_spec.rb
@@ -2,9 +2,9 @@
 
 require 'rails_helper'
 
-RSpec.describe 'GET /passports/new' do
+RSpec.describe 'GET /staff/passports/new' do
   before do
-    get '/passports/new'
+    get '/staff/passports/new'
   end
 
   specify do
diff --git a/spec/requests/passports/show_spec.rb b/spec/requests/staff/passports/show_spec.rb
similarity index 96%
rename from spec/requests/passports/show_spec.rb
rename to spec/requests/staff/passports/show_spec.rb
index f525192..d1c3e03 100644
--- a/spec/requests/passports/show_spec.rb
+++ b/spec/requests/staff/passports/show_spec.rb
@@ -2,12 +2,12 @@
 
 require 'rails_helper'
 
-RSpec.describe 'GET /passports/:id' do
+RSpec.describe 'GET /staff/passports/:id' do
   let!(:passport) { create :confirmed_passport }
   let(:current_account) { create :usual_account }
 
   def make_request
-    get "/passports/#{passport.id}"
+    get "/staff/passports/#{passport.id}"
   end
 
   before do