Commit f1277fbf authored by James Lopez's avatar James Lopez

refactor code based on feedback

parent 27442862
...@@ -191,7 +191,7 @@ class ProjectsController < Projects::ApplicationController ...@@ -191,7 +191,7 @@ class ProjectsController < Projects::ApplicationController
end end
def download_export def download_export
if @project.export_project_exists? if @project.export_file_exists?
send_upload(@project.export_file) send_upload(@project.export_file)
else else
redirect_to( redirect_to(
......
...@@ -1738,7 +1738,7 @@ class Project < ActiveRecord::Base ...@@ -1738,7 +1738,7 @@ class Project < ActiveRecord::Base
:started :started
elsif after_export_in_progress? elsif after_export_in_progress?
:after_export_action :after_export_action
elsif export_project_exists? elsif export_file_exists?
:finished :finished
else else
:none :none
...@@ -1754,13 +1754,13 @@ class Project < ActiveRecord::Base ...@@ -1754,13 +1754,13 @@ class Project < ActiveRecord::Base
end end
def remove_exports def remove_exports
return unless export_project_exists? return unless export_file_exists?
import_export_upload.remove_export_file! import_export_upload.remove_export_file!
import_export_upload.save import_export_upload.save
end end
def export_project_exists? def export_file_exists?
export_file&.file export_file&.file
end end
......
...@@ -21,8 +21,8 @@ module API ...@@ -21,8 +21,8 @@ module API
detail 'This feature was introduced in GitLab 10.6.' detail 'This feature was introduced in GitLab 10.6.'
end end
get ':id/export/download' do get ':id/export/download' do
if user_project.export_project_exists? if user_project.export_file_exists?
present_carrierwave_file!(user_ project.export_file) present_carrierwave_file!(user_project.export_file)
else else
render_api_error!('404 Not found or has expired', 404) render_api_error!('404 Not found or has expired', 404)
end end
......
...@@ -53,7 +53,7 @@ module Gitlab ...@@ -53,7 +53,7 @@ module Gitlab
end end
def self.lock_file_path(project) def self.lock_file_path(project)
return unless project.export_path || object_storage? return unless project.export_path || export_file_exists?
lock_path = project.import_export_shared.archive_path lock_path = project.import_export_shared.archive_path
...@@ -83,8 +83,8 @@ module Gitlab ...@@ -83,8 +83,8 @@ module Gitlab
errors.full_messages.each { |msg| project.import_export_shared.add_error_message(msg) } errors.full_messages.each { |msg| project.import_export_shared.add_error_message(msg) }
end end
def object_storage? def export_file_exists?
project.export_project_exists? project.export_file_exists?
end end
end end
end end
......
...@@ -54,7 +54,7 @@ namespace :gitlab do ...@@ -54,7 +54,7 @@ namespace :gitlab do
end end
Projects::ImportExport::ExportService.new(project, admin).execute Projects::ImportExport::ExportService.new(project, admin).execute
download_or_copy_upload( project.export_file, template.archive_path) download_or_copy_upload(project.export_file, template.archive_path)
Projects::DestroyService.new(admin, project).execute Projects::DestroyService.new(admin, project).execute
puts "Exported #{template.name}".green puts "Exported #{template.name}".green
end end
......
...@@ -12,7 +12,7 @@ describe Gitlab::ImportExport::AfterExportStrategies::BaseAfterExportStrategy do ...@@ -12,7 +12,7 @@ describe Gitlab::ImportExport::AfterExportStrategies::BaseAfterExportStrategy do
end end
it 'returns if project exported file is not found' do it 'returns if project exported file is not found' do
allow(project).to receive(:export_project_exists?).and_return(false) allow(project).to receive(:export_file_exists?).and_return(false)
expect(service).not_to receive(:strategy_execute) expect(service).not_to receive(:strategy_execute)
......
...@@ -2859,7 +2859,7 @@ describe Project do ...@@ -2859,7 +2859,7 @@ describe Project do
it 'removes the export' do it 'removes the export' do
project.remove_exports project.remove_exports
expect(project.export_project_exists?).to be_falsey expect(project.export_file_exists?).to be_falsey
end end
end end
......
...@@ -189,7 +189,7 @@ describe API::ProjectExport do ...@@ -189,7 +189,7 @@ describe API::ProjectExport do
end end
it 'has removed the export' do it 'has removed the export' do
expect(project_after_export.export_project_exists?).to be_falsey expect(project_after_export.export_file_exists?).to be_falsey
end end
it_behaves_like '404 response' do it_behaves_like '404 response' do
......
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