Shared repositories indicator (#1077)

Shared repositories indicator

Author: piotr-travisci

lib/travis/api/v3/models/user.rb

@@ -35,7 +35,24 @@ def repository_ids
     end
 
     def repositories
-      Models::Repository.where(owner_type: 'User', owner_id: id)
+      Models::Repository.where(
+        '((repositories.owner_type = ? AND repositories.owner_id = ?) OR repositories.id IN (?))'.freeze,
+        'User'.freeze,
+        id,
+        shared_repositories_ids
+      ).order('id ASC')
+    end
+
+    def organizations_repositories_ids
+      @organizations_repositories_ids ||= organizations.empty? ? [] : Models::Repository.where(owner_id: organizations.pluck(:id)).pluck(:id)
+    end
+
+    def access_repositories_ids
+      @access_repositories_ids ||= permissions.pluck(:repository_id)
+    end
+
+    def shared_repositories_ids
+      access_repositories_ids - organizations_repositories_ids
     end
 
     def token

lib/travis/api/v3/renderer/repository.rb

@@ -1,7 +1,7 @@
 module Travis::API::V3
   class Renderer::Repository < ModelRenderer
     representation(:minimal,  :id, :name, :slug)
-    representation(:standard, :id, :name, :slug, :description, :github_id, :vcs_id, :vcs_type, :github_language, :active, :private, :owner, :owner_name, :vcs_name, :default_branch, :starred, :managed_by_installation, :active_on_org, :migration_status, :history_migration_status)
+    representation(:standard, :id, :name, :slug, :description, :github_id, :vcs_id, :vcs_type, :github_language, :active, :private, :owner, :owner_name, :vcs_name, :default_branch, :starred, :managed_by_installation, :active_on_org, :migration_status, :history_migration_status, :shared)
     representation(:experimental, :id, :name, :slug, :description, :vcs_id, :vcs_type, :github_id, :github_language, :active, :private, :owner, :default_branch, :starred, :current_build, :last_started_build, :next_build_number)
     representation(:internal, :id, :name, :slug, :github_id, :vcs_id, :vcs_type, :active, :private, :owner, :default_branch, :private_key, :token, :user_settings)
     representation(:additional, :allow_migration)
@@ -50,6 +50,12 @@ def starred
       user.starred_repository_ids.include? id
     end
 
+    def shared
+      return owner_name.downcase != access_control.user.login.downcase \
+      && access_control.user.shared_repositories_ids.include?(id) if access_control.user && owner_name
+      false
+    end
+
     def email_subscribed
       return false unless user = access_control.user
       !user.email_unsubscribed_repository_ids.include?(id)

lib/travis/testing/factories.rb

@@ -78,6 +78,16 @@
     owner { User.find_by_login('josevalim') || FactoryBot.create(:user, :login => 'josevalim') }
   end
 
+  factory :sharedrepo, :parent => :repository_without_last_build do
+    name { 'sharedrepo' }
+    owner_name { 'sharedrepoowner' }
+    owner_email { '[email protected]' }
+    owner { User.find_by_login('sharedrepoowner') || FactoryBot.create(:user, :login => 'sharedrepoowner', :name => 'Sharedrepo Owner') }
+    last_build_number { nil }
+    last_build_started_at { nil }
+    last_build_finished_at { nil }
+  end
+
   factory :event do
     repository { Repository.first || FactoryBot.create(:repository) }
     source { Build.first || FactoryBot.create(:build) }
@@ -87,6 +97,14 @@
   factory :permission do
   end
 
+  factory :sharedrepo_permission, class: Permission do
+    user_id { (User.find_by_login('johndoe') || FactoryBot.create(:user_with_sharedrepo)).id }
+    repository_id { Repository.find_by_name('sharedrepo').id }
+    admin { false }
+    push { true }
+    pull { true }
+  end
+
   factory :membership, class: Travis::API::V3::Models::Membership do
     organization_id { FactoryBot.create(:org_v3).id }
     user_id         { FactoryBot.create(:user).id }
@@ -101,6 +119,14 @@
     github_oauth_token { 'github_oauth_token' }
   end
 
+  factory :user_with_sharedrepo, class: User do
+    name  { 'John Doe' }
+    login { 'johndoe' }
+    email { '[email protected]' }
+    tokens { [Token.new] }
+    github_oauth_token { 'github_oauth_token' }
+  end
+
   factory :org, :class => 'Organization' do
     name { 'travis-ci' }
     login { 'travis-ci' }

lib/travis/testing/scenario.rb

@@ -1,7 +1,8 @@
 module Scenario
   class << self
     def default
-      minimal, enginex = repositories :minimal, :enginex
+      minimal, enginex, sharedrepo = repositories :minimal, :enginex, :sharedrepo
+      sharedrepo_permission = permissions :sharedrepo_permission
 
       build :repository => minimal,
             :owner => minimal.owner,
@@ -66,6 +67,26 @@ def default
               { :owner => minimal.owner, :worker => 'ruby3.worker.travis-ci.org:travis-ruby-4' }
             ]
 
