Add truncate to checksum_calculated_at

DFE-Digital · Apr 22, 2024 · d66cd0d · d66cd0d
1 parent 83da45f
commit d66cd0d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/dfe/analytics/services/generic_checksum_calculator.rb b/lib/dfe/analytics/services/generic_checksum_calculator.rb
@@ -1,5 +1,4 @@
 require_relative '../shared/service_pattern'
-require_relative '../shared/checksum_query_components'
 
 module DfE
   module Analytics
@@ -63,7 +62,7 @@ def build_select_and_order_clause(order_column, table_name_sanitized)
         def build_where_clause(order_column, table_name_sanitized, checksum_calculated_at_sanitized)
           return '' unless WHERE_CLAUSE_ORDER_COLUMNS.map(&:downcase).include?(order_column.downcase)
 
-          "WHERE DATE_TRUNC('milliseconds', #{table_name_sanitized}.#{order_column.downcase}) < #{checksum_calculated_at_sanitized}"
+          "WHERE #{table_name_sanitized}.#{order_column.downcase} < #{checksum_calculated_at_sanitized}"
         end
       end
     end

diff --git a/lib/dfe/analytics/services/postgres_checksum_calculator.rb b/lib/dfe/analytics/services/postgres_checksum_calculator.rb
@@ -1,5 +1,4 @@
 require_relative '../shared/service_pattern'
-require_relative '../shared/checksum_query_components'
 
 module DfE
   module Analytics
@@ -66,7 +65,7 @@ def build_select_and_order_clause(order_column, table_name_sanitized)
         def build_where_clause(order_column, table_name_sanitized, checksum_calculated_at_sanitized)
           return '' unless WHERE_CLAUSE_ORDER_COLUMNS.map(&:downcase).include?(order_column.downcase)
 
-          "WHERE #{table_name_sanitized}.#{order_column.downcase} < #{checksum_calculated_at_sanitized}"
+          "WHERE DATE_TRUNC('milliseconds', #{table_name_sanitized}.#{order_column.downcase}) < DATE_TRUNC('milliseconds', '#{checksum_calculated_at_sanitized}')"
         end
       end
     end