Revert changes to the MetadataService interface as they made little sense with the current implementation.

Author: mereghost

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

@@ -30,42 +30,43 @@
 
 module Wikis
   class PageLinkMetadataService
-    # @param relation [ActiveRecord::Relation<Wikis::PageLink>]
-    # @return [ServiceResult<ActiveRecord::Relation<Wikis::PageLink>]
-    def self.call(relation) = new.call(relation)
-
-    def initialize
+    # @param page_links [ActiveRecord::Relation<Wikis::PageLink>]
+    def initialize(page_links)
       @result = ServiceResult.success(errors: ActiveModel::Errors.new(self))
+      @relation = page_links
     end
 
-    def call(relation)
+    # @return [ServiceResult<ActiveRecord::Relation<Wikis::PageLink>]
+    def call
       metadata = relation.group_by(&:provider).flat_map do |provider, page_links|
         build_inputs(page_links).filter_map do |input_data|
           provider.resolve("queries.page_info").call(input_data).value_or(nil)
         end
       end
 
-      @result.result = enrich_models(relation, metadata)
+      @result.result = enrich_models(metadata)
       @result
     end
 
     private
 
+    attr_reader :relation
+
     def build_inputs(page_links)
       page_links.filter_map do |page_link|
         Adapters::Input::PageInfo.build(identifier: page_link.identifier).value_or(nil)
       end
     end
 
-    def enrich_models(page_links, metadata)
+    def enrich_models(metadata)
       identifier_title_map = metadata.sort_by(&:identifier).to_h { [it.identifier, it.title] }
       variable_placeholders = build_placeholders(identifier_title_map.size)
 
-      result_scope(page_links, metadata_join_sql(variable_placeholders, identifier_title_map))
+      result_scope(metadata_join_sql(variable_placeholders, identifier_title_map))
     end
 
-    def result_scope(page_links, join_expression)
-      page_links.joins(join_expression).select("wiki_page_links.*, metadata.title as title")
+    def result_scope(join_expression)
+      relation.joins(join_expression).select("wiki_page_links.*, metadata.title as title")
     end
 
     def metadata_join_sql(variable_placeholders, identifier_title_map)

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

@@ -34,7 +34,7 @@ module PageLinks
       class WorkPackageWikiPageLinksAPI < OpenProjectAPI
         helpers do
           def enrich_models_with_wiki_metadata(relation)
-            Wikis::PageLinkMetadataService.call(relation)
+            Wikis::PageLinkMetadataService.new(relation).call
           end
         end
 

modules/wikis/spec/services/wikis/page_link_metadata_service_spec.rb

@@ -38,7 +38,7 @@ module Wikis
     shared_let(:provider) { create(:internal_wiki_provider) }
     shared_let(:page_links) { create_list(:relation_wiki_page_link, 3, provider:) }
 
-    subject(:service) { described_class }
+    subject(:service) { described_class.new(relation) }
 
     before do
       query_double = instance_double(Adapters::Providers::Internal::Queries::PageInfo)
@@ -58,15 +58,15 @@ module Wikis
     end
 
     it "returns a new relation" do
-      service_result = service.call(relation)
+      service_result = service.call
 
       expect(service_result).to be_success
       expect(service_result.errors).to be_empty
       expect(service_result.result).to be_an(ActiveRecord::Relation)
     end
 
     it "adds the title attribute to the metadata association" do
-      service_result = service.call(relation)
+      service_result = service.call
       expect(service_result).to be_success
 
       page_links = service_result.result