From 01e89d1a40158b71eaf22dff5c6ee1afd57a93f1 Mon Sep 17 00:00:00 2001
From: Convly <jean-sebastien.herbaux@epitech.eu>
Date: Thu, 21 Dec 2023 16:18:11 +0100
Subject: [PATCH] fix: remove conditionals for attribute filtering, causing
 infinite recursion

---
 .../entity-service/params/filters/index.ts    | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/packages/core/types/src/modules/entity-service/params/filters/index.ts b/packages/core/types/src/modules/entity-service/params/filters/index.ts
index 0767137e48..64267b994d 100644
--- a/packages/core/types/src/modules/entity-service/params/filters/index.ts
+++ b/packages/core/types/src/modules/entity-service/params/filters/index.ts
@@ -58,23 +58,19 @@ export type AttributesFiltering<TSchemaUID extends Common.UID.Schema> = Utils.Gu
  * Definition of scalar attribute filtering for a given schema UID.
  * @template TSchemaUID - The UID of the schema.
  */
-export type ScalarAttributesFiltering<TSchemaUID extends Common.UID.Schema> =
-  AttributeUtils.GetScalarKeys<TSchemaUID> extends infer TKeys
-    ? TKeys extends AttributeUtils.GetScalarKeys<TSchemaUID>
-      ? IDFiltering & { [TKey in TKeys]?: AttributeCondition<TSchemaUID, TKey> }
-      : never
-    : never;
+export type ScalarAttributesFiltering<TSchemaUID extends Common.UID.Schema> = IDFiltering & {
+  [TKey in AttributeUtils.GetScalarKeys<TSchemaUID>]?: AttributeCondition<TSchemaUID, TKey>;
+};
 
 /**
  * Filters object for nested schema attributes.
  * @template TSchemaUID - The UID of the schema to perform filtering on.
  */
-export type NestedAttributeFiltering<TSchemaUID extends Common.UID.Schema> =
-  AttributeUtils.GetNestedKeys<TSchemaUID> extends infer TKeys
-    ? TKeys extends AttributeUtils.GetNestedKeys<TSchemaUID>
-      ? { [TKey in TKeys]?: ObjectNotation<Attribute.GetTarget<TSchemaUID, TKey>> }
-      : never
-    : never;
+export type NestedAttributeFiltering<TSchemaUID extends Common.UID.Schema> = {
+  [TKey in AttributeUtils.GetNestedKeys<TSchemaUID>]?: ObjectNotation<
+    Attribute.GetTarget<TSchemaUID, TKey>
+  >;
+};
 
 type IDFiltering = { id?: AttributeCondition<never, IDKey> };