Commit 37fc518c authored by Sean McGivern's avatar Sean McGivern

Merge branch 'conan-packages-dedup-methods' into 'master'

Deduplicate conan package methods

See merge request gitlab-org/gitlab!24755
parents f1182aea 5f5b6bf6
...@@ -294,24 +294,22 @@ module API ...@@ -294,24 +294,22 @@ module API
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
include ::API::Helpers::RelatedResourcesHelpers include ::API::Helpers::RelatedResourcesHelpers
def present_package_download_urls def present_download_urls(entity)
authorize!(:read_package, project) authorize!(:read_package, project)
presenter = ::Packages::Conan::PackagePresenter.new(recipe, current_user, project) presenter = ::Packages::Conan::PackagePresenter.new(recipe, current_user, project)
render_api_error!("No recipe manifest found", 404) if presenter.package_urls.empty? render_api_error!("No recipe manifest found", 404) if yield(presenter).empty?
present presenter, with: EE::API::Entities::ConanPackage::ConanPackageManifest present presenter, with: entity
end end
def present_recipe_download_urls def present_package_download_urls
authorize!(:read_package, project) present_download_urls(EE::API::Entities::ConanPackage::ConanPackageManifest, &:package_urls)
end
presenter = ::Packages::Conan::PackagePresenter.new(recipe, current_user, project)
render_api_error!("No recipe manifest found", 404) if presenter.recipe_urls.empty?
present presenter, with: EE::API::Entities::ConanPackage::ConanRecipeManifest def present_recipe_download_urls
present_download_urls(EE::API::Entities::ConanPackage::ConanRecipeManifest, &:recipe_urls)
end end
def recipe_upload_urls(file_names) def recipe_upload_urls(file_names)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment