Do not return permissions/memberships that have user_id: nil (#1166)

Author: pavel-d

lib/travis/api/v3/queries/build_permissions.rb

@@ -1,11 +1,11 @@
 module Travis::API::V3
   class Queries::BuildPermissions < Query
     def find_for_repo(repository)
-      Models::Repository.find(repository.id).permissions.includes(:user)
+      Models::Repository.find(repository.id).permissions.joins(:user).includes(:user)
     end
 
     def find_for_organization(organization)
-      Models::Membership.where(organization_id: organization.id).includes(:user)
+      Models::Membership.where(organization_id: organization.id).joins(:user).includes(:user)
     end
 
     def update_for_organization(organization, user_ids, permission)

spec/v3/queries/build_permissions_spec.rb

@@ -5,28 +5,45 @@
 
   describe '#find_for_repo' do
     let(:repo) { FactoryBot.create(:repository) }
-
-    before { repo.permissions.create(build: true, user: user) }
+    let!(:permission) { repo.permissions.create(build: true, user: user) }
 
     it 'returns permissions for repo' do
       perms = subject.find_for_repo(repo)
 
       expect(perms.first.build).to eq(true)
       expect(perms.first.user.id).to eq(user.id)
     end
+
+    context 'when permission has user_id: nil' do
+      let!(:permission) { repo.permissions.create(build: true, user_id: nil) }
+
+      it 'filters it out' do
+        perms = subject.find_for_repo(repo)
+        expect(perms.length).to eq(0)
+      end
+    end
   end
 
   describe '#find_for_organization' do
     let(:organization) { FactoryBot.create(:org) }
 
-    before { organization.memberships.create(user: user, role: 'admin', build_permission: true) }
+    let!(:membership) { organization.memberships.create(user: user, role: 'admin', build_permission: true) }
 
     it 'returns build memberships for organization' do
       perms = subject.find_for_organization(organization)
 
       expect(perms.first.build_permission).to eq(true)
       expect(perms.first.user.id).to eq(user.id)
     end
+
+    context 'when membership has user_id: nil' do
+      let!(:membership) { organization.memberships.create(user_id: nil, role: 'admin', build_permission: true) }
+
+      it 'filters it out' do
+        perms = subject.find_for_organization(organization)
+        expect(perms.length).to eq(0)
+      end
+    end
   end
 
   describe '#update_for_repo' do