#434

backend/app/services/counts_query.rb

@@ -10,7 +10,7 @@ class CountsQuery
           'name', 'names', 'category', 'aliases', 'parents', 'deprecated'] }.freeze
   KEYS = [
       'locale', 'mode', 'axis', 'page', 'limit', 'from', 'before', 'latest',
-      'user_id', 'resource_id', 'tag', 'columns', 'sort'].freeze
+      'user_id', 'resource_id', 'tag', 'columns', 'sort', 'at'].freeze
 
   attr_reader :page, :limit, :mode, :axis
 
@@ -41,15 +41,19 @@ class CountsQuery
     apply_filters
   end
 
+  def relation = @scope
+
   def count = @scope.count
 
   def latest_expression
     return @latest_expression if @latest_expression
 
+    at = timestamp('at')
+    cutoff = at ? "AND newer.created_at <= #{ @scope.klass.connection.quote(at) }" : ''
     <<~SQL.squish
       NOT EXISTS (SELECT 1 FROM #{ @table } newer
         WHERE newer.#{ @id_column } = #{ @table }.#{ @id_column }
-          AND newer.version_no > #{ @table }.version_no)
+          AND newer.version_no > #{ @table }.version_no #{ cutoff })
     SQL
   end
 
@@ -59,7 +63,7 @@ class CountsQuery
         .limit(limit).offset((page - 1) * limit)
   end
 
-  def summary
+  def summary(include_count: true)
     expression = axis == 'month' ? "DATE_FORMAT(#{ @table }.created_at, '%Y-%m')" :
                                   "#{ @table }.created_by_user_id"
     group_order = axis == 'user' ? 'MAX(counts_actor.name)' : expression
@@ -68,13 +72,13 @@ class CountsQuery
         "#{ group_order } AS group_name")).to_sql
     connection = @scope.klass.connection
     source = "FROM (#{ sql }) counts_groups"
-    groups = connection.select_value("SELECT COUNT(*) #{ source }")
+    groups = include_count ? connection.select_value("SELECT COUNT(*) #{ source }") : nil
     expressions = { 'group' => ['group_name'], 'count' => ['record_count'] }
     order = order_sql(expressions, ['group_key IS NULL ASC', 'group_key ASC'])
     rows = connection.select_all(
         "SELECT group_key, group_name, record_count #{ source } " +
         "ORDER BY #{ order } LIMIT #{ limit } OFFSET #{ (page - 1) * limit }")
-    { group_count: groups.to_i,
+    { group_count: groups&.to_i,
       groups: rows.map do |row|
         { key: row['group_key'],
           name: axis == 'user' ? row['group_name'] : nil,
@@ -168,18 +172,21 @@ class CountsQuery
   def timestamp(key)
     value = @params[key].presence
     return nil unless value
-    raise ArgumentError unless value.match?(/\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2})?Z\z/)
+    pattern = /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d{1,6})?)?Z\z/
+    raise ArgumentError unless value.match?(pattern)
 
     Date.iso8601(value.first(10))
     Time.iso8601(value.length == 17 ? value.sub(/Z\z/, ':00Z') : value)
   end
 
   def apply_filters
+    at = timestamp('at')
     first = timestamp('from')
     last = timestamp('before')
     raise ArgumentError if first && last && first >= last
     raise ArgumentError unless ['0', '1'].include?(@params.fetch('latest', '1'))
 
+    @scope = @scope.where("#{ @table }.created_at <= ?", at) if at
     @scope = @scope.where(Arel.sql(latest_expression)) unless @params['latest'] == '0'
     @scope = @scope.where("#{ @table }.created_at >= ?", first) if first
     @scope = @scope.where("#{ @table }.created_at < ?", last) if last