graphql-rails-api 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c789b39c99efe639f6a7d035d012d28b4d6cff882c4bcfb7c1145ec03ffa7d9
-  data.tar.gz: 27c85cd1193f34216fe52d9dde5f05e0a5ca87bec25efb24ffc9a72c0be447c0
+  metadata.gz: c1751d6f6ae5edf98341bdf30a149cd8aa9ab4dbcb0a627cb25c380cfe15c676
+  data.tar.gz: 90c9dc17368d908efb70a8ee55837c3d6b117709762c006eaee18ddcd3a820ff
 SHA512:
-  metadata.gz: 8c73593751c6aff011ae081788c1072fbeca7a8b86c0dd736c00c635f4956db56a178dfe3518a6c39a5a7c286cb939675fc67862cfa36b09617a396998e086a9
-  data.tar.gz: '069beded1ed21d5c0392e4daf48ceae733a6e95f8f022eb5341fd0541e89a5849a8acd3db0f8b59355c08d9ec3479f4860ddb96071fdd95acdd66bc2b8bd110a'
+  metadata.gz: 98cd97012f608dea85e6a5417a4d1ab83ddf3cdae9a51473a014a3c4d45769ce928301a9e57ab32a9c65a76df5e3687cead2046e57a829da18a1309ecfc7ff06
+  data.tar.gz: d297e02228b4a00c81a9f29eef88c92da12a23698e9e2dc3aa9eab52c3ccf97a471c04aa134d9cb11bb516bc1d2446464ba9b69b8cc0be8d1f84d465deaa2a91

data/lib/graphql/hydrate_query.rb

@@ -4,37 +4,110 @@ require 'rkelly'
 module Graphql
   class HydrateQuery
 
-    def initialize(model, context, order_by: nil, filter: nil, id: nil, user: nil, page: nil, per_page: 10)
+    def initialize(model, context, order_by: nil, filter: nil, check_visibility: true, id: nil, user: nil, page: nil, per_page: nil)
       @context = context
       @filter = filter
       @order_by = order_by
       @model = model
       @models = [model_name.singularize.camelize]
+      @check_visibility = check_visibility
       @id = id
       @user = user
-      @page = page
-      @per_page = per_page
+      @page = page || 1
+      @per_page = per_page || 1000
     end
 
     def run
