From e98aa82e8ec2bc7e9bbd5a22f2a371625cf140c2 Mon Sep 17 00:00:00 2001 From: Jamil Date: Fri, 11 Jul 2025 12:12:05 -0700 Subject: [PATCH] fix(portal): respect gateway_group_id filter in REST API (#9840) Fixes #9815 --- elixir/apps/api/lib/api/controllers/gateway_controller.ex | 7 +++++++ .../api/test/api/controllers/gateway_controller_test.exs | 3 +++ 2 files changed, 10 insertions(+) diff --git a/elixir/apps/api/lib/api/controllers/gateway_controller.ex b/elixir/apps/api/lib/api/controllers/gateway_controller.ex index 12211cb37..258b91540 100644 --- a/elixir/apps/api/lib/api/controllers/gateway_controller.ex +++ b/elixir/apps/api/lib/api/controllers/gateway_controller.ex @@ -31,6 +31,13 @@ defmodule API.GatewayController do |> Pagination.params_to_list_opts() |> Keyword.put(:preload, :online?) + list_opts = + if group_id = params["gateway_group_id"] do + Keyword.put(list_opts, :filter, gateway_group_id: group_id) + else + list_opts + end + with {:ok, gateways, metadata} <- Gateways.list_gateways(conn.assigns.subject, list_opts) do render(conn, :index, gateways: gateways, metadata: metadata) end diff --git a/elixir/apps/api/test/api/controllers/gateway_controller_test.exs b/elixir/apps/api/test/api/controllers/gateway_controller_test.exs index d90ad9b53..0732e4d0d 100644 --- a/elixir/apps/api/test/api/controllers/gateway_controller_test.exs +++ b/elixir/apps/api/test/api/controllers/gateway_controller_test.exs @@ -30,6 +30,9 @@ defmodule API.GatewayControllerTest do for _ <- 1..3, do: Fixtures.Gateways.create_gateway(%{account: account, group: gateway_group}) + other_group = Fixtures.Gateways.create_group(account: account) + Fixtures.Gateways.create_gateway(%{account: account, group: other_group}) + conn = conn |> authorize_conn(actor)