Exploded data storage

server/migrations/20240815200325_exploded-room-data-model.down.sql

@@ -0,0 +1,20 @@
+-- Add down migration script here
+
+alter table de drop column coordinate_source;
+alter table en drop column coordinate_source;
+alter table de drop column rank_type;
+alter table en drop column rank_type;
+alter table de drop column rank_combined;
+alter table en drop column rank_combined;
+alter table de drop column rank_usage;
+alter table en drop column rank_usage;
+alter table de drop column comment;
+alter table en drop column comment;
+
+DROP MATERIALIZED VIEW operators_de;
+DROP MATERIALIZED VIEW operators_en;
+DROP MATERIALIZED VIEW usage;
+DROP MATERIALIZED VIEW computed_properties;
+DROP MATERIALIZED VIEW urls_de;
+DROP MATERIALIZED VIEW urls_en;
+DROP MATERIALIZED VIEW sources;

server/migrations/20240815200325_exploded-room-data-model.up.sql

@@ -0,0 +1,99 @@
+-- Add up migration script here
+
+alter table de
+    add coordinate_accuracy text generated always as ((((data -> 'coords'::text) ->> 'accuracy'::text))::text) stored null;
+alter table en
+    add coordinate_accuracy text generated always as ((((data -> 'coords'::text) ->> 'accuracy'::text))::text) stored null;
+alter table de
+    add coordinate_source text generated always as ((((data -> 'coords'::text) ->> 'source'::text))::text) stored not null;
+alter table en
+    add coordinate_source text generated always as ((((data -> 'coords'::text) ->> 'source'::text))::text) stored not null;
+alter table de
+    add comment text generated always as (((data -> 'props'::text) ->> 'comment'::text)::text) stored null;
+alter table en
+    add comment text generated always as (((data -> 'props'::text) ->> 'comment'::text)::text) stored null;
+
+CREATE MATERIALIZED VIEW ranking_factors AS
+SELECT DISTINCT
+    data -> 'id' as id,
+    data -> 'ranking_factors' ->> 'rank_type' as rank_type,
+    data -> 'ranking_factors' ->> 'rank_combined' as rank_combined,
+    data -> 'ranking_factors' ->> 'rank_usage' as rank_usage,
+    data -> 'ranking_factors' ->> 'rank_custom' as rank_custom,
+    data -> 'ranking_factors' ->> 'rank_boost' as rank_boost
+from de;
+
+CREATE MATERIALIZED VIEW operators_de AS
+SELECT DISTINCT data -> 'props' -> 'operator' ->> 'id'   as id,
+                data -> 'props' -> 'operator' ->> 'url'  as url,
+                data -> 'props' -> 'operator' ->> 'code' as code,
+                data -> 'props' -> 'operator' ->> 'name' as name
+from de;
+
+CREATE MATERIALIZED VIEW operators_en AS
+SELECT DISTINCT data -> 'props' -> 'operator' ->> 'id'   as id,
+                data -> 'props' -> 'operator' ->> 'url'  as url,
+                data -> 'props' -> 'operator' ->> 'code' as code,
+                data -> 'props' -> 'operator' ->> 'name' as name
+from en;
+
+CREATE MATERIALIZED VIEW usage AS
+SELECT DISTINCT data -> 'usage' ->> 'name'         as name,
+                data -> 'usage' ->> 'din_277'      as din_277,
+                data -> 'usage' ->> 'din_277_desc' as din_277_desc
+from de
+UNION
+DISTINCT
+SELECT DISTINCT data -> 'usage' ->> 'name'         as name,
+                data -> 'usage' ->> 'din_277'      as din_277,
+                data -> 'usage' ->> 'din_277_desc' as din_277_desc
+from en;
+
+CREATE MATERIALIZED VIEW computed_properties as
+(
+with facts(key, fact) as (SELECT key, JSON_ARRAY_ELEMENTS((data -> 'props' -> 'computed')::json) as fact
+                          from de),
+     extracted_facts(key, name, value) as (Select key, fact ->> 'name' as name, fact ->> 'text' as value
+                                           From facts)
+
+select distinct f.key,
+                room_keys.value    as room_key,
+                address.value       as address,
+                level.value        as level,
+                arch_name.value    as arch_name,
+                room_cnt.value     as room_cnt,
+                building_cnt.value as building_cnt
+from extracted_facts f
+         left outer join extracted_facts room_keys on f.key = room_keys.key and room_keys.name = 'Gebäudekennungen'
+         left outer join extracted_facts address on f.key = address.key and address.name = 'Adresse'
+         left outer join extracted_facts level on f.key = level.key and level.name = 'Stockwerk'
+         left outer join extracted_facts arch_name on f.key = arch_name.key and arch_name.name = 'Architekten-Name'
+         left outer join extracted_facts room_cnt on f.key = room_cnt.key and room_cnt.name = 'Anzahl Räume'
+         left outer join extracted_facts building_cnt
+                         on f.key = building_cnt.key and building_cnt.name = 'Anzahl Gebäude'
+    );
+
+CREATE MATERIALIZED VIEW urls_de as
+(
+with unrolled_urls(key, url) as (SELECT key, JSON_ARRAY_ELEMENTS((data -> 'props' ->> 'links')::json) as url
+                                 from de)
+SELECT key, url ->> 'url' as url, url ->> 'text' as text
+FROM unrolled_urls);
+
+CREATE MATERIALIZED VIEW urls_en as
+(
+with unrolled_urls(key, url) as (SELECT key, JSON_ARRAY_ELEMENTS((data -> 'props' ->> 'links')::json) as url
+                                 from en)
+SELECT key, url ->> 'url' as url, url ->> 'text' as text
+FROM unrolled_urls);
+
+CREATE MATERIALIZED VIEW sources as
+(
+with unrolled_sources(key, source) as (SELECT key,
+                                              JSON_ARRAY_ELEMENTS((data -> 'sources' -> 'base')::json) as source
+                                       from de)
+SELECT key,
+       source ->> 'url'  as url,
+       source ->> 'name' as name
+FROM unrolled_sources
+ORDER BY key, source ->> 'name');

