fix: add support count deactivate on relationships resources (#552)

Author: matthv

app/controllers/forest_liana/application_controller.rb

@@ -90,6 +90,10 @@ def internal_server_error
       head :internal_server_error
     end
 
+    def deactivate_count_response
+      render serializer: nil, json: { meta: { count: 'deactivated '} }
+    end
+
     private
 
     def force_utf8_encoding(json)

app/controllers/forest_liana/associations_controller.rb

@@ -1,11 +1,11 @@
 module ForestLiana
   class AssociationsController < ForestLiana::ApplicationController
     if Rails::VERSION::MAJOR < 4
-      before_filter :find_resource
-      before_filter :find_association
+      before_filter :find_resource, except: :count
+      before_filter :find_association, except: :count
     else
-      before_action :find_resource
-      before_action :find_association
+      before_action :find_resource, except: :count
+      before_action :find_association, except: :count
     end
 
     def index
@@ -25,6 +25,8 @@ def index
     end
 
     def count
+      find_resource
+      find_association
       begin
         getter = HasManyGetter.new(@resource, @association, params, forest_user)
         getter.count

app/controllers/forest_liana/resources_controller.rb

@@ -13,10 +13,6 @@ class ResourcesController < ForestLiana::ApplicationController
       before_action :find_resource, except: :count
     end
 
-    def deactivate_count_response
-      render serializer: nil, json: { meta: { count: 'deactivated '} }
-    end
-
     def index
       begin
         if request.format == 'csv'

spec/dummy/app/models/owner.rb

@@ -1,2 +1,3 @@
 class Owner < ActiveRecord::Base
+  has_many :trees
 end

spec/dummy/config/routes.rb

@@ -2,6 +2,7 @@
   namespace :forest do
     post '/actions/test' => 'islands#test'
     get '/Owner/count' , to: 'owners#count'
+    get '/Owner/:id/relationships/trees/count' , to: 'owner_trees#count'
   end
 
   mount ForestLiana::Engine => "/forest"

spec/dummy/lib/forest_liana/controllers/owner_trees_controller.rb

@@ -0,0 +1,11 @@
+class Forest::OwnerTreesController < ForestLiana::AssociationsController
+  def count
+    if (params[:search])
+      deactivate_count_response
+    else
+      params[:collection] = 'Owner'
+      params[:association_name] = 'trees'
+      super
+    end
+  end
+end

spec/requests/count_spec.rb

@@ -3,7 +3,8 @@
 describe 'Requesting Owner', :type => :request  do
   before(:each) do
     1.upto(10) do |i|
-     Owner.create(name: "Owner #{i}")
+      owner = Owner.create(name: "Owner #{i}")
+      Tree.create(name: "Tree #{i}", owner_id: owner.id)
     end
   end
 
@@ -52,13 +53,33 @@
 
     it 'should equal to 10' do
       get '/forest/Owner/count', params: params, headers: headers
+      expect(response.body).to eq('{"count":10}')
+    end
+  end
+
+  describe 'count on relationships' do
+    params = {
+      fields: { 'Tree' => 'id,name,owner' },
+      page: { 'number' => '1', 'size' => '10' },
+      searchExtended: '0',
+      sort: '-id',
+      timezone: 'Europe/Paris'
+    }
+
+    it 'should respond 200' do
+      get '/forest/Owner/1/relationships/trees/count', params: params, headers: headers
       expect(response.status).to eq(200)
     end
+
+    it 'should equal to 1' do
+      get '/forest/Owner/1/relationships/trees/count', params: params, headers: headers
+      expect(response.body).to eq('{"count":1}')
+    end
   end
 
   describe 'deactivate_count_response' do
     params = {
-      fields: { 'Product' => 'id,name' },
+      fields: { 'Owner' => 'id,name' },
       page: { 'number' => '1', 'size' => '10' },
       search: 'foo',
       searchExtended: '0',
@@ -76,4 +97,25 @@
       expect(response.body).to eq('{"meta":{"count":"deactivated "}}')
     end
   end
+
+  describe 'deactivate_count_response' do
+    params = {
+      fields: { 'Tree' => 'id,name,owner' },
+      page: { 'number' => '1', 'size' => '10' },
+      search: 'foo',
+      searchExtended: '0',
+      sort: '-id',
+      timezone: 'Europe/Paris'
+    }
+
+    it 'should respond 200' do
+      get '/forest/Owner/1/relationships/trees/count', params: params, headers: headers
+      expect(response.status).to eq(200)
+    end
+
+    it 'should equal to deactivated response' do
+      get '/forest/Owner/1/relationships/trees/count', params: params, headers: headers
+      expect(response.body).to eq('{"meta":{"count":"deactivated "}}')
+    end
+  end
 end