graphql-rails-api 0.9.5 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3613d8a2bc521ba1e8c8cdcc120b72ac56b5d6db12ac829c21d608605164aef4
-  data.tar.gz: 8365841223a6f4390e8fdbd870d5f3a48d1982b69dba3d1eb05b385dd54eb509
+  metadata.gz: 2eb89c21597bdbc0a59ebe13ec5030d847fd356901600700ae3be29f33c3f54f
+  data.tar.gz: a276f011746654e122e7b574707fa1df57590e753ca64ea3d23e232d2fcb356a
 SHA512:
-  metadata.gz: 3bb630bcffe4434a46f1e9eeba4ef1f601f6dc77bc0bd1df8089249141b4997e7afc5e8ea8bd018e415cf02ba1b9f1efbef9f86ffe20b4f70bfd9231767fc3f4
-  data.tar.gz: '09c3d6d3967e433b58746f125ec9071024fe18609f42d91cee150c88017ec63d0c15abd4d0102f19ab042ca3f812298f86482d9575139248dd5ce4b5fb0e3b4a'
+  metadata.gz: bf96a1ce8f8f0d18a7d5ca9844fa3802c84664e05e1a790a257007cfd71444fff823a2b916b0e1e436694e9402edb38a484a1fe58c26b33e9b86ecbd551eee13
+  data.tar.gz: 438629cf1b5213e919639f60b52b2f8f64b02d086578570fc8924bedf770d5826af51506b6191d458dc4ba851839cd11f1abbb44775b3579b993aa336da87056

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
@@ -299,12 +357,33 @@ module Graphql
     end
 
     def deep_pluck_to_structs(irep_node)
-      plucked_attr_to_structs(
-        DeepPluck::Model.new(@model.visible_for(user: @user), user: @user).add(
-          ((hash_to_array_of_hashes(parse_fields(irep_node), @model) || []) + [@to_select_to_add]).compact
-        ).load_all,
+      attributes = (hash_to_array_of_hashes(parse_fields(irep_node), @model) || []).compact
+      res = plucked_attr_to_structs(
+        DeepPluck::Model.new(@model.visible_for(user: @user), user: @user).add(attributes).load_all,
         model_name.singularize.camelize.constantize
       )&.compact
+      res.map do |r|
+        fill_nil_in_openstruct(r, attributes)
+      end
+      res
+    end
+
+    def fill_nil_in_openstruct(struct, fields)
+      fields.each do |field|
+        if field.is_a?(Hash)
+          struct[field.keys.first] ||= OpenStruct.new
+          data = struct[field.keys.first]
+          if data.is_a?(Array)
+            data.each do |s|
+              fill_nil_in_openstruct(s, field.values.first)
+            end
+          else
+            fill_nil_in_openstruct(data, field.values.first)
+          end
+        else
+          struct[field] ||= nil
+        end
+      end
     end
 
     def plucked_attr_to_structs(arr, parent_model)
@@ -401,5 +480,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.7".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.7
 platform: ruby
 authors:
 - poilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Graphql rails api framework to create easily graphql api with rails