[BC-7978] Add support for subcategory filtering (#16)

* [BC-7978] Add support for subcategory filtering in VRT.all_matching_categories

* Clean up sub v cat id

* bump version

Author: adamrdavid

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vrt (0.4.2)
+    vrt (0.4.4)
 
 GEM
   remote: https://rubygems.org/

lib/vrt.rb

@@ -57,7 +57,11 @@ def current_categories
 
   # Get all deprecated ids that would match in the given categories from the current version
   def all_matching_categories(categories)
-    cross_version_category_mapping.select { |key, _value| categories.include?(key) }.values.flatten
+    cross_version_category_mapping
+      .select { |key, _value| categories.include?(key) }
+      .values
+      .flatten
+      .uniq
   end
 
   # Finds the best match valid node. First looks at valid nodes in the given new version or finds

lib/vrt/cross_version_mapping.rb

@@ -1,12 +1,16 @@
 module VRT
   module CrossVersionMapping
     # Maps new_category_id: deprecated_node_id
+    # and new_subcategory_id: deprecated_node_id
     def cross_version_category_mapping
       category_map = {}
       deprecated_node_json.each do |key, value|
         latest_version = value.keys.sort_by { |n| Gem::Version.new(n) }.last
-        id = value[latest_version].split('.')[0]
-        category_map[id] ? category_map[id] << key : category_map[id] = [key]
+        id_list = value[latest_version].split('.')
+        cat_id = id_list[0]
+        sub_id = id_list[0..1].join('.')
+        category_map[cat_id] ? category_map[cat_id] << key : category_map[cat_id] = [key]
+        category_map[sub_id] ? category_map[sub_id] << key : category_map[sub_id] = [key]
       end
       category_map
     end

lib/vrt/version.rb

@@ -1,3 +1,3 @@
 module Vrt
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.4.4'.freeze
 end

spec/vrt_spec.rb

@@ -183,6 +183,30 @@
         expect(full_search_list).to contain_exactly(*deprecated)
       end
     end
+
+    context 'with subcategories included' do
+      let(:categories) do
+        %w[
+          external_behavior
+          other
+          unvalidated_redirects_and_forwards.open_redirect
+        ]
+      end
+      let(:deprecated) do
+        %w[
+          poor_physical_security
+          social_engineering
+          unvalidated_redirects_and_forwards.lack_of_security_speed_bump_page
+          unvalidated_redirects_and_forwards.open_redirect.get_based_all_users
+          unvalidated_redirects_and_forwards.open_redirect.get_based_unauthenticated
+          unvalidated_redirects_and_forwards.open_redirect.get_based_authenticated
+        ]
+      end
+
+      it 'should return a list containing the deprecated categories' do
+        expect(full_search_list).to contain_exactly(*deprecated)
+      end
+    end
   end
 
   describe '#current_version?' do