Fix bounds on sparkline query and rounding error

Author: radical-ube

app/controllers/podcast_metrics_controller.rb

@@ -2,7 +2,7 @@ class PodcastMetricsController < ApplicationController
   include MetricsUtils
 
   before_action :set_podcast
-  before_action :check_clickhouse, except: %i[show]
+  # before_action :check_clickhouse, except: %i[show]
 
   def show
   end
@@ -12,9 +12,10 @@ def episode_sparkline
     @prev_episode = Episode.find_by(guid: metrics_params[:prev_episode_id])
 
     @episode_trend = calculate_episode_trend(@episode, @prev_episode)
+
     @sparkline_downloads =
       Rollups::HourlyDownload
-        .where(episode_id: @episode[:guid], hour: (@episode.first_rss_published_at..))
+        .where(episode_id: @episode[:guid], hour: (publish_hour(@episode)..publish_hour(@episode) + 6.months))
         .final
         .select(:episode_id, "DATE_TRUNC('DAY', hour) AS hour", "SUM(count) AS count")
         .group(:episode_id, "DATE_TRUNC('DAY', hour) AS hour")
@@ -219,19 +220,19 @@ def metrics_params
   end
 
   def calculate_episode_trend(episode, prev_episode)
-    return nil unless episode.in_default_feed? && episode.first_rss_published_at.present? && prev_episode.present?
+    return nil unless episode.first_rss_published_at.present? && prev_episode.present?
     return nil if (episode.first_rss_published_at + 1.day) > Time.now
 
     ep_dropday_sum = episode_dropday_query(episode)
     previous_ep_dropday_sum = episode_dropday_query(prev_episode)
 
     return nil if ep_dropday_sum <= 0 || previous_ep_dropday_sum <= 0
 
-    ((ep_dropday_sum.to_f / previous_ep_dropday_sum.to_f) - 1).round(2)
+    ((ep_dropday_sum.to_f / previous_ep_dropday_sum.to_f) - 1).round(3)
   end
 
   def episode_dropday_query(ep)
-    lowerbound = ep.first_rss_published_at.beginning_of_hour
+    lowerbound = publish_hour(ep)
     upperbound = lowerbound + 24.hours
 
     Rollups::HourlyDownload
@@ -240,4 +241,12 @@ def episode_dropday_query(ep)
       .load_async
       .sum(:count)
   end
+
+  def publish_hour(episode)
+    if episode.first_rss_published_at.present?
+      episode.first_rss_published_at.beginning_of_hour
+    else
+      episode.published_at.beginning_of_hour
+    end
+  end
 end

app/helpers/metrics_helper.rb

@@ -17,13 +17,13 @@ def parse_trend(trend)
 
     if trend > 0
       {
-        percent: "+#{(trend * 100).round(2)}%",
+        percent: "+#{trend * 100}%",
         color: modified_trend_color(trend, "text-success"),
         direction: modified_trend_direction(trend, "up")
       }
     elsif trend < 0
       {
-        percent: "-#{(trend * -100).round(2)}%",
+        percent: "-#{trend * -100}%",
         color: modified_trend_color(trend, "text-danger"),
         direction: modified_trend_direction(trend, "down")
       }