Updates the Moderation Organisation controller

app/controllers/moderation/organizations_controller.rb

@@ -1,25 +1,19 @@
 class Moderation::OrganizationsController < Moderation::BaseController
 
-  before_filter :load_organizations, only: :index
-  load_and_authorize_resource class: 'User'
+  load_and_authorize_resource
 
   def index
+    @organizations = @organizations.includes(:user).order(:name, 'users.email')
   end
 
-  def verify_organization
-    @organization.update(organization_verified_at: Time.now)
+  def verify
+    @organization.verify
     redirect_to action: :index
   end
 
-  def reject_organization
-    @organization.update(organization_rejected_at: Time.now)
+  def reject
+    @organization.reject
     redirect_to action: :index
   end
 
-  private
-
-    def load_organizations
-      @organizations = User.organizations.order(:organization_name, :email)
-    end
-
 end

app/views/moderation/organizations/index.html.erb

@@ -1,27 +1,27 @@
 <h1><%= t('moderation.organizations.index.title') %></h1>
 
 <table>
-<% @organizations.each do |organization| %>
+  <% @organizations.each do |organization| %>
   <tr>
-    <td><%= organization.organization_name %></td>
+    <td><%= organization.name %></td>
     <td><%= organization.email %></td>
     <td><%= organization.phone_number %></td>
-    <% if organization.verified_organization? %>
+    <% if organization.verified? %>
       <td><%= t('moderation.organizations.index.verified') %></td>
     <% end %>
-    <% if can? :verify_organization, organization %>
+    <% if can? :verify, organization %>
       <td><%= link_to t('moderation.organizations.index.verify'),
-                verify_organization_moderation_organization_path(organization),
+                verify_moderation_organization_path(organization),
                 method: :put
           %>
       </td>
     <% end %>
-    <% if organization.rejected_organization? %>
+    <% if organization.rejected? %>
       <td><%= t('moderation.organizations.index.rejected') %></td>
     <% end %>
-    <% if can? :reject_organization, organization %>
+    <% if can? :reject, organization %>
       <td><%= link_to t('moderation.organizations.index.reject'),
-                reject_organization_moderation_organization_path(organization),
+                reject_moderation_organization_path(organization),
                 method: :put
           %>
       </td>

config/routes.rb

@@ -29,8 +29,8 @@ Rails.application.routes.draw do
     root to: "dashboard#index"
     resources :organizations, only: :index do
       member do
-        put :verify_organization
-        put :reject_organization
+        put :verify
+        put :reject
       end
     end
   end

spec/features/moderation/organizations_spec.rb

@@ -21,11 +21,11 @@ feature 'Moderations::Organizations' do
     expect(current_path).to eq(moderation_organizations_path)
     expect(page).to have_content ('Verified')
 
-    expect(organization.reload.verified_organization?).to eq(true)
+    expect(organization.reload.verified?).to eq(true)
   end
 
   scenario "verified organizations have link to reject" do
-    organization = create(:organization, organization_verified_at: Time.now)
+    organization = create(:verified_organization)
 
     visit moderation_organizations_path
     expect(page).to have_content ('Verified')
@@ -36,11 +36,11 @@ feature 'Moderations::Organizations' do
     expect(current_path).to eq(moderation_organizations_path)
     expect(page).to have_content ('Rejected')
 
-    expect(organization.reload.rejected_organization?).to eq(true)
+    expect(organization.reload.rejected?).to eq(true)
   end
 
   scenario "rejected organizations have link to verify" do
-    organization = create(:organization, organization_rejected_at: Time.now)
+    organization = create(:rejected_organization)
 
     visit moderation_organizations_path
     expect(page).to have_content ('Rejected')
@@ -51,7 +51,7 @@ feature 'Moderations::Organizations' do
     expect(current_path).to eq(moderation_organizations_path)
     expect(page).to have_content ('Verified')
 
-    expect(organization.reload.verified_organization?).to eq(true)
+    expect(organization.reload.verified?).to eq(true)
   end
 
 end