Test and fix relationship update

Author: thomassnielsen

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

@@ -830,7 +830,7 @@ class RequestHandler extends APIHandlerBase {
             where: this.makeIdFilter(typeInfo.idFields, resourceId),
             select: {
                 ...typeInfo.idFields.reduce((acc, field) => ({ ...acc, [field.name]: true }), {}),
-                [relationship]: { select: { [this.makeIdKey(relationInfo.idFields)]: true } },
+                [relationship]: { select: this.makeIdSelect(relationInfo.idFields) },
             },
         };
 
@@ -885,9 +885,9 @@ class RequestHandler extends APIHandlerBase {
 
             updateArgs.data = {
                 [relationship]: {
-                    [relationVerb]: enumerate(parsed.data.data).map((item: any) => ({
-                        [this.makeIdKey(relationInfo.idFields)]: item.id,
-                    })),
+                    [relationVerb]: enumerate(parsed.data.data).map((item: any) =>
+                        this.makeIdFilter(relationInfo.idFields, item.id)
+                    ),
                 },
             };
         }

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

@@ -6,7 +6,6 @@ import { loadSchema, run } from '@zenstackhq/testtools';
 import { Decimal } from 'decimal.js';
 import SuperJSON from 'superjson';
 import makeHandler, { idDivider } from '../../src/api/rest';
-import e from 'express';
 
 describe('REST server tests', () => {
     let prisma: any;
@@ -137,7 +136,7 @@ describe('REST server tests', () => {
                         path: '/user',
                         prisma,
                     });
-                    console.log('yufail', JSON.stringify(r));
+
                     expect(r.status).toBe(200);
                     expect(r.body).toMatchObject({
                         data: [],
@@ -324,8 +323,6 @@ describe('REST server tests', () => {
                         prisma,
                     });
 
-                    console.log('yufail', JSON.stringify(r));
-
                     expect(r.status).toBe(200);
                     expect(r.body).toMatchObject({
                         links: {
@@ -1641,6 +1638,27 @@ describe('REST server tests', () => {
                     expect(r.status).toBe(404);
                 });
 
+                it('create relation with compound id', async () => {
+                    await prisma.user.create({ data: { myId: 'user1', email: 'user1@abc.com' } });
+                    await prisma.post.create({ data: { id: 1, title: 'Post1' } });
+
+                    const r = await handler({
+                        method: 'post',
+                        path: '/postLike',
+                        query: {},
+                        requestBody: {
+                            data: {
+                                type: 'postLike',
+                                id: `1${idDivider}user1`,
+                                attributes: { userId: 'user1', postId: 1, superLike: false },
+                            },
+                        },
+                        prisma,
+                    });
+
+                    expect(r.status).toBe(201);
+                });
+
                 describe('compound id', () => {
                     beforeEach(async () => {
                         await prisma.user.create({ data: { myId: 'user1', email: 'user1@abc.com' } });
@@ -1909,6 +1927,24 @@ describe('REST server tests', () => {
                     });
                 });
 
+                it('update a collection of relations with compound id', async () => {
+                    await prisma.user.create({ data: { myId: 'user1', email: 'user1@abc.com' } });
+                    await prisma.post.create({ data: { id: 1, title: 'Post1' } });
+                    await prisma.postLike.create({ data: { userId: 'user1', postId: 1, superLike: false } });
+
+                    const r = await handler({
+                        method: 'patch',
+                        path: '/post/1/relationships/likes',
+                        query: {},
+                        requestBody: {
+                            data: [{ type: 'postLike', id: '1_user1', attributes: { superLike: true } }],
+                        },
+                        prisma,
+                    });
+
+                    expect(r.status).toBe(200);
+                });
+
                 it('update a collection of relations to empty', async () => {
                     await prisma.user.create({
                         data: { myId: 'user1', email: 'user1@abc.com', posts: { create: { id: 1, title: 'Post1' } } },