so far making progress

Author: JMStudiosJoe

backend/routes/search.py

@@ -309,8 +309,11 @@ def text_search():
     q_page = args.get("page", 1, type=int)
     q_per_page = args.get("per_page", 20, type=int)
     query = args.get("query", None, type=str)
+    location = args.get("location", None, type=str)
+
     params = {
         "query": query,
+        "location": location,
         "page": q_page,
         "per_page": q_per_page
     }
@@ -341,26 +344,76 @@ def text_search():
     if total_results < (q_page - 1) * q_per_page:
         return jsonify({"message": "Page number exceeds total results"}), 400
 
-    # Query Everything
-    cypher = """
-    CALL () {
+    cypher = """"""
+    if location is None:
+        # Query Everything
+        cypher = """
+        CALL () {
+            CALL db.index.fulltext.queryNodes('officerNames', $query)
+                YIELD node, score
+                RETURN node, score
+            UNION ALL
+            CALL db.index.fulltext.queryNodes('agencyNames', $query)
+                YIELD node, score
+                RETURN node, score
+            UNION ALL
+            CALL db.index.fulltext.queryNodes('unitNames', $query)
+                YIELD node, score
+                RETURN node, score
+        }
+        RETURN node, score
+        ORDER BY score DESC
+        SKIP $per_page * ($page - 1)
+        LIMIT $per_page
+        """
+    else:
+        cypher = """
+        OPTIONAL MATCH (city:CityNode {name: $location})
+        -[]-(:CountyNode)-[]-(:StateNode {name: $location})
+
+        CALL {
+        WITH city
+
+        // Officers: (Officer)-[]-(Unit)-[]-(Agency)-[]-(CityNode)
         CALL db.index.fulltext.queryNodes('officerNames', $query)
             YIELD node, score
-            RETURN node, score
+        WHERE city IS NOT NULL
+            AND EXISTS {
+            (node:Officer)-[]-(:Unit)-[]-(:Agency)-[]-(city)
+            }
+        RETURN node, score
+
         UNION ALL
+
+        // Agencies: (Agency)-[]-(CityNode)
+        WITH city
         CALL db.index.fulltext.queryNodes('agencyNames', $query)
             YIELD node, score
-            RETURN node, score
+        WHERE city IS NOT NULL
+            AND EXISTS {
+            (node:Agency)-[]-(city)
+            }
+        RETURN node, score
+
         UNION ALL
+
+        // Units: (Unit)-[]-(Agency)-[]-(CityNode)
+        WITH city
         CALL db.index.fulltext.queryNodes('unitNames', $query)
             YIELD node, score
-            RETURN node, score
-    }
-    RETURN node, score
-    ORDER BY score DESC
-    SKIP $per_page * ($page - 1)
-    LIMIT $per_page
-    """
+        WHERE city IS NOT NULL
+            AND EXISTS {
+            (node:Unit)-[]-(:Agency)-[]-(city)
+            }
+        RETURN node, score
+        }
+
+        RETURN node, score
+        ORDER BY score DESC
+        SKIP $per_page * ($page - 1)
+        LIMIT $per_page
+        """
+
 
     results, meta = db.cypher_query(cypher, params)
     if not results:

frontend/app/search/Filter.tsx

@@ -9,6 +9,9 @@ import {
   Typography
 } from "@mui/material"
 import { Search } from "@mui/icons-material"
+import { KeyboardEvent, useState, ChangeEvent } from "react"
+import { useSearch } from "@/providers/SearchProvider"
+import { useSearchParams } from "next/navigation"
 
 const FILTER_GROUP_1 = [
   { id: 1, title: "All the locations", count: 56 },
@@ -22,19 +25,44 @@ const FILTER_GROUP_2 = [
 ]
 
 const Filter = () => {
+  const [localLocationInputState, setLocalLocationInputState] = useState('')
+  const { searchAll } = useSearch()
+  const searchParams = useSearchParams()
+  function changeLocalSearchVal(e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) {
+    const changeVal = e.target.value
+    // TODO: this is causing the other search box to refresh as wll
+    setLocalLocationInputState(changeVal)
+  }
+  async function locationFilterSearch(e: KeyboardEvent<HTMLDivElement>) {
+    if (e.key === 'Enter') {
+      const currentQuery = searchParams.get('query') ?? ''
+      await searchAll({ query: currentQuery, location: localLocationInputState })
+    }
+
+  }
   return (
     <section className={styles.filterWrapper}>
       <h3 className={styles.filterTitleText}>Filters</h3>
       <div className={styles.filterContentsWrapper}>
-        <FilterGroup withSearch filters={FILTER_GROUP_1} title="Location" />
+        <FilterGroup
+          onChangeHandler={changeLocalSearchVal}
+          searchHandler={locationFilterSearch}
+          value={localLocationInputState}
+          withSearch
+          filters={FILTER_GROUP_1}
+          title="Location"
+        />
         <FilterGroup filters={FILTER_GROUP_2} title="Data Source" />
       </div>
     </section>
   )
 }
 
 type FilterGroupProps = {
+  searchHandler?: (e: KeyboardEvent<HTMLDivElement>) => void
   withSearch?: boolean
+  value?: string
+  onChangeHandler?: (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void
   filters: FilterItem[]
   title: string
 }
@@ -45,17 +73,20 @@ type FilterItem = {
   count: number
 }
 
-const FilterGroup = ({ withSearch = false, filters = [], title }: FilterGroupProps) => {
+const FilterGroup = ({ withSearch = false, filters = [], title, searchHandler, value, onChangeHandler }: FilterGroupProps) => {
   return (
     <FormGroup sx={{ marginBottom: "1.5rem" }}>
       <Typography variant="subtitle1" sx={{ marginBlockEnd: "0.5rem", fontWeight: "600" }}>
         {title}
       </Typography>
-      {withSearch && (
+      {(withSearch && searchHandler !== null) && (
         <TextField
           id="search"
           variant="outlined"
           fullWidth
+          onKeyDown={searchHandler}
+          onChange={onChangeHandler}
+          value={value}
           sx={{
             marginBottom: "1rem",
             "& .MuiInputBase-root": {

frontend/components/SearchBar/index.tsx

@@ -15,6 +15,7 @@ export const SearchBar = () => {
 
   const handleSearch = async (query: string) => {
     try {
+      console.log("the query", query)
       await searchAll({ query })
     } catch (error) {
       // If it's an authentication error, redirect to login