From e5dde472c95376a4028dc538b9947d725d3ccf65 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Tue, 5 Dec 2023 00:43:02 +0100
Subject: [PATCH] Fix projected relations mixed with normal relations

---
 back/src/Kyoo.Core/Controllers/Repositories/DapperHelper.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/back/src/Kyoo.Core/Controllers/Repositories/DapperHelper.cs b/back/src/Kyoo.Core/Controllers/Repositories/DapperHelper.cs
index cfe8cc49..e9f1b869 100644
--- a/back/src/Kyoo.Core/Controllers/Repositories/DapperHelper.cs
+++ b/back/src/Kyoo.Core/Controllers/Repositories/DapperHelper.cs
@@ -36,6 +36,7 @@ using Kyoo.Abstractions.Models.Utils;
 using Kyoo.Authentication;
 using Kyoo.Utils;
 using Microsoft.AspNetCore.Http;
+using Newtonsoft.Json;
 
 namespace Kyoo.Core.Controllers;
 
@@ -131,7 +132,10 @@ public static class DapperHelper
 
 		T Map(T item, IEnumerable<object?> relations)
 		{
-			foreach ((string name, object? value) in include.Fields.Zip(relations))
+			IEnumerable<string> metadatas = include.Metadatas
+				.Where(x => x is not Include.ProjectedRelation)
+				.Select(x => x.Name);
+			foreach ((string name, object? value) in metadatas.Zip(relations))
 			{
 				if (value == null)
 					continue;