fixted compilation mistakes

server/main-api/migrations/20240505224430_fix-calendar-id-not-extracted.up.sql

@@ -14,7 +14,6 @@ alter table de drop column type_common_name;
 alter table de add column type_common_name TEXT NOT NULL GENERATED ALWAYS AS (CAST (data->>'type_common_name' AS TEXT)) STORED;
 alter table de drop column type;
 alter table de add column type TEXT NOT NULL GENERATED ALWAYS AS (CAST (data->>'type' AS TEXT)) STORED;
-alter table de drop column calendar_url;
 alter table de add column calendar_url TEXT GENERATED ALWAYS AS (CAST (data->'props'->>'calendar_url' AS TEXT)) STORED;
 
 alter table en alter column data type json using data::json;
@@ -28,5 +27,4 @@ alter table en drop column type_common_name;
 alter table en add column type_common_name TEXT NOT NULL GENERATED ALWAYS AS (CAST (data->>'type_common_name' AS TEXT)) STORED;
 alter table en drop column type;
 alter table en add column type TEXT NOT NULL GENERATED ALWAYS AS (CAST (data->>'type' AS TEXT)) STORED;
-alter table en drop column calendar_url;
 alter table en add column calendar_url TEXT GENERATED ALWAYS AS (CAST (data->'props'->>'calendar_url' AS TEXT)) STORED;

server/main-api/src/details.rs

@@ -30,8 +30,8 @@ pub async fn get_handler(
         Ok(d) => match d {
             None => HttpResponse::NotFound().body("Not found"),
             Some(d) => {
-                let mut response_json = d.clone();
-                // We don not want to serialise this data at any point in the server.
+                let mut response_json = serde_json::to_string(&d).unwrap();
+                // We don't want to serialise this data at any point in the server.
                 // This just flows through the server, but adding redirect_url to the response is necessary
                 response_json.pop(); // remove last }
                 response_json.push_str(&format!(",\"redirect_url\":\"{redirect_url}\"}}",));

server/main-api/src/models.rs

@@ -1,4 +1,5 @@
 use chrono::{DateTime, Utc};
+use serde_json::Value;
 
 #[derive(Debug, Clone)]
 pub struct Location {
@@ -11,7 +12,7 @@ pub struct Location {
     pub type_common_name: String,
     pub lat: f64,
     pub lon: f64,
-    pub data: String,
+    pub data: Value,
 }
 
 #[derive(Debug, Clone)]

server/main-api/src/setup/database/data.rs

@@ -4,11 +4,10 @@ use std::time::Instant;
 use log::info;
 use serde_json::Value;
 
-
 struct DelocalisedValues {
     key: String,
-    de: HashMap<String, Value>,
-    en: HashMap<String, Value>,
+    de: Value,
+    en: Value,
 }
 
 impl From<HashMap<String, Value>> for DelocalisedValues {
@@ -63,15 +62,21 @@ impl DelocalisedValues {
         self,
         tx: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), sqlx::Error> {
-        let data = serde_json::to_string(&self.de).unwrap();
-        sqlx::query!(r#"INSERT INTO de(key,data)VALUES ($1,$2)"#, self.key, data)
-            .execute(&mut **tx)
-            .await?;
+        sqlx::query!(
+            r#"INSERT INTO de(key,data)VALUES ($1,$2)"#,
+            self.key,
+            self.de
+        )
+        .execute(&mut **tx)
+        .await?;
 
-        let data = serde_json::to_string(&self.en).unwrap();
-        sqlx::query!(r#"INSERT INTO en(key,data)VALUES ($1,$2)"#, self.key, data)
-            .execute(&mut **tx)
-            .await?;
+        sqlx::query!(
+            r#"INSERT INTO en(key,data)VALUES ($1,$2)"#,
+            self.key,
+            self.en
+        )
+        .execute(&mut **tx)
+        .await?;
 
         Ok(())
     }