Skip to content

don't return the same route multiple times when shared to more then 2 spaces #4702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Benjamintf1 merged 2 commits into from
Dec 15, 2025
Merged

don't return the same route multiple times when shared to more then 2 spaces #4702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f42c27c
don't return the same route multiple times when shared to more then 2…
Benjamintf1 Dec 12, 2025
f0f5b1d
add test for duplicate routes
Benjamintf1 Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/fetchers/route_fetcher.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def fetch(message, readable_space_guids_dataset: nil, eager_loaded_associations:
(Sequel[:route_shares][:target_space_guid] =~ readable_space_guids_dataset)
end
end
dataset = dataset.distinct(Sequel[:routes][:guid])
filter(message, dataset)
end

Expand Down
14 changes: 10 additions & 4 deletions spec/unit/fetchers/route_fetcher_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module VCAP::CloudController
describe '.fetch' do
before do
Route.dataset.destroy
# shared_route.add_shared_space(space2)
end

let!(:space1) { Space.make }
Expand All @@ -17,7 +16,6 @@ module VCAP::CloudController
let!(:route1) { Route.make(guid: 'route1_guid', host: 'host1', path: '/path1', space: space1, domain: domain1) }
let!(:route2) { Route.make(guid: 'route2_guid', host: 'host2', path: '/path2', space: space1, domain: domain1) }
let!(:route3) { Route.make(guid: 'route3_guid', host: 'host3', path: '/path1', space: space2, domain: domain2) }
# let!(:shared_route) { Route.make(guid: 'shared_route_guid', host: 'host2', path: '/path1', space: space1, domain: domain2) }

let(:message) do
RoutesListMessage.from_params(routes_filter)
Expand All @@ -30,14 +28,22 @@ module VCAP::CloudController
expect(RouteFetcher.fetch(message, omniscient: true).all).to contain_exactly(route1, route2, route3)
end

it 'does not duplicate routes when shared' do
space3 = Space.make
shared_route = Route.make(guid: 'shared_route_guid', host: 'host1', path: '/path_shared', space: space1, domain: domain1)
shared_route.add_shared_space(space2)
shared_route.add_shared_space(space3)
expect(RouteFetcher.fetch(message, omniscient: true).all).to contain_exactly(route1, route2, route3, shared_route)
end

it 'fetches the routes owned by readable spaces' do
dataset = RouteFetcher.fetch(message, readable_space_guids_dataset: Space.where(id: [space1.id]).select(:guid))
expect(dataset.all).to contain_exactly(route1, route2)
end

it 'fetches the instances shared to readable spaces' do
space4 = Space.make
shared_route = Route.make(space: space4)
space3 = Space.make
shared_route = Route.make(space: space3)
shared_route.add_shared_space(space2)
dataset = RouteFetcher.fetch(message, readable_space_guids_dataset: Space.where(id: [space2.id]).select(:guid))
expect(dataset.all).to contain_exactly(route3, shared_route)
Expand Down