audiences 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4af455b618eb475abafc8af9308a208193b7ba2dc90e1bdb06ace775a6187577
-  data.tar.gz: e5c9e37d32d7ded3e324d3d17cbb293d93809c94dcf05f3104511f3f46af364c
+  metadata.gz: db54cba8b15c751dd4103cb6941fb5dfcbdf3c2094a91a57233f4ee768b06e5c
+  data.tar.gz: bef9487c0a68472e81ed365b902ceff656fb6c789c53fe6b36bbcadac5b80d59
 SHA512:
-  metadata.gz: 4a9c2bddbd35c72e69423d069e83c7c474a9b7969049bc474466768233e526454accd14097ea83dea2de9384d1ed821d6140f43cd9ddb8f10e0e0e9ad07b23dc
-  data.tar.gz: 56e5af91a67d7838b0ae1305b505482dab15e9c930eb2ffad8051bec6e0f1cb6d4ecee0a5e4da2eb27fd6c21d34e26f285ff919e870f06b83a5f22517eeff351
+  metadata.gz: 4ec464d9f638ebee06c02bf523181db448449df899086e9a6c66de38d537711bef47f8bd58cd5291aa6ac622e733057fd159702473708bde591ba2bbe6715e0b
+  data.tar.gz: 22761b14b02f2ed98f13b63f2356a39c7d5dc62f0cbfbf3cb48f6c6b433c8f0fa6a1a027cde1ae9c5baba343785509d467613f10314a4ba85d20a8e89acb7594

data/app/models/audiences/external_user.rb

@@ -10,7 +10,8 @@ module Audiences
       attrs = resources.map do |data|
         { user_id: data["id"], data: data, created_at: Time.current, updated_at: Time.current }
       end
-      upsert_all(attrs) # rubocop:disable Rails/SkipsModelValidations
+      unique_by = :user_id if connection.supports_insert_conflict_target?
+      upsert_all(attrs, unique_by: unique_by) # rubocop:disable Rails/SkipsModelValidations
       where(user_id: attrs.pluck(:user_id))
     end
 

data/app/models/audiences/users_search.rb

@@ -27,7 +27,14 @@ module Audiences
   private
 
     def result
-      @result ||= @scope.where("data LIKE ?", "%#{@query}%")
+      @result ||= @scope.where("#{data_attribute_query} LIKE ?", "%#{@query}%")
+    end
+
+    def data_attribute_query
+      case @scope.connection.adapter_name
+      when "PostgreSQL" then "CAST(data AS TEXT)"
+      else "CAST(data AS CHAR)"
+      end
     end
   end
 end

data/docs/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+# Version 1.0.3 (2024-05-14)
+
+- Fix PostgreSQL compability [#312](https://github.com/powerhome/audiences/pull/312)
+- Fix audiences resources pagination [#313](https://github.com/powerhome/audiences/pull/313)
+
 # Version 1.0.2 (2024-04-30)
 
 - Fix mysql2 compability – drop sqlite3 [#292](https://github.com/powerhome/audiences/pull/292)

data/lib/audiences/scim/resources_query.rb

@@ -31,19 +31,30 @@ module Audiences
       end
 
       def next_page?
-        start_index = response.fetch("startIndex", 1)
-        per_page = response["itemsPerPage"].to_i
-        total_results = response["totalResults"].to_i
-
         start_index + per_page <= total_results
       end
 
+      def start_index
+        response.fetch("startIndex", 1)
+      end
+
+      def per_page
+        response["itemsPerPage"].to_i
+      end
+
+      def total_results
+        response["totalResults"].to_i
+      end
+
+      def next_index
+        start_index + per_page
+      end
+
       def next_page
         return unless next_page?
 
-        current_page = @query_options.fetch(:page, 1)
         ResourcesQuery.new(@client, resource_type: @resource_type, **@query_options,
-                                    page: current_page + 1)
+                                    startIndex: next_index)
       end
 
     private

data/lib/audiences/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Audiences
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audiences
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Carlos Palhares
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails