Merge pull request #244 from rayfoss/patch-3

Current getter should support id 0

Author: marshallswain

src/service-module/getters.js

@@ -55,7 +55,7 @@ export default function makeServiceGetters (servicePath) {
       return keyedById[id] ? select(params, idField)(keyedById[id]) : undefined
     },
     current (state) {
-      return state.currentId ? state.keyedById[state.currentId] : null
+      return state.currentId === null ? null : state.keyedById[state.currentId]
     },
     getCopy (state) {
       return state.copy ? state.copy : null

test/service-module/getters.test.js

@@ -8,13 +8,14 @@ const options = {
   autoRemove: false
 }
 
-const { find, list } = makeServiceGetters('todos', options)
+const { find, list, current } = makeServiceGetters('todos', options)
 const { addItems } = makeServiceMutations('todos', options)
 
 describe('Service Module - Getters', function () {
   beforeEach(function () {
     const state = makeServiceState('todos', options)
     this.items = [
+      { _id: 0, otherField: true, test: true },
       { _id: 1, otherField: true, test: true },
       {
         _id: 2,
@@ -35,6 +36,7 @@ describe('Service Module - Getters', function () {
       }
     ]
     addItems(state, this.items)
+    state.currentId = 0
     this.state = state
   })
 
@@ -45,6 +47,13 @@ describe('Service Module - Getters', function () {
     assert.deepEqual(results, items, 'the list was correct')
   })
 
+  it('current with id 0', function () {
+    const { state, items } = this
+    const result = current(state)
+
+    assert.deepEqual(result, items[0], 'current was correct')
+  })
+
   it('find', function () {
     const { state, items } = this
     const params = { query: {} }
@@ -53,7 +62,7 @@ describe('Service Module - Getters', function () {
     assert.deepEqual(results.data, items, 'the list was correct')
     assert(results.limit === 0, 'limit was correct')
     assert(results.skip === 0, 'skip was correct')
-    assert(results.total === 3, 'total was correct')
+    assert(results.total === 4, 'total was correct')
   })
 
   it('find with query', function () {
@@ -148,23 +157,23 @@ describe('Service Module - Getters', function () {
     const results = find(state)(params)
 
     assert(results.data.length === 1, 'the length was correct')
-    assert(results.data[0]._id === 1, 'the correct record was returned')
+    assert(results.data[0]._id === 0, 'the correct record was returned')
     assert(results.limit === 1, 'limit was correct')
     assert(results.skip === 0, 'skip was correct')
-    assert(results.total === 3, 'total was correct')
+    assert(results.total === 4, 'total was correct')
   })
 
   it('find with skip', function () {
     const { state } = this
     const params = { query: { $skip: 1 } }
     const results = find(state)(params)
 
-    assert(results.data.length === 2, 'the length was correct')
-    assert(results.data[0]._id === 2, 'the correct record was returned')
-    assert(results.data[1]._id === 3, 'the correct record was returned')
+    assert(results.data.length === 3, 'the length was correct')
+    assert(results.data[0]._id === 1, 'the correct record was returned')
+    assert(results.data[1]._id === 2, 'the correct record was returned')
     assert(results.limit === 0, 'limit was correct')
     assert(results.skip === 1, 'skip was correct')
-    assert(results.total === 3, 'total was correct')
+    assert(results.total === 4, 'total was correct')
   })
 
   it('find with limit and skip', function () {
@@ -173,24 +182,24 @@ describe('Service Module - Getters', function () {
     const results = find(state)(params)
 
     assert(results.data.length === 1, 'the length was correct')
-    assert(results.data[0]._id === 2, 'the correct record was returned')
+    assert(results.data[0]._id === 1, 'the correct record was returned')
     assert(results.limit === 1, 'limit was correct')
     assert(results.skip === 1, 'skip was correct')
-    assert(results.total === 3, 'total was correct')
+    assert(results.total === 4, 'total was correct')
   })
 
   it('find with select', function () {
     const { state } = this
     const params = { query: { $select: ['otherField'] } }
     const results = find(state)(params)
 
-    assert(results.data.length === 3, 'the length was correct')
+    assert(results.data.length === 4, 'the length was correct')
     results.data.forEach(result => {
       assert(Object.keys(result).length === 1, 'only one field was returned')
       assert(result.otherField, 'the correct field was returned')
     })
     assert(results.limit === 0, 'limit was correct')
     assert(results.skip === 0, 'skip was correct')
-    assert(results.total === 3, 'total was correct')
+    assert(results.total === 4, 'total was correct')
   })
 })