Converts filter output to match expected query string for users

coconutcalendar · Nov 30, 2018 · 3bcc9a0 · 3bcc9a0
1 parent 26a3bb4
commit 3bcc9a0
Show file tree

Hide file tree

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

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