Merge branch '349178-self_and_ancestors-linear-query-with-upto-param' into 'master'

Add self_and_ancestors linear query upto parameter

See merge request gitlab-org/gitlab!77283

app/models/namespaces/traversal/linear_scopes.rb

@@ -22,7 +22,7 @@ module Namespaces
           unscoped.where(id: root_ids)
         end
 
-        def self_and_ancestors(include_self: true, hierarchy_order: nil)
+        def self_and_ancestors(include_self: true, upto: nil, hierarchy_order: nil)
           return super unless use_traversal_ids_for_ancestor_scopes?
 
           ancestors_cte, base_cte = ancestor_ctes
@@ -35,11 +35,15 @@ module Namespaces
             .where(namespaces[:id].eq(ancestors_cte.table[:ancestor_id]))
             .order_by_depth(hierarchy_order)
 
-          if include_self
-            records
-          else
-            records.where(ancestors_cte.table[:base_id].not_eq(ancestors_cte.table[:ancestor_id]))
+          unless include_self
+            records = records.where(ancestors_cte.table[:base_id].not_eq(ancestors_cte.table[:ancestor_id]))
           end
+
+          if upto
+            records = records.where.not(id: unscoped.where(id: upto).select('unnest(traversal_ids)'))
+          end
+
+          records
         end
 
         def self_and_ancestor_ids(include_self: true)

app/models/namespaces/traversal/recursive_scopes.rb

@@ -17,8 +17,8 @@ module Namespaces
             .where(namespaces: { parent_id: nil })
         end
 
-        def self_and_ancestors(include_self: true, hierarchy_order: nil)
-          records = Gitlab::ObjectHierarchy.new(all).base_and_ancestors(hierarchy_order: hierarchy_order)
+        def self_and_ancestors(include_self: true, upto: nil, hierarchy_order: nil)
+          records = Gitlab::ObjectHierarchy.new(all).base_and_ancestors(upto: upto, hierarchy_order: hierarchy_order)
 
           if include_self
             records

spec/support/shared_examples/namespaces/traversal_scope_examples.rb

@@ -130,6 +130,12 @@ RSpec.shared_examples 'namespace traversal scopes' do
 
       it { is_expected.to contain_exactly(group_2, nested_group_2, deep_nested_group_2) }
     end
+
+    context 'with upto' do
+      subject { described_class.where(id: deep_nested_group_1).self_and_ancestors(upto: nested_group_1.id) }
+
+      it { is_expected.to contain_exactly(deep_nested_group_1) }
+    end
   end
 
   describe '.self_and_ancestors' do