fix: Ensure consistent order of results on list responses (frontend and API)

app/controllers/api/v1/add_ons_controller.rb

@@ -51,20 +51,27 @@ def show
       end
 
       def index
-        add_ons = current_organization.add_ons
-          .order(created_at: :desc)
-          .page(params[:page])
-          .per(params[:per_page] || PER_PAGE)
+        result = AddOnsQuery.call(
+          organization: current_organization,
+          pagination: {
+            page: params[:page],
+            limit: params[:per_page] || PER_PAGE
+          }
+        )
 
-        render(
-          json: ::CollectionSerializer.new(
-            add_ons.includes(:taxes),
-            ::V1::AddOnSerializer,
-            collection_name: "add_ons",
-            meta: pagination_metadata(add_ons),
-            includes: %i[taxes]
+        if result.success?
+          render(
+            json: ::CollectionSerializer.new(
+              result.add_ons.includes(:taxes),
+              ::V1::AddOnSerializer,
+              collection_name: "add_ons",
+              meta: pagination_metadata(result.add_ons),
+              includes: %i[taxes]
+            )
           )
-        )
+        else
+          render_error_response(result)
+        end
       end
 
       private

app/controllers/api/v1/billable_metrics_controller.rb

@@ -79,21 +79,27 @@ def show
       end
 
       def index
-        metrics = current_organization.billable_metrics
-          .includes(:filters)
-          .order(created_at: :desc)
-          .page(params[:page])
-          .per(params[:per_page] || PER_PAGE)
+        result = BillableMetricsQuery.call(
+          organization: current_organization,
+          pagination: {
+            page: params[:page],
+            limit: params[:per_page] || PER_PAGE
+          }
+        )
 
-        render(
-          json: ::CollectionSerializer.new(
-            metrics,
-            ::V1::BillableMetricSerializer,
-            collection_name: "billable_metrics",
-            meta: pagination_metadata(metrics),
-            includes: %i[counters] # DEPRECATED since 2024-11-22
+        if result.success?
+          render(
+            json: ::CollectionSerializer.new(
+              result.billable_metrics.includes(:filters),
+              ::V1::BillableMetricSerializer,
+              collection_name: "billable_metrics",
+              meta: pagination_metadata(result.billable_metrics),
+              includes: %i[counters] # DEPRECATED since 2024-11-22
+            )
           )
-        )
+        else
+          render_error_response(result)
+        end
       end
 
       def evaluate_expression

app/controllers/api/v1/coupons_controller.rb

@@ -52,19 +52,26 @@ def show
       end
 
       def index
-        coupons = current_organization.coupons
-          .order(created_at: :desc)
-          .page(params[:page])
-          .per(params[:per_page] || PER_PAGE)
+        result = CouponsQuery.call(
+          organization: current_organization,
+          pagination: {
+            page: params[:page],
+            limit: params[:per_page] || PER_PAGE
+          }
+        )
 
-        render(
-          json: ::CollectionSerializer.new(
-            coupons,
-            ::V1::CouponSerializer,
-            collection_name: "coupons",
-            meta: pagination_metadata(coupons)
+        if result.success?
+          render(
+            json: ::CollectionSerializer.new(
+              result.coupons,
+              ::V1::CouponSerializer,
+              collection_name: "coupons",
+              meta: pagination_metadata(result.coupons)
+            )
           )
-        )
+        else
+          render_error_response(result)
+        end
       end
 
       private

app/controllers/api/v1/credit_notes_controller.rb

@@ -93,25 +93,28 @@ def void
       end
 
       def index
-        credit_notes = current_organization.credit_notes.finalized
-
-        if params[:external_customer_id]
-          credit_notes = credit_notes.joins(:customer).where(customers: {external_id: params[:external_customer_id]})
-        end
-
-        credit_notes = credit_notes.order(created_at: :desc)
-          .page(params[:page])
-          .per(params[:per_page] || PER_PAGE)
+        result = CreditNotesQuery.call(
+          organization: current_organization,
+          pagination: {
+            page: params[:page],
+            limit: params[:per_page] || PER_PAGE
+          },
+          filters: index_filters
+        )
 
-        render(
-          json: ::CollectionSerializer.new(
-            credit_notes.includes(:items, :applied_taxes),
-            ::V1::CreditNoteSerializer,
-            collection_name: 'credit_notes',
-            meta: pagination_metadata(credit_notes),
-            includes: %i[items applied_taxes error_details]
+        if result.success?
+          render(
+            json: ::CollectionSerializer.new(
+              result.credit_notes.includes(:items, :applied_taxes),
+              ::V1::CreditNoteSerializer,
+              collection_name: "credit_notes",
+              meta: pagination_metadata(result.credit_notes),
+              includes: %i[items applied_taxes error_details]
+            )
           )
-        )
+        else
+          render_error_response(result)
+        end
       end
 
       def estimate
@@ -164,6 +167,10 @@ def estimate_params
           )
       end
 
+      def index_filters
+        params.permit(:external_customer_id)
+      end
+
       def resource_name
         'credit_note'
       end

app/controllers/api/v1/customers_controller.rb

@@ -36,19 +36,27 @@ def portal_url
       end
 
       def index
-        customers = current_organization.customers
-          .page(params[:page])
-          .per(params[:per_page] || PER_PAGE)
+        result = CustomersQuery.call(
+          organization: current_organization,
+          pagination: {
+            page: params[:page],
+            limit: params[:per_page] || PER_PAGE
+          }
+        )
 
-        render(
-          json: ::CollectionSerializer.new(
-            customers.includes(:taxes, :integration_customers),
-            ::V1::CustomerSerializer,
-            collection_name: 'customers',
-            meta: pagination_metadata(customers),
-            includes: %i[taxes integration_customers]
+        if result.success?
+          render(
+            json: ::CollectionSerializer.new(
+              result.customers.includes(:taxes, :integration_customers),
+              ::V1::CustomerSerializer,
+              collection_name: "customers",
+              meta: pagination_metadata(result.customers),
+              includes: %i[taxes integration_customers]
+            )
           )
-        )
+        else
+          render_error_response(result)
+        end
       end
 
       def show

app/controllers/api/v1/plans_controller.rb

@@ -47,20 +47,33 @@ def show
       end
 
       def index
-        plans = current_organization.plans.parents
-          .order(created_at: :desc)
-          .page(params[:page])
-          .per(params[:per_page] || PER_PAGE)
+        result = PlansQuery.call(
+          organization: current_organization,
+          pagination: {
+            page: params[:page],
+            limit: params[:per_page] || PER_PAGE
+          },
+          filters: {include_pending_deletion: true}
+        )
 
-        render(
-          json: ::CollectionSerializer.new(
-            plans.includes(:usage_thresholds, :taxes, :minimum_commitment, charges: {filters: {values: :billable_metric_filter}}),
-            ::V1::PlanSerializer,
-            collection_name: 'plans',
-            meta: pagination_metadata(plans),
-            includes: %i[charges usage_thresholds taxes minimum_commitment]
+        if result.success?
+          render(
+            json: ::CollectionSerializer.new(
+              result.plans.includes(
+                :usage_thresholds,
+                :taxes,
+                :minimum_commitment,
+                charges: {filters: {values: :billable_metric_filter}}
+              ),
+              ::V1::PlanSerializer,
+              collection_name: "plans",
+              meta: pagination_metadata(result.plans),
+              includes: %i[charges usage_thresholds taxes minimum_commitment]
+            )
           )
-        )
+        else
+          render_error_response(result)
+        end
       end
 
       private

app/controllers/api/v1/taxes_controller.rb

@@ -43,19 +43,26 @@ def show
       end
 
       def index
-        taxes = current_organization.taxes
-          .order(created_at: :desc)
-          .page(params[:page])
-          .per(params[:per_page] || PER_PAGE)
+        result = TaxesQuery.call(
+          organization: current_organization,
+          pagination: {
+            page: params[:page],
+            limit: params[:per_page] || PER_PAGE
+          }
+        )
 
-        render(
-          json: ::CollectionSerializer.new(
-            taxes,
-            ::V1::TaxSerializer,
-            collection_name: 'taxes',
-            meta: pagination_metadata(taxes)
+        if result.success?
+          render(
+            json: ::CollectionSerializer.new(
+              result.taxes,
+              ::V1::TaxSerializer,
+              collection_name: "taxes",
+              meta: pagination_metadata(result.taxes)
+            )
           )
-        )
+        else
+          render_error_response(result)
+        end
       end
 
       private

app/controllers/api/v1/wallets_controller.rb

@@ -52,22 +52,28 @@ def show
       end
 
       def index
-        customer = current_organization.customers.find_by(external_id: params[:external_customer_id])
-        return not_found_error(resource: 'customer') unless customer
-
-        wallets = customer.wallets
-          .page(params[:page])
-          .per(params[:per_page] || PER_PAGE)
+        result = WalletsQuery.call(
+          organization: current_organization,
+          pagination: {
+            page: params[:page],
+            limit: params[:per_page] || PER_PAGE
+          },
+          filters: {external_customer_id: params[:external_customer_id]}
+        )
 
-        render(
-          json: ::CollectionSerializer.new(
-            wallets,
-            ::V1::WalletSerializer,
-            collection_name: 'wallets',
-            meta: pagination_metadata(wallets),
-            includes: %i[recurring_transaction_rules]
+        if result.success?
+          render(
+            json: ::CollectionSerializer.new(
+              result.wallets.includes(:recurring_transaction_rules),
+              ::V1::WalletSerializer,
+              collection_name: "wallets",
+              meta: pagination_metadata(result.wallets),
+              includes: %i[recurring_transaction_rules]
+            )
           )
-        )
+        else
+          render_error_response(result)
+        end
       end
 
       private

app/controllers/api/v1/webhook_endpoints_controller.rb

@@ -31,18 +31,26 @@ def update
       end
 
       def index
-        webhook_endpoints = current_organization.webhook_endpoints
-          .page(params[:page])
-          .per(params[:per_page] || PER_PAGE)
+        result = WebhookEndpointsQuery.call(
+          organization: current_organization,
+          pagination: {
+            page: params[:page],
+            limit: params[:per_page] || PER_PAGE
+          }
+        )
 
-        render(
-          json: ::CollectionSerializer.new(
-            webhook_endpoints,
-            ::V1::WebhookEndpointSerializer,
-            collection_name: 'webhook_endpoints',
-            meta: pagination_metadata(webhook_endpoints)
+        if result.success?
+          render(
+            json: ::CollectionSerializer.new(
+              result.webhook_endpoints,
+              ::V1::WebhookEndpointSerializer,
+              collection_name: "webhook_endpoints",
+              meta: pagination_metadata(result.webhook_endpoints)
+            )
           )
-        )
+        else
+          render_error_response(result)
+        end
       end
 
       def show

app/queries/add_ons_query.rb

@@ -4,7 +4,7 @@ class AddOnsQuery < BaseQuery
   def call
     add_ons = base_scope.result
     add_ons = paginate(add_ons)
-    add_ons = add_ons.order(created_at: :desc)
+    add_ons = apply_consistent_ordering(add_ons)
 
     result.add_ons = add_ons
     result

app/queries/applied_coupons_query.rb

@@ -3,7 +3,7 @@
 class AppliedCouponsQuery < BaseQuery
   def call
     applied_coupons = paginate(base_scope)
-    applied_coupons = applied_coupons.order(created_at: :desc)
+    applied_coupons = apply_consistent_ordering(applied_coupons)
 
     applied_coupons = with_external_customer(applied_coupons) if filters.external_customer_id
     applied_coupons = with_status(applied_coupons) if valid_status?