From a625749d1bf56a25d4b6be6caf54f69afa03c97d Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@carto.com>
Date: Thu, 14 May 2020 11:35:36 +0200
Subject: [PATCH] Exclude staging and other teams and make it more general

as per review comment.
---
 app/mailers/data_observatory_mailer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/mailers/data_observatory_mailer.rb b/app/mailers/data_observatory_mailer.rb
index 1261dbe78e..a66d1d10d1 100644
--- a/app/mailers/data_observatory_mailer.rb
+++ b/app/mailers/data_observatory_mailer.rb
@@ -1,7 +1,7 @@
 class DataObservatoryMailer < ActionMailer::Base
 
   CARTO_REQUEST_RECIPIENT = 'dataobservatory@carto.com'.freeze
-  TEAM_ORG = 'team'.freeze
+  EXCLUDED_ORGS = %w(team solutionscdb).freeze
 
   default from: Cartodb.get_config(:mailer, 'from')
   layout 'mail'
@@ -22,7 +22,7 @@ class DataObservatoryMailer < ActionMailer::Base
     @dataset_id = dataset_id
     @delivery_days = delivery_days
 
-    unless user.organization&.name == TEAM_ORG
+    unless Rails.env.staging? || EXCLUDED_ORGS.include?(user.organization&.name)
       mail to: CARTO_REQUEST_RECIPIENT, subject: subject
     end
   end