Merge ab352b7 into bbd65b7

mod/deckorate_calculations/lib/calculate/calculator/input_item/defaults.rb

@@ -43,10 +43,18 @@ def restrict_years_in_query?
         end
 
         def answer_query
-          query = { metric_id: input_card.id }
-          query[:company_id] = search_space.company_ids if search_space.company_ids?
+          { metric_id: input_card.id }.tap do |query|
+            restrict_companies query
+            restrict_years query
+          end
+        end
+
+        def restrict_years query
           query[:year] = search_space.years if restrict_years_in_query?
-          query
+        end
+
+        def restrict_companies query
+          query[:company_id] = search_space.company_ids if search_space.company_ids?
         end
 
         # overwritten in other places to move input items with no restriction on

mod/deckorate_calculations/lib/calculate/calculator/input_item/options/company_option/grouped_companies.rb

@@ -27,11 +27,10 @@ def answer_lists
             end
 
             def answer_relation
-              query = {
-                metric_id: input_card.id,
-                company_group: company_group.id,
-                published: :all
-              }
+              query = { metric_id: input_card.id,
+                        company_group: company_group.id,
+                        published: :all }
+              restrict_years query
               Card::AnswerQuery.new(query).lookup_relation
             end
 

mod/deckorate_calculations/lib/calculate/calculator/input_item/options/company_option/related_companies.rb

@@ -24,7 +24,6 @@ def input_answers_by_company_and_year
             end
 
             # must be overwritten, because "answers" does not filter by company
-            # (see #answer_query)
             def answers_for company_id, year
               @search_space = SearchSpace.new company_id, year
               Answer.where answer_query.merge(company_id: relationship_hash[company_id])

mod/deckorate_calculations/lib/calculate/calculator/input_item/options/company_option/single_company.rb

@@ -10,13 +10,13 @@ module SingleCompany
             include CompanyIndependentInput
 
             def year_answer_pairs
-              each_input_answer answer_query_relation, {} do |input_answer, hash|
+              each_input_answer answers, {} do |input_answer, hash|
                 hash[input_answer.year] = input_answer
               end
             end
 
-            def answer_query_relation
-              Answer.where metric_id: input_card.id, company_id: requested_company_id
+            def restrict_companies query
+              query[:company_id] = requested_company_id
             end
 
             private

mod/deckorate_calculations/spec/calculate/calculator/input_item_spec.rb

@@ -103,8 +103,8 @@ def answer_value_hash *args
       end
 
       example "company group" do
-        expect(answer_value_hash(samsung, nil, company: "Deadliest"))
-          .to eq(1977 => %w[100 40 50])
+        expect(answer_value_hash(samsung, nil, company: "Deadliest")[1977].sort)
+          .to eq(%w[100 40 50])
       end
 
       example "metric with related company option" do