Merge pull request #890 from scientist-softserv/i686-or-conditions

🐛 Handle "or" behavior for specified metric types

app/models/sushi/platform_report.rb

@@ -120,7 +120,11 @@ def as_json(_options = {})
     alias to_hash as_json
 
     def attribute_performance_for_resource_types
-      return [] if metric_type_in_params && metric_types.include?("Searches_Platform")
+      # We want to consider "or" behavior for multiple metric_types.  Namely if you specify any
+      # metric type (other than Searches_Platform) you're going to get results.
+      #
+      # See https://github.com/scientist-softserv/palni-palci/issues/686#issuecomment-1785326034
+      return [] if metric_type_in_params && (metric_types & (ALLOWED_METRIC_TYPES - ['Searches_Platform'])).count.zero?
 
       data_for_resource_types.map do |record|
         {

spec/models/sushi/platform_report_spec.rb

@@ -33,6 +33,20 @@
       end
     end
 
+    context 'when given metric_types searches_platform AND total_item_requests' do
+      let(:params) do
+        {
+          begin_date: '2023-08',
+          end_date: '2023-09',
+          metric_type: 'total_item_requests|searches_platform'
+        }
+      end
+
+      it 'includes the platform data type and the article data type (which is the only data type within the date range' do
+        expect(subject.dig('Report_Items', 'Attribute_Performance').map { |ap| ap['Data_Type'] }.sort).to match_array(['Article', 'Platform'])
+      end
+    end
+
     context 'with additional params that are not required' do
       let(:params) do
         {