From 1addbe31b4d7c34b7ea50a7845f8f41af92b0a43 Mon Sep 17 00:00:00 2001 From: amartynov Date: Wed, 3 Dec 2014 14:52:14 +0300 Subject: [PATCH] fixed type and added sort param --- devops-service/db/mongo/mongo_connector.rb | 12 ++++++++++++ devops-service/report.rb | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/devops-service/db/mongo/mongo_connector.rb b/devops-service/db/mongo/mongo_connector.rb index a3f7ca5..efcc49a 100644 --- a/devops-service/db/mongo/mongo_connector.rb +++ b/devops-service/db/mongo/mongo_connector.rb @@ -389,6 +389,18 @@ class MongoConnector options.delete("date_to") options["created_at"] = date unless date.empty? 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)} end diff --git a/devops-service/report.rb b/devops-service/report.rb index 65f4eae..566e07d 100644 --- a/devops-service/report.rb +++ b/devops-service/report.rb @@ -11,7 +11,7 @@ class ReportRoutes < Sinatra::Base get "/all" do 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? end json DevopsService.mongo.reports(options).map{|r| r.to_hash}