#434

backend/app/services/counts_population.rb

@@ -14,6 +14,7 @@ class CountsPopulation
 
     @scope = definition.model.all
     make_population
+    @scope = HistoryAccess.visible(@scope, 'v')
     apply_filters
   rescue TZInfo::InvalidTimezoneIdentifier
     raise ArgumentError
@@ -62,7 +63,8 @@ class CountsPopulation
     @scope = @scope.from("#{ table } v").select('v.*')
     keys = definition.keys.map { "previous.#{ _1 } = v.#{ _1 }" }.join(' AND ')
     @scope = @scope.joins("LEFT JOIN #{ table } previous ON #{ keys } " +
-        'AND previous.version_no = v.version_no - 1')
+        'AND previous.version_no = v.version_no - 1 AND ' +
+        HistoryAccess.sql(definition.model, 'previous'))
     @scope = @scope.where("v.#{ definition.time_column } <= ?", at)
     unless history
       point = timestamp(params['at']) || at
@@ -92,11 +94,11 @@ class CountsPopulation
       @scope = @scope.where("#{ definition.expression(key) } = ?", value.to_i)
     end
     apply_tags if params['tags'].present? || params['tag'].present?
-    conditions = JSON.parse(params.fetch('conditions', '[]'))
+    conditions = QueryState.records(params, 'conditions')
     raise ArgumentError unless conditions.is_a?(Array) && conditions.length <= 100
 
     conditions.each { apply_condition(_1) }
-    drills = JSON.parse(params.fetch('drill', '[]'))
+    drills = QueryState.records(params, 'drill')
     raise ArgumentError unless drills.is_a?(Array) && drills.length <= 100
 
     drills.each do |entry|
@@ -190,7 +192,7 @@ class CountsPopulation
     return unless params['tags'].present?
 
     locale = Locale.find_by!(code: params.fetch('locale', 'ja'))
-    refs = PostTagSearch.parse_references(params['tag_refs'], params['tags'].split)
+    refs = PostTagSearch.parse_references(params, params['tags'].split)
     raw = params['tags']
     literals = PostTagSearch.literals(locale, raw, references: refs)
     predicates = literals.map do |literal|