use typeMap instead of dynamic calls to getIdFields()

Author: lsmith77

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

@@ -1241,7 +1241,7 @@ class RequestHandler extends APIHandlerBase {
         const linkers: Record<string, Linker<any>> = {};
 
         for (const model of Object.keys(modelMeta.models)) {
-            const ids = this.getIdFields(modelMeta, model);
+            const ids = this.typeMap[model].idFields;
             const mappedModel = this.mapModelName(model);
 
             if (ids.length < 1) {
@@ -1251,7 +1251,7 @@ class RequestHandler extends APIHandlerBase {
             const linker = new Linker((items) =>
                 Array.isArray(items)
                     ? this.makeLinkUrl(`/${mappedModel}`)
-                    : this.makeLinkUrl(`/${mappedModel}/${this.getId(model, items, modelMeta)}`)
+                    : this.makeLinkUrl(`/${mappedModel}/${this.getId(model, items)}`)
             );
             linkers[model] = linker;
 
@@ -1293,7 +1293,7 @@ class RequestHandler extends APIHandlerBase {
                 if (!fieldSerializer) {
                     continue;
                 }
-                const fieldIds = this.getIdFields(modelMeta, fieldMeta.type);
+                const fieldIds = this.typeMap[fieldMeta.type].idFields;
                 if (fieldIds.length > 0) {
                     const mappedModel = this.mapModelName(model);
 
@@ -1306,16 +1306,13 @@ class RequestHandler extends APIHandlerBase {
                             relatedName: field,
                             linkers: {
                                 related: new Linker((primary) =>
-                                    this.makeLinkUrl(
-                                        `/${lowerCaseFirst(model)}/${this.getId(model, primary, modelMeta)}/${field}`
-                                    )
+                                    this.makeLinkUrl(`/${lowerCaseFirst(model)}/${this.getId(model, primary)}/${field}`)
                                 ),
                                 relationship: new Linker((primary) =>
                                     this.makeLinkUrl(
                                         `/${lowerCaseFirst(mappedModel)}/${this.getId(
                                             model,
-                                            primary,
-                                            modelMeta
+                                            primary
                                         )}/relationships/${field}`
                                     )
                                 ),
@@ -1329,11 +1326,11 @@ class RequestHandler extends APIHandlerBase {
         }
     }
 
-    private getId(model: string, data: any, modelMeta: ModelMeta) {
+    private getId(model: string, data: any) {
         if (!data) {
             return undefined;
         }
-        const ids = this.getIdFields(modelMeta, model);
+        const ids = this.typeMap[model].idFields;
         if (ids.length === 0) {
             return undefined;
         } else {