Address feedback, move provider handling to use universal identifiers

Author: mereghost

modules/wikis/app/models/queries/wikis/page_links/filter/provider_filter.rb

@@ -42,11 +42,13 @@ def human_name
           end
 
           def allowed_values
-            ::Wikis::Provider.pluck(:id).map { |id| [id, id.to_s] }
+            ::Wikis::Provider.enabled.pluck(:universal_identifier).map { |uid| [uid, uid.to_s] }
           end
 
+          def left_outer_joins = :provider
+
           def where
-            operator_strategy.sql_for_field(values, ::Wikis::PageLink.table_name, "provider_id")
+            operator_strategy.sql_for_field(values, ::Wikis::Provider.table_name, "universal_identifier")
           end
         end
       end

modules/wikis/app/models/queries/wikis/page_links/page_link_query.rb

@@ -38,6 +38,10 @@ class PageLinkQuery
         def self.model
           @model ||= ::Wikis::PageLink
         end
+
+        def default_scope
+          ::Wikis::PageLink.includes(:provider).all
+        end
       end
     end
   end

modules/wikis/app/services/wikis/page_link_metadata_service.rb

@@ -36,8 +36,8 @@ def initialize(page_links)
     end
 
     def call
-      metadata = @page_links.group_by(&:provider).filter_map do |provider, pages|
-        result = provider.resolve("queries.pages").call(page_identifiers: pages.map(&:identifier))
+      metadata = @page_links.group_by(&:provider).filter_map do |provider, links|
+        result = provider.resolve("queries.pages").call(page_identifiers: links.map(&:identifier))
         result.value_or { add_wiki_error(it) and next }
       end
 

modules/wikis/config/locales/en.yml

@@ -2,6 +2,8 @@
 en:
   activerecord:
     attributes:
+      wikis/page_link:
+        provider: Wiki Provider
       wikis/xwiki_provider:
         authentication_method: Authentication method
         authentication_methods:

modules/wikis/lib/api/v3/page_links/page_link_representer.rb

@@ -61,7 +61,9 @@ class PageLinkRepresenter < Decorators::Single
           }
         end
 
-        associated_resource :provider, v3_path: :wiki_provider
+        associated_resource :provider, v3_path: :wiki_provider, link: ->(*) {
+          { href: api_v3_paths.wiki_provider(represented.provider.universal_identifier), title: represented.provider.name }
+        }
 
         # TODO: Make this truly polymorphic - @mereghost 2026-04-13
         associated_resource :linkable,

modules/wikis/lib/api/v3/providers/provider_representer.rb

@@ -35,13 +35,13 @@ class ProviderRepresenter < Decorators::Single
         include Decorators::LinkedResource
         include Decorators::DateProperty
 
-        property :id
+        property :universal_identifier
         property :name
 
         date_time_property :created_at
         date_time_property :updated_at
 
-        self_link(path: :wiki_provider)
+        self_link(path: :wiki_provider, id_attribute: :universal_identifier)
       end
     end
   end

modules/wikis/spec/lib/api/v3/page_links/page_link_representer_spec.rb

@@ -60,7 +60,7 @@ module PageLinks
           describe "provider" do
             it_behaves_like "has a titled link" do
               let(:link) { "provider" }
-              let(:href) { "/api/v3/wiki_providers/#{represented.provider_id}" }
+              let(:href) { "/api/v3/wiki_providers/#{represented.provider.universal_identifier}" }
               let(:title) { represented.provider.name }
             end
           end

modules/wikis/spec/lib/api/v3/providers/provider_representer_spec.rb

@@ -48,13 +48,21 @@ module Providers
           describe "self" do
             it_behaves_like "has a titled link" do
               let(:link) { "self" }
-              let(:href) { "/api/v3/wiki_providers/#{represented.id}" }
+              let(:href) { "/api/v3/wiki_providers/#{represented.universal_identifier}" }
               let(:title) { represented.name }
             end
           end
         end
 
         describe "properties" do
+          it_behaves_like "property", :name do
+            let(:value) { represented.name }
+          end
+
+          it_behaves_like "property", :universalIdentifier do
+            let(:value) { represented.universal_identifier }
+          end
+
           it_behaves_like "datetime property", :createdAt do
             let(:value) { represented.created_at }
           end

modules/wikis/spec/requests/api/v3/page_links/page_links_api_spec.rb

@@ -59,7 +59,7 @@
     end
 
     context "when filtered by provider" do
-      let(:filter) { [{ provider: { operator: "=", values: [internal_wiki.id] } }] }
+      let(:filter) { [{ provider: { operator: "=", values: [internal_wiki.universal_identifier] } }] }
 
       before do
         create_list(:relation_wiki_page_link, 3, provider: create(:xwiki_provider), linkable: work_package)