Merge pull request #469 from alphagov/remove-abbreviation

Change use of abbreviation to primary hostname
alphagov · Dec 14, 2023 · 46466c9 · 46466c9
2 parents 9465735 + 2f39a7c
commit 46466c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/bouncer/outcome/global_type.rb b/lib/bouncer/outcome/global_type.rb
@@ -14,7 +14,7 @@ def serve
         when "archive"
           [410, { "Content-Type" => "text/html" }, [renderer.render(context.attributes_for_render, 410)]]
         else
-          message = "Can't serve unexpected global_type: #{context.site.global_type} for #{context.site.abbr}"
+          message = "Can't serve unexpected global_type: #{context.site.global_type} for #{context.site.default_hostname}"
           [500, { "Content-Type" => "text/plain" }, [message]]
         end
       end

diff --git a/lib/site.rb b/lib/site.rb
@@ -6,4 +6,8 @@ class Site < ActiveRecord::Base
   belongs_to :organisation
   has_many :hosts
   has_many :mappings
+
+  def default_hostname
+    @default_hostname ||= hosts.where(canonical_host_id: nil).order(:id).first.hostname
+  end
 end