Add ref properties as include query parameters in pull request

Author: leandrogehlen

src/helpers.ts

@@ -5,7 +5,7 @@ import {
   Request,
   Transporter,
 } from './types';
-import { compact, get, isEmpty, isNil, omit, omitBy } from 'lodash';
+import { compact, get, isEmpty, isNil, omit, omitBy, snakeCase } from 'lodash';
 
 export function buildUrl(parts: (number | string)[]): string {
   return compact(parts)
@@ -83,6 +83,9 @@ export async function executePull({
   deletedField,
   transporter,
 }: OrionPullExecuteOptions): Promise<any[]> {
+  const references = extractReferences(collection.schema);
+  const keys = Object.keys(references);
+
   const request = {
     url,
     wrap,
@@ -96,27 +99,28 @@ export async function executePull({
       limit: batchSize,
       ...params,
     },
-  };
+  } as any;
+
+  if (keys.length) {
+    request.params.include = keys.join(',');
+  }
 
   const response = await executeRequest(transporter, request);
 
   if (collection && response.length) {
-    const primaryPath = collection.schema.primaryPath;
-    const references = extractReferences(collection.schema);
-
-    for (const item of response) {
-      if (!item[deletedField]) {
-        for (const [key, value] of Object.entries(references)) {
-          const rows = await executePull({
-            url: `${url}/${item[primaryPath]}/${key}`,
-            transporter,
-            wrap,
-            batchSize,
-            deletedField,
-          });
+    return response;
+  }
+
+  for (const item of response) {
+    if (!item[deletedField]) {
+      for (const [key, value] of Object.entries(references)) {
+        const property = snakeCase(value);
+        const reference = collection.database.collections[value];
 
-          const schema = collection.database.collections[value].schema;
-          item[key] = rows.map((row) => row[schema.primaryPath]);
+        if (reference) {
+          item[key] = item[property].map(
+            (row: any) => row[reference.schema.primaryPath]
+          );
         }
       }
     }

tests/replication.mock.ts

@@ -3,7 +3,7 @@ import nock from 'nock';
 nock('http://api.fake.push')
   .post('/users/search')
   .times(3)
-  .query({ limit: 3, with_trashed: true })
+  .query({ limit: 3, include: 'roles', with_trashed: true })
   .reply(200, { data: [] })
   .post('/users')
   .reply(200, { data: { id: '1', name: 'Jeff' } })
@@ -26,8 +26,8 @@ nock('http://api.fake.pull')
   .query({ limit: 3, include: 'roles', with_trashed: true })
   .reply(200, {
     data: [
-      { id: '10', name: 'Jeff' },
-      { id: '11', name: 'Mark' },
+      { id: '10', name: 'Jeff', 'roles': ['100'] },
+      { id: '11', name: 'Mark', 'roles': ['200'] },
     ],
   })
   .post('/users/search')