[api] harmonize Repository.find_by name with other models

find_by_project_and_repo_name => find_by_project_and_name

src/api/app/controllers/source_controller.rb

@@ -1290,7 +1290,7 @@ def package_command_updatepatchinfo
   # POST /source/<project>/<package>?cmd=importchannel
   def package_command_importchannel
     repo=nil
-    repo=Repository.find_by_project_and_repo_name(params[:target_project], params[:target_repository]) if params[:target_project]
+    repo=Repository.find_by_project_and_name(params[:target_project], params[:target_repository]) if params[:target_project]
 
     import_channel(request.raw_post, @package, repo)
 
@@ -1599,7 +1599,7 @@ def _package_command_release_manual_target(pkg)
       if params[:target_repository].blank? or params[:repository].blank?
         raise MissingParameterError.new 'release action with specified target project needs also "repository" and "target_repository" parameter'
       end
-      targetrepo=Repository.find_by_project_and_repo_name(@target_project_name, params[:target_repository])
+      targetrepo=Repository.find_by_project_and_name(@target_project_name, params[:target_repository])
       raise UnknownRepository.new "Repository does not exist #{params[:target_repository]}" unless targetrepo
 
       repo=pkg.project.repositories.where(name: params[:repository])

src/api/app/controllers/webui/package_controller.rb

@@ -131,7 +131,7 @@ def binary
         :package => @package, :repository => @repository, :nextstatus => 404
       return
     end
-    repo = Repository.find_by_project_and_repo_name(@project.to_s, @repository.to_s)
+    repo = Repository.find_by_project_and_name(@project.to_s, @repository.to_s)
     @durl = repo.download_url_for_package(@package, @arch, @filename)
     if @durl and not file_available?( @durl )
       # ignore files not available

src/api/app/jobs/update_released_binaries.rb

@@ -8,7 +8,7 @@ def self.job_queue
 
   def perform
     pl = event.payload
-    repo = Repository.find_by_project_and_repo_name(pl['project'], pl['repo'])
+    repo = Repository.find_by_project_and_name(pl['project'], pl['repo'])
     return unless repo
     BinaryRelease.update_binary_releases(repo, pl['payload'], event.created_at)
   end

src/api/app/models/bs_request_permission_check.rb

@@ -94,7 +94,7 @@ def check_delete_accept(action)
       @target_package.can_be_deleted?
     else
       if action.target_repository
-        r=Repository.find_by_project_and_repo_name(@target_project.name, action.target_repository)
+        r=Repository.find_by_project_and_name(@target_project.name, action.target_repository)
         unless r
           raise RepositoryMissing.new "The repository #{@target_project} / #{action.target_repository} does not exist"
         end

src/api/app/models/package_build_status.rb

@@ -34,7 +34,7 @@ def check_repo_status(srep)
     archs = []
     srep.elements('path') do |p|
       if p['project'] != @pkg.project.name
-        r = Repository.find_by_project_and_repo_name(p['project'], p['repository'])
+        r = Repository.find_by_project_and_name(p['project'], p['repository'])
         r.architectures.each { |a| archs << a.name.to_s }
         trepo << [p['project'], p['repository']]
       end

src/api/app/models/product.rb

@@ -92,7 +92,7 @@ def _update_from_xml_register_pool(rxml)
       end
       u.elements('repository') do |repo|
         next if repo['project'].blank? # it may be just a url= reference
-        poolRepo = Repository.find_by_project_and_repo_name(repo['project'], repo['name'])
+        poolRepo = Repository.find_by_project_and_name(repo['project'], repo['name'])
         unless poolRepo
           errors.add(:missing, "Pool repository #{repo['project']}/#{repo['name']} missing")
           next
@@ -130,7 +130,7 @@ def _update_from_xml_register_update(rxml)
         update[key] = pu
       end
       u.elements('repository') do |repo|
-        updateRepo = Repository.find_by_project_and_repo_name(repo.get('project'), repo.get('name'))
+        updateRepo = Repository.find_by_project_and_name(repo.get('project'), repo.get('name'))
         next unless updateRepo # it might be a remote repo, which will not become indexed
         arch = repo.get('arch')
         key = updateRepo.id.to_s

