Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/gitlab/usage_data_queries.rb b/lib/gitlab/usage_data_queries.rb
index b2d74b1f0dd..fef5cd680cb 100644
--- a/lib/gitlab/usage_data_queries.rb
+++ b/lib/gitlab/usage_data_queries.rb
@@ -85,6 +85,16 @@ module Gitlab
           failures: []
         }
       end
+
+      # rubocop: disable CodeReuse/ActiveRecord
+      def sent_in_product_marketing_email_count(sent_emails, track, series)
+        count(Users::InProductMarketingEmail.where(track: track, series: series))
+      end
+
+      def clicked_in_product_marketing_email_count(clicked_emails, track, series)
+        count(Users::InProductMarketingEmail.where(track: track, series: series).where.not(cta_clicked_at: nil))
+      end
+      # rubocop: enable CodeReuse/ActiveRecord
     end
   end
 end