Add a problems err and notices in api show action

Callum Dryden
1 parent f39fed7d
Showing 2 changed files with 10 additions and 6 deletions Show diff stats
app/controllers/api/v1/problems_controller.rb
spec/controllers/api/v1/problems_controller_spec.rb
 class Api::V1::ProblemsController < ApplicationController
   respond_to :json, :xml
+  FIELDS = %w{app_id app_name environment message where first_notice_at last_notice_at resolved resolved_at notices_count}
   def show
     result = benchmark("[api/v1/problems_controller/show] query time") do
-      Problem.find(params[:id])
+      problem = Problem.only(FIELDS).find(params[:id])
+      problem.as_json(include: {errs: { include: :notices}})
     end
+
     respond_to do |format|
-      format.any(:html, :json) { render :json => Yajl.dump(result) } # render JSON if no extension specified on path
+      format.any(:html, :json) { render :json => result } # render JSON if no extension specified on path
       format.xml  { render :xml  => result }
     end
   end
   def index
     query = {}
-    fields = %w{app_id app_name environment message where first_notice_at last_notice_at resolved resolved_at notices_count}
     if params.key?(:start_date) && params.key?(:end_date)
       start_date = Time.parse(params[:start_date]).utc
@@ -23,7 +25,7 @@ class Api::V1::ProblemsController &lt; ApplicationController
     end
     results = benchmark("[api/v1/problems_controller/index] query time") do
-      Problem.where(query).with(:consistency => :strong).only(fields).to_a
+      Problem.where(query).with(:consistency => :strong).only(FIELDS).to_a
     end
     respond_to do |format|
@@ -9,7 +9,9 @@ describe Api::V1::ProblemsController do
     describe "GET /api/v1/problems/:id" do
       before do
-        Fabricate(:problem, :first_notice_at => Date.new(2012, 8, 01), :resolved_at => Date.new(2012, 8, 02))
+        notice = Fabricate(:notice)
+        err = Fabricate(:err, :notices => [notice])
+        problem = Fabricate(:problem, :errs => [err])
       end
       it "returns JSON if JSON is requested" do
@@ -20,7 +22,7 @@ describe Api::V1::ProblemsController do
       it "returns the correct problem" do
         requested_problem = Problem.first
         get :show, :auth_token => @user.authentication_token, :format => "json", :id => requested_problem.id
-        expect( response.body ).to eq(requested_problem.to_json)
+        expect( response.body ).to eq(requested_problem.to_json(include: {errs: { include: :notices}}))
       end
     end