added denormalize, updated tests

bhunjadi · Aug 10, 2024 · 04a497e · 04a497e
1 parent c79edca
commit 04a497e
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 141 deletions.
diff --git a/lib/namedQuery/testing/client.test.js b/lib/namedQuery/testing/client.test.js
@@ -11,7 +11,7 @@ import Users from '../../query/testing/bootstrap/users/collection';
 import { _ } from 'meteor/underscore';
 
 describe('Named Query', function () {
-  it('Should return proper values', function (done) {
+  it.only('Should return proper values', function (done) {
     const query = createQuery({
       postListExposure: {
         title: 'User Post - 3',

diff --git a/lib/query/query.server.js b/lib/query/query.server.js
@@ -16,12 +16,9 @@ export default class Query extends Base {
    * @returns {*}
    */
   fetch(context = {}) {
-    const node = createGraph(
-      this.collection,
-      prepareForProcess(this.body, this.params),
+    throw new Error(
+      'You must call fetchAsync instead of fetch from server-side',
     );
-
-    return hypernova(node, context.userId, { params: this.params });
   }
 
   /**
@@ -42,9 +39,9 @@ export default class Query extends Base {
    * @returns {*}
    */
   fetchOne(context = {}) {
-    context.$options = context.$options || {};
-    context.$options.limit = 1;
-    return _.first(this.fetch(context));
+    throw new Error(
+      'You must call fetchOneAsync instead of fetchOne from server-side',
+    );
   }
 
   /**
@@ -63,6 +60,16 @@ export default class Query extends Base {
    * @returns {number}
    */
   getCount() {
-    return this.collection.find(this.body.$filters || {}, {}).count();
+    throw new Error(
+      'You must call countAsync instead of count from server-side',
+    );
+  }
+
+  /**
+   * Gets the count of matching elements.
+   * @returns {Promise<number>}
+   */
+  getCountAsync() {
+    return this.collection.find(this.body.$filters || {}, {}).countAsync();
   }
 }
diff --git a/lib/query/testing/bootstrap/posts/links.js b/lib/query/testing/bootstrap/posts/links.js
@@ -31,29 +31,27 @@ Posts.addLinks({
     type: 'one',
     collection: Authors,
     field: 'ownerId',
-    // TODO(v3): denormalize
-    // denormalize: {
-    //     field: 'authorCache',
-    //     body: {
-    //         name: 1,
-    //         profile: {
-    //             firstName: 1,
-    //             lastName: 1,
-    //         }
-    //     }
-    // }
+    denormalize: {
+      field: 'authorCache',
+      body: {
+        name: 1,
+        profile: {
+          firstName: 1,
+          lastName: 1,
+        },
+      },
+    },
   },
   tagsCached: {
     collection: Tags,
     type: 'many',
     field: 'tagIds',
-    // TODO(v3): denormalize
-    // denormalize: {
-    //     field: 'tagsCache',
-    //     body: {
-    //         name: 1
-    //     }
-    // }
+    denormalize: {
+      field: 'tagsCache',
+      body: {
+        name: 1,
+      },
+    },
   },
 });
 

diff --git a/lib/query/testing/bootstrap/users/links.js b/lib/query/testing/bootstrap/users/links.js
@@ -11,16 +11,15 @@ Users.addLinks({
     field: 'subordinateIds',
     type: 'many',
   },
-  // TODO(v3): denormalize not working
-  // friendsCached: {
-  //   collection: Users,
-  //   field: 'friendIds',
-  //   type: 'many',
-  //   denormalize: {
-  //     field: 'friendsCache',
-  //     body: {
-  //       name: 1,
-  //     },
-  //   },
-  // },
+  friendsCached: {
+    collection: Users,
+    field: 'friendIds',
+    type: 'many',
+    denormalize: {
+      field: 'friendsCache',
+      body: {
+        name: 1,
+      },
+    },
+  },
 });
diff --git a/lib/query/testing/client.test.js b/lib/query/testing/client.test.js
@@ -270,8 +270,7 @@ describe('Query Client Tests', function () {
     assert.isFunction(clone.setParams({}).fetchOne);
   });
 
-  // TODO(v3): denormalize
-  it.skip('Should work with denormalized fields in the many links', async () => {
+  it('Should work with denormalized fields in the many links', async () => {
     const query = createQuery({
       users: {
         $filters: {

diff --git a/lib/query/testing/link-cache/collections.js b/lib/query/testing/link-cache/collections.js
@@ -15,67 +15,62 @@ Posts.addLinks({
     type: 'one',
     collection: Authors,
     field: 'authorId',
-    // TODO(v3): denormalize
-    // denormalize: {
-    //   field: 'authorCache',
-    //   body: {
-    //     name: 1,
-    //     address: 1,
-    //   },
-    // },
+    denormalize: {
+      field: 'authorCache',
+      body: {
+        name: 1,
+        address: 1,
+      },
+    },
   },
   categories: {
     type: 'many',
     metadata: true,
     collection: Categories,
     field: 'categoryIds',
-    // TODO(v3): denormalize
-    // denormalize: {
-    //   field: 'categoriesCache',
-    //   body: {
-    //     name: 1,
-    //   },
-    // },
+    denormalize: {
+      field: 'categoriesCache',
+      body: {
+        name: 1,
+      },
+    },
   },
 });
 
 Authors.addLinks({
   posts: {
     collection: Posts,
     inversedBy: 'author',
-    // TODO(v3): denormalize
-    // denormalize: {
-    //   field: 'postCache',
-    //   body: {
-    //     title: 1,
-    //   },
-    // },
+    denormalize: {
+      field: 'postCache',
+      body: {
+        title: 1,
+      },
+    },
   },
   groups: {
     type: 'many',
     collection: Groups,
     field: 'groupIds',
-    // TODO(v3): denormalize
-    // denormalize: {
-    //   field: 'groupsCache',
-    //   body: {
-    //     name: 1,
-    //   },
-    // },
+    denormalize: {
+      field: 'groupsCache',
+      body: {
+        name: 1,
+      },
+    },
   },
   profile: {
     type: 'one',
     metadata: true,
     collection: AuthorProfiles,
     field: 'profileId',
     unique: true,
-    // TODO(v3): denormalize
-    // denormalize: {
-    //   field: 'profileCache',
-    //   body: {
-    //     name: 1,
-    //   },
-    // },
+    denormalize: {
+      field: 'profileCache',
+      body: {
+        name: 1,
+      },
+    },
   },
 });
 
@@ -84,40 +79,37 @@ AuthorProfiles.addLinks({
     collection: Authors,
     inversedBy: 'profile',
     unique: true,
-    // TODO(v3): denormalize
-    // denormalize: {
-    //   field: 'authorCache',
-    //   body: {
-    //     name: 1,
-    //   },
-    // },
+    denormalize: {
+      field: 'authorCache',
+      body: {
+        name: 1,
+      },
+    },
   },
 });
 
 Groups.addLinks({
   authors: {
     collection: Authors,
     inversedBy: 'groups',
-    // TODO(v3): denormalize
-    // denormalize: {
-    //   field: 'authorsCache',
-    //   body: {
-    //     name: 1,
-    //   },
-    // },
+    denormalize: {
+      field: 'authorsCache',
+      body: {
+        name: 1,
+      },
+    },
   },
 });
 
 Categories.addLinks({
   posts: {
     collection: Posts,
     inversedBy: 'categories',
-    // TODO(v3): denormalize
-    // denormalize: {
-    //   field: 'postsCache',
-    //   body: {
-    //     title: 1,
-    //   },
-    // },
+    denormalize: {
+      field: 'postsCache',
+      body: {
+        title: 1,
+      },
+    },
   },
 });