From f7f00e93641d05342e2673891e7260fcc7728f9e Mon Sep 17 00:00:00 2001
From: Colin McKechney <cmckechn@nd.edu>
Date: Sun, 7 May 2023 19:12:58 +0000
Subject: [PATCH] final commit for backend

---
 backend/src/api/menu.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/src/api/menu.rs b/backend/src/api/menu.rs
index d85d246..8178c45 100644
--- a/backend/src/api/menu.rs
+++ b/backend/src/api/menu.rs
@@ -20,7 +20,8 @@ pub struct SearchResult {
     item_name: Option<String>,
     item_id: u32,
     eatery_id: Option<u32>,
-    serving_size: Option<String>
+    serving_size: Option<String>,
+    eatery_name: Option<String>
 }
 
 pub async fn menu_search(term: Json<SearchTerm>) -> Json<SearchResults> {
@@ -39,7 +40,7 @@ pub async fn menu_search(term: Json<SearchTerm>) -> Json<SearchResults> {
 
 fn fuzzy_search(term: &str) -> Result<SearchResults> {
     let conn = Connection::connect(ORACLE_USER,ORACLE_PASS,ORACLE_CON_STR)?;
-    let mut stmt = conn.statement(format!("select * from menu_item where item_name like '{}%'", term).as_str()).build()?;
+    let mut stmt = conn.statement(format!("select * from menu_item inner join eatery on menu_item.eatery_id = eatery.id where item_name like '%{}%'", term).as_str()).build()?;
     
     let rows = stmt.query(&[])?;
 
@@ -51,7 +52,8 @@ fn fuzzy_search(term: &str) -> Result<SearchResults> {
         item_name: row.get(0).unwrap_or(None),
         item_id: row.get(1)?,
         eatery_id: row.get(2).unwrap_or(None),
-        serving_size: row.get(3).unwrap_or(None)
+        serving_size: row.get(3).unwrap_or(None),
+        eatery_name: row.get(5).unwrap_or(None)
         });
     }
     conn.close()?;