Fix dataset filtering (#4520)

We need to filter for managed service instances for the target space.

Co-authored-by: serdarozerr <[email protected]>
Co-authored-by: johha <[email protected]>

Author: 3 people

app/models/runtime/space.rb

@@ -51,7 +51,7 @@ class DBNameUniqueRaceError < Sequel::ValidationFailed; end
     one_to_many :events, primary_key: :guid, key: :space_guid
     one_to_many :service_instances
     one_to_many :managed_service_instances,
-                dataset: -> { VCAP::CloudController::ServiceInstance.filter(is_gateway_service: true) }
+                dataset: -> { VCAP::CloudController::ServiceInstance.filter(space_id: id, is_gateway_service: true) }
     many_to_many :service_instances_shared_from_other_spaces,
                  left_key: :target_space_guid,
                  left_primary_key: :guid,

spec/unit/models/runtime/space_spec.rb

@@ -116,15 +116,17 @@ module VCAP::CloudController
       end
 
       describe 'dataset managed_service_instances' do
-        subject(:space) { Space.make }
+        let(:space)        { Space.make }
+        let(:other_space)  { Space.make }
 
-        it 'includes managed service instances and no user provided service instances' do
-          managed_service_instance = ManagedServiceInstance.make(space:)
-          user_provided_service_instance = UserProvidedServiceInstance.make(space:)
+        it 'includes only managed instances from the same space' do
+          mine   = ManagedServiceInstance.make(space:)
+          other  = ManagedServiceInstance.make(space: other_space)
+          upsi   = UserProvidedServiceInstance.make(space:)
 
-          managed_instances = space.managed_service_instances
-          expect(managed_instances).to include(managed_service_instance)
-          expect(managed_instances).not_to include(user_provided_service_instance)
+          expect(space.managed_service_instances).to include(mine)
+          expect(space.managed_service_instances).not_to include(other)
+          expect(space.managed_service_instances).not_to include(upsi)
         end
       end