Auto merge of #2138 - Turbo87:cnt, r=locks

mirage: Calculate `crates_cnt` properties

These should be consistent with the data that we have in the mock backend database.

r? @locks

Author: bors

mirage/factories/category.js

@@ -17,5 +17,4 @@ export default Factory.extend({
   },
 
   created_at: '2010-06-16T21:30:45Z',
-  crates_cnt: 0,
 });

mirage/factories/keyword.js

@@ -6,6 +6,4 @@ export default Factory.extend({
   id() {
     return this.keyword;
   },
-
-  crates_cnt: 0,
 });

mirage/fixtures/categories.js

@@ -1,7 +1,6 @@
 export default [
   {
     category: 'API bindings',
-    crates_cnt: 0,
     created_at: '2017-01-20T14:51:49Z',
     description:
       'Idiomatic wrappers of specific APIs for convenient access from Rust. Includes HTTP API wrappers as well. Non-idiomatic or unsafe bindings can be found in External FFI bindings.',
@@ -10,15 +9,13 @@ export default [
   },
   {
     category: 'Algorithms',
-    crates_cnt: 1,
     created_at: '2017-01-20T14:51:49Z',
     description: 'Rust implementations of core algorithms such as hashing, sorting, searching, and more.',
     id: 'algorithms',
     slug: 'algorithms',
   },
   {
     category: 'Asynchronous',
-    crates_cnt: 3910,
     created_at: '2017-01-20T14:51:49Z',
     description:
       'Crates to help you deal with events independently of the main program flow, using techniques like futures, promises, waiting, or eventing.',

mirage/fixtures/keywords.js

@@ -1,84 +1,70 @@
 export default [
   {
-    crates_cnt: 38,
     created_at: '2014-11-23T06:47:40Z',
     id: 'network',
     keyword: 'network',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'rust',
     keyword: 'rust',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'plugin',
     keyword: 'plugin',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'code-generation',
     keyword: 'code-generation',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'python',
     keyword: 'python',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'ruby',
     keyword: 'ruby',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'shell',
     keyword: 'shell',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'string',
     keyword: 'string',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'case',
     keyword: 'case',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'camel',
     keyword: 'camel',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'snake',
     keyword: 'snake',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'inflection',
     keyword: 'inflection',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'elastic',
     keyword: 'elastic',
   },
   {
-    crates_cnt: 1,
     created_at: '2014-11-23T06:47:40Z',
     id: 'elasticsearch',
     keyword: 'elasticsearch',

mirage/serializers/category.js

@@ -0,0 +1,24 @@
+import BaseSerializer from './application';
+
+export default BaseSerializer.extend({
+  getHashForResource() {
+    let [hash, addToIncludes] = BaseSerializer.prototype.getHashForResource.apply(this, arguments);
+
+    if (Array.isArray(hash)) {
+      for (let resource of hash) {
+        this._adjust(resource);
+      }
+    } else {
+      this._adjust(hash);
+    }
+
+    return [hash, addToIncludes];
+  },
+
+  _adjust(hash) {
+    let allCrates = this.schema.crates.all();
+    let associatedCrates = allCrates.filter(it => it.categoryIds.includes(hash.id));
+
+    hash.crates_cnt = associatedCrates.length;
+  },
+});

mirage/serializers/keyword.js

@@ -0,0 +1,24 @@
+import BaseSerializer from './application';
+
+export default BaseSerializer.extend({
+  getHashForResource() {
+    let [hash, addToIncludes] = BaseSerializer.prototype.getHashForResource.apply(this, arguments);
+
+    if (Array.isArray(hash)) {
+      for (let resource of hash) {
+        this._adjust(resource);
+      }
+    } else {
+      this._adjust(hash);
+    }
+
+    return [hash, addToIncludes];
+  },
+
+  _adjust(hash) {
+    let allCrates = this.schema.crates.all();
+    let associatedCrates = allCrates.filter(it => it.keywordIds.includes(hash.id));
+
+    hash.crates_cnt = associatedCrates.length;
+  },
+});

tests/acceptance/categories-test.js

@@ -13,9 +13,9 @@ module('Acceptance | categories', function(hooks) {
   test('is accessible', async function(assert) {
     assert.expect(0);
 
-    this.server.create('category', { category: 'API bindings', crates_cnt: 0 });
-    this.server.create('category', { category: 'Algorithms', crates_cnt: 1 });
-    this.server.create('category', { category: 'Asynchronous', crates_cnt: 3910 });
+    this.server.create('category', { category: 'API bindings' });
+    this.server.create('category', { category: 'Algorithms' });
+    this.server.create('category', { category: 'Asynchronous' });
 
     await visit('/categories');
     percySnapshot(assert);
@@ -26,7 +26,7 @@ module('Acceptance | categories', function(hooks) {
   test('category/:category_id is accessible', async function(assert) {
     assert.expect(0);
 
-    this.server.create('category', { category: 'Algorithms', crates_cnt: 1 });
+    this.server.create('category', { category: 'Algorithms' });
 
     await visit('/categories/algorithms');
     percySnapshot(assert);
@@ -35,19 +35,21 @@ module('Acceptance | categories', function(hooks) {
   });
 
   test('listing categories', async function(assert) {
-    this.server.create('category', { category: 'API bindings', crates_cnt: 0 });
-    this.server.create('category', { category: 'Algorithms', crates_cnt: 1 });
-    this.server.create('category', { category: 'Asynchronous', crates_cnt: 3910 });
+    this.server.create('category', { category: 'API bindings' });
+    this.server.create('category', { category: 'Algorithms' });
+    this.server.createList('crate', 1, { categoryIds: ['algorithms'] });
+    this.server.create('category', { category: 'Asynchronous' });
+    this.server.createList('crate', 15, { categoryIds: ['asynchronous'] });
 
     await visit('/categories');
 
     assert.dom('[data-test-category="api-bindings"] [data-test-crate-count]').hasText('0 crates');
     assert.dom('[data-test-category="algorithms"] [data-test-crate-count]').hasText('1 crate');
-    assert.dom('[data-test-category="asynchronous"] [data-test-crate-count]').hasText('3,910 crates');
+    assert.dom('[data-test-category="asynchronous"] [data-test-crate-count]').hasText('15 crates');
   });
 
   test('category/:category_id index default sort is recent-downloads', async function(assert) {
-    this.server.create('category', { category: 'Algorithms', crates_cnt: 1 });
+    this.server.create('category', { category: 'Algorithms' });
 
     await visit('/categories/algorithms');
 

tests/mirage/categories-test.js

@@ -125,6 +125,28 @@ module('Mirage | Categories', function(hooks) {
         },
       });
     });
+
+    test('calculates `crates_cnt` correctly', async function(assert) {
+      this.server.create('category', { category: 'cli' });
+      this.server.createList('crate', 7, { categoryIds: ['cli'] });
+      this.server.create('category', { category: 'not-cli' });
+      this.server.createList('crate', 3, { categoryIds: ['not-cli'] });
+
+      let response = await fetch('/api/v1/categories/cli');
+      assert.equal(response.status, 200);
+
+      let responsePayload = await response.json();
+      assert.deepEqual(responsePayload, {
+        category: {
+          category: 'cli',
+          crates_cnt: 7,
+          created_at: '2010-06-16T21:30:45Z',
+          description: 'This is the description for the category called "cli"',
+          id: 'cli',
+          slug: 'cli',
+        },
+      });
+    });
   });
 
   module('GET /api/v1/category_slugs', function() {

tests/mirage/crates-test.js

@@ -294,7 +294,7 @@ module('Mirage | Crates', function(hooks) {
         {
           id: 'no-std',
           category: 'no-std',
-          crates_cnt: 0,
+          crates_cnt: 1,
           created_at: '2010-06-16T21:30:45Z',
           description: 'This is the description for the category called "no-std"',
           slug: 'no-std',
@@ -314,7 +314,7 @@ module('Mirage | Crates', function(hooks) {
       assert.deepEqual(responsePayload.crate.keywords, ['no-std']);
       assert.deepEqual(responsePayload.keywords, [
         {
-          crates_cnt: 0,
+          crates_cnt: 1,
           id: 'no-std',
           keyword: 'no-std',
         },

tests/mirage/keywords-test.js

@@ -107,5 +107,24 @@ module('Mirage | Keywords', function(hooks) {
         },
       });
     });
+
+    test('calculates `crates_cnt` correctly', async function(assert) {
+      this.server.create('keyword', { keyword: 'cli' });
+      this.server.createList('crate', 7, { keywordIds: ['cli'] });
+      this.server.create('keyword', { keyword: 'not-cli' });
+      this.server.createList('crate', 3, { keywordIds: ['not-cli'] });
+
+      let response = await fetch('/api/v1/keywords/cli');
+      assert.equal(response.status, 200);
+
+      let responsePayload = await response.json();
+      assert.deepEqual(responsePayload, {
+        keyword: {
+          id: 'cli',
+          crates_cnt: 7,
+          keyword: 'cli',
+        },
+      });
+    });
   });
 });