add import status endpoint

1 files changed, 18 insertions, 8 deletions

diff --git a/lib/api/project_import.rb b/lib/api/project_import.rb
index 5a4e4189a58..d554d6d12bd 100644
--- a/lib/api/project_import.rb
+++ b/lib/api/project_import.rb
@@ -16,12 +16,13 @@ module API
       not_found! unless Gitlab::CurrentSettings.import_sources.include?('gitlab_project')
     end
 
-    params do
-      requires :path, type: String, desc: 'The new project path and name'
-      optional :namespace, type: String, desc: 'The ID or name of the namespace that the project will be imported into. Defaults to the user namespace.'
-      requires :file, type: File, desc: 'The project export file to be imported'
-    end
-    resource :projects do
+    resource :projects, requirements: { id: %r{[^/]+} } do
+
+      params do
+        requires :path, type: String, desc: 'The new project path and name'
+        optional :namespace, type: String, desc: 'The ID or name of the namespace that the project will be imported into. Defaults to the user namespace.'
+        requires :file, type: File, desc: 'The project export file to be imported'
+      end
       desc 'Get export status' do
         success Entities::ProjectImportStatus
       end
@@ -40,13 +41,22 @@ module API
 
         project_params = import_params.merge(namespace_id: namespace.id,
                                              file: import_params[:file]['tempfile'])
-
         project = ::Projects::GitlabProjectsImportService.new(current_user, project_params).execute
 
-        render_api_error!(project.full_messages.first, 400) unless project.saved?
+        render_api_error!(project&.full_messages&.first, 400) unless project&.saved?
 
         present project, with: Entities::ProjectImportStatus
       end
+
+      params do
+        requires :id, type: String, desc: 'The ID of a project'
+      end
+      desc 'Get export status' do
+        success Entities::ProjectImportStatus
+      end
+      get ':id/import' do
+        present user_project, with: Entities::ProjectImportStatus
+      end
     end
   end
 end