src/api/app/models/project.rb

@@ -547,7 +547,7 @@ def update_one_repository_add_pathes(repo)
     #recreate pathelements from xml
     position = 1
     repo.elements('path') do |path|
-      link_repo = Repository.find_by_project_and_repo_name(path['project'], path['repository'])
+      link_repo = Repository.find_by_project_and_name(path['project'], path['repository'])
       if path['project'] == self.name &&
           path['repository'] == repo['name']
         raise SaveError, 'Using same repository as path element is not allowed'
@@ -577,7 +577,7 @@ def update_one_repository_without_path(repo)
 
     #recreate release targets from xml
     repo.elements('releasetarget') do |rt|
-      target_repo = Repository.find_by_project_and_repo_name(rt['project'], rt['repository'])
+      target_repo = Repository.find_by_project_and_name(rt['project'], rt['repository'])
       unless target_repo
         raise SaveError.new("Unknown target repository '#{rt['project']}/#{rt['repository']}'")
       end

src/api/app/models/repository.rb

@@ -63,7 +63,7 @@ def cleanup_before_destroy
   end
 
   class << self
-    def find_by_project_and_repo_name( project, repo )
+    def find_by_project_and_name( project, repo )
       result = not_remote.joins(:project).where(:projects => {:name => project}, :name => repo).first
       return result unless result.nil?
 
@@ -82,7 +82,7 @@ def find_by_project_and_path( project, path )
     end
 
     def deleted_instance
-      repo = Repository.find_by_project_and_repo_name( "deleted", "deleted" )
+      repo = Repository.find_by_project_and_name( "deleted", "deleted" )
       return repo unless repo.nil?
 
       # does not exist, so let's create it

src/api/test/unit/binary_release.rb

@@ -16,7 +16,7 @@ def teardown
   end
 
   def test_render_fixture
-    r = Repository.find_by_project_and_repo_name("BaseDistro3",
+    r = Repository.find_by_project_and_name("BaseDistro3",
                                                  "BaseDistro3_repo")
     br = BinaryRelease.where(repository: r).first
     xml = br.render_xml
@@ -73,7 +73,7 @@ def test_update_from_json_hash
              "version"=>"1.0", "release"=>"1", "repository"=>"BaseDistro3_repo",
              "name"=>"package_newweaktags", "buildtime"=>"1409642056"}]
 
-    r = Repository.find_by_project_and_repo_name("BaseDistro3", "BaseDistro3_repo")
+    r = Repository.find_by_project_and_name("BaseDistro3", "BaseDistro3_repo")
 
     BinaryRelease.update_binary_releases_via_json(r, json)
     count = BinaryRelease.all.length

src/api/test/unit/channel_test.rb

@@ -47,11 +47,11 @@ def test_parse_xml
       assert_equal 2, @channel.channel_targets.size
       ct = @channel.channel_targets.first
       assert_equal "UpdateInfoTag-%Y-%C", ct.id_template
-      assert_equal Repository.find_by_project_and_repo_name("home:Iggy", "10.2"), ct.repository
+      assert_equal Repository.find_by_project_and_name("home:Iggy", "10.2"), ct.repository
       assert_equal false, ct.disabled
       ct = @channel.channel_targets.last
       assert_nil ct.id_template
-      assert_equal Repository.find_by_project_and_repo_name("BaseDistro", "BaseDistro_repo"), ct.repository
+      assert_equal Repository.find_by_project_and_name("BaseDistro", "BaseDistro_repo"), ct.repository
       assert_equal true, ct.disabled
 
       assert_equal 1, @channel.channel_binary_lists.size
@@ -80,7 +80,7 @@ def test_parse_xml
     assert_equal 1, @channel.channel_targets.size
     ct = @channel.channel_targets.first
     assert_equal "NEW-%Y-%C", ct.id_template
-    assert_equal Repository.find_by_project_and_repo_name("home:Iggy", "10.2"), ct.repository
+    assert_equal Repository.find_by_project_and_name("home:Iggy", "10.2"), ct.repository
     assert_equal 1, @channel.channel_binary_lists.size
     cbl = @channel.channel_binary_lists.first
     assert_equal 2, cbl.channel_binaries.size