audiences 2.0.0 → 2.0.1

data/app/events/audiences/application_event.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Audiences
+  class ApplicationEvent < AetherObservatory::EventBase
+    event_prefix "audiences"
+  end
+end

data/app/events/audiences/persisted_resource_event.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Audiences
+  class PersistedResourceEvent < ApplicationEvent
+    event_name { "persisted.#{resource_type}" }
+
+    attribute :params
+    attribute :resource_type
+  end
+end

data/app/models/audiences/external_user.rb

@@ -79,37 +79,22 @@ module Audiences
         "title" => names["Titles"],
         "urn:ietf:params:scim:schemas:extension:authservice:2.0:User" => {
           "role" => names["Roles"], "department" => names["Departments"],
-          "territory" => names["Territories"], "territoryAbbr" => TERRITORY_ABBRS[names["Territories"]]
+          "territory" => names["Territories"], "territoryAbbr" => territory_abbr(names["Territories"])
         },
       }
     end
 
-    TERRITORY_ABBRS = {
-      "Philadelphia" => "PHL",
-      "New Jersey" => "NJ",
-      "Maryland" => "MD",
-      "Connecticut" => "CT",
-      "Long Island" => "LI",
-      "Boston" => "BOS",
-      "Atlanta" => "ATL",
-      "Chicago" => "CHI",
-      "Detroit" => "DET",
-      "Houston" => "HOU",
-      "Dallas" => "DAL",
-      "Denver" => "DEN",
-      "Tampa" => "TPA",
-      "Austin" => "AUS",
-      "Charlotte" => "CLT",
-      "Nashville" => "NSH",
-      "Phoenix" => "PHX",
-      "Pittsburgh" => "PIT",
-      "San Antonio" => "SAO",
-      "Fort Lauderdale" => "FLL",
-      "Las Vegas" => "LVS",
-      "Orlando" => "ORL",
-      "Cincinnati" => "CIN",
-      "Columbus" => "CLB",
-      "Jacksonville" => "JAX",
-    }.freeze
+    def missing_group_types(expected_types = Audiences.config.required_group_types)
+      return [] if expected_types.blank?
+
+      actual_types = groups.map(&:resource_type)
+      expected_types - actual_types
+    end
+
+  private
+
+    def territory_abbr(territory)
+      Audiences.config.territory_abbreviations[territory]
+    end
   end
 end

data/app/models/audiences/group_membership.rb

@@ -5,6 +5,8 @@ module Audiences
     belongs_to :external_user
     belongs_to :group
 
+    validates :external_user_id, uniqueness: { scope: :group_id }
+
     after_commit on: %i[create destroy] do
       relevant_groups = Audiences::Context.relevant_to(group)
 

data/db/migrate/20260506150000_add_unique_index_to_group_memberships.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddUniqueIndexToGroupMemberships < ActiveRecord::Migration[6.1]
+  def change
+    add_index :audiences_group_memberships,
+              %i[group_id external_user_id],
+              unique: true,
+              name: "index_group_memberships_on_group_and_user"
+  end
+end

