Refactor status API controller

* Due to the removal of the SelfMonitoringProjectCreateWorker.status
method, refactor the controller.

app/controllers/admin/application_settings_controller.rb

@@ -87,13 +87,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   def status_create_self_monitoring_project
     return self_monitoring_project_not_implemented unless Feature.enabled?(:self_monitoring_project)
 
-    job_id = params[:job_id]
-
-    unless job_id.present? && job_id.is_a?(String)
-      return render status: :bad_request, json: {
-        message: _('"job_id" must be an alphanumeric value')
-      }
-    end
+    job_id = params[:job_id].to_s
 
     unless job_id.length <= PARAM_JOB_ID_MAX_SIZE
       return render status: :bad_request, json: {
@@ -102,29 +96,19 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       }
     end
 
-    ::Gitlab::PollingInterval.set_header(response, interval: 3_000)
-
-    result = SelfMonitoringProjectCreateWorker.status(job_id)
+    if Gitlab::CurrentSettings.instance_administration_project_id.present?
+      render status: :ok, json: self_monitoring_data
 
-    if [:in_progress, :unknown].include?(result[:status])
-      render status: :accepted, json: result
+    elsif SelfMonitoringProjectCreateWorker.in_progress?(job_id)
+      ::Gitlab::PollingInterval.set_header(response, interval: 3_000)
 
-    elsif result[:status] == :completed
-      data = result[:output].merge(self_monitoring_data)
+      render status: :accepted, json: { message: _('Job is in progress') }
 
-      render status: :ok, json: data
     else
-      message = _('SelfMonitoringProjectCreateWorker#status returned unknown status "%{status}"') %
-        { status: result[:status] }
-      raise_exception_for_dev(
-        message,
-        { return_value: result }
-      )
-
-      render(
-        status: :internal_server_error,
-        json: { message: message }
-      )
+      render status: :bad_request, json: {
+        message: _('Self-monitoring project does not exist. Please check logs ' \
+          'for any error messages')
+      }
     end
   end
 
@@ -137,13 +121,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     }
   end
 
