Merge pull request #307 from mikeyavorsky/fix-date-search

Fix Incident date search
codeforboston · Nov 22, 2023 · 7a96faa · 7a96faa
2 parents d7b3310 + 1fcf7d0
commit 7a96faa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/backend/routes/incidents.py b/backend/routes/incidents.py
@@ -96,11 +96,11 @@ def search_incidents():
         if body.dateStart:
             query = query.filter(
                                 Incident.time_of_incident >=
-                                datetime.strptime(body.dateStart, "%Y-%m-%d"))
+                                datetime.fromisoformat(body.dateStart))
         if body.dateEnd:
             query = query.filter(
                                 Incident.time_of_incident <=
-                                datetime.strptime(body.dateEnd, "%Y-%m-%d"))
+                                datetime.fromisoformat(body.dateEnd))
         if body.description:
             query = query.filter(
                 Incident.description.ilike(f"%{body.description}%")

diff --git a/frontend/helpers/api/api.ts b/frontend/helpers/api/api.ts
@@ -161,8 +161,8 @@ export function searchIncidents({
   dateEnd,
   ...rest
 }: IncidentSearchRequest): Promise<IncidentSearchResponse> {
-  if (dateStart) dateStart = new Date(dateStart).toISOString()
-  if (dateEnd) dateEnd = new Date(dateEnd).toISOString()
+  if (dateStart) dateStart = new Date(dateStart).toISOString().slice(0, -1)
+  if (dateEnd) dateEnd = new Date(dateEnd).toISOString().slice(0, -1)
 
   return request({
     url: "/incidents/search",