From 1355ce7b498a55ab6b597abca597e26f67db26d3 Mon Sep 17 00:00:00 2001
From: Colin McKechney <cmckechn@nd.edu>
Date: Mon, 1 May 2023 04:08:18 +0000
Subject: [PATCH] changed to vec

---
 backend/src/api/week.rs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/backend/src/api/week.rs b/backend/src/api/week.rs
index d1fc3b5..be30e29 100644
--- a/backend/src/api/week.rs
+++ b/backend/src/api/week.rs
@@ -28,11 +28,6 @@ pub struct MenuItems {
     item_list: Vec<u32>
 }
 
-#[derive(Serialize, Deserialize, Debug, Default)]
-pub struct WeekData{
-    week: Vec<ItemResult>
-}
-
 #[derive(Serialize, Deserialize, Debug, Default)]
 pub struct ItemResult{
     item_id: Option<u32>,
@@ -76,7 +71,7 @@ pub async fn week_meals(items: Json<MenuItems>) -> impl Responder {
     }
 }
 
-pub async fn week_lookup(net_id: Path<String>) -> Json<WeekData> {
+pub async fn week_lookup(net_id: Path<String>) -> Json<Vec<ItemResult>> {
 
     let net_id = net_id.into_inner();
 
@@ -84,7 +79,7 @@ pub async fn week_lookup(net_id: Path<String>) -> Json<WeekData> {
         Ok(week) => Json(week),
         Err(e) => {
             error!("failed to grab week info from {}: {}", net_id, e);
-            Json(WeekData::default())
+            Json(vec![])
         }
     }
 
@@ -162,17 +157,17 @@ fn add_menu_items(items: MenuItems) -> Result<()> {
 }
 
 
-fn get_week(net_id: &str) -> Result<WeekData> {
+fn get_week(net_id: &str) -> Result<Vec<ItemResult>> {
     
     let conn = Connection::connect(ORACLE_USER, ORACLE_PASS, ORACLE_CON_STR)?;
     let mut stmt = conn.statement(format!("select * from {}", net_id).as_str()).build()?;
 
     let rows = stmt.query(&[])?;
-    let mut week = WeekData::default();
+    let mut week = vec![];
 
     for row_result in rows {
         let row = row_result?;
-        week.week.push( ItemResult { 
+        week.push( ItemResult { 
             item_id: row.get(0).unwrap_or(None), 
             amount: row.get(1).unwrap_or(None),
             item_name: row.get(2).unwrap_or(None),
@@ -188,7 +183,6 @@ fn get_week(net_id: &str) -> Result<WeekData> {
             potassium_mg: row.get(12).unwrap_or(None),
             cholesterol_mg: row.get(13).unwrap_or(None) });
     }
-
     Ok(week)