fix: pluralize fields resource name (#216)

* deps: update babel-eslint to version 6.1.1 (#204) https://greenkeeper.io/ * deps: update rollup to version 0.33.2 (#205) https://greenkeeper.io/ * deps: update babel-eslint to version 6.1.2 (#206) https://greenkeeper.io/ * deps: update babel-eslint to version 6.1.1 (#204) https://greenkeeper.io/ * deps: update test-app dependencies (#208) * deps: update rollup to version 0.34.0 (#210) https://greenkeeper.io/ * deps: update rollup to version 0.33.2 (#205) https://greenkeeper.io/ * Fix sparse fieldsets in included resources * Adapt tests to new fields semantics * Use the resource name instead of the model name * rollup version 0.34.1 * babel-eslint: 6.1.2 * pg: 6.0.2
postlight · Jul 17, 2016 · 6b62779 · 6b62779
1 parent 44025b3
commit 6b62779
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/packages/route/middleware/sanitize-params.js b/src/packages/route/middleware/sanitize-params.js
@@ -1,5 +1,5 @@
 // @flow
-import { camelize } from 'inflection';
+import { camelize, pluralize } from 'inflection';
 
 import pick from '../../../utils/pick';
 import entries from '../../../utils/entries';
@@ -84,7 +84,7 @@ export default function sanitizeParams(req: IncomingMessage): void {
         value = [value];
       }
 
-      if (key === modelName) {
+      if (key === pluralize(modelName)) {
         const { attributes } = this;
 
         if (value.length) {

diff --git a/src/packages/route/middleware/set-fields.js b/src/packages/route/middleware/set-fields.js
@@ -1,5 +1,6 @@
 // @flow
 import type { IncomingMessage } from 'http';
+import { pluralize } from 'inflection';
 
 /**
  * @private
@@ -14,7 +15,7 @@ export default function setFields(req: IncomingMessage): void {
       }
     } = req;
 
-    fields = fields[this.modelName];
+    fields = fields[pluralize(this.modelName)];
     req.params.fields = fields ? fields : this.attributes;
   }
 }
diff --git a/src/packages/route/middleware/set-include.js b/src/packages/route/middleware/set-include.js
@@ -1,5 +1,5 @@
 // @flow
-import { singularize } from 'inflection';
+import { pluralize } from 'inflection';
 
 import omit from '../../../utils/omit';
 
@@ -35,7 +35,7 @@ export default function setInclude(req: IncomingMessage): void {
       }
     } = req;
 
-    fields = omit(fields, modelName);
+    fields = omit(fields, pluralize(modelName));
 
     Object.assign(req.params, {
       include: relationships.reduce((included, value) => {
@@ -50,11 +50,12 @@ export default function setInclude(req: IncomingMessage): void {
             model: {
               serializer: {
                 attributes: relatedAttrs
-              }
+              },
+              modelName: relatedName
             }
           } = relationship;
 
-          let fieldsForRelationship = fields[singularize(value)];
+          let fieldsForRelationship = fields[pluralize(relatedName)];
 
           if (fieldsForRelationship) {
             fieldsForRelationship = fieldsForRelationship.filter(attr => {

diff --git a/test/integration/controller.js b/test/integration/controller.js
@@ -219,8 +219,8 @@ describe('Integration: class Controller', () => {
       before(async () => {
         [included, excluded] = await Promise.all([
           ...[
-            fetch(`${host}/posts?include=author&${encodeURIComponent('fields[post]')}=title&${encodeURIComponent('fields[author]')}=name`),
-            fetch(`${host}/posts?${encodeURIComponent('fields[post]')}=title`)
+            fetch(`${host}/posts?include=author&${encodeURIComponent('fields[posts]')}=title&${encodeURIComponent('fields[authors]')}=name`),
+            fetch(`${host}/posts?${encodeURIComponent('fields[posts]')}=title`)
           ].map(async (req) => {
             const res = await req;
 
@@ -327,8 +327,8 @@ describe('Integration: class Controller', () => {
       before(async () => {
         [included, excluded] = await Promise.all([
           ...[
-            fetch(`${host}/posts/1?include=author&${encodeURIComponent('fields[post]')}=title&${encodeURIComponent('fields[author]')}=name`),
-            fetch(`${host}/posts/1?${encodeURIComponent('fields[post]')}=title`)
+            fetch(`${host}/posts/1?include=author&${encodeURIComponent('fields[posts]')}=title&${encodeURIComponent('fields[authors]')}=name`),
+            fetch(`${host}/posts/1?${encodeURIComponent('fields[posts]')}=title`)
           ].map(async (req) => {
             const res = await req;