data/docs/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+# Version 2.0.1 (2026-05-08)
+
+- Fixes a performance issue where we load all users when updating memberships [#557](https://github.com/powerhome/audiences/pull/557)
+
 # Version 2.0 (2025-08-25)
 
 The all new 2.0 release inverts the SCIM logic, where now Audiences no longer pulls data from SCIM, but rather it will receive and cache SCIM data, allowing for an in database calculation of audiences. This improved process allows audiences to be more independent from SCIM, while still compatible with the protocol.

data/lib/audiences/configuration.rb

@@ -16,6 +16,23 @@ module Audiences
     %w[Groups]
   end
 
+  # Group types that must be present in a user provisioning event
+  config_accessor :required_group_types do
+    []
+  end
+
+  DEFAULT_TERRITORY_ABBREVIATIONS = {
+    "Philadelphia" => "PHL", "New Jersey" => "NJ", "Maryland" => "MD", "Connecticut" => "CT",
+    "Long Island" => "LI", "Boston" => "BOS", "Atlanta" => "ATL", "Chicago" => "CHI",
+    "Detroit" => "DET", "Houston" => "HOU", "Dallas" => "DAL", "Denver" => "DEN", "Tampa" => "TPA",
+    "Austin" => "AUS", "Charlotte" => "CLT", "Nashville" => "NSH", "Phoenix" => "PHX",
+    "Pittsburgh" => "PIT", "San Antonio" => "SAO", "Fort Lauderdale" => "FLL", "Las Vegas" => "LVS",
+    "Orlando" => "ORL", "Cincinnati" => "CIN", "Columbus" => "CLB", "Jacksonville" => "JAX",
+    "Oklahoma City" => "OKC", "Raleigh" => "RLD", "Cleveland" => "CLE"
+  }.freeze
+
+  config_accessor(:territory_abbreviations) { DEFAULT_TERRITORY_ABBREVIATIONS }
+
   # Defines a default scope for users, so the users that are part of an audience can
   # be filtered (i.e.: only active, only users in a specific group, etc)
   #
@@ -98,7 +115,7 @@ module Audiences
       Audiences.logger.warn(<<~MESSAGE)
         Audiences authenticate is currently configured using a default and is blocking authenticaiton.
 
-        To make this wraning go away provide a configuration for `Audiences.config.authenticate`.
+        To make this warning go away provide a configuration for `Audiences.config.authenticate`.
 
         The value should:
           1. Be callable like a Proc.

data/lib/audiences/scim/field_mapping.rb

@@ -8,13 +8,27 @@ module Audiences
       end
 
       def remove(object, path, val)
-        current = object.send to(path)
-        _set object, path, current - value(path, val)
+        return unless @map.key?(path)
+
+        case @map[path]
+        in { to: to, find: find }
+          remove_from_association(object, to, find, val)
+        else
+          current = object.send to(path)
+          _set object, path, current - value(path, val)
+        end
       end
 
       def add(object, path, val)
-        current = object.send to(path)
-        _set object, path, current + value(path, val)
+        return unless @map.key?(path)
+
+        case @map[path]
+        in { to: to, find: find }
+          add_to_association(object, to, find, val)
+        else
+          current = object.send to(path)
+          _set object, path, current + value(path, val)
+        end
       end
 
       def replace(object, path, val)
@@ -44,6 +58,20 @@ module Audiences
         else val
         end
       end
+
+      def add_to_association(object, to, find, val)
+        # Use << operator to avoid loading all records
+        collection = object.send(to)
+        new_items = [val].flatten.pluck("value").filter_map(&find)
+        new_items.each { |item| collection << item unless collection.include?(item) }
+      end
+
+      def remove_from_association(object, to, find, val)
+        # Use delete operator to avoid loading all records
+        collection = object.send(to)
+        items_to_remove = [val].flatten.pluck("value").filter_map(&find)
+        collection.delete(*items_to_remove)
+      end
     end
   end
 end

data/lib/audiences/scim/upsert_groups_observer.rb

@@ -12,6 +12,7 @@ module Audiences
         Audiences.logger.info "#{upsert_action} group #{new_display_name} (#{new_external_id})"
 
         group.update! external_id: new_external_id, display_name: new_display_name, active: new_active
+        Audiences::PersistedResourceEvent.create(resource_type: "Groups", params: event_payload.params)
       rescue => e
         Audiences.logger.error e
         raise

data/lib/audiences/scim/upsert_users_observer.rb

@@ -7,9 +7,11 @@ module Audiences
       subscribe_to "two_percent.scim.replace.Users"
 
       def process
-        Audiences.logger.info "#{upsert_action} group #{event_payload.params['displayName']} (#{scim_id})"
-
+        log_upsert_action
         external_user.update! updated_attributes
+        return unless valid_group_types?
+
+        Audiences::PersistedResourceEvent.create(resource_type: "Users", params: event_payload.params)
       rescue => e
         Audiences.logger.error e
         raise
@@ -17,6 +19,10 @@ module Audiences
 
     private
 
+      def log_upsert_action
+        Audiences.logger.info "#{upsert_action} user #{event_payload.params['displayName']} (#{scim_id})"
+      end
+
       def scim_id = event_payload.params["id"]
 
       def external_user
@@ -43,6 +49,14 @@ module Audiences
           Audiences::Group.find_by(scim_id: group["value"])
         end
       end
+
+      def valid_group_types?
+        missing = external_user.missing_group_types
+        return true if missing.empty?
+
+        Audiences.logger.warn "Provisioning event for user #{scim_id} with missing group types: #{missing.join(', ')}"
+        false
+      end
     end
   end
 end

data/lib/audiences/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audiences
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Carlos Palhares
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-25 00:00:00.000000000 Z
+date: 2026-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aether_observatory
@@ -51,6 +51,8 @@ files:
 - app/controllers/audiences/application_controller.rb
 - app/controllers/audiences/contexts_controller.rb
 - app/controllers/audiences/scim_proxy_controller.rb
+- app/events/audiences/application_event.rb
+- app/events/audiences/persisted_resource_event.rb
 - app/models/audiences/application_record.rb
 - app/models/audiences/context.rb
 - app/models/audiences/context/locating.rb
@@ -85,6 +87,7 @@ files:
 - db/migrate/20250624171247_create_audiences_context_extra_users.rb
 - db/migrate/20250624171706_rename_audiences_context_extra_users_to_extra_users_json.rb
 - db/migrate/20250701173946_move_extra_users_to_context_extra_users.rb
+- db/migrate/20260506150000_add_unique_index_to_group_memberships.rb
 - docs/CHANGELOG.md
 - docs/README.md
 - lib/audiences.rb