move model-count to service-action

Author: fratzinger

src/service-module/make-base-model.ts

@@ -177,19 +177,13 @@ export default function makeBaseModel(options: FeathersVuexOptions) {
     }
 
     public static count(params) {
-      params = params || {
-        query: {} 
-      }
-      params.query.$limit = 0; // <- limit 0 in feathers is a fast count query
-      return this._dispatch('find', params).then((res) => {
-        return res.total
-      })
+      return this._dispatch('count', params)
     }
 
     public static countInStore(params) {
       return this._getters('count', params)
     }
-    
+
     public static get(id, params) {
       if (params) {
         return this._dispatch('get', [id, params])

src/service-module/service-module.actions.ts

@@ -50,7 +50,7 @@ export default function makeServiceActions(service: Service<any>) {
         commit('setPending', 'get')
         return service
           .get(id, params)
-          .then(async function(item) {
+          .then(async function (item) {
             dispatch('addOrUpdate', item)
             commit('unsetPending', 'get')
             return state.keyedById[id]
@@ -134,7 +134,7 @@ export default function makeServiceActions(service: Service<any>) {
 
       return service
         .update(id, data, params)
-        .then(async function(item) {
+        .then(async function (item) {
           dispatch('addOrUpdate', item)
           commit('unsetPending', 'update')
           return state.keyedById[id]
@@ -164,7 +164,7 @@ export default function makeServiceActions(service: Service<any>) {
 
       return service
         .patch(id, data, params)
-        .then(async function(item) {
+        .then(async function (item) {
           dispatch('addOrUpdate', item)
           commit('unsetPending', 'patch')
           return state.keyedById[id]
@@ -208,6 +208,22 @@ export default function makeServiceActions(service: Service<any>) {
   }
 
   const actions = {
+    count({ dispatch }, params) {
+      params = params || {}
+      params = fastCopy(params)
+
+      if (!params.query) {
+        throw 'params must contain a query-object'
+      }
+
+      params.query.$limit = 0 // <- limit 0 in feathers is a fast count query
+
+      return dispatch('find', params)
+        .then(response => {
+          return response.total || response.length
+        })
+        .catch(error => dispatch('handleFindError', { params, error }))
+    },
     /**
      * Handle the response from the find action.
      *

src/service-module/service-module.getters.ts

@@ -21,35 +21,6 @@ export default function makeServiceGetters() {
     list(state) {
       return state.ids.map(id => state.keyedById[id])
     },
-    count: state => params => {
-      if (isRef(params)) {
-        params = params.value
-      }
-      params = { ...params } || {}
-
-      // Set params.temps to true to include the tempsById records
-      params.temps = params.hasOwnProperty('temps') ? params.temps : false
-
-      const { paramsForServer, whitelist, keyedById } = state
-      const q = _omit(params.query || {}, paramsForServer)
-      const customOperators = Object.keys(q).filter(
-        k => k[0] === '$' && !defaultOps.includes(k)
-      )
-      const cleanQuery = _omit(q, customOperators)
-
-      const { query, filters } = filterQuery(cleanQuery, {
-        operators: additionalOperators.concat(whitelist)
-      })
-      let values = _.values(keyedById)
-
-      if (params.temps) {
-        values = values.concat(_.values(state.tempsById))
-      }
-
-      values = values.filter(sift(query))
-
-      return values.length
-    },
     find: state => params => {
       if (isRef(params)) {
         params = params.value
@@ -102,6 +73,9 @@ export default function makeServiceGetters() {
         data: values
       }
     },
+    count: (state, getters) => params => {
+      return getters.find(state)(params).total
+    },
     get: ({ keyedById, tempsById, idField, tempIdField }) => (
       id,
       params = {}