server/src/calendar/models.rs

@@ -2,8 +2,6 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use std::fmt::Display;
 
-use crate::models::Location;
-
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub(super) struct CalendarLocation {
     pub key: String,
@@ -13,20 +11,6 @@ pub(super) struct CalendarLocation {
     pub type_common_name: String,
     pub r#type: String,
 }
-
-impl From<Location> for CalendarLocation {
-    fn from(loc: Location) -> Self {
-        Self {
-            key: loc.key,
-            name: loc.name,
-            last_calendar_scrape_at: loc.last_calendar_scrape_at,
-            calendar_url: loc.calendar_url,
-            type_common_name: loc.type_common_name,
-            r#type: loc.r#type,
-        }
-    }
-}
-
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub(super) struct LocationEvents {
     pub(super) events: Vec<Event>,

server/src/locations/preview.rs

@@ -13,31 +13,47 @@ use crate::limited::vec::LimitedVec;
 use crate::localisation;
 use crate::maps::overlay_map::OverlayMapTask;
 use crate::maps::overlay_text::{OverlayText, CANTARELL_BOLD, CANTARELL_REGULAR};
-use crate::models::Location;
 use crate::models::LocationKeyAlias;
 
+#[derive(Debug)]
+struct Location {
+    name: String,
+    r#type: String,
+    type_common_name: String,
+    lat: f64,
+    lon: f64,
+}
+
 #[tracing::instrument(skip(pool))]
 async fn get_localised_data(
     pool: &PgPool,
     id: &str,
     should_use_english: bool,
 ) -> Result<Location, HttpResponse> {
     let result = if should_use_english {
-        sqlx::query_as!(Location, "SELECT key,name,last_calendar_scrape_at,calendar_url,type,type_common_name,lat,lon FROM en WHERE key = $1", id)
-            .fetch_all(pool)
-            .await
+        sqlx::query_as!(
+            Location,
+            "SELECT type,lat,lon,name,type_common_name FROM en WHERE key = $1",
+            id
+        )
+        .fetch_all(pool)
+        .await
     } else {
-        sqlx::query_as!(Location, "SELECT key,name,last_calendar_scrape_at,calendar_url,type,type_common_name,lat,lon FROM de WHERE key = $1", id)
-            .fetch_all(pool)
-            .await
+        sqlx::query_as!(
+            Location,
+            "SELECT type,lat,lon,name,type_common_name FROM de WHERE key = $1",
+            id
+        )
+        .fetch_all(pool)
+        .await
     };
 
     match result {
-        Ok(r) => match r.len() {
-            0 => Err(HttpResponse::NotFound()
+        Ok(mut r) => match r.pop() {
+            None => Err(HttpResponse::NotFound()
                 .content_type("text/plain")
                 .body("Not found")),
-            _ => Ok(r[0].clone()),
+            Some(item) => Ok(item),
         },
         Err(e) => {
             error!("Error preparing statement: {e:?}");
@@ -59,7 +75,10 @@ async fn construct_image_from_data(
     };
 
     // add the map
-    if !OverlayMapTask::from(&data).draw_onto(&mut img).await {
+    if !OverlayMapTask::new(&data.r#type, data.lat, data.lon)
+        .draw_onto(&mut img)
+        .await
+    {
         return None;
     }
     draw_pin(&mut img);