refactor code based on feedback

2 files changed, 10 insertions, 6 deletions

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 646d8329aff..f4049bbfa46 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -191,8 +191,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'),
diff --git a/app/models/project.rb b/app/models/project.rb
index 35c93aec20a..60d3e99252f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1738,7 +1738,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
@@ -1754,14 +1754,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