additional fixes

- use zod schema that contains only non-relation fields to validate mutation payload
- make sure id fields are always included in the base zod schema (even if they're also FK fields)

Author: ymc9

packages/schema/src/plugins/zod/generator.ts

@@ -10,6 +10,7 @@ import {
     isEnumFieldReference,
     isForeignKeyField,
     isFromStdlib,
+    isIdField,
     parseOptionAsStrings,
     resolvePath,
 } from '@zenstackhq/sdk';
@@ -291,8 +292,10 @@ export class ZodSchemaGenerator {
         sf.replaceWithText((writer) => {
             const scalarFields = model.fields.filter(
                 (field) =>
+                    // id fields are always included
+                    isIdField(field) ||
                     // regular fields only
-                    !isDataModel(field.type.reference?.ref) && !isForeignKeyField(field)
+                    (!isDataModel(field.type.reference?.ref) && !isForeignKeyField(field))
             );
 
             const relations = model.fields.filter((field) => isDataModel(field.type.reference?.ref));

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

@@ -719,21 +719,10 @@ class RequestHandler extends APIHandlerBase {
         const parsed = this.createUpdatePayloadSchema.parse(body);
         const attributes: any = parsed.data.attributes;
 
-        // Map in the compound id relationships as attributes, as they are expected by the zod schema
-        if (parsed.data.relationships) {
-            for (const [key, data] of Object.entries<any>(parsed.data.relationships)) {
-                const typeInfo = this.typeMap[key];
-                if (typeInfo && typeInfo.idFields.length > 1) {
-                    typeInfo.idFields.forEach((field, index) => {
-                        attributes[field.name] = this.coerce(field.type, data.data.id.split(this.idDivider)[index]);
-                    });
-                }
-            }
-        }
-
         if (attributes) {
-            const schemaName = `${upperCaseFirst(type)}${upperCaseFirst(mode)}Schema`;
-            // zod-parse attributes if a schema is provided
+            // use the zod schema (that only contains non-relation fields) to validate the payload,
+            // if available
+            const schemaName = `${upperCaseFirst(type)}${upperCaseFirst(mode)}ScalarSchema`;
             const payloadSchema = zodSchemas?.models?.[schemaName];
             if (payloadSchema) {
                 const parsed = payloadSchema.safeParse(attributes);
@@ -769,18 +758,6 @@ class RequestHandler extends APIHandlerBase {
 
         const { error, attributes, relationships } = this.processRequestBody(type, requestBody, zodSchemas, 'create');
 
-        if (relationships) {
-            // Remove attributes that are present in compound id relationships, as they are not expected by Prisma
-            for (const [key] of Object.entries<any>(relationships)) {
-                const typeInfo = this.typeMap[key];
-                if (typeInfo && typeInfo.idFields.length > 1) {
-                    typeInfo.idFields.forEach((field) => {
-                        delete attributes[field.name];
-                    });
-                }
-            }
-        }
-
         if (error) {
             return error;
         }