Add latest changes from gitlab-org/gitlab@master

2 files changed, 108 insertions, 0 deletions

diff --git a/lib/gitlab/usage/metrics/instrumentations/in_product_marketing_email_cta_clicked_metric.rb b/lib/gitlab/usage/metrics/instrumentations/in_product_marketing_email_cta_clicked_metric.rb
new file mode 100644
index 00000000000..b1a2de29fd7
--- /dev/null
+++ b/lib/gitlab/usage/metrics/instrumentations/in_product_marketing_email_cta_clicked_metric.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Usage
+    module Metrics
+      module Instrumentations
+        class InProductMarketingEmailCtaClickedMetric < DatabaseMetric
+          operation :count
+
+          def initialize(metric_definition)
+            super
+
+            unless track.in?(allowed_track)
+              raise ArgumentError, "track '#{track}' must be one of: #{allowed_track.join(', ')}"
+            end
+
+            return if series.in?(allowed_series)
+
+            raise ArgumentError, "series '#{series}' must be one of: #{allowed_series.join(', ')}"
+          end
+
+          relation { Users::InProductMarketingEmail }
+
+          private
+
+          def relation
+            scope = super.where.not(cta_clicked_at: nil)
+            scope = scope.where(series: series)
+            scope.where(track: track)
+          end
+
+          def track
+            options[:track]
+          end
+
+          def series
+            options[:series]
+          end
+
+          def allowed_track
+            Users::InProductMarketingEmail::ACTIVE_TRACKS.keys
+          end
+
+          def allowed_series
+            @allowed_series ||= begin
+              series_amount = Namespaces::InProductMarketingEmailsService.email_count_for_track(track)
+              0.upto(series_amount - 1).to_a
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/usage/metrics/instrumentations/in_product_marketing_email_sent_metric.rb b/lib/gitlab/usage/metrics/instrumentations/in_product_marketing_email_sent_metric.rb
new file mode 100644
index 00000000000..50dec606d9b
--- /dev/null
+++ b/lib/gitlab/usage/metrics/instrumentations/in_product_marketing_email_sent_metric.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Usage
+    module Metrics
+      module Instrumentations
+        class InProductMarketingEmailSentMetric < DatabaseMetric
+          operation :count
+
+          def initialize(metric_definition)
+            super
+
+            unless track.in?(allowed_track)
+              raise ArgumentError, "track '#{track}' must be one of: #{allowed_track.join(', ')}"
+            end
+
+            return if series.in?(allowed_series)
+
+            raise ArgumentError, "series '#{series}' must be one of: #{allowed_series.join(', ')}"
+          end
+
+          relation { Users::InProductMarketingEmail }
+
+          private
+
+          def relation
+            scope = super
+            scope = scope.where(series: series)
+            scope.where(track: track)
+          end
+
+          def track
+            options[:track]
+          end
+
+          def series
+            options[:series]
+          end
+
+          def allowed_track
+            Users::InProductMarketingEmail::ACTIVE_TRACKS.keys
+          end
+
+          def allowed_series
+            @allowed_series ||= begin
+              series_amount = Namespaces::InProductMarketingEmailsService.email_count_for_track(track)
+              0.upto(series_amount - 1).to_a
+            end
+          end
+        end
+      end
+    end
+  end
+end