Inherit from BaseService

Change MetricsDashboard::Service to inherit from BaseService so that
it can reuse methods like initialize, success, error.

1 files changed, 13 insertions, 3 deletions

diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 69ceeab5b99..25815b92a0f 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -162,9 +162,19 @@ class Projects::EnvironmentsController < Projects::ApplicationController
 
     respond_to do |format|
       format.json do
-        dashboard = Gitlab::MetricsDashboard::Service.new(@project).get_dashboard
-
-        render json: dashboard, status: :ok
+        result = Gitlab::MetricsDashboard::Service.new(@project).get_dashboard
+
+        if result[:status] == :success
+          render status: :ok, json: {
+            status: :success,
+            dashboard: result[:dashboard]
+          }
+        else
+          render status: result[:http_status] || :bad_request, json: {
+            message: result[:message],
+            status: result[:status]
+          }
+        end
       end
     end
   end