From e0e01a54459574b19c37b07b02c0b1cb8da8dfbd Mon Sep 17 00:00:00 2001 From: f Date: Mon, 23 Dec 2024 16:36:27 -0300 Subject: [PATCH] fix: optimizar api de sitios #18074 --- app/controllers/api/v1/sites_controller.rb | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/v1/sites_controller.rb b/app/controllers/api/v1/sites_controller.rb index 05abc38a..384a8e4f 100644 --- a/app/controllers/api/v1/sites_controller.rb +++ b/app/controllers/api/v1/sites_controller.rb @@ -9,22 +9,30 @@ module Api # Lista de nombres de dominios a emitir certificados def index - render json: alternative_names + api_names + www_names + render json: alternative_names.concat(api_names).concat(www_names) end private + # @param query [ActiveRecord::Relation] + # @return [Array] + def hostname_of(query) + query.pluck(Arel.sql("values->>'hostname'")).compact.uniq + end + def canonicalize(name) name.end_with?('.') ? name[0..-2] : "#{name}.#{Site.domain}" end def subdomain?(name) - name.end_with? ".#{Site.domain}" + @@subdomain ||= ".#{Site.domain}" + + name.end_with? @subdomain end # Dominios alternativos def alternative_names - (DeployAlternativeDomain.all.map(&:hostname) + DeployLocalizedDomain.all.map(&:hostname)).map do |name| + hostname_of(DeployAlternativeDomain.all).concat(hostname_of(DeployLocalizedDomain)).map do |name| canonicalize name end.reject do |name| subdomain? name @@ -33,12 +41,12 @@ module Api # Obtener todos los sitios con API habilitada, es decir formulario # de contacto y/o colaboración anónima. - # - # TODO: Optimizar def api_names Site.where(contact: true) .or(Site.where(colaboracion_anonima: true)) - .select("'api.' || name as name").map(&:name).map do |name| + .pluck(:name).map do |name| + "api.#{name}" + end.map do |name| canonicalize name end.reject do |name| subdomain? name @@ -47,8 +55,8 @@ module Api # Todos los dominios con WWW habilitado def www_names - Site.where(id: DeployWww.all.pluck(:site_id)).select("'www.' || name as name").map(&:name).map do |name| - canonicalize name + Site.where(id: DeployWww.all.pluck(:site_id)).pluck(:name).map do |name| + canonicalize "www.#{name}" end end end