istox 0.1.102 → 0.1.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02359b553606b9825cc8e94ac5060303dd9ab56e4fba7b9bde8c5e4e85529984'
-  data.tar.gz: 70aae89471427d04de003f0fe88200db70a04b204eddbb65e01e87afc3fc9c24
+  metadata.gz: 2a4fdf1c4ef6e43e08853ee0921fe24c7a5055954f09e8994947d319f95e127f
+  data.tar.gz: fb11c641a84a1f285ef85ea5ad532b3896d3db6971f65ce4c83ec0970c43ed9d
 SHA512:
-  metadata.gz: f4fcac506560e2bd2739f31fc99ac4c1875a3c5e0605017ddf48cc057b1d4b946084135e80227bf8dc476a1efec5dc988f67cc0f84c5b68f94331efce582bbbb
-  data.tar.gz: b2cf95ab75837b7fa8630ccfd80d3165f79d76d21c3bb0892969cb81088c086ba2d8863382f7f9ece7683e0122e47022e177f96f133f094ffce48c7e94b9d217
+  metadata.gz: 4bec68b057c3f448e08f4958b7a51964cbda8b99a5689028107928e2b5a385914e78ff703d74ac43542e4f1c93b615be1c3a0a07a130c9fa4264df223be67fe9
+  data.tar.gz: 9f5d910541029a58e96bb1ef1955671b0ba431bb68acdd59de4e8da7a957485a1e68ad92e79ef278f80dc13f640a9e5c81b148e2a62f4eec4e79ea29ca007b58

data/lib/istox/helpers/result_handler.rb

@@ -1,8 +1,7 @@
 module Istox
   module ResultHandler
     ##### main method to be called, suggested to always use this method and not individual method below
-    def self.process(query:, meta:, exclude_filter: false, exclude_order: false, exclude_paginate: false)
-      query = filter(query: query, meta: meta) unless exclude_filter
+    def self.process(query:, meta:, exclude_order: false, exclude_paginate: false)
       query = order(query: query, meta: meta) unless exclude_order
 
       # if never set limit, means no pagination is needed
@@ -13,36 +12,6 @@ module Istox
       query
     end
 
-    def self.filter(query:, meta:)
-      return query if meta.blank? || meta.filters.blank?
-
-      meta.filters.each do |filter|
-        # chain the query with AND conditions
-        # skip if there is no compare present, mean it is for inner filters
-        if filter.compare.present?
-
-          validate_filter(filter)
-          query = query.where("#{filter.field} #{transform_compare(filter.type, filter.compare)} ?",
-                              transform_value(filter.type, filter.value))
-        end
-
-        next if filter.filters.blank?
-
-        # contains inner filters, chain the query with AND condition but internally with OR condition
-        columns = []
-        values = []
-        filter.filters.each do |inner_filter|
-          validate_filter(filter)
-          columns.push("#{inner_filter.field} #{transform_compare(inner_filter.type, inner_filter.compare)} ?")
-          values.push(transform_value(inner_filter.type, inner_filter.value))
-        end
-
-        query = query.where(columns.join(' OR '), *values) unless columns.empty?
-      end
-
-      query
-    end
-
     def self.order(query:, meta:)
       return query if meta.blank? || meta.sorts.blank?
 
@@ -95,42 +64,6 @@ module Istox
       Istox::RegexHelper.alphabet_only(column)
     end
 
-    def self.validate_filter(filter)
-      # filter.field/column should contains only alphabet and nothing else
-      raise StandardError, 'POSSIBLE_SQL_INJECTION' unless validate_column_name(filter.field)
-
-      # filter.compare should only contains alphabets (eg. IN) or symbols only (eg. >=, =, <=, <>)
-      raise StandardError, 'POSSIBLE_SQL_INJECTION' unless validate_compare(filter.compare)
-    end
-
-    def self.transform_compare(type, compare)
-      return compare if type.blank?
-
-      return 'IS' if type.downcase == 'nullable' && ['=', 'is', '=='].include?(compare.downcase)
-
-      return 'IS NOT' if type.downcase == 'nullable' && ['<>', 'is not', '!='].include?(compare.downcase)
-
-      compare
-    end
-
-    def self.transform_value(type, value)
-      return value if value.blank? || type.blank? || type.downcase == 'string'
-
-      return nil if type.downcase == 'nullable'
-
-      return value.to_i if type.downcase == 'integer'
-
-      return value.to_f if type.downcase == 'float'
-
-      return ::Istox::CommonHelper.to_boolean(value) if type.downcase == 'boolean'
-
-      return ::Istox::CommonHelper.to_datetime(value) if type.downcase == 'date' || type.downcase == 'datetime'
-    end
-
-    def self.validate_compare(compare)
-      Istox::RegexHelper.alphabet_only(compare) || Istox::RegexHelper.symbol_only(compare)
-    end
-
-    private_class_method :validate_compare, :validate_filter, :transform_value, :transform_compare, :validate_column_name
+    private_class_method :validate_column_name
   end
 end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.102'.freeze
+  VERSION = '0.1.103'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.102
+  version: 0.1.103
 platform: ruby
 authors:
 - Siong Leng