fixs: better handling around struct types w/ resource as instance_of

Author: zachdaniel

lib/ash_json_api/json_schema/json_schema.ex

@@ -371,7 +371,7 @@ defmodule AshJsonApi.JsonSchema do
   end
 
   defp resource_write_attribute_type(%{type: type} = attr, action_type) do
-    if Ash.Type.embedded_type?(type) do
+    if embedded?(type) do
       embedded_type_input(attr, action_type)
     else
       if :erlang.function_exported(type, :json_write_schema, 1) do
@@ -439,7 +439,7 @@ defmodule AshJsonApi.JsonSchema do
       function_exported?(type, :json_schema, 1) ->
         type.json_schema(constraints)
 
-      Ash.Type.embedded_type?(type) ->
+      embedded?(type) ->
         %{
           "type" => "object",
           "properties" => resource_attributes(type),

lib/ash_json_api/json_schema/open_api.ex

@@ -473,7 +473,7 @@ if Code.ensure_loaded?(OpenApiSpex) do
     end
 
     defp resource_write_attribute_type(%{type: type} = attr, action_type) do
-      if Ash.Type.embedded_type?(type) do
+      if AshJsonApi.JsonSchema.embedded?(type) do
         embedded_type_input(attr, action_type)
       else
         if :erlang.function_exported(type, :json_write_schema, 1) do
@@ -489,7 +489,7 @@ if Code.ensure_loaded?(OpenApiSpex) do
            action_type
          ) do
       if type = constraints[:instance_of] do
-        if Ash.Type.embedded_type?(type) do
+        if AshJsonApi.JsonSchema.embedded?(type) do
           embedded_type_input(attr, action_type)
         else
           %Schema{}
@@ -598,7 +598,7 @@ if Code.ensure_loaded?(OpenApiSpex) do
 
     defp resource_attribute_type(%{type: Ash.Type.Struct, constraints: constraints}) do
       if type = constraints[:instance_of] do
-        if Ash.Type.embedded_type?(type) do
+        if AshJsonApi.JsonSchema.embedded?(type) do
           %Schema{
             type: :object,
             properties: resource_attributes(type),
@@ -616,7 +616,7 @@ if Code.ensure_loaded?(OpenApiSpex) do
       constraints = attr.constraints
 
       cond do
-        Ash.Type.embedded_type?(type) ->
+        AshJsonApi.JsonSchema.embedded?(type) ->
           %Schema{
             type: :object,
             properties: resource_attributes(type),

lib/ash_json_api/serializer.ex

@@ -737,13 +737,21 @@ defmodule AshJsonApi.Serializer do
   end
 
   def serialize_value(value, type, constraints, domain) do
-    {type, _constraints} = flatten_new_type(type, constraints || [])
+    {type, constraints} = flatten_new_type(type, constraints || [])
 
-    if Ash.Type.embedded_type?(type) do
+    with Ash.Type.Struct <- type,
+         instance_of when not is_nil(instance_of) <- constraints[:instance_of],
+         true <- Ash.Resource.Info.resource?(instance_of) do
       req = %{fields: %{}, route: %{}, domain: domain}
       serialize_attributes(req, value)
     else
-      value
+      _ ->
+        if Ash.Type.embedded_type?(type) do
+          req = %{fields: %{}, route: %{}, domain: domain}
+          serialize_attributes(req, value)
+        else
+          value
+        end
     end
   end