refactor code based on feedback

app/controllers/projects_controller.rb

@@ -193,8 +193,8 @@ class ProjectsController < Projects::ApplicationController
   end
 
   def download_export
-    if @project.export_project_object_exists?
-      send_upload(@project.import_export_upload.export_file)
+    if @project.export_project_exists?
+      send_upload(@project.export_file)
     else
       redirect_to(
         edit_project_path(@project, anchor: 'js-export-project'),

app/models/project.rb

@@ -1756,7 +1756,7 @@ class Project < ActiveRecord::Base
       :started
     elsif after_export_in_progress?
       :after_export_action
-    elsif export_project_object_exists?
+    elsif export_project_exists?
       :finished
     else
       :none
@@ -1772,14 +1772,18 @@ class Project < ActiveRecord::Base
   end
 
   def remove_exports
-    return unless export_project_object_exists?
+    return unless export_project_exists?
 
     import_export_upload.remove_export_file!
     import_export_upload.save
   end
 
-  def export_project_object_exists?
-    import_export_upload&.export_file&.file
+  def export_project_exists?
+    export_file&.file
+  end
+
+  def export_file
+    import_export_upload&.export_file
   end
 
   def full_path_slug

lib/api/project_export.rb

@@ -21,8 +21,8 @@ module API
         detail 'This feature was introduced in GitLab 10.6.'
       end
       get ':id/export/download' do
-        if user_project.export_project_object_exists?
-          present_carrierwave_file!(user_project.import_export_upload.export_file)
+        if user_project.export_project_exists?
+          present_carrierwave_file!(user_ project.export_file)
         else
           render_api_error!('404 Not found or has expired', 404)
         end

lib/gitlab/import_export/after_export_strategies/base_after_export_strategy.rb

@@ -84,7 +84,7 @@ module Gitlab
         end
 
         def object_storage?
-          project.export_project_object_exists?
+          project.export_project_exists?
         end
       end
     end

lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb

@@ -44,7 +44,7 @@ module Gitlab
         end
 
         def export_file
-          project.import_export_upload.export_file.open
+           project.export_file.open
         end
 
         def send_file_options
@@ -59,7 +59,7 @@ module Gitlab
         end
 
         def export_size
-          project.import_export_upload.export_file.file.size
+           project.export_file.file.size
         end
       end
     end

lib/gitlab/import_export/saver.rb

@@ -18,7 +18,7 @@ module Gitlab
 
           Rails.logger.info("Saved project export #{archive_file}")
 
-          save_on_object_storage
+          save_upload
         else
           @shared.error(Gitlab::ImportExport::Error.new(error_message))
           false
@@ -49,7 +49,7 @@ module Gitlab
         @archive_file ||= File.join(@shared.archive_path, Gitlab::ImportExport.export_filename(project: @project))
       end
 
-      def save_on_object_storage
+      def save_upload
         upload = ImportExportUpload.find_or_initialize_by(project: @project)
 
         File.open(archive_file) { |file| upload.export_file = file }

lib/tasks/gitlab/update_templates.rake

@@ -54,7 +54,7 @@ namespace :gitlab do
       end
 
       Projects::ImportExport::ExportService.new(project, admin).execute
-      download_or_copy_upload(project.import_export_upload.export_file, template.archive_path)
+      download_or_copy_upload( project.export_file, template.archive_path)
       Projects::DestroyService.new(admin, project).execute
       puts "Exported #{template.name}".green
     end

spec/lib/gitlab/import_export/after_export_strategies/base_after_export_strategy_spec.rb

@@ -12,7 +12,7 @@ describe Gitlab::ImportExport::AfterExportStrategies::BaseAfterExportStrategy do
     end
 
     it 'returns if project exported file is not found' do
-      allow(project).to receive(:export_project_object_exists?).and_return(false)
+      allow(project).to receive(:export_project_exists?).and_return(false)
 
       expect(service).not_to receive(:strategy_execute)
 

spec/models/project_spec.rb

@@ -3151,7 +3151,7 @@ describe Project do
     it 'removes the export' do
       project.remove_exports
 
-      expect(project.export_project_object_exists?).to be_falsey
+      expect(project.export_project_exists?).to be_falsey
     end
   end
 

spec/requests/api/project_export_spec.rb

@@ -189,7 +189,7 @@ describe API::ProjectExport do
         end
 
         it 'has removed the export' do
-          expect(project_after_export.export_project_object_exists?).to be_falsey
+          expect(project_after_export.export_project_exists?).to be_falsey
         end
 
         it_behaves_like '404 response' do

spec/support/import_export/export_file_helper.rb

@@ -52,7 +52,7 @@ module ExportFileHelper
   # Expands the compressed file for an exported project into +tmpdir+
   def in_directory_with_expanded_export(project)
     Dir.mktmpdir do |tmpdir|
-      export_file = project.import_export_upload.export_file.path
+      export_file =  project.export_file.path
       _output, exit_status = Gitlab::Popen.popen(%W{tar -zxf #{export_file} -C #{tmpdir}})
 
       yield(exit_status, tmpdir)