made sure that Location.* is not needlessly overfetched

TUM-Dev · Jun 17, 2024 · c96bf9b · c96bf9b
1 parent d4c9290
commit c96bf9b
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 77 deletions.
diff --git a/...d161757d7ce6fcee59c23c23abbf45e803cb.json → ...ee13b64b16adb36252d6c3135e1ce7ff0887.json b/...d161757d7ce6fcee59c23c23abbf45e803cb.json → ...ee13b64b16adb36252d6c3135e1ce7ff0887.json
diff --git a/...1a495534817fb39a9e25f6720267c6025965.json → ...766a50309ca0b3dfb34b523468c5d13a4409.json b/...1a495534817fb39a9e25f6720267c6025965.json → ...766a50309ca0b3dfb34b523468c5d13a4409.json
diff --git a/server/main-api/src/calendar/mod.rs b/server/main-api/src/calendar/mod.rs
@@ -65,7 +65,7 @@ pub async fn calendar_handler(
 }
 
 async fn get_location(pool: &PgPool, id: &str) -> Result<Option<Location>, sqlx::Error> {
-    sqlx::query_as!(Location, "SELECT * FROM de WHERE key = $1", id)
+    sqlx::query_as!(Location, "SELECT name,last_calendar_scrape_at,calendar_url,type,type_common_name,lat,lon FROM de WHERE key = $1", id)
         .fetch_optional(pool)
         .await
 }

diff --git a/server/main-api/src/maps/mod.rs b/server/main-api/src/maps/mod.rs
@@ -35,11 +35,11 @@ async fn get_localised_data(
     should_use_english: bool,
 ) -> Result<Location, HttpResponse> {
     let result = if should_use_english {
-        sqlx::query_as!(Location, "SELECT * FROM en WHERE key = $1", id)
+        sqlx::query_as!(Location, "SELECT name,last_calendar_scrape_at,calendar_url,type,type_common_name,lat,lon FROM en WHERE key = $1", id)
             .fetch_all(conn)
             .await
     } else {
-        sqlx::query_as!(Location, "SELECT * FROM de WHERE key = $1", id)
+        sqlx::query_as!(Location, "SELECT name,last_calendar_scrape_at,calendar_url,type,type_common_name,lat,lon FROM de WHERE key = $1", id)
             .fetch_all(conn)
             .await
     };

diff --git a/server/main-api/src/models.rs b/server/main-api/src/models.rs
@@ -1,18 +1,14 @@
 use chrono::{DateTime, Utc};
-use serde_json::Value;
 
 #[derive(Debug, Clone)]
 pub struct Location {
-    pub key: String,
     pub name: String,
     pub last_calendar_scrape_at: Option<DateTime<Utc>>,
-    pub tumonline_room_nr: Option<i32>,
     pub calendar_url: Option<String>,
     pub r#type: String,
     pub type_common_name: String,
     pub lat: f64,
     pub lon: f64,
-    pub data: Value,
 }
 
 #[derive(Debug, Clone)]