Allow arbitrary depth in taxonomy tagging

This now assembles all the taxons that content is tagged to, whether directly, or via taxonomy inheritance. It then checks to see if any of those are priority taxons.
alphagov · May 23, 2020 · b35f461 · b35f461
1 parent 98bfb13
commit b35f461
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb b/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb
@@ -27,18 +27,16 @@ def taxon
     private
 
       def priority_taxons
-        taxons = []
-        content_item.dig("links", "taxons")&.map do |taxon|
-          taxons << taxon if priority_taxon?(taxon)
-
-          taxons << taxon.dig("links", "parent_taxons")&.select do |parent_taxon|
-            priority_taxon?(parent_taxon)
-          end
+        taxons = content_item.dig("links", "taxons")
+        taxon_tree(taxons).select do |taxon|
+          priority_taxon?(taxon)
         end
+      end
+
+      def taxon_tree(taxons)
+        return [] if taxons.blank?
 
-        taxons.flatten!
-        taxons.compact!
-        taxons
+        taxons + taxons.flat_map { |taxon| taxon_tree(taxon.dig("links", "parent_taxons")) }
       end
 
       def priority_taxon?(taxon)

diff --git a/.../lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority_spec.rb b/.../lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority_spec.rb
@@ -71,7 +71,6 @@
     end
   end
 
-
   def directly_tagged_to_taxons(taxons)
     taxons << other_taxon
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,6 @@ @@
         end
       end
       def directly_tagged_to_taxons(taxons)
         taxons << other_taxon
         {
@@ Expand Down @@