Add timezone to place

Author: julien1619

Cargo.lock

@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 base64 = "0.13"
 chrono = { version = "0.4", features = ["serde"] }
-chrono-tz = "0.5"
+chrono-tz = { version = "0.5", features = ["serde"] }
 clap = "3.0.0-beta"
 custom_error = "1.9"
 diesel = { version = "1.4", features = ["postgres", "chrono", "r2d2", "serde_json", "uuidv07"] }

Cargo.toml

@@ -0,0 +1,12 @@
+DROP TABLE "public"."opening_hour_day";
+
+
+DROP TABLE "public"."opening_hour_date";
+
+
+DROP TABLE "public"."opening_hour_computed";
+
+
+ALTER TABLE "public"."place"
+DROP COLUMN "timezone";
+

migrations/2021-05-21-183525_add_opened_hours/down.sql

@@ -0,0 +1,53 @@
+CREATE TABLE "public"."opening_hour_day" (
+    "id" uuid NOT NULL DEFAULT gen_random_uuid(),
+    "place_id" uuid NOT NULL,
+    "day" int2 NOT NULL,
+    "opening_time" time NOT NULL,
+    "closure_time" time NOT NULL,
+    "evacuation_time" time NOT NULL,
+    "created_at" timestamptz NOT NULL DEFAULT NOW(),
+    "updated_at" timestamptz NOT NULL DEFAULT NOW(),
+    PRIMARY KEY ("id")
+);
+
+CREATE INDEX "opening_hour_day_place_id_index" ON "public"."opening_hour_day" USING BTREE ("place_id");
+
+ALTER TABLE "public"."opening_hour_day" ADD FOREIGN KEY ("place_id") REFERENCES "public"."place" ("id") ON DELETE CASCADE;
+
+CREATE TABLE "public"."opening_hour_date" (
+    "id" uuid NOT NULL DEFAULT gen_random_uuid(),
+    "place_id" uuid NOT NULL,
+    "date" date NOT NULL,
+    "opening_time" time,
+    "closure_time" time,
+    "evacuation_time" time,
+    "closed" bool NOT NULL,
+    "created_at" timestamptz NOT NULL DEFAULT NOW(),
+    "updated_at" timestamptz NOT NULL DEFAULT NOW(),
+    PRIMARY KEY ("id")
+);
+
+CREATE INDEX "opening_hour_date_place_id_index" ON "public"."opening_hour_date" USING BTREE ("place_id");
+
+ALTER TABLE "public"."opening_hour_date" ADD FOREIGN KEY ("place_id") REFERENCES "public"."place" ("id") ON DELETE CASCADE;
+
+CREATE TABLE "public"."opening_hour_computed" (
+    "id" uuid NOT NULL DEFAULT gen_random_uuid(),
+    "place_id" uuid NOT NULL,
+    "opening_timestamp" timestamptz NOT NULL,
+    "closing_timestamp" timestamptz NOT NULL,
+    "evacuation_timestamp" timestamptz NOT NULL,
+    "created_at" timestamptz NOT NULL DEFAULT NOW(),
+    "updated_at" timestamptz NOT NULL DEFAULT NOW(),
+    PRIMARY KEY ("id")
+);
+
+CREATE INDEX "opening_hour_computed_place_id_index" ON "public"."opening_hour_computed" USING BTREE ("place_id");
+
+ALTER TABLE "public"."opening_hour_computed" ADD FOREIGN KEY ("place_id") REFERENCES "public"."place" ("id") ON DELETE CASCADE;
+
+SELECT diesel_manage_updated_at('opening_hour_day');
+SELECT diesel_manage_updated_at('opening_hour_date');
+SELECT diesel_manage_updated_at('opening_hour_computed');
+
+ALTER TABLE "public"."place" ADD COLUMN "timezone" text NOT NULL DEFAULT 'Europe/Paris';

migrations/2021-05-21-183525_add_opened_hours/up.sql

@@ -1,7 +1,7 @@
 use crate::model::organization::Organization;
 
 use super::super::schema::place;
-use super::super::types::{GaugeLevel, Gauge_level};
+use super::super::types::{GaugeLevel, Gauge_level, Timezone};
 use chrono::{DateTime, Utc};
 use postgis::ewkb::Point;
 
