Fixes based on coderabbit review

Author: thomassnielsen

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

@@ -92,6 +92,8 @@ const FilterOperations = [
 
 type FilterOperationType = (typeof FilterOperations)[number] | undefined;
 
+const prismaIdDivider = '_';
+
 registerCustomSerializers();
 
 /**
@@ -216,7 +218,7 @@ class RequestHandler extends APIHandlerBase {
 
     constructor(private readonly options: Options) {
         super();
-        this.idDivider = options.idDivider ?? '_';
+        this.idDivider = options.idDivider ?? prismaIdDivider;
         const segmentCharset = options.urlSegmentNameCharset ?? 'a-zA-Z0-9-_~ %';
         this.urlPatterns = this.buildUrlPatterns(this.idDivider, segmentCharset);
     }
@@ -1131,7 +1133,7 @@ class RequestHandler extends APIHandlerBase {
         if (ids.length === 0) {
             return undefined;
         } else {
-            return data[ids.map((id) => id.name).join(this.idDivider)];
+            return data[this.makeIdKey(ids)];
         }
     }
 
@@ -1233,7 +1235,7 @@ class RequestHandler extends APIHandlerBase {
         } else {
             return {
                 // TODO: support `@@id` with custom name
-                [idFields.map((idf) => idf.name).join('_')]: idFields.reduce(
+                [idFields.map((idf) => idf.name).join(prismaIdDivider)]: idFields.reduce(
                     (acc, curr, idx) => ({
                         ...acc,
                         [curr.name]: this.coerce(curr.type, resourceId.split(this.idDivider)[idx]),
@@ -1257,7 +1259,7 @@ class RequestHandler extends APIHandlerBase {
 
     private makePrismaIdKey(idFields: FieldInfo[]) {
         // TODO: support `@@id` with custom name
-        return idFields.map((idf) => idf.name).join('_');
+        return idFields.map((idf) => idf.name).join(prismaIdDivider);
     }
 
     private makeCompoundId(idFields: FieldInfo[], item: any) {

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

@@ -2532,6 +2532,7 @@ describe('REST server tests', () => {
     model User {
         email String
         role Role
+        enabled Boolean @default(true)
 
         @@id([email, role])
     }
@@ -2553,7 +2554,7 @@ describe('REST server tests', () => {
                 endpoint: 'http://localhost/api',
                 pageSize: 5,
                 idDivider,
-                urlSegmentNameCharset: 'a-zA-Z0-9-_~ %@.',
+                urlSegmentNameCharset: 'a-zA-Z0-9-_~ %@.:',
             });
             handler = (args) =>
                 _handler({ ...args, zodSchemas, modelMeta, url: new URL(`http://localhost/${args.path}`) });
@@ -2624,13 +2625,14 @@ describe('REST server tests', () => {
                 requestBody: {
                     data: {
                         type: 'user',
-                        attributes: { role: 'ADMIN_USER' },
+                        attributes: { enabled: false },
                     },
                 },
                 prisma,
             });
 
             expect(r.status).toBe(200);
+            expect(r.body.data.attributes.enabled).toBe(false);
         });
     });
 });