Adds urns for page link type improve some tests

Author: mereghost

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

@@ -33,6 +33,8 @@ module V3
     module PageLinks
       class PageLinkCollectionRepresenter < Decorators::OffsetPaginatedCollection
         property :count, getter: ->(*) { count(:id) }
+
+        def _type = "WikiPageLinkCollection"
       end
     end
   end

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

@@ -31,13 +31,22 @@
 module API
   module V3
     module PageLinks
+      URN_INLINE_PAGE_LINK = "#{URN_PREFIX}wikiPageLinks:Inline".freeze
+      URN_RELATION_PAGE_LINK = "#{::API::V3::URN_PREFIX}wikiPageLinks:Relation".freeze
+
+      URN_PAGE_LINK_TYPE = {
+        "Wikis::RelationPageLink" => URN_RELATION_PAGE_LINK,
+        "Wikis::InlinePageLink" => URN_INLINE_PAGE_LINK
+      }.freeze
+
       class PageLinkRepresenter < Decorators::Single
         include Decorators::LinkedResource
         include Decorators::DateProperty
         include Caching::CachedRepresenter
 
         property :id
         property :identifier
+        property :wiki_page_link_type, exec_context: :decorator
 
         date_time_property :created_at
         date_time_property :updated_at
@@ -71,7 +80,9 @@ class PageLinkRepresenter < Decorators::Single
                             representer: ::API::V3::WorkPackages::WorkPackageRepresenter,
                             skip_render: ->(*) { represented.linkable_id.nil? || represented.linkable_type != "WorkPackage" }
 
-        def _type = represented.class.name.demodulize
+        def _type = "WikiPageLink"
+
+        def wiki_page_link_type = URN_PAGE_LINK_TYPE[represented.class.name]
 
         private
 

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

@@ -113,18 +113,34 @@ module PageLinks
         end
 
         describe "properties" do
+          describe "wiki_page_link_type" do
+            context "when InlinePageLink" do
+              let(:represented) { inline_page_link }
+
+              it_behaves_like "property", :wikiPageLinkType do
+                let(:value) { URN_INLINE_PAGE_LINK }
+              end
+            end
+
+            context "when RelationPageLink" do
+              it_behaves_like "property", :wikiPageLinkType do
+                let(:value) { URN_RELATION_PAGE_LINK }
+              end
+            end
+          end
+
           describe "_type" do
             context "when InlinePageLink" do
               let(:represented) { inline_page_link }
 
               it_behaves_like "property", :_type do
-                let(:value) { "InlinePageLink" }
+                let(:value) { "WikiPageLink" }
               end
             end
 
             context "when RelationPageLink" do
               it_behaves_like "property", :_type do
-                let(:value) { "RelationPageLink" }
+                let(:value) { "WikiPageLink" }
               end
             end
           end

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

@@ -35,16 +35,24 @@
 
   let(:work_package) { create(:work_package) }
   let(:internal_wiki) { create(:internal_wiki_provider) }
+  let(:xwiki_provider) { create(:xwiki_provider) }
 
   let(:project) { work_package.project }
 
   let(:user) { create(:user, member_with_permissions: { project => %i(view_work_packages view_wiki_page_links) }) }
 
-  let(:relation_page_links) { create_list(:relation_wiki_page_link, 3, provider: internal_wiki, linkable: work_package) }
+  let(:relation_page_links) { create_list(:relation_wiki_page_link, 3, provider: xwiki_provider, linkable: work_package) }
+  let(:inline_page_links) { create_list(:inline_wiki_page_link, 3, provider: internal_wiki, linkable: work_package) }
+
+  let(:unrelated_page_links) do
+    create_list(:inline_wiki_page_link, 3, provider: internal_wiki, linkable: create(:work_package, project: project))
+  end
 
   before do
     login_as user
     relation_page_links
+    inline_page_links
+    unrelated_page_links
   end
 
   describe "GET /api/v3/work_packages/:id/wiki_page_links" do
@@ -53,21 +61,20 @@
     context "with all preconditions met (happy path)" do
       before { get path }
 
-      it_behaves_like "API V3 collection response", 3, 3, "RelationPageLink", "Collection" do
-        let(:elements) { relation_page_links.reverse }
+      it_behaves_like "API V3 collection response", 6, 6, "WikiPageLink", "WikiPageLinkCollection" do
+        let(:elements) { Wikis::PageLink.where(linkable: work_package).order(id: :desc).all }
       end
     end
 
     context "when filtered by provider" do
       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)
         get "#{path}?filters=#{CGI.escape(filter.to_json)}"
       end
 
-      it_behaves_like "API V3 collection response", 3, 3, "RelationPageLink", "Collection" do
-        let(:elements) { relation_page_links.reverse }
+      it_behaves_like "API V3 collection response", 3, 3, "WikiPageLink", "WikiPageLinkCollection" do
+        let(:elements) { Wikis::PageLink.where(linkable: work_package, provider: internal_wiki).order(id: :desc).all }
       end
     end
   end