Add city criteria to newsletter segments

Allow filtering newsletter segment members by their city (exact match).
This enables targeting members in specific locations for newsletters.

- Add city column to newsletter_segments table
- Add by_city filter method in Newsletter::Segment model
- Add city select input in segment admin form (after depot)
- Extract member_cities_collection helper to share between
  member filter and segment form
- Add translations for all supported languages

Author: thibaudgg

app/admin/member.rb

@@ -25,9 +25,7 @@
     as: :select,
     collection: -> { admin_depots_collection },
     if: proc { params[:scope] != "inactive" && feature?("shop") }
-  filter :city, as: :select, collection: -> {
-    Member.pluck(:city).uniq.map(&:presence).compact.sort
-  }
+  filter :city, as: :select, collection: -> { member_cities_collection }
   filter :country_code, as: :select, collection: -> {
     country_codes = Member.pluck(:country_code).uniq.map(&:presence).compact.sort
     countries_collection(country_codes)

app/admin/newsletter/segment.rb

@@ -53,6 +53,11 @@
         for: Depot,
         label: Depot.model_name.human(count: 2),
         hint: t("formtastic.hints.newsletter/segment.depot_ids")
+      f.input :city,
+        as: :select,
+        collection: member_cities_collection,
+        include_blank: true,
+        hint: t("formtastic.hints.newsletter/segment.city")
       if DeliveryCycle.kept.many?
         f.input :delivery_cycle_ids,
           collection: admin_delivery_cycles_collection,
@@ -93,6 +98,7 @@
     :coming_deliveries_in_days,
     :billing_year_division,
     :membership_ids,
+    :city,
     *I18n.available_locales.map { |l| "title_#{l}" },
     basket_size_ids: [],
     basket_complement_ids: [],

app/helpers/admin_helper.rb

@@ -46,6 +46,10 @@ def cycles_option_for_select(cycles)
     }
   end
 
+  def member_cities_collection
+    Member.pluck(:city).uniq.map(&:presence).compact.sort
+  end
+
   def grouped_by_date(relation, past: :last)
     if fy_year = params.dig(:q, :during_year)
       relation = relation.during_year(fy_year)

app/models/newsletter/segment.rb

@@ -50,6 +50,7 @@ def members
       members = by_billing_year_division(members)
       members = by_coming_deliveries_in_days(members)
       members = by_membership_ids(members)
+      members = by_city(members)
       members.uniq
     end
 
@@ -117,5 +118,11 @@ def by_membership_ids(members)
 
       members.where(memberships: { id: self[:membership_ids] })
     end
+
+    def by_city(members)
+      return members unless city?
+
+      members.where(city: city)
+    end
   end
 end

config/locales/formtastic.yml

@@ -721,6 +721,12 @@ _:
           _de: Unterscheidet aktive Mitglieder anhand des Zeitraums, in dem sie ihre Rechnungen erhalten.
           _it: Permette di differenziare i soci attivi in base all'intervallo di pagamento del loro abbonamento.
           _nl: Onderscheidt actieve leden op basis van de periode waarin zij hun rekeningen ontvangen.
+        city:
+          _en: Filters active members by their city (exact match).
+          _fr: Permet de filtrer les membres actifs par leur ville (correspondance exacte).
+          _de: Filtert aktive Mitglieder nach ihrer Stadt (exakte Übereinstimmung).
+          _it: Filtra i soci attivi per la loro città (corrispondenza esatta).
+          _nl: Filtert actieve leden op hun stad (exacte overeenkomst).
         coming_deliveries_in_days:
           _en: Differentiates active members based on the date of their next basket delivery.
           _fr: Permet de différencier les membres actifs par la date de leur prochaine livraison de panier.

db/migrate/20260106203500_add_city_to_newsletter_segments.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCityToNewsletterSegments < ActiveRecord::Migration[8.1]
+  def change
+    add_column :newsletter_segments, :city, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2026_01_04_091700) do
+ActiveRecord::Schema[8.1].define(version: 2026_01_06_203500) do
   create_table "absences", force: :cascade do |t|
     t.datetime "created_at"
     t.date "ended_on"
@@ -675,6 +675,7 @@
     t.json "basket_complement_ids", default: [], null: false
     t.json "basket_size_ids", default: [], null: false
     t.integer "billing_year_division"
+    t.string "city"
     t.integer "coming_deliveries_in_days"
     t.datetime "created_at", null: false
     t.json "delivery_cycle_ids", default: [], null: false

test/models/newsletter/segment_test.rb

@@ -115,4 +115,20 @@ class Newsletter::SegmentTest < ActiveSupport::TestCase
     segment = Newsletter::Segment.create!(membership_ids: "")
     assert_equal [ members(:anna), members(:john), members(:bob), members(:jane) ], segment.members
   end
+
+  test "segment by city" do
+    travel_to "2024-01-01"
+
+    members(:john).update!(city: "Zurich")
+    members(:anna).update!(city: "Zurich")
+
+    segment = Newsletter::Segment.create!(city: "Zurich")
+    assert_equal [ members(:anna), members(:john) ], segment.members
+
+    segment = Newsletter::Segment.create!(city: "City")
+    assert_equal [ members(:bob), members(:jane) ], segment.members
+
+    segment = Newsletter::Segment.create!(city: nil)
+    assert_equal [ members(:anna), members(:john), members(:bob), members(:jane) ], segment.members
+  end
 end