graphql-rails-api 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3613d8a2bc521ba1e8c8cdcc120b72ac56b5d6db12ac829c21d608605164aef4
-  data.tar.gz: 8365841223a6f4390e8fdbd870d5f3a48d1982b69dba3d1eb05b385dd54eb509
+  metadata.gz: 1bb023539d96953816444d9bfb1c00a93143e7bf78bb6bd01fbdc90a2c8f9c52
+  data.tar.gz: fa272ef8fc02dd009221281694d1f567c4a3d3ef62a45d0129e5477cb145ba37
 SHA512:
-  metadata.gz: 3bb630bcffe4434a46f1e9eeba4ef1f601f6dc77bc0bd1df8089249141b4997e7afc5e8ea8bd018e415cf02ba1b9f1efbef9f86ffe20b4f70bfd9231767fc3f4
-  data.tar.gz: '09c3d6d3967e433b58746f125ec9071024fe18609f42d91cee150c88017ec63d0c15abd4d0102f19ab042ca3f812298f86482d9575139248dd5ce4b5fb0e3b4a'
+  metadata.gz: d72815cf15edf05a92ac0c49752acebb7f390999232caec1d7960b8d486f96b27e2a1cce616470e7627814a6f5161101a2c7f0c5af6d741d52186fe7371fe587
+  data.tar.gz: dc1a6d286bf8cfe6d6a2a2bb2398906f0ee860079d7acf46f88134dba05aa2775f227506fa978d05b696ac320357d9e8e653c313761a03cb55a9422e3b43b07d

data/lib/graphql/hydrate_query.rb

@@ -58,7 +58,7 @@ module Graphql
       return if @order_by.blank?
 
       sign = @order_by.split(" ").last.downcase == "desc" ? "desc" : "asc"
-      column = @order_by.split(" ").first.strip
+      column = @order_by.split(" ").first.strip.underscore
 
       if column.include?(".")
         associated_model = column.split(".").first
@@ -120,6 +120,8 @@ module Graphql
         handle_LessNode(node, model)
       elsif node.instance_of?(RKelly::Nodes::GreaterNode)
         handle_GreaterNode(node, model)
+      elsif node.instance_of?(RKelly::Nodes::ModulusNode)
+        handle_ModulusNode(node, model)
       else
         raise GraphQL::ExecutionError, "Invalid filter: #{node.class} unknown operator"
       end
@@ -174,9 +176,17 @@ module Graphql
       if node.instance_of?(RKelly::Nodes::StringNode)
         val = node.value.gsub(/^'|'$|^"|"$/, "")
         if sym_type == :datetime
-          DateTime.parse(val)
+          begin
+            DateTime.parse(val)
+          rescue
+            val
+          end
         elsif sym_type == :date
-          Date.parse(val)
+          begin
+            DateTime.parse(val)
+          rescue
+            val
+          end
         elsif sym_type == :integer
           # Enums are handled here : We are about to compare a string with an integer column
           # If the symbol and the value correspond to an existing enum into the model
@@ -208,6 +218,7 @@ module Graphql
 
     def handle_NotEqualNode(node, model)
       arel_field, model, type, value = handle_operator_node(node, model)
+      arel_field.name = arel_field.name.underscore
 
       if value.nil?
         model.where.not(arel_field.eq(nil))
@@ -220,6 +231,7 @@ module Graphql
 
     def handle_NotStrictEqualNode(node, model)
       arel_field, model, type, value = handle_operator_node(node, model)
+      arel_field.name = arel_field.name.underscore
 
       if value.nil?
         model.where.not(arel_field.eq(nil))
@@ -232,6 +244,7 @@ module Graphql
 
     def handle_EqualNode(node, model)
       arel_field, model, type, value = handle_operator_node(node, model)
+      arel_field.name = arel_field.name.underscore
 
       if value.nil?
         model.where(arel_field.eq(nil))
@@ -244,6 +257,7 @@ module Graphql
 
     def handle_StrictEqualNode(node, model)
       arel_field, model, type, value = handle_operator_node(node, model)
+      arel_field.name = arel_field.name.underscore
 
       if value.nil?
         model.where(arel_field.eq(nil))
@@ -256,24 +270,68 @@ module Graphql
 
     def handle_GreaterOrEqualNode(node, model)
       arel_field, model, type, value = handle_operator_node(node, model)
+      arel_field.name = arel_field.name.underscore
+
       model.where(arel_field.gteq(value))
     end
 
     def handle_LessOrEqualNode(node, model)
       arel_field, model, type, value = handle_operator_node(node, model)
+      arel_field.name = arel_field.name.underscore
+
       model.where(arel_field.lteq(value))
     end
 
     def handle_LessNode(node, model)
       arel_field, model, type, value = handle_operator_node(node, model)
+      arel_field.name = arel_field.name.underscore
+
       model.where(arel_field.lt(value))
     end
 
     def handle_GreaterNode(node, model)
       arel_field, model, type, value = handle_operator_node(node, model)
+      arel_field.name = arel_field.name.underscore
+
       model.where(arel_field.gt(value))
     end
 
+    # Example: "US" should match "US" and "USA" and "AUS"
+    def handle_ModulusNode(node, model)
+      arel_field, model, type, value = handle_operator_node(node, model)
+      arel_field.name = arel_field.name.underscore
+
+      if value.nil?
+        model.where(arel_field.eq(nil))
+      elsif type == :text || type == :string
+        model.where(arel_field.matches("%" + sanitize_sql_like(value) + "%"))
+      elsif type == :datetime
+        if value.instance_of?(DateTime)
+          model.where(arel_field.gteq(value).and(arel_field.lteq(value + 1.day)))
+        else
+          model.where(
+            Arel::Nodes::NamedFunction.new(
+              "CAST",
+              [Arel::Nodes::As.new(arel_field, Arel::Nodes::SqlLiteral.new("text"))]
+            ).matches("%" + sanitize_sql_like(value) + "%")
+          )
+        end
+      elsif type == :uuid
+        model.where(
+          Arel::Nodes::NamedFunction.new(
+            "CAST",
+            [Arel::Nodes::As.new(arel_field, Arel::Nodes::SqlLiteral.new("text"))]
+          ).matches("%" + sanitize_sql_like(value) + "%")
+        )
+      else
+        model.where(arel_field.eq(value))
+      end
+    end
+
+    def uuid_to_string(uuid)
+      uuid.delete("-")
+    end
+
     def valid_id?(id)
       valid_uuid?(id) || id.is_a?(Integer)
     end
@@ -291,7 +349,7 @@ module Graphql
     end
 
     def get_field_type!(model, field_name)
-      field = model.column_for_attribute(field_name.to_sym)
+      field = model.column_for_attribute(field_name.underscore.to_sym)
       unless field.present?
         raise GraphQL::ExecutionError, "Invalid filter: #{field_name} is not a field of #{model}"
       end
@@ -401,5 +459,4 @@ module Graphql
       @model.class.to_s.split("::").first.underscore.pluralize
     end
   end
-
 end

data/lib/graphql/rails/api/version.rb

@@ -1,7 +1,7 @@
 module Graphql
   module Rails
     module Api
-      VERSION = "0.9.5".freeze
+      VERSION = "0.9.6".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails-api
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - poilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql