Merge branch 'master' into add-trial-for-api-plans

santiment · Nov 20, 2023 · 39816d0 · 39816d0
2 parents 5aead45 + c25ffda
commit 39816d0
Show file tree

Hide file tree

Showing 5 changed files with 311 additions and 253 deletions.
diff --git a/lib/sanbase/clickhouse/github/sql_query.ex b/lib/sanbase/clickhouse/github/sql_query.ex
@@ -1,5 +1,12 @@
 defmodule Sanbase.Clickhouse.Github.SqlQuery do
-  import Sanbase.Metric.SqlQuery.Helper, only: [timerange_parameters: 3]
+  import Sanbase.Metric.SqlQuery.Helper,
+    only: [
+      timerange_parameters: 3,
+      to_unix_timestamp: 3,
+      to_unix_timestamp_from_number: 2
+    ]
+
+  import Sanbase.DateTimeUtils, only: [maybe_str_to_sec: 1]
 
   @non_dev_events [
     "IssueCommentEvent",
@@ -52,12 +59,24 @@ defmodule Sanbase.Clickhouse.Github.SqlQuery do
   end
 
   def dev_activity_contributors_count_query(organizations, from, to, interval) do
+    {from, to, _interval, span} = timerange_parameters(from, to, interval)
+
+    params = %{
+      interval: maybe_str_to_sec(interval),
+      organizations: organizations |> Enum.map(&String.downcase/1),
+      from: from,
+      to: to,
+      span: span,
+      non_dev_events: @non_dev_events
+    }
+
+    # {to_unix_timestamp(interval, "dt", argument_name: "interval")} AS time,
     sql =
       """
       SELECT time, toUInt32(SUM(uniq_contributors)) AS value
       FROM (
         SELECT
-          toUnixTimestamp(intDiv(toUInt32(dt), {{interval}}) * {{interval}}) AS time,
+          #{to_unix_timestamp(interval, "dt", argument_name: "interval")} AS time,
           uniqExact(actor) AS uniq_contributors
         FROM #{@table}
         PREWHERE
@@ -69,29 +88,29 @@ defmodule Sanbase.Clickhouse.Github.SqlQuery do
       )
       GROUP BY time
       """
-      |> wrap_timeseries_in_gap_filling_query()
+      |> wrap_timeseries_in_gap_filling_query(interval)
+
+    Sanbase.Clickhouse.Query.new(sql, params)
+  end
 
-    {from, to, interval, span} = timerange_parameters(from, to, interval)
+  def github_activity_contributors_count_query(organizations, from, to, interval) do
+    {from, to, _interval, span} = timerange_parameters(from, to, interval)
 
     params = %{
-      interval: interval,
+      interval: maybe_str_to_sec(interval),
       organizations: organizations |> Enum.map(&String.downcase/1),
       from: from,
       to: to,
-      non_dev_events: @non_dev_events,
-      span: span
+      span: span,
+      non_dev_events: @non_dev_events
     }
 
-    Sanbase.Clickhouse.Query.new(sql, params)
-  end
-
-  def github_activity_contributors_count_query(organizations, from, to, interval) do
     sql =
       """
       SELECT time, toUInt32(SUM(uniq_contributors)) AS value
       FROM (
         SELECT
-          toUnixTimestamp(intDiv(toUInt32(dt), {{interval}}) * {{interval}}) AS time,
+          #{to_unix_timestamp(interval, "dt", argument_name: "interval")} AS time,
           uniqExact(actor) AS uniq_contributors
         FROM #{@table}
         PREWHERE
@@ -102,28 +121,29 @@ defmodule Sanbase.Clickhouse.Github.SqlQuery do
       )
       GROUP BY time
       """
-      |> wrap_timeseries_in_gap_filling_query()
+      |> wrap_timeseries_in_gap_filling_query(interval)
+
+    Sanbase.Clickhouse.Query.new(sql, params)
+  end
 
-    {from, to, interval, span} = timerange_parameters(from, to, interval)
+  def dev_activity_query(organizations, from, to, interval) do
+    {from, to, _interval, span} = timerange_parameters(from, to, interval)
 
     params = %{
-      interval: interval,
+      interval: maybe_str_to_sec(interval),
       organizations: organizations |> Enum.map(&String.downcase/1),
       from: from,
       to: to,
-      span: span
+      span: span,
+      non_dev_events: @non_dev_events
     }
 
-    Sanbase.Clickhouse.Query.new(sql, params)
-  end
-
-  def dev_activity_query(organizations, from, to, interval) do
     sql =
       """
       SELECT time, SUM(events) AS value
       FROM (
         SELECT
-          toUnixTimestamp(intDiv(toUInt32(dt), {{interval}}) * {{interval}}) AS time,
+          #{to_unix_timestamp(interval, "dt", argument_name: "interval")} AS time,
           count(events) AS events
         FROM (
           SELECT any(event) AS events, dt
@@ -139,29 +159,29 @@ defmodule Sanbase.Clickhouse.Github.SqlQuery do
       )
       GROUP BY time
       """
-      |> wrap_timeseries_in_gap_filling_query()
+      |> wrap_timeseries_in_gap_filling_query(interval)
 
-    {from, to, interval, span} = timerange_parameters(from, to, interval)
+    Sanbase.Clickhouse.Query.new(sql, params)
+  end
+
+  def github_activity_query(organizations, from, to, interval) do
+    {from, to, _interval, span} = timerange_parameters(from, to, interval)
 
     params = %{
-      interval: interval,
+      interval: maybe_str_to_sec(interval),
       organizations: organizations |> Enum.map(&String.downcase/1),
       from: from,
       to: to,
-      non_dev_events: @non_dev_events,
-      span: span
+      span: span,
+      non_dev_events: @non_dev_events
     }
 
-    Sanbase.Clickhouse.Query.new(sql, params)
-  end
-
-  def github_activity_query(organizations, from, to, interval) do
     sql =
       """
       SELECT time, SUM(events) AS value
       FROM (
         SELECT
-          toUnixTimestamp(intDiv(toUInt32(dt), {{interval}}) * {{interval}}) AS time,
+          #{to_unix_timestamp(interval, "dt", argument_name: "interval")} AS time,
           count(events) AS events
         FROM (
           SELECT any(event) AS events, dt
@@ -176,17 +196,7 @@ defmodule Sanbase.Clickhouse.Github.SqlQuery do
       )
       GROUP BY time
       """
-      |> wrap_timeseries_in_gap_filling_query()
-
-    {from, to, interval, span} = timerange_parameters(from, to, interval)
-
-    params = %{
-      interval: interval,
-      organizations: organizations |> Enum.map(&String.downcase/1),
-      from: from,
-      to: to,
-      span: span
-    }
+      |> wrap_timeseries_in_gap_filling_query(interval)
 
     Sanbase.Clickhouse.Query.new(sql, params)
   end
@@ -307,12 +317,12 @@ defmodule Sanbase.Clickhouse.Github.SqlQuery do
     """
   end
 
-  defp wrap_timeseries_in_gap_filling_query(query) do
+  defp wrap_timeseries_in_gap_filling_query(query, interval) do
     """
     SELECT time, SUM(value)
     FROM (
       SELECT
-        toUnixTimestamp(intDiv(toUInt32({{from}} + number * {{interval}}), {{interval}}) * {{interval}}) AS time,
+        #{to_unix_timestamp_from_number(interval, from_argument_name: "from")} AS time,
         toUInt32(0) AS value
       FROM numbers({{span}})