Merge pull request #768 from scientist-softserv/adding-yop-to-filter-…

…header 🐛 Add YOP to Report_Header > Report_Filters when provided
scientist-softserv · Sep 5, 2023 · af5079e · af5079e
2 parents 42be90d + ea22823
commit af5079e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/app/models/sushi.rb b/app/models/sushi.rb
@@ -307,7 +307,7 @@ def coerce_author(params = {})
   module YearOfPublicationCoercion
     extend ActiveSupport::Concern
     included do
-      attr_reader :yop_as_where_parameters, :yop_in_params
+      attr_reader :yop_as_where_parameters, :yop
     end
 
     DATE_RANGE_REGEXP = /^(\d+)\s*-\s*(\d+)$/
@@ -347,7 +347,7 @@ def coerce_yop(params = {})
           where_values << Integer(slug)
         end
       end
-
+      @yop = params[:yop]
       @yop_as_where_parameters = ["(#{where_clauses.join(' OR ')})"] + where_values
     rescue ArgumentError
       raise Sushi::InvalidParameterValue.invalid_yop(params.fetch(:yop))

diff --git a/app/models/sushi/item_report.rb b/app/models/sushi/item_report.rb
@@ -84,6 +84,7 @@ def as_json(_options = {})
       report_hash['Report_Header']['Report_Filters']['Item_ID'] = item_id if item_id_in_params
       report_hash['Report_Header']['Report_Filters']['Metric_Type'] = metric_types if metric_type_in_params
       report_hash['Report_Header']['Report_Filters']['Platform'] = platform if platform_in_params
+      report_hash['Report_Header']['Report_Filters']['YOP'] = yop if yop
 
       report_hash
     end

diff --git a/spec/models/sushi/item_report_spec.rb b/spec/models/sushi/item_report_spec.rb
@@ -34,6 +34,27 @@
       expect(subject.dig('Report_Items', 0, 'Items', 0, 'Attribute_Performance', 0, 'Performance', 'Unique_Item_Investigations', '2023-08')).to eq(1)
       expect(subject.dig('Report_Items', 2, 'Items', 0, 'Attribute_Performance', 0, 'Performance', 'Unique_Item_Investigations', '2022-01')).to eq(1)
     end
+
+    describe 'yop parameter' do
+      context 'when provided' do
+        let(:params) do
+          {
+            **required_parameters,
+            yop: '1900-2023'
+          }
+        end
+
+        it 'has a Report_Header > Report_Filters > YOP property' do
+          expect(subject.dig("Report_Header", "Report_Filters", "YOP")).to eq('1900-2023')
+        end
+      end
+
+      context 'when not provided' do
+        it 'does not have a Report_Header > Report_Filters > YOP property' do
+          expect(subject.dig("Report_Header", "Report_Filters")).not_to have_key("YOP")
+        end
+      end
+    end
   end
 
   describe 'with an access_method parameter' do

diff --git a/spec/models/sushi_spec.rb b/spec/models/sushi_spec.rb
@@ -182,6 +182,7 @@ def initialize(params = {})
         let(:params) { { yop: given_yop } }
 
         if expected.is_a?(Array)
+          its(:yop) { is_expected.to eq(given_yop) }
           its(:yop_as_where_parameters) { is_expected.to match_array(expected) }
         else
           it "raises an #{expected}" do