1 files changed, 31 insertions, 14 deletions

diff --git a/lib/gitlab/github_import/clients/search_repos.rb b/lib/gitlab/github_import/clients/search_repos.rb
index b72e5ac7751..a2ef6ca24eb 100644
--- a/lib/gitlab/github_import/clients/search_repos.rb
+++ b/lib/gitlab/github_import/clients/search_repos.rb
@@ -5,24 +5,24 @@ module Gitlab
     module Clients
       module SearchRepos
         def search_repos_by_name_graphql(name, options = {})
-          with_retry do
-            octokit.post(
-              '/graphql',
-              { query: graphql_search_repos_body(name, options) }.to_json
-            ).to_h
-          end
+          graphql_request(graphql_search_repos_body(name, options))
+        end
+
+        def count_repos_by_relation_type_graphql(options)
+          graphql_request(count_by_relation_type_query(options))
         end
 
-        def search_repos_by_name(name, options = {})
-          search_query = search_repos_query(name, options)
+        private
 
+        def graphql_request(query)
           with_retry do
-            octokit.search_repositories(search_query, options).to_h
+            octokit.post(
+              '/graphql',
+              { query: query }.to_json
+            ).to_h
           end
         end
 
-        private
-
         def graphql_search_repos_body(name, options)
           query = search_repos_query(name, options)
           query = "query: \"#{query}\""
@@ -45,14 +45,15 @@ module Gitlab
                       endCursor
                       hasNextPage
                       hasPreviousPage
-                  }
+                  },
+                  repositoryCount
               }
           }
           TEXT
         end
 
         def search_repos_query(string, options = {})
-          base = "#{string} in:name is:public,private"
+          base = "#{string} in:name is:public,private fork:true"
 
           case options[:relation_type]
           when 'organization' then organization_repos_query(base, options)
@@ -64,7 +65,11 @@ module Gitlab
         end
 
         def organization_repos_query(search_string, options)
-          "#{search_string} org:#{options[:organization_login]}"
+          if options[:organization_login].present?
+            "#{search_string} org:#{options[:organization_login]}"
+          else
+            organizations_subquery
+          end
         end
 
         def collaborated_repos_query(search_string)
@@ -95,6 +100,18 @@ module Gitlab
             .map { |org| "org:#{org[:login]}" }
             .join(' ')
         end
+
+        def count_by_relation_type_query(options)
+          query = search_repos_query(nil, options)
+          query = "query: \"#{query}\""
+          <<-TEXT
+          {
+            search(type: REPOSITORY, #{query}) {
+              repositoryCount
+            }
+          }
+          TEXT
+        end
       end
     end
   end