fix: support aggregates over calculations

ash-project · Aug 30, 2023 · 1d69d8e · 1d69d8e
1 parent 0c869aa
commit 1d69d8e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/lib/resource/resource.ex b/lib/resource/resource.ex
@@ -1854,7 +1854,7 @@ defmodule AshGraphql.Resource do
       with field when not is_nil(field) <- field,
            related when not is_nil(related) <-
              Ash.Resource.Info.related(resource, relationship_path),
-           attr when not is_nil(attr) <- Ash.Resource.Info.attribute(related, field) do
+           attr when not is_nil(attr) <- Ash.Resource.Info.field(related, field) do
         attr.type
       end
 
@@ -2271,7 +2271,7 @@ defmodule AshGraphql.Resource do
       with field when not is_nil(field) <- aggregate.field,
            related when not is_nil(related) <-
              Ash.Resource.Info.related(resource, aggregate.relationship_path),
-           attr when not is_nil(attr) <- Ash.Resource.Info.attribute(related, aggregate.field) do
+           attr when not is_nil(attr) <- Ash.Resource.Info.field(related, aggregate.field) do
         attr.type
       end
 
@@ -3480,7 +3480,7 @@ defmodule AshGraphql.Resource do
         with field when not is_nil(field) <- aggregate.field,
              related when not is_nil(related) <-
                Ash.Resource.Info.related(resource, aggregate.relationship_path),
-             attr when not is_nil(attr) <- Ash.Resource.Info.attribute(related, aggregate.field) do
+             attr when not is_nil(attr) <- Ash.Resource.Info.field(related, aggregate.field) do
           {attr.type, attr.constraints}
         else
           _ ->

diff --git a/test/read_test.exs b/test/read_test.exs
@@ -595,14 +595,13 @@ defmodule AshGraphql.ReadTest do
   end
 
   test "aggregate of a calculation" do
-    post =
-      AshGraphql.Test.Post
-      |> Ash.Changeset.for_create(:create,
-        text: "foo",
-        published: true,
-        score: 9.8
-      )
-      |> AshGraphql.Test.Api.create!()
+    AshGraphql.Test.Post
+    |> Ash.Changeset.for_create(:create,
+      text: "foo",
+      published: true,
+      score: 9.8
+    )
+    |> AshGraphql.Test.Api.create!()
 
     post =
       AshGraphql.Test.Post

diff --git a/test/support/types/status.ex b/test/support/types/status.ex
@@ -27,7 +27,7 @@ defmodule AshGraphql.Test.Status do
   end
 
   @impl true
-  def cast_stored(value, nil), do: {:ok, nil}
+  def cast_stored(nil, _), do: {:ok, nil}
 
   def cast_stored(value, _) when value in @values do
     {:ok, value}