#434

backend/app/services/counts_population.rb

@@ -67,10 +67,15 @@ class CountsPopulation
   def make_population
     table = definition.table
     @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 ' +
-        access_sql(definition.model, 'previous'))
+    previous = ['rows', 'cols'].any? do |key|
+      QueryState.axes(params.fetch(key, '')).any? { _1['field'] == 'changed_field' }
+    end || QueryState.records(params, 'drill').any? { _1['field'] == 'changed_field' }
+    if previous
+      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 ' +
+          access_sql(definition.model, 'previous'))
+    end
     @scope = @scope.where("v.#{ definition.time_column } <= ?", at)
     unless history
       point = timestamp(params['at']) || at
@@ -169,15 +174,21 @@ class CountsPopulation
     end
     return unless params['tags'].present?
 
-    locale = Locale.find_by!(code: params.fetch('locale', 'ja'))
     refs = PostTagSearch.parse_references(params, params['tags'].split)
     raw = params['tags']
-    literals = PostTagSearch.literals(locale, raw, references: refs)
+    literals = PostTagSearch.literals(nil, raw, references: refs)
     predicates = literals.map do |literal|
-      internal, external = PostTagSearch.references(locale, literal)
-      parts = Array(internal).map { snapshot_membership("internal:#{ _1 }") } +
-          Array(external).map { snapshot_membership("external:#{ _1 }") }
-      expression = parts.empty? ? 'FALSE' : "(#{ parts.join(' OR ') })"
+      reference = literal[:reference]
+      expression = if reference
+                     parts = { 'internal' => reference['tag_id'],
+                         'external' => reference['external_tag_id'] }.filter_map do |kind, id|
+                       snapshot_membership("#{ kind }:#{ id }") if id
+                     end
+                     parts.empty? ? 'FALSE' : "(#{ parts.join(' OR ') })"
+                   else
+                     @condition ||= CountsCondition.new(self)
+                     @condition.tag_name_match(literal[:name])
+                   end
       literal[:negative] ? "NOT #{ expression }" : expression
     end
     return if predicates.empty?