@@ -26,6 +26,7 @@ pub struct Place {
     pub location: Option<PointC<Point>>,
     pub current_gauge_level: GaugeLevel,
     pub current_gauge_percent: Option<i64>,
+    pub timezone: Timezone,
 }
 
 pub struct PlaceSearchResult {
@@ -45,6 +46,7 @@ pub struct PlaceInsert {
     pub address: Option<String>,
     pub maximum_duration: i64,
     pub location: Option<PointC<Point>>,
+    pub timezone: Timezone,
 }
 
 #[derive(AsChangeset)]
@@ -58,6 +60,7 @@ pub struct PlaceUpdate {
     pub address: Option<String>,
     pub maximum_duration: i64,
     pub location: Option<PointC<Point>>,
+    pub timezone: Timezone,
 }
 
 #[derive(QueryableByName)]
@@ -93,6 +96,8 @@ pub struct PlaceSearchRow {
     pub current_gauge_level: GaugeLevel,
     #[sql_type = "Nullable<Int8>"]
     pub current_gauge_percent: Option<i64>,
+    #[sql_type = "Text"]
+    pub timezone: Timezone,
 
     // organization table
     #[sql_type = "Uuid"]
@@ -135,6 +140,7 @@ impl From<PlaceSearchRow> for PlaceSearchResult {
                 location: place_row.location,
                 current_gauge_level: place_row.current_gauge_level,
                 current_gauge_percent: place_row.current_gauge_percent,
+                timezone: place_row.timezone,
             },
             organization: Organization {
                 id: place_row.org_id,

src/model/place/common.rs

@@ -37,6 +37,57 @@ table! {
     }
 }
 
+table! {
+    use diesel::sql_types::*;
+    use postgis_diesel::sql_types::*;
+    use crate::model::types::*;
+
+    opening_hour_computed (id) {
+        id -> Uuid,
+        place_id -> Uuid,
+        opening_timestamp -> Timestamptz,
+        closing_timestamp -> Timestamptz,
+        evacuation_timestamp -> Timestamptz,
+        created_at -> Timestamptz,
+        updated_at -> Timestamptz,
+    }
+}
+
+table! {
+    use diesel::sql_types::*;
+    use postgis_diesel::sql_types::*;
+    use crate::model::types::*;
+
+    opening_hour_date (id) {
+        id -> Uuid,
+        place_id -> Uuid,
+        date -> Date,
+        opening_time -> Nullable<Time>,
+        closure_time -> Nullable<Time>,
+        evacuation_time -> Nullable<Time>,
+        closed -> Bool,
+        created_at -> Timestamptz,
+        updated_at -> Timestamptz,
+    }
+}
+
+table! {
+    use diesel::sql_types::*;
+    use postgis_diesel::sql_types::*;
+    use crate::model::types::*;
+
+    opening_hour_day (id) {
+        id -> Uuid,
+        place_id -> Uuid,
+        day -> Int2,
+        opening_time -> Time,
+        closure_time -> Time,
+        evacuation_time -> Time,
+        created_at -> Timestamptz,
+        updated_at -> Timestamptz,
+    }
+}
+
 table! {
     use diesel::sql_types::*;
     use postgis_diesel::sql_types::*;
@@ -74,6 +125,7 @@ table! {
         location -> Nullable<Geometry>,
         current_gauge_level -> Gauge_level,
         current_gauge_percent -> Nullable<Int8>,
+        timezone -> Text,
     }
 }
 
@@ -116,8 +168,21 @@ joinable!(checkin -> place (place_id));
 joinable!(checkin -> session (session_id));
 joinable!(checkin -> user (user_id));
 joinable!(infection -> organization (organization_id));
+joinable!(opening_hour_computed -> place (place_id));
+joinable!(opening_hour_date -> place (place_id));
+joinable!(opening_hour_day -> place (place_id));
 joinable!(organization -> user (user_id));
 joinable!(place -> organization (organization_id));
 joinable!(session -> user (user_id));
 
-allow_tables_to_appear_in_same_query!(checkin, infection, organization, place, session, user,);
+allow_tables_to_appear_in_same_query!(
+    checkin,
+    infection,
+    opening_hour_computed,
+    opening_hour_date,
+    opening_hour_day,
+    organization,
+    place,
+    session,
+    user,
+);

src/model/schema.rs

@@ -1,4 +1,12 @@
 use std::fmt;
+use std::io::Write;
+
+use chrono_tz::Tz;
+use diesel::backend::Backend;
+use diesel::deserialize;
+use diesel::serialize::{self, Output, ToSql};
+use diesel::sql_types::Text;
+use diesel::types::FromSql;
 
 #[derive(Debug, PartialEq, diesel_derive_enum::DbEnum)]
 #[DieselType = "Gauge_level"]
@@ -28,3 +36,37 @@ pub fn join_gauge_levels(gauge_levels: Vec<GaugeLevel>) -> String {
         .collect::<Vec<String>>()
         .join(",")
 }
+
+#[derive(Debug, PartialEq, FromSqlRow, AsExpression)]
+#[sql_type = "Text"]
+pub struct Timezone {
+    pub tz: Tz,
+}
+
+impl From<Tz> for Timezone {
+    fn from(tz: Tz) -> Self {
+        Timezone { tz }
+    }
+}
+
+impl<DB> ToSql<Text, DB> for Timezone
+where
+    DB: Backend,
+    String: ToSql<Text, DB>,
+{
+    fn to_sql<W: Write>(&self, out: &mut Output<W, DB>) -> serialize::Result {
+        self.tz.to_string().to_sql(out)
+    }
+}
+
+impl<DB> FromSql<Text, DB> for Timezone
+where
+    DB: Backend,
+    String: FromSql<Text, DB>,
+{
+    fn from_sql(bytes: Option<&DB::RawValue>) -> deserialize::Result<Self> {
+        let tz_str = String::from_sql(bytes)?;
+        let tz = tz_str.parse::<Tz>()?;
+        Ok(Timezone { tz })
+    }
+}

src/model/types.rs

@@ -168,6 +168,7 @@ async fn create(
             address: data.address,
             maximum_duration: data.maximum_duration,
             location: data.location.map(|location| location.into()),
+            timezone: data.timezone.into(),
         },
     )?;
 
@@ -205,6 +206,7 @@ async fn update(
             address: data.address,
             maximum_duration: data.maximum_duration,
             location: data.location.map(|location| location.into()),
+            timezone: data.timezone.into(),
         },
     )?;
 

