fix(calendarEvents): fix post request for searching within groups

* fixes for GWP-6481 * changes to calendarEvents, removing calendarEvent * CalendarEvent type changes
gigwalk-corp · Nov 3, 2016 · ad8051e · ad8051e
1 parent a8daecb
commit ad8051e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 221 deletions.
diff --git a/src/api/calendarEvent/calendarEvent-schema.json b/src/api/calendarEvent/calendarEvent-schema.json
diff --git a/src/api/calendarEvent/index.js b/src/api/calendarEvent/index.js
diff --git a/src/api/calendarEvent/types.js b/src/api/calendarEvent/types.js
diff --git a/src/api/calendarEvents/types.js b/src/api/calendarEvents/types.js
@@ -1,15 +1,20 @@
 // @flow
 
 export type CalendarEvent = {
-    name: string,
     id: number,
-    parent_id: number,
-    parent: Object,
-    organization_id: number,
-    member_count: number,
-    owners: Array<Object>,
-    sub_groups: Array<Object>,
-    organization_data: Array<Object>;
+    customer_id: number,
+    ticket?: {
+        id: number,
+        start_date: string,
+        due_date: string
+    },
+    summary: ?string,
+    description: ?string,
+    start: string,
+    end: string,
+    recurrence: ?string,
+    event_type: string,
+    generated: boolean
 }
 
 type CalendarEventField = {
@@ -43,9 +48,9 @@ type GetCalendarEventsForCustomerQuery = {
     time_min: string,
     time_max: string,
     time_zone: string,
-    event_type: 'TICKET_SCHEDULE' | 'BLOCK',
-    offset: number,
-    limit: number
+    event_type?: 'TICKET_SCHEDULE' | 'BLOCK',
+    offset?: number,
+    limit?: number
 }
 
 export type GetCalendarEventsForCustomerParams = {

diff --git a/src/api/tickets/index.js b/src/api/tickets/index.js
@@ -44,14 +44,14 @@ export default class Tickets extends Resource {
      *             gigwalk.tickets.searchForGroup({...})
      */
     searchForGroup(params: SearchGroupTicketsParams): APIPromise<Array<ESTicket>> {
-        const query = this.stringForQueryObject(params.query);
+        const queryParams = this.stringForQueryObject(params.query_params);
         const data = {
-            query_params: params.query_params,
+            query: params.query,
             bounding_box: params.bounding_box,
             timezone: params.timezone
         };
 
-        return this.client.post(`/v1/groups/${params.group_id}/tickets/search${query}`, data);
+        return this.client.post(`/v1/groups/${params.group_id}/tickets/search${queryParams}`, data);
     }
 
     /**