+      build :repository => sharedrepo,
+            :owner => sharedrepo.owner,
+            :number => 1,
+            :config => { 'rvm' => ['1.8.7', '1.9.2'], 'gemfile' => ['test/Gemfile.rails-2.3.x', 'test/Gemfile.rails-3.0.x'] },
+            :state  => 'failed',
+            :started_at => '2010-11-12 12:00:00',
+            :finished_at => '2010-11-12 12:00:10',
+            :commit => {
+              :commit => '1a738d9d6f297c105ae2',
+              :ref => 'refs/heads/develop',
+              :branch => 'master',
+              :message => 'add Gemfile',
+              :committer_name => 'Sven Fuchs',
+              :committer_email => '[email protected]',
+              :committed_at => '2010-11-12 11:50:00',
+            },
+            :jobs => [
+              { :owner => sharedrepo.owner, :worker => 'ruby3.worker.travis-ci.org:travis-ruby-4' }
+            ]
+
       build :repository => enginex,
             :owner => enginex.owner,
             :number => 1,
@@ -98,6 +119,13 @@ def repositories(*names)
       }
     end
 
+    def permissions(*names)
+      names.map { |name|
+        perm = FactoryBot.create(name)
+        perm
+      }
+    end
+
     def build(attributes)
       commit = attributes.delete(:commit)
       jobs  = attributes.delete(:jobs)

spec/lib/model/permission_spec.rb

@@ -5,7 +5,7 @@
     end
 
     it 'returns matching permissions if two roles given as symbols' do
-      expect(Permission.by_roles([:admin, :pull]).size).to eq(2)
+      expect(Permission.by_roles([:admin, :pull]).size).to eq(3)
     end
 
     it 'returns a single permission if one role given' do

spec/v3/services/enterprise_license/find_spec.rb

@@ -23,7 +23,7 @@
           "license_id" => "12345675ad",
           "license_type" => "trial",
           "seats" => 20,
-          "active_users" => 1,
+          "active_users" => 3,
           "expiration_time" => "2018-08-18T00:00:00Z"
         }
       }

spec/v3/services/owner/find_spec.rb

@@ -98,6 +98,7 @@
           "github_language"   => nil,
           "active"            => false,
           "private"           => false,
