#434

backend/app/services/counts_population.rb

@@ -103,7 +103,21 @@ class CountsPopulation
     conditions = QueryState.records(params, 'conditions')
     raise ArgumentError unless conditions.is_a?(Array) && conditions.length <= 100
 
-    conditions.each { apply_condition(_1) }
+    values = QueryState.records(params, 'condition_values')
+    values.each do |entry|
+      index = entry.fetch('condition')
+      raise ArgumentError unless index.between?(0, conditions.length - 1)
+      raise ArgumentError unless conditions[index]['values'] == true
+    end
+    conditions.each_with_index do |entry, index|
+      if entry.key?('values')
+        raise ArgumentError unless entry['values'] == true
+
+        entry = entry.merge('values' => values.select { _1['condition'] == index }
+            .map { _1.fetch('value') })
+      end
+      apply_condition(entry)
+    end
     drills = QueryState.records(params, 'drill')
     raise ArgumentError unless drills.is_a?(Array) && drills.length <= 100