Orgs can be filtered on created_ats and updated_ats

[#173719526]

Co-authored-by: Sarah Weinstein <sweinstein@pivotal.io>
Co-authored-by: Chris Selzo <cselzo@pivotal.io>

Author: sweinstein22

app/controllers/v3/organizations_controller.rb

@@ -194,9 +194,9 @@ def fetch_isolation_segment(guid)
 
   def fetch_orgs(message)
     if permission_queryer.can_read_globally?
-      OrgListFetcher.new.fetch_all(message: message, eager_loaded_associations: Presenters::V3::OrganizationPresenter.associated_resources)
+      OrgListFetcher.fetch_all(message: message, eager_loaded_associations: Presenters::V3::OrganizationPresenter.associated_resources)
     else
-      OrgListFetcher.new.fetch(
+      OrgListFetcher.fetch(
         message: message,
         guids: permission_queryer.readable_org_guids,
         eager_loaded_associations: Presenters::V3::OrganizationPresenter.associated_resources
@@ -206,12 +206,12 @@ def fetch_orgs(message)
 
   def fetch_orgs_for_isolation_segment(message)
     if permission_queryer.can_read_globally?
-      isolation_segment, dataset = OrgListFetcher.new.fetch_all_for_isolation_segment(
+      isolation_segment, dataset = OrgListFetcher.fetch_all_for_isolation_segment(
         message: message,
         eager_loaded_associations: Presenters::V3::OrganizationPresenter.associated_resources
       )
     else
-      isolation_segment, dataset = OrgListFetcher.new.fetch_for_isolation_segment(
+      isolation_segment, dataset = OrgListFetcher.fetch_for_isolation_segment(
         message: message,
         guids: permission_queryer.readable_org_guids,
         eager_loaded_associations: Presenters::V3::OrganizationPresenter.associated_resources

app/fetchers/org_list_fetcher.rb

@@ -1,65 +1,68 @@
 require 'cloud_controller/paging/sequel_paginator'
 require 'cloud_controller/paging/paginated_result'
+require 'fetchers/base_list_fetcher'
 
 module VCAP::CloudController
-  class OrgListFetcher
-    def fetch(message:, guids:, eager_loaded_associations: [])
-      dataset = Organization.where(guid: guids)
-      dataset = eager_load(dataset, eager_loaded_associations)
-      filter(message, dataset)
-    end
-
-    def fetch_all(message:, eager_loaded_associations: [])
-      dataset = Organization.dataset
-      dataset = eager_load(dataset, eager_loaded_associations)
-      filter(message, dataset)
-    end
+  class OrgListFetcher < BaseListFetcher
+    class << self
+      def fetch(message:, guids:, eager_loaded_associations: [])
+        dataset = Organization.where(guid: guids)
+        dataset = eager_load(dataset, eager_loaded_associations)
+        filter(message, dataset)
+      end
 
-    def fetch_for_isolation_segment(message:, guids:, eager_loaded_associations: [])
-      isolation_segment = IsolationSegmentModel.where(guid: message.isolation_segment_guid).first
-      return nil unless isolation_segment
+      def fetch_all(message:, eager_loaded_associations: [])
+        dataset = Organization.dataset
+        dataset = eager_load(dataset, eager_loaded_associations)
+        filter(message, dataset)
+      end
 
-      dataset = isolation_segment.organizations_dataset.where(guid: guids)
-      dataset = eager_load(dataset, eager_loaded_associations)
-      [isolation_segment, filter(message, dataset)]
-    end
+      def fetch_for_isolation_segment(message:, guids:, eager_loaded_associations: [])
+        isolation_segment = IsolationSegmentModel.where(guid: message.isolation_segment_guid).first
+        return nil unless isolation_segment
 
-    def fetch_all_for_isolation_segment(message:, eager_loaded_associations: [])
-      isolation_segment = IsolationSegmentModel.where(guid: message.isolation_segment_guid).first
-      return nil unless isolation_segment
+        dataset = isolation_segment.organizations_dataset.where(guid: guids)
+        dataset = eager_load(dataset, eager_loaded_associations)
+        [isolation_segment, filter(message, dataset)]
+      end
 
-      dataset = isolation_segment.organizations_dataset
-      dataset = eager_load(dataset, eager_loaded_associations)
-      [isolation_segment, filter(message, dataset)]
-    end
+      def fetch_all_for_isolation_segment(message:, eager_loaded_associations: [])
+        isolation_segment = IsolationSegmentModel.where(guid: message.isolation_segment_guid).first
+        return nil unless isolation_segment
 
-    private
+        dataset = isolation_segment.organizations_dataset
+        dataset = eager_load(dataset, eager_loaded_associations)
+        [isolation_segment, filter(message, dataset)]
+      end
 
-    def eager_load(dataset, associated_resources=[])
-      return dataset if associated_resources.empty?
+      private
 
-      dataset.eager(*associated_resources)
-    end
+      def eager_load(dataset, associated_resources=[])
+        return dataset if associated_resources.empty?
 
-    def filter(message, dataset)
-      if message.requested?(:names)
-        dataset = dataset.where(name: message.names)
+        dataset.eager(*associated_resources)
       end
 
-      if message.requested?(:guids)
-        dataset = dataset.where(guid: message.guids)
-      end
+      def filter(message, dataset)
+        if message.requested?(:names)
+          dataset = dataset.where(name: message.names)
+        end
 
-      if message.requested?(:label_selector)
-        dataset = LabelSelectorQueryGenerator.add_selector_queries(
-          label_klass: OrganizationLabelModel,
-          resource_dataset: dataset,
-          requirements: message.requirements,
-          resource_klass: Organization,
-        )
-      end
+        if message.requested?(:guids)
+          dataset = dataset.where(guid: message.guids)
+        end
+
+        if message.requested?(:label_selector)
+          dataset = LabelSelectorQueryGenerator.add_selector_queries(
+            label_klass: OrganizationLabelModel,
+            resource_dataset: dataset,
+            requirements: message.requirements,
+            resource_klass: Organization,
+          )
+        end
 
-      dataset
+        super(message, dataset, Organization)
+      end
     end
   end
 end

spec/request/organizations_spec.rb

@@ -130,6 +130,14 @@ module VCAP::CloudController
         end
       end
 
+      it_behaves_like 'list_endpoint_with_common_filters' do
+        let(:resource_klass) { VCAP::CloudController::Organization }
+        let(:api_call) do
+          lambda { |headers, filters| get "/v3/organizations?#{filters}", nil, headers }
+        end
+        let(:headers) { admin_headers }
+      end
+
       it 'returns a paginated list of orgs the user has access to' do
         get '/v3/organizations?per_page=2', nil, user_header
         expect(last_response.status).to eq(200)