From b36bdc976324d7359c8ac2a0574ff6e949fdb559 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 30 Apr 2022 10:03:14 -0300
Subject: [PATCH] fixup! no se puede renombrar un rollup usando dimensiones
 exactas

---
 app/jobs/concerns/recursive_rollup.rb | 6 +++---
 app/jobs/uri_collection_job.rb        | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/jobs/concerns/recursive_rollup.rb b/app/jobs/concerns/recursive_rollup.rb
index 5ba9dd8b..3539d7d2 100644
--- a/app/jobs/concerns/recursive_rollup.rb
+++ b/app/jobs/concerns/recursive_rollup.rb
@@ -30,14 +30,14 @@ module RecursiveRollup
     #
     # @param :name [String]
     # @param :new_name [String]
-    # @param :interval_previous [String]
-    # @param :interval [String]
+    # @param :interval_previous [String, Symbol]
+    # @param :interval [String, Symbol]
     # @param :operation [Symbol]
     # @param :dimensions [Hash]
     # @param :beginning [Time]
     # @return [Rollup]
     def square_rollup(name:, new_name:, interval:, dimensions:, beginning:, operation: :sum)
-      Rollup.where(name: name, interval: interval_previous)
+      Rollup.where(name: name, interval: interval)
             .where_dimensions(**dimensions)
             .where('time >= ?', beginning.try(:"beginning_of_#{interval}"))
             .group(*dimensions_to_jsonb_query(dimensions))
diff --git a/app/jobs/uri_collection_job.rb b/app/jobs/uri_collection_job.rb
index 5de95d43..a9549efe 100644
--- a/app/jobs/uri_collection_job.rb
+++ b/app/jobs/uri_collection_job.rb
@@ -52,11 +52,11 @@ class UriCollectionJob < PeriodicJob
         columns.each do |column|
           # Obtener orígenes de visitas por host
           AccessLog.where(**host_dimensions).distinct(column).pluck(column).each do |value|
-            name = "#{name}|#{column}"
+            column_name = "host|#{column}"
             dimensions[column] = value
 
-            rollup(name, beginning, **dimensions)
-            reduce_rollup(name, beginning, **dimensions)
+            rollup(column_name, beginning, **dimensions)
+            reduce_rollup(column_name, beginning, **dimensions)
           end
         end
       end
@@ -145,6 +145,9 @@ class UriCollectionJob < PeriodicJob
 
   # Recolecta todas las URIs menos imágenes
   #
+  # TODO: Para los sitios con DeployLocalizedDomain estamos buscando
+  # URIs de más.
+  #
   # @return [Array]
   def uris
     @uris ||=