+          "shared"            => false,
           "owner"             => { "@href"=> "/v3/org/#{org.id}" },
           "default_branch"    => {
             "@type"           => "branch",
@@ -165,6 +166,7 @@
           "github_language" => nil,
           "active"          => false,
           "private"         => false,
+          "shared"          => false,
           "owner"           => { "@href"=> "/v3/org/#{org.id}" },
           "default_branch"  => {
             "@type"         => "branch",

spec/v3/services/repositories/for_current_user_spec.rb

@@ -63,6 +63,7 @@
         "github_language"    => nil,
         "active"             => true,
         "private"            => true,
+        "shared"             => false,
         "owner"              => {
           "@type"            => "user",
           "@href"            => "/v3/user/#{repo.owner_id}",

spec/v3/services/repositories/for_owner_spec.rb

@@ -1,15 +1,20 @@
 describe Travis::API::V3::Services::Repositories::ForOwner, set_app: true do
   include Support::Formats
   let(:repo)  { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
+  let(:sharedrepo)  { Travis::API::V3::Models::Repository.where(owner_name: 'sharedrepoowner', name: 'sharedrepo').first }
   let(:build) { repo.builds.first }
   let(:jobs)  { Travis::API::V3::Models::Build.find(build.id).jobs }
 
   let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
   let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+
+  let(:token_collaborator)   { Travis::Api::App::AccessToken.create(user: Travis::API::V3::Models::User.find_by_login('johndoe'), app_id: 1) }
+  let(:headers_collaborator) {{ 'HTTP_AUTHORIZATION' => "token #{token_collaborator}"                        }}
   before        { Travis::API::V3::Models::Permission.create(repository: repo, user: repo.owner, pull: true) }
   before        { repo.update_attribute(:private, true)                             }
   before        { repo.update_attribute(:current_build, build)                             }
   after         { repo.update_attribute(:private, false)                            }
+  before        { RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = 1024*1024 }
 
   describe "sorting by default_branch.last_build" do
     let!(:repo2) { Travis::API::V3::Models::Repository.create!(owner_name: 'svenfuchs', owner: repo.owner, name: 'second-repo', default_branch_name: 'other-branch') }
@@ -33,7 +38,7 @@
   describe "private repository, private API, authenticated as user with access" do
     before  { get("/v3/owner/svenfuchs/repos", {}, headers) }
     example { expect(last_response).to be_ok }
-    example { expect(JSON.load(body)).to be == {
+    example { puts JSON.load(body); expect(JSON.load(body)).to be == {
       "@type"                => "repositories",
       "@href"                => "/v3/owner/svenfuchs/repos",
       "@representation"      => "standard",
@@ -83,6 +88,7 @@
         "github_language"    => nil,
         "active"             => true,
         "private"            => true,
+        "shared"             => false,
         "owner"              => {
           "@type"            => "user",
           "id"               => repo.owner_id,
@@ -134,6 +140,7 @@
         "github_language"    =>nil,
         "active"             =>true,
         "private"            =>true,
+        "shared"             =>false,
         "owner"              =>{
           "@type"            =>"user",
           "id"               =>1,
@@ -245,6 +252,7 @@
         "github_language"    => nil,
         "active"             => true,
         "private"            => true,
+        "shared"             => false,
         "owner"              => {
           "@type"            => "user",
           "id"               => 1,
@@ -413,6 +421,7 @@
           "@representation"=>"minimal",
           "name"          => "master" },
         "starred"         => false,
+        "shared"          => false,
         "managed_by_installation"=>false,
         "active_on_org"   => nil,
         "migration_status" => nil,
@@ -446,6 +455,7 @@
         "github_language" => nil,
         "active"          => true,
         "private"         => false,
+        "shared"          => false,
         "owner"           => {
           "@type"         => "user",
           "id"            => 1,
@@ -462,4 +472,76 @@
           "migration_status" => nil,
           "history_migration_status" => nil}]}
   end
+
+  describe "shared repository for collaborator, authenticated as user with access" do
+    before  { get("/v3/owner/johndoe/repos", {}, headers_collaborator) }
+    example { expect(last_response).to be_ok }
+    example { puts JSON.load(body); expect(JSON.load(body)).to be == {
+      "@type"                => "repositories",
+      "@href"                => "/v3/owner/johndoe/repos",
+      "@representation"      => "standard",
+      "@pagination"          => {
+        "limit"              => 100,
+        "offset"             => 0,
+        "count"              => 1,
+        "is_first"           => true,
+        "is_last"            => true,
+        "next"               => nil,
+        "prev"               => nil,
+        "first"              => {
+          "@href"            => "/v3/owner/johndoe/repos",
+          "offset"           => 0,
+          "limit"            => 100},
+          "last"             => {
+            "@href"          => "/v3/owner/johndoe/repos",
+            "offset"         => 0,
+            "limit"          => 100}},
+      "repositories"         => [{
+        "@type"              => "repository",
+        "@href"              => "/v3/repo/#{sharedrepo.id}",
+        "@representation"    => "standard",
+        "@permissions"       => {
+          "read"             => true,
+          "activate"         => true,
+          "deactivate"       => true,
+          "migrate"          => false,
+          "star"             => true,
+          "unstar"           => true,
+          "create_request"   => true,
+          "create_cron"      => true,
+          "create_env_var"   => true,
+          "create_key_pair"  => true,
+          "delete_key_pair"  => true,
+          "admin"            => false
+        },
+        "id"                 => sharedrepo.id,
+        "name"               => "sharedrepo",
+        "slug"               => "sharedrepoowner/sharedrepo",
+        "description"        => nil,
+        "github_id"          => sharedrepo.github_id,
+        "vcs_id"             => sharedrepo.vcs_id,
+        "vcs_type"           => sharedrepo.vcs_type,
+        "owner_name"         => "sharedrepoowner",
+        "vcs_name"           => "sharedrepo",
+        "github_language"    => nil,
+        "active"             => true,
+        "private"            => false,
+        "shared"             => true,
+        "owner"              => {
+          "@type"            => "user",
+          "id"               => sharedrepo.owner_id,
+          "login"            => "sharedrepoowner",
+          "@href"            => "/v3/user/#{sharedrepo.owner_id}" },
+        "default_branch"     => {
+          "@type"            => "branch",
+          "@href"            => "/v3/repo/#{sharedrepo.id}/branch/master",
+          "@representation"  => "minimal",
+          "name"             => "master"},
+          "starred"          => false,
+          "managed_by_installation"=>false,
+          "active_on_org"    => nil,
+          "migration_status" => nil,
+          "history_migration_status"  => nil
+        }]}}
+  end
 end

spec/v3/services/repository/find_spec.rb

@@ -85,6 +85,7 @@
       "github_language"    => nil,
       "active"             => true,
       "private"            => opts[:private],
+      "shared"             => false,
       "owner"              => {
         "id"               => repo.owner_id,
         "login"            => "svenfuchs",