Merge pull request #373 from Martinarbez/fix/multiple.includes.nested…

…Resuorces fix/multiple.includes.nestedResources
kurierjs · Dec 22, 2023 · cbd5337 · cbd5337
2 parents d741f0f + d383e52
commit cbd5337
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/src/processors/knex-processor.ts b/src/processors/knex-processor.ts
@@ -66,6 +66,7 @@ const parseOperationIncludedRelationships = (
     .filter((include) => include.length > 1)
     .reduce((acumRelationships, [nestedOrigin, nestedRelationshipName]) => {
       acumRelationships[nestedOrigin] = {
+        ...acumRelationships[nestedOrigin],
         [nestedRelationshipName]: relationships[nestedOrigin].type().schema.relationships[nestedRelationshipName],
       };
       return acumRelationships;

diff --git a/src/serializers/serializer.ts b/src/serializers/serializer.ts
@@ -294,8 +294,6 @@ export default class JsonApiSerializer implements IJsonApiSerializer {
           }
         },
       );
-    return [...new Set(includedData.map((item: Resource) => `${item.type}_${item.id}`))].map((typeId) =>
-      includedData.find((item: Resource) => `${item.type}_${item.id}` === typeId),
-    );
+    return includedData
   }
 }
diff --git a/tests/test-suite/acceptance/factories/nestedResources.ts b/tests/test-suite/acceptance/factories/nestedResources.ts
@@ -35,5 +35,17 @@ export default {
       data: getFactoryObject(comments)(1),
       included: [getFactoryObject(comments)(2), getFactoryObject(comments)(3)],
     },
+    authorAndAuthorVotesAndAuthorCommentsOf1stArticle: {
+      data: {
+        ...getFactoryObject(articles)(1),
+        relationships: {
+          ...getExtraRelationships(users, "author")([1], "Object"),
+        },
+        meta: {
+          hello: "world",
+        },
+      },
+      included: [getFactoryObject(users)(1), ...getFactoryObjects(votes)([1, 2]), ...getFactoryObjects(comments)([1, 3])],
+    },
   },
 };
diff --git a/tests/test-suite/acceptance/nestedResources.test.ts b/tests/test-suite/acceptance/nestedResources.test.ts
@@ -38,6 +38,13 @@ describe.each(transportLayers)("Transport Layer: %s", (transportLayer) => {
         expect(result.status).toEqual(200);
         expect(result.body).toEqual(nested.get.parentCommentAndParentCommentsParentCommentOf1stComment);
       });
+
+      it("Get the 1st article'Author's Votes and Comments (*-1-*)", async () => {
+        const authData = await getAuthenticationData();
+        const result = await request.get("/articles/1?include=author.votes,author.comments").set("Authorization", authData.token);
+        expect(result.status).toEqual(200);
+        expect(result.body).toEqual(nested.get.authorAndAuthorVotesAndAuthorCommentsOf1stArticle);
+      });
     });
   });
 });