Move where=[] to filters=[]

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 738ad67bec7ed3246249919d3ad1eb665f019133..d8c4d4c84cd4164555f6f04a81b75d0de9f036aa 100644 (file)
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -10,6 +10,7 @@ class ApplicationController < ActionController::Base
   before_filter :catch_redirect_hint
 
   before_filter :load_where_param, :only => :index
+  before_filter :load_filters_param, :only => :index
   before_filter :find_objects_for_index, :only => :index
   before_filter :find_object_by_uuid, :except => [:index, :create,
                                                   :render_error,
@@ -107,16 +108,30 @@ class ApplicationController < ActionController::Base
   def load_where_param
     if params[:where].nil? or params[:where] == ""
       @where = {}
-    elsif params[:where].is_a? Hash or params[:where].is_a? Array
+    elsif params[:where].is_a? Hash
       @where = params[:where]
     elsif params[:where].is_a? String
       begin
         @where = Oj.load(params[:where])
+        raise unless @where.is_a? Hash
       rescue
         raise ArgumentError.new("Could not parse \"where\" param as an object")
       end
     end
-    @where = @where.with_indifferent_access if @where.is_a? Hash
+    @where = @where.with_indifferent_access
+  end
+
+  def load_filters_param
+    if params[:filters].is_a? Array
+      @filters = params[:filters]
+    elsif params[:filters].is_a? String
+      begin
+        @filters = Oj.load params[:filters]
+        raise unless @filters.is_a? Array
+      rescue
+        raise ArgumentError.new("Could not parse \"filters\" param as an array")
+      end
+    end
   end
 
   def find_objects_for_index
@@ -125,10 +140,10 @@ class ApplicationController < ActionController::Base
   end
 
   def apply_where_limit_order_params
-    if @where.is_a? Array and @where.any?
+    if @filters.is_a? Array and @filters.any?
       cond_out = []
       param_out = []
-      @where.each do |attr, operator, operand|
+      @filters.each do |attr, operator, operand|
         if !model_class.searchable_columns.index attr.to_s
           raise ArgumentError.new("Invalid attribute '#{attr}' in condition")
         end
@@ -136,6 +151,10 @@ class ApplicationController < ActionController::Base
         when '=', '<', '<=', '>', '>=', 'like'
           if operand.is_a? String
             cond_out << "#{table_name}.#{attr} #{operator} ?"
+            if operator.match(/[<=>]/) and
+                model_class.attribute_column(attr).type == :datetime
+              operand = Time.parse operand
+            end
             param_out << operand
           end
         when 'in'
@@ -148,7 +167,8 @@ class ApplicationController < ActionController::Base
       if cond_out.any?
         @objects = @objects.where(cond_out.join(' AND '), *param_out)
       end
-    elsif @where.is_a? Hash and @where.any?
+    end
+    if @where.is_a? Hash and @where.any?
       conditions = ['1=1']
       @where.each do |attr,value|
         if attr == :any

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index 8ee14b793667f86e44a6fbb311fbee402689a14b..9475f0dd1d5d819b832ba460986f348887cc38c8 100644 (file)
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -40,12 +40,16 @@ class ArvadosModel < ActiveRecord::Base
 
   def self.searchable_columns
     self.columns.collect do |col|
-      if [:string, :text].index(col.type) && col.name != 'owner_uuid'
+      if [:string, :text, :datetime].index(col.type) && col.name != 'owner_uuid'
         col.name
       end
     end.compact
   end
 
+  def self.attribute_column attr
+    self.columns.select { |col| col.name == attr.to_s }.first
+  end
+
   def eager_load_associations
     self.class.columns.each do |col|
       re = col.name.match /^(.*)_kind$/

diff --git a/services/api/test/functional/arvados/v1/jobs_controller_test.rb b/services/api/test/functional/arvados/v1/jobs_controller_test.rb
index 2b508834a753f62ce133099fde2ccdc6ebeacc48..91f867a15cda4c934e9ce86ec42a1c76b0932bf6 100644 (file)
--- a/services/api/test/functional/arvados/v1/jobs_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/jobs_controller_test.rb
@@ -107,7 +107,7 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
   test "search jobs by uuid with >= query" do
     authorize_with :active
     get :index, {
-      where: [['uuid', '>=', 'zzzzz-8i9sb-pshmckwoma9plh7']]
+      filters: [['uuid', '>=', 'zzzzz-8i9sb-pshmckwoma9plh7']]
     }
     assert_response :success
     found = assigns(:objects).collect(&:uuid)
@@ -118,7 +118,7 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
   test "search jobs by uuid with <= query" do
     authorize_with :active
     get :index, {
-      where: [['uuid', '<=', 'zzzzz-8i9sb-pshmckwoma9plh7']]
+      filters: [['uuid', '<=', 'zzzzz-8i9sb-pshmckwoma9plh7']]
     }
     assert_response :success
     found = assigns(:objects).collect(&:uuid)
@@ -129,7 +129,7 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
   test "search jobs by uuid with >= and <= query" do
     authorize_with :active
     get :index, {
-      where: [['uuid', '>=', 'zzzzz-8i9sb-pshmckwoma9plh7'],
+      filters: [['uuid', '>=', 'zzzzz-8i9sb-pshmckwoma9plh7'],
               ['uuid', '<=', 'zzzzz-8i9sb-pshmckwoma9plh7']]
     }
     assert_response :success
@@ -140,7 +140,7 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
   test "search jobs by uuid with < query" do
     authorize_with :active
     get :index, {
-      where: [['uuid', '<', 'zzzzz-8i9sb-pshmckwoma9plh7']]
+      filters: [['uuid', '<', 'zzzzz-8i9sb-pshmckwoma9plh7']]
     }
     assert_response :success
     found = assigns(:objects).collect(&:uuid)
@@ -151,7 +151,7 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
   test "search jobs by uuid with like query" do
     authorize_with :active
     get :index, {
-      where: [['uuid', 'like', '%hmckwoma9pl%']]
+      filters: [['uuid', 'like', '%hmckwoma9pl%']]
     }
     assert_response :success
     found = assigns(:objects).collect(&:uuid)
@@ -161,8 +161,8 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
   test "search jobs by uuid with 'in' query" do
     authorize_with :active
     get :index, {
-      where: [['uuid', 'in', ['zzzzz-8i9sb-4cf0nhn6xte809j',
-                              'zzzzz-8i9sb-pshmckwoma9plh7']]]
+      filters: [['uuid', 'in', ['zzzzz-8i9sb-4cf0nhn6xte809j',
+                                'zzzzz-8i9sb-pshmckwoma9plh7']]]
     }
     assert_response :success
     found = assigns(:objects).collect(&:uuid)
@@ -173,7 +173,7 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
   test "search jobs by nonexistent column with < query" do
     authorize_with :active
     get :index, {
-      where: [['is_borked', '<', 'fizzbuzz']]
+      filters: [['is_borked', '<', 'fizzbuzz']]
     }
     assert_response 422
   end