Routes, security groups, service brokers can be filtered by created_ats and updated_ats

[#173719526]

Authored-by: Sarah Weinstein <sweinstein@pivotal.io>

Author: sweinstein22

app/controllers/v3/service_brokers_controller.rb

@@ -12,9 +12,9 @@ def index
     invalid_param!(message.errors.full_messages) unless message.valid?
 
     dataset = if permission_queryer.can_read_globally?
-                ServiceBrokerListFetcher.new.fetch(message: message)
+                ServiceBrokerListFetcher.fetch(message: message)
               else
-                ServiceBrokerListFetcher.new.fetch(message: message, permitted_space_guids: permission_queryer.readable_secret_space_guids)
+                ServiceBrokerListFetcher.fetch(message: message, permitted_space_guids: permission_queryer.readable_secret_space_guids)
               end
 
     presenter = Presenters::V3::PaginatedListPresenter.new(

app/fetchers/route_fetcher.rb

@@ -1,5 +1,7 @@
+require 'fetchers/base_list_fetcher'
+
 module VCAP::CloudController
-  class RouteFetcher
+  class RouteFetcher < BaseListFetcher
     class << self
       def fetch(message, readable_route_guids, eager_loaded_associations: [])
         dataset = Route.where(guid: readable_route_guids).eager(eager_loaded_associations).qualify
@@ -48,7 +50,7 @@ def filter(message, dataset)
           )
         end
 
-        dataset
+        super(message, dataset, Route)
       end
     end
   end

app/fetchers/security_group_list_fetcher.rb

@@ -1,9 +1,10 @@
 require 'cloud_controller/paging/sequel_paginator'
 require 'cloud_controller/paging/paginated_result'
 require 'fetchers/label_selector_query_generator'
+require 'fetchers/base_list_fetcher'
 
 module VCAP::CloudController
-  class SecurityGroupListFetcher
+  class SecurityGroupListFetcher < BaseListFetcher
     class << self
       def fetch_all(message)
         dataset = SecurityGroup.dataset
@@ -44,7 +45,7 @@ def filter(message, dataset)
           dataset = dataset.where(staging_default: ActiveModel::Type::Boolean.new.cast(message.globally_enabled_staging))
         end
 
-        dataset
+        super(message, dataset, SecurityGroup)
       end
     end
   end

app/fetchers/service_broker_list_fetcher.rb

@@ -1,44 +1,48 @@
+require 'fetchers/base_list_fetcher'
+
 module VCAP::CloudController
-  class ServiceBrokerListFetcher
-    def fetch(message:, permitted_space_guids: nil)
-      if permitted_space_guids
-        dataset = ServiceBroker.dataset.where(Sequel[:service_brokers][:space_id] => spaces_from(permitted_space_guids))
-        return filter(message, dataset)
+  class ServiceBrokerListFetcher < BaseListFetcher
+    class << self
+      def fetch(message:, permitted_space_guids: nil)
+        if permitted_space_guids
+          dataset = ServiceBroker.dataset.where(Sequel[:service_brokers][:space_id] => spaces_from(permitted_space_guids))
+          return filter(message, dataset)
+        end
+
+        dataset = ServiceBroker.dataset
+        filter(message, dataset)
       end
 
-      dataset = ServiceBroker.dataset
-      filter(message, dataset)
-    end
+      private
 
-    private
+      def filter(message, dataset)
+        if message.requested?(:space_guids)
+          dataset = dataset.where(
+            Sequel[:service_brokers][:space_id] => spaces_from(message.space_guids)
+          )
+        end
 
-    def filter(message, dataset)
-      if message.requested?(:space_guids)
-        dataset = dataset.where(
-          Sequel[:service_brokers][:space_id] => spaces_from(message.space_guids)
-        )
-      end
+        if message.requested?(:names)
+          dataset = dataset.where(
+            name: message.names
+          )
+        end
 
-      if message.requested?(:names)
-        dataset = dataset.where(
-          name: message.names
-        )
-      end
+        if message.requested?(:label_selector)
+          dataset = LabelSelectorQueryGenerator.add_selector_queries(
+            label_klass: ServiceBrokerLabelModel,
+            resource_dataset: dataset,
+            requirements: message.requirements,
+            resource_klass: ServiceBroker,
+          )
+        end
 
-      if message.requested?(:label_selector)
-        dataset = LabelSelectorQueryGenerator.add_selector_queries(
-          label_klass: ServiceBrokerLabelModel,
-          resource_dataset: dataset,
-          requirements: message.requirements,
-          resource_klass: ServiceBroker,
-        )
+        super(message, dataset, ServiceBroker)
       end
 
-      dataset
-    end
-
-    def spaces_from(space_guids)
-      Space.where(guid: space_guids).select(:id)
+      def spaces_from(space_guids)
+        Space.where(guid: space_guids).select(:id)
+      end
     end
   end
 end

spec/request/routes_spec.rb

@@ -111,6 +111,14 @@
       }
     end
 
+    it_behaves_like 'list_endpoint_with_common_filters' do
+      let(:resource_klass) { VCAP::CloudController::Route }
+      let(:api_call) do
+        lambda { |headers, filters| get "/v3/routes?#{filters}", nil, headers }
+      end
+      let(:headers) { admin_headers }
+    end
+
     describe 'query list parameters' do
       it_behaves_like 'request_spec_shared_examples.rb list query endpoint' do
         let(:request) { 'v3/routes' }

spec/request/security_groups_spec.rb

@@ -511,6 +511,14 @@
       security_group_2.add_staging_space(space)
     end
 
+    it_behaves_like 'list_endpoint_with_common_filters' do
+      let(:resource_klass) { VCAP::CloudController::SecurityGroup }
+      let(:api_call) do
+        lambda { |headers, filters| get "/v3/security_groups?#{filters}", nil, headers }
+      end
+      let(:headers) { admin_headers }
+    end
+
     context 'getting security groups' do
       let(:expected_response_1) do
         {

spec/request/service_brokers_spec.rb

@@ -120,6 +120,14 @@
       end
     end
 
+    it_behaves_like 'list_endpoint_with_common_filters' do
+      let(:resource_klass) { VCAP::CloudController::ServiceBroker }
+      let(:api_call) do
+        lambda { |headers, filters| get "/v3/service_brokers?#{filters}", nil, headers }
+      end
+      let(:headers) { admin_headers }
+    end
+
     describe 'empty response' do
       let(:expected_codes_and_responses) do
         h = Hash.new(

spec/unit/fetchers/service_broker_list_fetcher_spec.rb

@@ -16,7 +16,7 @@ module VCAP::CloudController
       let(:space_3) { Space.make }
       let(:space_scoped_broker_3) { ServiceBroker.make(space_guid: space_3.guid, name: 'broker-3') }
 
-      let(:fetcher) { ServiceBrokerListFetcher.new }
+      let(:fetcher) { ServiceBrokerListFetcher }
       let(:message) { ServiceBrokersListMessage.from_params(filters) }
 
       before do