src/serve/controller/place.rs

@@ -3,6 +3,7 @@ use crate::model::organization::Organization as OrganizationModel;
 use crate::model::place::{Place as PlaceModel, PlaceSearchResult as PlaceSearchResultModel};
 use crate::model::types::GaugeLevel as GaugeLevelModel;
 use crate::types::{Location, Pagination, PaginationQuery};
+use chrono_tz::Tz;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
@@ -18,6 +19,7 @@ pub struct Place {
     pub address: Option<String>,
     pub location: Option<Location>,
     pub current_gauge_level: GaugeLevel,
+    pub timezone: Tz,
 }
 
 #[derive(Serialize)]
@@ -36,6 +38,7 @@ pub struct OwnedPlace {
     pub current_gauge: i64,
     pub current_gauge_percent: Option<i64>,
     pub current_gauge_level: GaugeLevel,
+    pub timezone: Tz,
 }
 
 #[derive(Deserialize, Serialize)]
@@ -88,6 +91,7 @@ pub struct PlaceForm {
     pub location: Option<Location>,
     #[validate(range(min = 1, max = 1440))]
     pub maximum_duration: i64,
+    pub timezone: Tz,
 }
 
 impl From<(PlaceModel, OrganizationModel)> for Place {
@@ -101,6 +105,7 @@ impl From<(PlaceModel, OrganizationModel)> for Place {
             address: place.address,
             location: place.location.map(|point| point.into()),
             current_gauge_level: place.current_gauge_level.into(),
+            timezone: place.timezone.tz,
         }
     }
 }
@@ -131,6 +136,7 @@ impl From<(PlaceModel, OrganizationModel)> for OwnedPlace {
             current_gauge: place.current_gauge,
             current_gauge_percent: place.current_gauge_percent,
             current_gauge_level: place.current_gauge_level.into(),
+            timezone: place.timezone.tz,
         }
     }
 }