Use the tenant name as default organization name

This way we'll avoid having all tenant organizations named "CONSUL" by
default, and we'll also use different email senders per tenant, which
will reduce the change of the emails being marked as spam.

app/models/setting.rb

@@ -159,14 +159,13 @@ def defaults
         "twitter_handle": nil,
         "twitter_hashtag": nil,
         "youtube_handle": nil,
-        # CONSUL installation's organization name
-        "org_name": "CONSUL",
+        "org_name": default_org_name,
         "meta_title": nil,
         "meta_description": nil,
         "meta_keywords": nil,
         "proposal_notification_minimum_interval_in_days": 3,
         "direct_message_max_per_day": 3,
-        "mailer_from_name": "CONSUL",
+        "mailer_from_name": default_org_name,
         "mailer_from_address": default_mailer_from_address,
         "min_age_to_participate": 16,
         "hot_score_period_in_days": 31,
@@ -199,6 +198,14 @@ def defaults
       }
     end
 
+    def default_org_name
+      Tenant.current&.name || default_main_org_name
+    end
+
+    def default_main_org_name
+      "CONSUL"
+    end
+
     def default_mailer_from_address
       "noreply@#{Tenant.current_host.presence || "consul.dev"}"
     end

app/models/tenant.rb

@@ -91,6 +91,10 @@ def self.current_schema
     Apartment::Tenant.current
   end
 
+  def self.current
+    find_by(schema: current_schema)
+  end
+
   def self.switch(...)
     Apartment::Tenant.switch(...)
   end

db/dev_seeds/settings.rb

@@ -6,12 +6,10 @@
     "feature.featured_proposals": "true",
     "feature.map": "true",
     "instagram_handle": "CONSUL",
-    "mailer_from_name": "CONSUL",
     "meta_description": "Citizen participation tool for an open, "\
                         "transparent and democratic government",
     "meta_keywords": "citizen participation, open government",
     "meta_title": "CONSUL",
-    "org_name": "CONSUL",
     "proposal_code_prefix": "MAD",
     "proposal_notification_minimum_interval_in_days": 0,
     "telegram_handle": "CONSUL",

spec/models/setting_spec.rb

@@ -187,6 +187,19 @@
     end
   end
 
+  describe ".default_org_name" do
+    it "returns the main org name for the default tenant" do
+      expect(Setting.default_org_name).to eq "CONSUL"
+    end
+
+    it "returns the tenant name for other tenants" do
+      create(:tenant, schema: "new", name: "New Institution")
+      allow(Tenant).to receive(:current_schema).and_return("new")
+
+      expect(Setting.default_org_name).to eq "New Institution"
+    end
+  end
+
   describe ".default_mailer_from_address" do
     before { allow(Tenant).to receive(:default_host).and_return("consulproject.org") }