-  def raise_exception_for_dev(message, extra = {})
-    Gitlab::ErrorTracking.track_and_raise_for_dev_exception(
-      StandardError.new(message),
-      extra
-    )
-  end
-
   def self_monitoring_project_not_implemented
     render(
       status: :not_implemented,

locale/gitlab.pot

@@ -65,9 +65,6 @@ msgstr ""
 msgid "\"%{path}\" did not exist on \"%{ref}\""
 msgstr ""
 
-msgid "\"job_id\" must be an alphanumeric value"
-msgstr ""
-
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
@@ -10194,6 +10191,9 @@ msgstr ""
 msgid "Job has wrong arguments format."
 msgstr ""
 
+msgid "Job is in progress"
+msgstr ""
+
 msgid "Job is missing the `model_type` argument."
 msgstr ""
 
@@ -16220,7 +16220,7 @@ msgstr ""
 msgid "Self-monitoring is not enabled on this GitLab server, contact your administrator."
 msgstr ""
 
-msgid "SelfMonitoringProjectCreateWorker#status returned unknown status \"%{status}\""
+msgid "Self-monitoring project does not exist. Please check logs for any error messages"
 msgstr ""
 
 msgid "Send a separate email notification to Developers."

spec/requests/self_monitoring_project_spec.rb

@@ -85,23 +85,7 @@ describe 'Self-Monitoring project requests' do
       end
 
       context 'with feature flag enabled' do
-        it 'calls .status' do
-          expect(worker_class).to receive(:status).with(job_id).and_call_original
-
-          subject
-        end
-
-        it 'sets polling header' do
-          expect(::Gitlab::PollingInterval).to receive(:set_header)
-
-          subject
-        end
-
         context 'with invalid job_id' do
-          it_behaves_like 'handles missing or invalid job_id', nil
-          it_behaves_like 'handles missing or invalid job_id', job_id: nil
-          it_behaves_like 'handles missing or invalid job_id', job_id: [2]
-
           it 'returns bad_request if job_id too long' do
             get status_create_self_monitoring_project_admin_application_settings_path,
               params: { job_id: 'a' * 51 }
@@ -114,89 +98,74 @@ describe 'Self-Monitoring project requests' do
           end
         end
 
-        context 'different status values' do
+        context 'when self-monitoring project exists' do
+          let(:project) { build(:project) }
+
           before do
-            allow(worker_class).to receive(:status).and_return(status)
+            stub_application_setting(instance_administration_project_id: 1)
+            stub_application_setting(instance_administration_project: project)
           end
 
-          context 'when status returns in_progress' do
-            let(:status) { { status: :in_progress } }
+          it 'does not need job_id' do
+            get status_create_self_monitoring_project_admin_application_settings_path
 
-            it 'returns status accepted' do
-              subject
-
-              aggregate_failures do
-                expect(response).to have_gitlab_http_status(:accepted)
-                expect(json_response).to eq('status' => 'in_progress')
-              end
+            aggregate_failures do
+              expect(response).to have_gitlab_http_status(:success)
+              expect(json_response).to eq(
+                'project_id' => 1,
+                'project_full_path' => project.full_path
+              )
             end
           end
 
-          context 'when status returns unknown' do
-            let(:status) { { status: :unknown, message: 'message' } }
-
-            it 'returns accepted' do
-              subject
+          it 'returns success' do
+            subject
 
-              aggregate_failures do
-                expect(response).to have_gitlab_http_status(:accepted)
-                expect(json_response).to eq(
-                  'status' => 'unknown',
-                  'message' => 'message'
-                )
-              end
+            aggregate_failures do
+              expect(response).to have_gitlab_http_status(:success)
+              expect(json_response).to eq(
+                'project_id' => 1,
+                'project_full_path' => project.full_path
+              )
             end
           end
+        end
 
-          context 'when status returns completed' do
-            let(:status) { { status: :completed, output: { status: :success } } }
-            let(:project) { build(:project) }
+        context 'when job is in progress' do
+          before do
+            allow(worker_class).to receive(:in_progress?)
+              .with(job_id)
+              .and_return(true)
+          end
 
-            before do
-              stub_application_setting(instance_administration_project_id: 2)
-              stub_application_setting(instance_administration_project: project)
-            end
+          it 'sets polling header' do
+            expect(::Gitlab::PollingInterval).to receive(:set_header)
 
-            it 'returns output' do
-              subject
-
-              aggregate_failures do
-                expect(response).to have_gitlab_http_status(:success)
-                expect(json_response).to eq(
-                  'status' => 'success',
-                  'project_id' => 2,
-                  'project_full_path' => project.full_path
-                )
-              end
-            end
+            subject
           end
 
-          context 'when unexpected status is returned' do
-            let(:status) { { status: :unexpected_status } }
+          it 'returns accepted' do
+            subject
 
-            it 'raises error' do
-              expect { subject }.to raise_error(
-                StandardError, 'SelfMonitoringProjectCreateWorker#status returned ' \
-                  'unknown status "unexpected_status"'
-              )
+            aggregate_failures do
+              expect(response).to have_gitlab_http_status(:accepted)
+              expect(json_response).to eq('message' => 'Job is in progress')
             end
+          end
+        end
+
+        context 'when self-monitoring project and job do not exist' do
+          let(:job_id) { nil }
+
+          it 'returns bad_request' do
+            subject
 
-            context 'in production' do
-              before do
-                stub_rails_env('production')
-              end
-
-              it 'returns internal_server_error' do
-                subject
-
-                aggregate_failures do
-                  expect(response).to have_gitlab_http_status(:internal_server_error)
-                  expect(json_response).to eq(
-                    'message' => 'SelfMonitoringProjectCreateWorker#status returned ' \
-                      'unknown status "unexpected_status"'
-                  )
-                end
-              end
+            aggregate_failures do
+              expect(response).to have_gitlab_http_status(:bad_request)
+              expect(json_response).to eq(
+                'message' => 'Self-monitoring project does not exist. Please check ' \
+                  'logs for any error messages'
+              )
             end
           end
         end

spec/support/shared_examples/requests/self_monitoring_shared_examples.rb

@@ -18,17 +18,6 @@ RSpec.shared_examples 'not accessible if feature flag is disabled' do
   end
 end
 
-RSpec.shared_examples 'handles missing or invalid job_id' do |job_id_param|
-  it "returns bad_request for #{job_id_param}" do
-    get status_create_self_monitoring_project_admin_application_settings_path, params: job_id_param
-
-    aggregate_failures do
-      expect(response).to have_gitlab_http_status(:bad_request)
-      expect(json_response).to eq('message' => '"job_id" must be an alphanumeric value')
-    end
-  end
-end
-
 RSpec.shared_examples 'not accessible to non-admin users' do
   context 'with unauthenticated user' do
     it 'redirects to signin page' do