tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed type and added sort param

Browse Source
This commit is contained in:
amartynov 2014-12-03 14:52:14 +03:00
parent 0887a8c8fc
commit 1addbe31b4
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devops-service/db/mongo/mongo_connector.rb
View File

@ -389,6 +389,18 @@ class MongoConnector
options.delete("date_to") options.delete("date_to")
options["created_at"] = date unless date.empty? options["created_at"] = date unless date.empty?
end end
if options.has_key?("type")
begin
options["type"] = Integer(options["type"])
rescue ArgumentError
options.delete("type")
end
end
sort = -1
if options.has_key?("sort")
sort = 1 if options["sort"] == "asc"
options.delete("sort")
end
@reports.find(options).to_a.map{|e| Report.new(e)} @reports.find(options).to_a.map{|e| Report.new(e)}
end end

2
devops-service/report.rb
View File

@ -11,7 +11,7 @@ class ReportRoutes < Sinatra::Base
get "/all" do get "/all" do
options = {} options = {}
["project", "deploy_env", "type", "created_by", "date_from", "date_to"].each do |k| ["project", "deploy_env", "type", "created_by", "date_from", "date_to", "sort"].each do |k|
options[k] = params[k] unless params[k].nil? options[k] = params[k] unless params[k].nil?
end end
json DevopsService.mongo.reports(options).map{|r| r.to_hash} json DevopsService.mongo.reports(options).map{|r| r.to_hash}