Fixes badspec exception

Author: mvilanova

src/dispatch/database/service.py

@@ -280,7 +280,7 @@ def apply_model_specific_filters(
     return query
 
 
-def apply_filters(query, filter_spec, do_auto_join=True):
+def apply_filters(query, filter_spec, model_cls, do_auto_join=True):
     """Apply filters to a SQLAlchemy query.
 
     :param query:
@@ -317,6 +317,8 @@ def apply_filters(query, filter_spec, do_auto_join=True):
     """
     filters = build_filters(filter_spec)
     default_model = get_default_model(query)
+    if not default_model:
+        default_model = model_cls
     filter_models = get_named_models(filters)[0]
 
     if do_auto_join:
@@ -470,7 +472,7 @@ def search_filter_sort_paginate(
 
         if filter_spec:
             query = apply_filter_specific_joins(model_cls, filter_spec, query)
-            query = apply_filters(query, filter_spec)
+            query = apply_filters(query, filter_spec, model_cls)
 
         if sort_by:
             sort_spec = create_sort_spec(model, sort_by, descending)

src/dispatch/static/dispatch/src/dashboard/DataOverview.vue

@@ -5,7 +5,12 @@
         <v-btn color="info" @click="copyView"> Share View </v-btn>
       </v-flex>
       <v-flex class="d-flex justify-end" lg6 sm6 xs12>
-        <dialog-filter @filterOptions="setFilterOptions" @update="update" @loading="setLoading" :projects="defaultUserProjects" />
+        <dialog-filter
+          @filterOptions="setFilterOptions"
+          @update="update"
+          @loading="setLoading"
+          :projects="defaultUserProjects"
+        />
       </v-flex>
     </v-layout>
     <v-row>

src/dispatch/static/dispatch/src/dashboard/IncidentOverview.vue

@@ -10,7 +10,11 @@
         <v-btn color="info" @click="copyView"> Share View </v-btn>
       </v-flex>
       <v-flex class="d-flex justify-end" lg6 sm6 xs12>
-        <incident-dialog-filter @update="update" @loading="setLoading" :projects="defaultUserProjects" />
+        <incident-dialog-filter
+          @update="update"
+          @loading="setLoading"
+          :projects="defaultUserProjects"
+        />
       </v-flex>
     </v-layout>
     <v-layout row wrap>

src/dispatch/static/dispatch/src/dashboard/TaskDialogFilter.vue

@@ -12,7 +12,7 @@
       <v-list dense>
         <v-list-item>
           <v-list-item-content>
-            <incident-window-input v-model="filters.created_at" />
+            <incident-window-input v-model="filters.created_at" label="Created At" />
           </v-list-item-content>
         </v-list-item>
         <v-list-item>
@@ -42,6 +42,7 @@
 <script>
 import { mapFields } from "vuex-map-fields"
 import { sum } from "lodash"
+import startOfMonth from "date-fns/startOfMonth"
 import subMonths from "date-fns/subMonths"
 
 import IncidentPriorityCombobox from "@/incident_priority/IncidentPriorityCombobox.vue"
@@ -60,6 +61,13 @@ let today = function () {
 export default {
   name: "TaskOverviewFilterDialog",
 
+  components: {
+    IncidentTypeCombobox,
+    IncidentPriorityCombobox,
+    ProjectCombobox,
+    IncidentWindowInput,
+  },
+
   props: {
     projects: {
       type: Array,
@@ -81,8 +89,8 @@ export default {
         status: [],
         tag: [],
         created_at: {
-          start: subMonths(today(), 6).toISOString().substr(0, 10),
-          end: today().toISOString().substr(0, 10),
+          start: null,
+          end: null,
         },
       },
     }
@@ -117,26 +125,27 @@ export default {
         filters: { ...this.filters },
       }
 
-      filterOptions = SearchUtils.createParametersFromTableOptions(filterOptions)
-
       this.$emit("loading", "error")
-      this.$emit("filterOptions", filterOptions)
+      filterOptions = SearchUtils.createParametersFromTableOptions(filterOptions)
+      // this.$emit("filterOptions", filterOptions)
       TaskApi.getAll(filterOptions).then((response) => {
         this.$emit("update", response.data.items)
         this.$emit("loading", false)
       })
     },
   },
 
-  components: {
-    IncidentTypeCombobox,
-    IncidentPriorityCombobox,
-    ProjectCombobox,
-    IncidentWindowInput,
-  },
-
   created() {
-    this.filters = { ...this.filters, ...RouterUtils.deserializeFilters(this.query) }
+    this.filters = {
+      ...this.filters,
+      ...{
+        created_at: {
+          start: startOfMonth(subMonths(today(), 1)).toISOString().slice(0, -1),
+          end: today().toISOString().slice(0, -1),
+        },
+      },
+      ...RouterUtils.deserializeFilters(this.query), // Order matters as values will overwrite
+    }
     this.fetchData()
   },
 }

src/dispatch/static/dispatch/src/incident/Table.vue

@@ -220,7 +220,7 @@ export default {
     this.filters = {
       ...this.filters,
       ...RouterUtils.deserializeFilters(this.query),
-      project: this.defaultUserProjects
+      project: this.defaultUserProjects,
     }
 
     this.getAll()

src/dispatch/task/views.py

@@ -1,3 +1,4 @@
+import json
 from typing import List
 from fastapi import APIRouter, Depends, HTTPException, Query, status
 
@@ -18,10 +19,10 @@
 
 @router.get("", summary="Retrieve a list of all tasks.")
 def get_tasks(
-    *, include: List[str] = Query([], alias="include[]"), commons: dict = Depends(common_parameters)
+    *, common: dict = Depends(common_parameters), include: List[str] = Query([], alias="include[]")
 ):
     """Retrieve all tasks."""
-    pagination = search_filter_sort_paginate(model="Task", **commons)
+    pagination = search_filter_sort_paginate(model="Task", **common)
 
     if include:
         # only allow two levels for now
@@ -34,8 +35,8 @@ def get_tasks(
             "total": ...,
         }
 
-        return TaskPagination(**pagination).dict(include=include_fields)
-    return TaskPagination(**pagination).dict()
+        return json.loads(TaskPagination(**pagination).json(include=include_fields))
+    return json.loads(TaskPagination(**pagination).json())
 
 
 @router.post("", response_model=TaskRead, tags=["tasks"])