Sidecars can be filtered on created_ats and updated_ats

Also refactored controller to extract a new fetcher class
[#173719526]

Co-authored-by: Harsha Nandiwada <hnandiwada@vmware.com>
Co-authored-by: Merric de Launey <mdelauney@pivotal.io>

Author: Harsha Nandiwada

app/controllers/v3/sidecars_controller.rb

@@ -6,20 +6,35 @@
 require 'actions/sidecar_create'
 require 'actions/sidecar_update'
 require 'presenters/v3/sidecar_presenter'
+require 'fetchers/sidecar_list_fetcher'
 
 class SidecarsController < ApplicationController
   include SubResource
 
   def index_by_app
-    app, space, org = AppFetcher.new.fetch(hashed_params[:app_guid])
-    resource_not_found!(:app) unless app && permission_queryer.can_read_from_space?(space.guid, org.guid)
-    validate_and_present_for_list(app.sidecars_dataset)
+    message = SidecarsListMessage.from_params(query_params)
+    invalid_param!(message.errors.full_messages) unless message.valid?
+
+    app, dataset = SidecarListFetcher.fetch_for_app(message, hashed_params[:app_guid])
+    resource_not_found!(:app) unless app && permission_queryer.can_read_from_space?(app.space.guid, app.organization.guid)
+    render status: :ok, json: Presenters::V3::PaginatedListPresenter.new(
+      presenter: Presenters::V3::SidecarPresenter,
+      paginated_result: SequelPaginator.new.get_page(dataset, message.try(:pagination_options)),
+      path: base_url(resource: 'sidecars'),
+      )
   end
 
   def index_by_process
-    process, space, org = ProcessFetcher.fetch(process_guid: hashed_params[:process_guid])
-    resource_not_found!(:process) unless process && permission_queryer.can_read_from_space?(space.guid, org.guid)
-    validate_and_present_for_list(process.sidecars_dataset)
+    message = SidecarsListMessage.from_params(query_params)
+    invalid_param!(message.errors.full_messages) unless message.valid?
+
+    process, dataset = SidecarListFetcher.fetch_for_process(message, hashed_params[:process_guid])
+    resource_not_found!(:process) unless process && permission_queryer.can_read_from_space?(process.space.guid, process.organization.guid)
+    render status: :ok, json: Presenters::V3::PaginatedListPresenter.new(
+      presenter: Presenters::V3::SidecarPresenter,
+      paginated_result: SequelPaginator.new.get_page(dataset, message.try(:pagination_options)),
+      path: base_url(resource: 'sidecars'),
+      )
   end
 
   def show
@@ -86,17 +101,4 @@ def destroy
     SidecarDelete.delete(sidecar)
     head :no_content
   end
-
-  private
-
-  def validate_and_present_for_list(dataset)
-    message = SidecarsListMessage.from_params(query_params)
-    invalid_param!(message.errors.full_messages) unless message.valid?
-
-    render status: :ok, json: Presenters::V3::PaginatedListPresenter.new(
-      presenter: Presenters::V3::SidecarPresenter,
-      paginated_result: SequelPaginator.new.get_page(dataset, message.try(:pagination_options)),
-      path: base_url(resource: 'sidecars'),
-      )
-  end
 end

spec/request/sidecars_spec.rb

@@ -426,6 +426,29 @@
       parsed_response = MultiJson.load(last_response.body)
       expect(parsed_response).to be_a_response_like(expected_response)
     end
+
+    context 'filtering on created_ats and updated_ats' do
+      let(:app_model3) { VCAP::CloudController::AppModel.make }
+      let!(:process3) { VCAP::CloudController::ProcessModel.make(
+        :process,
+        app:        app_model3,
+        type:       'web',
+        command:    'rackup',
+      )
+      }
+
+      it_behaves_like 'list_endpoint_with_common_filters' do
+        let(:resource_klass) { VCAP::CloudController::SidecarModel }
+        let(:additional_resource_params) { { app: app_model3 } }
+        let(:headers) { admin_headers }
+        let(:api_call) do
+          app_model3.sidecars_dataset.each do |sidecar|
+            VCAP::CloudController::SidecarProcessTypeModel.make(sidecar: sidecar, type: 'web')
+          end
+          lambda { |headers, filters| get "/v3/processes/#{process3.guid}/sidecars?#{filters}", nil, headers }
+        end
+      end
+    end
   end
 
   describe 'GET /v3/apps/:app_guid/sidecars' do
@@ -495,6 +518,16 @@
         }
     )
     end
+
+    it_behaves_like 'list_endpoint_with_common_filters' do
+      let(:resource_klass) { VCAP::CloudController::SidecarModel }
+      let(:app_model2) { VCAP::CloudController::AppModel.make }
+      let(:additional_resource_params) { { app: app_model2 } }
+      let(:headers) { admin_headers }
+      let(:api_call) do
+        lambda { |headers, filters| get "/v3/apps/#{app_model2.guid}/sidecars?#{filters}", nil, headers }
+      end
+    end
   end
 
   describe 'DELETE /v3/sidecars/:guid' do