Merge branch 'main' into feat/purchase-order-number-graphql-mutations

Author: tiagolupepic

app/models/charge.rb

@@ -224,6 +224,7 @@ def validate_accepts_target_wallet
 #  idx_on_plan_id_billable_metric_id_pay_in_advance_4a205974cb   (plan_id,billable_metric_id,pay_in_advance) WHERE (deleted_at IS NULL)
 #  index_charges_on_accepts_target_wallet                        (accepts_target_wallet) WHERE (accepts_target_wallet = true)
 #  index_charges_on_billable_metric_id                           (billable_metric_id) WHERE (deleted_at IS NULL)
+#  index_charges_on_billable_metric_id_all                       (billable_metric_id)
 #  index_charges_on_deleted_at                                   (deleted_at)
 #  index_charges_on_organization_id                              (organization_id)
 #  index_charges_on_parent_id                                    (parent_id)

app/services/wallets/threshold_top_up_service.rb

@@ -22,7 +22,6 @@ def call
         invoice_requires_successful_payment: rule.invoice_requires_successful_payment?,
         metadata: rule.transaction_metadata,
         name: rule.transaction_name,
-        purchase_order_number: rule.purchase_order_number,
         ignore_paid_top_up_limits: rule.ignore_paid_top_up_limits?
       }
 

db/migrate/20260703164249_add_unscoped_index_on_charges_billable_metric_id.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddUnscopedIndexOnChargesBillableMetricId < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :charges,
+      :billable_metric_id,
+      name: :index_charges_on_billable_metric_id_all,
+      algorithm: :concurrently,
+      if_not_exists: true
+  end
+end

db/structure.sql

@@ -746,6 +746,7 @@ DROP INDEX IF EXISTS public.index_charges_on_plan_id;
 DROP INDEX IF EXISTS public.index_charges_on_parent_id;
 DROP INDEX IF EXISTS public.index_charges_on_organization_id;
 DROP INDEX IF EXISTS public.index_charges_on_deleted_at;
+DROP INDEX IF EXISTS public.index_charges_on_billable_metric_id_all;
 DROP INDEX IF EXISTS public.index_charges_on_billable_metric_id;
 DROP INDEX IF EXISTS public.index_charges_on_accepts_target_wallet;
 DROP INDEX IF EXISTS public.index_charge_filters_on_organization_id;
@@ -7462,6 +7463,13 @@ CREATE INDEX index_charges_on_accepts_target_wallet ON public.charges USING btre
 CREATE INDEX index_charges_on_billable_metric_id ON public.charges USING btree (billable_metric_id) WHERE (deleted_at IS NULL);
 
 
+--
+-- Name: index_charges_on_billable_metric_id_all; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_charges_on_billable_metric_id_all ON public.charges USING btree (billable_metric_id);
+
+
 --
 -- Name: index_charges_on_deleted_at; Type: INDEX; Schema: public; Owner: -
 --
@@ -12840,6 +12848,7 @@ SET search_path TO "$user", public;
 
 INSERT INTO "schema_migrations" (version) VALUES
 ('20260706131152'),
+('20260703164249'),
 ('20260702074504'),
 ('20260701083110'),
 ('20260701083109'),