Skip to content

Commit

Permalink
Avoid querying the database for request sources
Browse files Browse the repository at this point in the history
They may be a remote project and we can query the backend
for it to create a link

Fixes #8779
  • Loading branch information
coolo committed Nov 26, 2019
1 parent a2ec232 commit 34da543
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions src/api/app/models/staging/staged_requests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -116,22 +116,19 @@ def link_package(bs_request_action)
return
end

source_package = Package.get_by_project_and_name!(bs_request_action.source_project,
bs_request_action.source_package)

query_options = { expand: 1 }
query_options = { expand: 1, project: bs_request_action.source_project, package: bs_request_action.source_package }
query_options[:rev] = bs_request_action.source_rev if bs_request_action.source_rev

backend_package_information = source_package.dir_hash(query_options)
backend_package_information = Directory.hashed(query_options)

source_vrev = backend_package_information['vrev']

package_rev = backend_package_information['srcmd5']

link_package = Package.create!(project: staging_project, name: bs_request_action.target_package)

create_link(staging_project.name, link_package.name, User.session!, project: source_package.project.name,
package: source_package.name, rev: package_rev,
create_link(staging_project.name, link_package.name, User.session!, project: bs_request_action.source_project,
package: bs_request_action.source_package, rev: package_rev,
vrev: source_vrev)
end

Expand Down

0 comments on commit 34da543

Please sign in to comment.