fix: nested boolean filters accept a list of filters, not a single fi…

…lter
ash-project · Dec 3, 2024 · 3df3a9c · 3df3a9c
1 parent d87f4c2
commit 3df3a9c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/lib/ash_json_api/json_schema/open_api.ex b/lib/ash_json_api/json_schema/open_api.ex
@@ -2253,11 +2253,19 @@ if Code.ensure_loaded?(OpenApiSpex) do
     defp boolean_filter_fields(resource) do
       if Ash.DataLayer.can?(:boolean_filter, resource) do
         [
-          and: %Reference{
-            "$ref": "#/components/schemas/#{AshJsonApi.Resource.Info.type(resource)}-filter"
+          and: %Schema{
+            type: :array,
+            items: %Reference{
+              "$ref": "#/components/schemas/#{AshJsonApi.Resource.Info.type(resource)}-filter"
+            },
+            uniqueItems: true
           },
-          or: %Reference{
-            "$ref": "#/components/schemas/#{AshJsonApi.Resource.Info.type(resource)}-filter"
+          or: %Schema{
+            type: :array,
+            items: %Reference{
+              "$ref": "#/components/schemas/#{AshJsonApi.Resource.Info.type(resource)}-filter"
+            },
+            uniqueItems: true
           },
           not: %Reference{
             "$ref": "#/components/schemas/#{AshJsonApi.Resource.Info.type(resource)}-filter"

diff --git a/test/acceptance/open_api_test.exs b/test/acceptance/open_api_test.exs
@@ -467,12 +467,24 @@ defmodule Test.Acceptance.OpenApiTest do
                  hidden: %OpenApiSpex.Reference{"$ref": "#/components/schemas/post-filter-hidden"},
                  id: %OpenApiSpex.Reference{"$ref": "#/components/schemas/post-filter-id"},
                  name: %OpenApiSpex.Reference{"$ref": "#/components/schemas/post-filter-name"},
-                 and: %OpenApiSpex.Reference{"$ref": "#/components/schemas/post-filter"},
+                 and: %Schema{
+                   type: :array,
+                   items: %OpenApiSpex.Reference{
+                     "$ref": "#/components/schemas/post-filter"
+                   },
+                   uniqueItems: true
+                 },
+                 or: %Schema{
+                   type: :array,
+                   items: %OpenApiSpex.Reference{
+                     "$ref": "#/components/schemas/post-filter"
+                   },
+                   uniqueItems: true
+                 },
                  name_twice: %OpenApiSpex.Reference{
                    "$ref": "#/components/schemas/post-filter-name_twice"
                  },
-                 not: %OpenApiSpex.Reference{"$ref": "#/components/schemas/post-filter"},
-                 or: %OpenApiSpex.Reference{"$ref": "#/components/schemas/post-filter"}
+                 not: %OpenApiSpex.Reference{"$ref": "#/components/schemas/post-filter"}
                }
              } = schema