-      @model = @model.where(transform_filter(@filter)) if @filter
-      @model = @model.order(@order_by) if @order_by
-
-      @model = @model.limit(@per_page) if @per_page
-      @model = @model.offset(@per_page * (@page - 1)) if @page
-
-      @model = @model.where(id: @id) if @id
-      plucked = DeepPluck::Model.new(@model.visible_for(user: @user), user: @user).add(
-        hash_to_array_of_hashes(parse_fields(@context&.irep_node), @model)
-      ).load_all
-      result = plucked_attr_to_structs(plucked, model_name.singularize.camelize.constantize)&.compact
-      @id ? result.first : result
+      if @id
+        @model = @model.where(id: @id)
+        deep_pluck_to_structs(@context&.irep_node).first
+      else
+        @model = @model.limit(@per_page)
+        @model = @model.offset(@per_page * (@page - 1))
+        filter_and_order
+        deep_pluck_to_structs(@context&.irep_node)
+      end
+    end
+
+    def paginated_run
+      filter_and_order
+
+      @total = @model.length
+      @model = @model.limit(@per_page)
+      @model = @model.offset(@per_page * (@page - 1))
+
+      ::Rails.logger.info(@model.to_sql)
+      OpenStruct.new(
+        data: deep_pluck_to_structs(@context&.irep_node&.typed_children&.values&.first.try(:[], 'data')),
+        total_count: @total,
+        per_page: @per_page,
+        page: @page
+      )
+    end
+
+    private
+
+    def filter_and_order
+      if @filter
+        transformed_filter = transform_filter(@filter)
+        to_join = transformed_filter.split(/AND|OR|like|ilike/).map do |expression|
+          expression.strip.split(/!=|=|IS/).first.strip
+        end.select { |e| e.include?('.') }.map { |e| e.split('.').first }.map(&:to_sym)
+        to_join.reject { |j| j.to_s.pluralize.to_sym == @model.klass.to_s.pluralize.underscore.to_sym }.each do |j|
+          @model = @model.left_joins(j).distinct
+        end
+        transformed_filter = transformed_filter.split(/(AND|OR|like|ilike)/).map do |e|
+          arr = e.split(/(!=|=|IS)/)
+          if arr.first.include?('.')
+            arr.first.split('.').first.pluralize + '.' + arr.first.split('.').last + arr[1].to_s + arr[2].to_s
+          else
+            arr.join
+          end
+        end.join
+        @model = @model.where(transformed_filter)
+      end
+
+      return unless @order_by
+
+      sign = @order_by.split(' ').last.downcase == 'desc' ? 'desc' : 'asc'
+      column = @order_by.split(' ').first
+      if column.include?('.')
+        @model = @model.left_joins(column.split('.').first.to_sym)
+        string_type = %i[string text].include?(
+          evaluate_model(@model, column.split('.').first).columns_hash[column.split('.').last]&.type
+        )
+
+        @to_select_to_add = if string_type
+                              "upper(#{column.split('.').first.pluralize}.#{column.split('.').last})"
+                            else
+                              column.split('.').first.pluralize + '.' + column.split('.').last
+                            end
+        @model = @model.select(@to_select_to_add)
+        column = "#{column.split('.').first.pluralize}.#{column.split('.').last}"
+        @model = @model.order(Arel.sql("#{string_type ? "upper(#{column})" : column} #{sign}"))
+      elsif @order_by
+        column = "upper(#{model_name}.#{column})" if %i[string text].include?(@model.columns_hash[column]&.type)
+        @model = @model.order("#{column} #{sign}")
+      end
     end
 
     def transform_filter(filter)
-      parsed_filter = RKelly::Parser.new.parse(filter.gsub('like', ' | ')).to_ecma
-      parsed_filter.gsub(' | ', ' like ').
-        gsub('||', 'OR').gsub('&&', 'AND').gsub('===', '=').gsub('==', '=').delete(';')
+      parsed_filter = RKelly::Parser.new.parse(filter.gsub('like', ' | '))&.to_ecma
+      return '' unless parsed_filter
+
+      @model.klass.defined_enums.values.reduce(:merge)&.each { |k, v| parsed_filter.gsub!("= #{k}", "= #{v}") }
+      parsed_filter.gsub(' | ', ' ilike ').gsub('||', 'OR').gsub('&&', 'AND').gsub('===', '=').gsub('==', '=').gsub(
+        '!= null', 'IS NOT NULL'
+      ).gsub('= null', 'IS NULL').delete(';')
+    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,
+        model_name.singularize.camelize.constantize
+      )&.compact
     end
 
     def plucked_attr_to_structs(arr, parent_model)
@@ -104,9 +177,7 @@ module Graphql
 
     def parse_fields(irep_node)
       fields = irep_node&.scoped_children&.values&.first
-      if fields.key?('edges')
-        fields = fields['edges'].scoped_children.values.first['node']&.scoped_children&.values&.first
-      end
+      fields = fields['edges'].scoped_children.values.first['node']&.scoped_children&.values&.first if fields&.key?('edges')
       return if fields.blank?
 
       fields.each_with_object({}) do |(k, v), h|

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

@@ -1,7 +1,7 @@
 module Graphql
   module Rails
     module Api
-      VERSION = '0.9.0'.freeze
+      VERSION = '0.9.1'.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.0
+  version: 0.9.1
 platform: ruby
 authors:
 - poilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -42,22 +42,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 7.0.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.4
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 7.0.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.4
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: rkelly-remix
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Graphql rails api framework to create easily graphql api with rails