feat: get many reference

panter · May 1, 2020 · 6d9c427 · 6d9c427
1 parent dbd8e78
commit 6d9c427
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 22 deletions.
diff --git a/packages/dataprovider/generated/nexus.ts b/packages/dataprovider/generated/nexus.ts
@@ -319,6 +319,7 @@ export interface NexusGenArgTypes {
       first?: number | null; // Int
       last?: number | null; // Int
       skip?: number | null; // Int
+      where?: NexusGenInputs['UserRoleWhereInput'] | null; // UserRoleWhereInput
     }
   }
 }

diff --git a/packages/dataprovider/generated/schema.graphql b/packages/dataprovider/generated/schema.graphql
@@ -77,7 +77,7 @@ type User {
   gender: Gender
   id: String!
   lastName: String
-  roles(after: UserRoleWhereUniqueInput, before: UserRoleWhereUniqueInput, first: Int, last: Int, skip: Int): [UserRole!]!
+  roles(after: UserRoleWhereUniqueInput, before: UserRoleWhereUniqueInput, first: Int, last: Int, skip: Int, where: UserRoleWhereInput): [UserRole!]!
   yearOfBirth: Int
 }
 

diff --git a/packages/dataprovider/src/buildVariables.test.ts b/packages/dataprovider/src/buildVariables.test.ts
@@ -200,7 +200,7 @@ describe("buildVariables", () => {
   });
 
   describe("GET_MANY", () => {
-    it("returns correct variables", () => {
+    it("returns correct variables for many relation", () => {
       const params = {
         ids: ["einstein", "rosen", "penrose"],
       };
@@ -213,10 +213,12 @@ describe("buildVariables", () => {
   });
 
   describe("GET_MANY_REFERENCE", () => {
-    it("returns correct variables", () => {
+    it("returns correct variables for many relation reference", () => {
       const params = {
-        target: "author.id",
-        id: "author1",
+        target: "roles",
+        id: "roleId",
+        pagination: { page: 10, perPage: 10 },
+        sort: { field: "email", order: "ASC" },
       };
 
       expect(
@@ -226,7 +228,10 @@ describe("buildVariables", () => {
           params,
         ),
       ).toEqual<NexusGenArgTypes["Query"]["users"]>({
-        where: { id: { in: ["author1"] } },
+        skip: 90,
+        first: 10,
+        orderBy: { email: "asc" },
+        where: { roles: { some: { id: { equals: "roleId" } } } },
       });
     });
   });

diff --git a/packages/dataprovider/src/buildVariables.ts b/packages/dataprovider/src/buildVariables.ts
@@ -19,6 +19,8 @@ import {
   IntrospectionInputTypeRef,
   IntrospectionInputValue,
   IntrospectionNamedTypeRef,
+  IntrospectionObjectType,
+  IntrospectionTypeRef,
 } from "graphql";
 import { IntrospectionResult, Resource } from "./constants/interfaces";
 
@@ -256,14 +258,15 @@ const buildNewInputValue = (
 
             const variables = fieldData.reduce<UpdateManyInput>(
               (inputs, referencedField) => {
-                if (isObjectWithId(referencedField)) {
-                  if (!updateListInputType) {
-                    throw new Error(
-                      `Input data for "${fieldName}" is of type "Object" but graphql endpoints does not expose the "update" mutation for "${fullFieldObjectType.name}"`,
-                    );
-                  }
+                if (isObject(referencedField)) {
                   // TODO: we assume "data.id" to be the id
-                  if (referencedField.id) {
+                  if (isObjectWithId(referencedField)) {
+                    if (!updateListInputType) {
+                      throw new Error(
+                        `Input data for "${fieldName}" is of type "Object" but graphql endpoints does not expose the "update" mutation for "${fullFieldObjectType.name}"`,
+                      );
+                    }
+
                     // update
                     const data = buildData(
                       updateListInputType,
@@ -504,13 +507,10 @@ export default (introspectionResults: IntrospectionResult) => (
         },
       };
     case GET_MANY_REFERENCE: {
-      return {
-        where: {
-          id: {
-            in: [params.id], // TOOD: not sure if this is correct, looks wrong to me
-          },
-        },
-      };
+      return buildGetListVariables(introspectionResults)(resource, GET_LIST, {
+        ...params,
+        filter: { [params.target]: params.id },
+      });
     }
     case GET_ONE:
       return {

diff --git a/packages/dataprovider/test-data/testSchema.ts b/packages/dataprovider/test-data/testSchema.ts
@@ -15,7 +15,7 @@ const User = objectType({
     t.model.firstName();
     t.model.lastName();
     t.model.yearOfBirth();
-    t.model.roles(null);
+    t.model.roles({ filtering: true });
     t.model.gender();
   },
 });

diff --git a/packages/dataprovider/tsconfig.json b/packages/dataprovider/tsconfig.json
@@ -3,5 +3,6 @@
   "compilerOptions": {
     "outDir": "lib-es"
   },
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["src/**/*.test.ts", "src/testUtils", "test-data", "generated"]
 }