Working compound id include read

Author: thomassnielsen

packages/server/src/api/rest/index.ts

@@ -532,12 +532,12 @@ class RequestHandler extends APIHandlerBase {
 
         const args: any = {
             where: this.makeIdFilter(typeInfo.idFields, resourceId),
-            select: this.makeIdSelect(type, modelMeta),
+            select: this.makeIdSelect(typeInfo.idFields),
         };
 
         // include IDs of relation fields so that they can be serialized
         // this.includeRelationshipIds(type, args, 'select');
-        args.select = { ...args.select, [relationship]: { select: this.makeIdSelect(relationInfo.type, modelMeta) } };
+        args.select = { ...args.select, [relationship]: { select: this.makeIdSelect(relationInfo.idFields) } };
 
         let paginator: Paginator<any> | undefined;
 
@@ -1230,15 +1230,11 @@ class RequestHandler extends APIHandlerBase {
         }
     }
 
-    private makeIdSelect(model: string, modelMeta: ModelMeta) {
-        const idFields = getIdFields(modelMeta, model);
+    private makeIdSelect(idFields: FieldInfo[]) {
         if (idFields.length === 0) {
             throw this.errors.noId;
-        } else if (idFields.length === 1) {
-            return { [idFields[0].name]: true };
-        } else {
-            return { [idFields.map((idf) => idf.name).join(',')]: true };
         }
+        return idFields.reduce((acc, curr) => ({ ...acc, [curr.name]: true }), {});
     }
 
     private makeIdKey(idFields: FieldInfo[]) {
@@ -1255,7 +1251,7 @@ class RequestHandler extends APIHandlerBase {
             return;
         }
         for (const [relation, relationInfo] of Object.entries(typeInfo.relationships)) {
-            args[mode] = { ...args[mode], [relation]: { select: { [this.makeIdKey(relationInfo.idFields)]: true } } };
+            args[mode] = { ...args[mode], [relation]: { select: this.makeIdSelect(relationInfo.idFields) } };
         }
     }
 

packages/server/tests/api/rest.test.ts

@@ -27,6 +27,7 @@ describe('REST server tests', () => {
         updatedAt DateTime @updatedAt
         email String @unique @email
         posts Post[]
+        likes PostLike[]
         profile Profile?
     }
     
@@ -48,6 +49,7 @@ describe('REST server tests', () => {
         publishedAt DateTime?
         viewCount Int @default(0)
         comments Comment[]
+        likes PostLike[]
         setting Setting?
     }
     
@@ -69,6 +71,8 @@ describe('REST server tests', () => {
         postId Int
         userId String
         superLike Boolean
+        post Post @relation(fields: [postId], references: [id])
+        user User @relation(fields: [userId], references: [myId])
         @@id([postId, userId])
     }
     `;
@@ -133,6 +137,7 @@ describe('REST server tests', () => {
                         path: '/user',
                         prisma,
                     });
+                    console.log('yufail', JSON.stringify(r));
                     expect(r.status).toBe(200);
                     expect(r.body).toMatchObject({
                         data: [],
@@ -299,6 +304,37 @@ describe('REST server tests', () => {
                     });
                 });
 
+                it('fetches a related resource with a compound ID', async () => {
+                    await prisma.user.create({
+                        data: {
+                            myId: 'user1',
+                            email: 'user1@abc.com',
+                            posts: {
+                                create: { id: 1, title: 'Post1' },
+                            },
+                        },
+                    });
+                    await prisma.postLike.create({
+                        data: { postId: 1, userId: 'user1', superLike: true },
+                    });
+
+                    const r = await handler({
+                        method: 'get',
+                        path: '/post/1/relationships/likes',
+                        prisma,
+                    });
+
+                    console.log('yufail', JSON.stringify(r));
+
+                    expect(r.status).toBe(200);
+                    expect(r.body).toMatchObject({
+                        links: {
+                            self: 'http://localhost/api/post/1/relationships/likes',
+                        },
+                        data: [{ type: 'postLike', id: '1_user1' }],
+                    });
+                });
+
                 it('fetch a relationship', async () => {
                     // Create a user first
                     await prisma.user.create({