ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add attachment object to account reports api 

closes PS-438

test plan
 - do a GET to an account report
 - the results should include the attachment object

Change-Id: I260b7a445c606877882d567a10348e5838392523
Reviewed-on: https://gerrit.instructure.com/21686
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Tyler Belnap <tyler@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
This commit is contained in:
Rob Orton 2013-06-24 12:12:55 -06:00
parent 6c7598144d
commit 112d70cc6c
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/api/v1/account_report.rb
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2012 Instructure, Inc.
# Copyright (C) 2012 - 2013 Instructure, Inc.
#
# This file is part of Canvas.
#
@ -18,6 +18,7 @@
module Api::V1::AccountReport
include Api::V1::Json
include Api::V1::Attachment
def account_reports_json(reports, user, session)
reports.map do |f|
@ -31,8 +32,10 @@ module Api::V1::AccountReport
)
json[:status] = report.workflow_state
json[:report] = report.report_type
json[:file_url] = (report.attachment.nil? ? nil : "https://#{HostUrl.context_host(report.account)}/accounts/#{report.account.id}/files/#{report.attachment.id}/download")
json[:file_url] = (report.attachment.nil? ? nil : "https://#{HostUrl.context_host(report.account.root_account)}/accounts/#{report.account_id}/files/#{report.attachment.id}/download")
if report.attachment
json[:attachment] = attachment_json(report.attachment, user, :host => HostUrl.context_host(report.account.root_account))
end
json
end
end

6
spec/apis/v1/account_reports_api_spec.rb
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2012 Instructure, Inc.
# Copyright (C) 2012 - 2013 Instructure, Inc.
#
# This file is part of Canvas.
#
@ -89,7 +89,9 @@ describe 'Account Reports API', :type => :integration do
json['id'].should == @report.id
json['status'].should == @report.workflow_state
json['progress'].should == @report.progress
json['file_url'].should == "https://#{HostUrl.context_host(@admin.account)}/accounts/#{@admin.account.id}/files/#{@report.attachment.id}/download"
json['file_url'].should == "https://#{HostUrl.context_host(@admin.account)}/accounts/#{@admin.account.id}/files/#{@report.attachment_id}/download"
#test that attachment object is here, no need to test attachment json
json['attachment']['id'].should == @report.attachment_id
@report.parameters.each do |key, value|
json['parameters'][key].should == value
end