Converts filter output to match expected query string for services

coconutcalendar · Nov 30, 2018 · 26a3bb4 · 26a3bb4
1 parent 9d975f4
commit 26a3bb4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/resources/service.test.ts b/src/resources/service.test.ts
@@ -134,12 +134,10 @@ it('can get services with additional parameters', async () => {
   expect(mockAxios.get).toHaveBeenCalledTimes(1);
   expect(mockAxios.get).toHaveBeenCalledWith('services', {
     params: {
-      filters: {
-        assigned: true,
-        category: 3,
-        location: 1,
-        user: 2,
-      },
+      'filter[assigned]': true,
+      'filter[category]': 3,
+      'filter[location]': 1,
+      'filter[user]': 2,
       limit: 5,
       page: 1,
       sort: 'created',

diff --git a/src/resources/service.ts b/src/resources/service.ts
@@ -1,5 +1,6 @@
 import { AxiosInstance } from 'axios';
 
+import { combine } from '../helpers/filters';
 import { Filterable, Pageable } from '../index';
 
 export interface ServiceFilter {
@@ -61,10 +62,10 @@ export default class Service implements ServiceResource {
 
   public async get(): Promise<any> {
     const parameters = this.params();
-    const params: Filterable<ServiceParameters> = {};
+    let params: Filterable<ServiceParameters> = {};
 
     if (Object.keys(parameters).length) {
-      params.filters = parameters;
+      params = combine(params, parameters);
     }
 
     if (this.limit) {