Add saved_places and saved_areas to user table

Author: bubelov

src/db/main/migrations/97.sql

@@ -0,0 +1,12 @@
+DROP TRIGGER admin_updated_at;
+DROP TRIGGER user_updated_at;
+ALTER TABLE user ADD COLUMN saved_places TEXT NOT NULL DEFAULT '';
+ALTER TABLE user ADD COLUMN saved_areas TEXT NOT NULL DEFAULT '';
+CREATE TRIGGER user_updated_at UPDATE OF name, password, roles, saved_places, saved_areas, created_at, deleted_at ON user
+BEGIN
+    UPDATE user SET updated_at = strftime('%Y-%m-%dT%H:%M:%fZ') WHERE id = old.id;
+END;
+CREATE TRIGGER osm_user_updated_at UPDATE OF osm_data, tags, created_at, deleted_at ON osm_user
+BEGIN
+    UPDATE osm_user SET updated_at = strftime('%Y-%m-%dT%H:%M:%fZ') WHERE id = old.id;
+END;

src/db/main/schema.sql

@@ -101,7 +101,7 @@ CREATE TABLE IF NOT EXISTS "user"(
     created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ')),
     updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ')),
     deleted_at TEXT
-) STRICT;
+, saved_places TEXT NOT NULL DEFAULT '', saved_areas TEXT NOT NULL DEFAULT '') STRICT;
 CREATE TABLE access_token(
     id INTEGER PRIMARY KEY NOT NULL,
     user_id INTEGER NOT NULL REFERENCES "user"(id),
@@ -139,10 +139,6 @@ CREATE TABLE place_submission(
     closed_at TEXT,
     deleted_at TEXT
 ) STRICT;
-CREATE TRIGGER user_updated_at UPDATE OF osm_data, tags, created_at, deleted_at ON "osm_user"
-BEGIN
-    UPDATE "osm_user" SET updated_at = strftime('%Y-%m-%dT%H:%M:%fZ') WHERE id = old.id;
-END;
 CREATE TRIGGER report_updated_at UPDATE OF area_id, date, tags, created_at, deleted_at ON report
 BEGIN
     UPDATE report SET updated_at = strftime('%Y-%m-%dT%H:%M:%fZ') WHERE id = old.id;
@@ -163,10 +159,6 @@ CREATE TRIGGER element_issue_updated_at UPDATE OF element_id, code, severity, cr
 BEGIN
     UPDATE element_issue SET updated_at = strftime('%Y-%m-%dT%H:%M:%fZ') WHERE id = old.id;
 END;
-CREATE TRIGGER admin_updated_at UPDATE OF name, password, roles, created_at, deleted_at ON "user"
-BEGIN
-    UPDATE "user" SET updated_at = strftime('%Y-%m-%dT%H:%M:%fZ') WHERE id = old.id;
-END;
 CREATE TRIGGER acess_token_updated_at UPDATE OF user_id, name, secret, roles, created_at, deleted_at ON access_token
 BEGIN
     UPDATE access_token SET updated_at = strftime('%Y-%m-%dT%H:%M:%fZ') WHERE id = old.id;
@@ -191,6 +183,14 @@ CREATE TRIGGER element_updated_at UPDATE OF overpass_data, tags, lat, lon, creat
 BEGIN
     UPDATE element SET updated_at = strftime('%Y-%m-%dT%H:%M:%fZ') WHERE id = old.id;
 END;
+CREATE TRIGGER user_updated_at UPDATE OF name, password, roles, saved_places, saved_areas, created_at, deleted_at ON user
+BEGIN
+    UPDATE user SET updated_at = strftime('%Y-%m-%dT%H:%M:%fZ') WHERE id = old.id;
+END;
+CREATE TRIGGER osm_user_updated_at UPDATE OF osm_data, tags, created_at, deleted_at ON osm_user
+BEGIN
+    UPDATE osm_user SET updated_at = strftime('%Y-%m-%dT%H:%M:%fZ') WHERE id = old.id;
+END;
 CREATE INDEX idx_user_updated_at ON "osm_user"(updated_at);
 CREATE INDEX area_updated_at ON area(updated_at);
 CREATE INDEX report_updated_at ON report(updated_at);
@@ -211,7 +211,6 @@ CREATE INDEX admin_updated_at ON "user"(updated_at);
 CREATE INDEX access_token_secret ON access_token(secret);
 CREATE UNIQUE INDEX area_element_area_id_element_id ON area_element(area_id, element_id);
 CREATE INDEX element_event_updated_at ON element_event(updated_at);
-CREATE INDEX element_event_user_created_type ON element_event(user_id, created_at, type);
 CREATE INDEX idx_area_bbox_west ON area(bbox_west);
 CREATE INDEX idx_area_bbox_south ON area(bbox_south);
 CREATE INDEX idx_area_bbox_east ON area(bbox_east);
@@ -220,4 +219,6 @@ CREATE UNIQUE INDEX place_submission_origin_external_id ON place_submission(orig
 CREATE INDEX element_lat_lon ON element(lat, lon);
 CREATE INDEX place_submission_lat_lon ON place_submission(lat, lon);
 CREATE INDEX element_deleted_at ON element(deleted_at);
+CREATE INDEX element_event_user_created_type ON element_event(user_id, created_at, type);
+CREATE INDEX area_type ON area(json_extract(tags, '$.type'));
 COMMIT;

src/db/main/user/blocking_queries.rs

@@ -99,6 +99,52 @@ pub fn set_roles(admin_id: i64, roles: &[Role], conn: &Connection) -> Result<Use
     .map_err(Into::into)
 }
 
+#[allow(dead_code)]
+pub fn set_saved_places(id: i64, saved_places: &[i64], conn: &Connection) -> Result<User> {
+    let saved_places: String = saved_places
+        .iter()
+        .map(|id| id.to_string())
+        .collect::<Vec<_>>()
+        .join(",");
+    conn.query_row(
+        &format!(
+            r#"
+                UPDATE {TABLE}
+                SET {SavedPlaces} = ?1
+                WHERE {Id} = ?2
+                RETURNING {projection}
+            "#,
+            projection = User::projection(),
+        ),
+        params![saved_places, id],
+        User::mapper(),
+    )
+    .map_err(Into::into)
+}
+
+#[allow(dead_code)]
+pub fn set_saved_areas(id: i64, saved_areas: &[i64], conn: &Connection) -> Result<User> {
+    let saved_areas: String = saved_areas
+        .iter()
+        .map(|id| id.to_string())
+        .collect::<Vec<_>>()
+        .join(",");
+    conn.query_row(
+        &format!(
+            r#"
+                UPDATE {TABLE}
+                SET {SavedAreas} = ?1
+                WHERE {Id} = ?2
+                RETURNING {projection}
+            "#,
+            projection = User::projection(),
+        ),
+        params![saved_areas, id],
+        User::mapper(),
+    )
+    .map_err(Into::into)
+}
+
 #[cfg(test)]
 mod test {
     use super::schema::Role;
@@ -158,4 +204,30 @@ mod test {
         assert_eq!(roles, super::select_by_id(admin_id, &conn)?.roles,);
         Ok(())
     }
+
+    #[test]
+    fn set_saved_places() -> Result<()> {
+        let conn = conn();
+        let admin_id = super::insert("name", "pwd", &conn)?.id;
+        let saved_places = vec![1, 2, 3];
+        super::set_saved_places(admin_id, &saved_places, &conn)?;
+        assert_eq!(
+            saved_places,
+            super::select_by_id(admin_id, &conn)?.saved_places
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn set_saved_areas() -> Result<()> {
+        let conn = conn();
+        let admin_id = super::insert("name", "pwd", &conn)?.id;
+        let saved_areas = vec![10, 20, 30];
+        super::set_saved_areas(admin_id, &saved_areas, &conn)?;
+        assert_eq!(
+            saved_areas,
+            super::select_by_id(admin_id, &conn)?.saved_areas
+        );
+        Ok(())
+    }
 }

src/db/main/user/queries.rs

@@ -45,3 +45,21 @@ pub async fn set_roles(admin_id: i64, roles: &[Role], pool: &Pool) -> Result<Use
         .interact(move |conn| blocking_queries::set_roles(admin_id, &roles, conn))
         .await?
 }
+
+#[allow(dead_code)]
+pub async fn set_saved_places(id: i64, saved_places: &[i64], pool: &Pool) -> Result<User> {
+    let saved_places = saved_places.to_vec();
+    pool.get()
+        .await?
+        .interact(move |conn| blocking_queries::set_saved_places(id, &saved_places, conn))
+        .await?
+}
+
+#[allow(dead_code)]
+pub async fn set_saved_areas(id: i64, saved_areas: &[i64], pool: &Pool) -> Result<User> {
+    let saved_areas = saved_areas.to_vec();
+    pool.get()
+        .await?
+        .interact(move |conn| blocking_queries::set_saved_areas(id, &saved_areas, conn))
+        .await?
+}

src/db/main/user/schema.rs

@@ -12,6 +12,8 @@ pub enum Columns {
     Name,
     Password,
     Roles,
+    SavedPlaces,
+    SavedAreas,
     CreatedAt,
     UpdatedAt,
     DeletedAt,
@@ -23,6 +25,8 @@ pub struct User {
     pub name: String,
     pub password: String,
     pub roles: Vec<Role>,
+    pub saved_places: Vec<i64>,
+    pub saved_areas: Vec<i64>,
     pub created_at: String,
     pub updated_at: String,
     pub deleted_at: Option<String>,
@@ -60,6 +64,8 @@ impl User {
                 Columns::Name,
                 Columns::Password,
                 Columns::Roles,
+                Columns::SavedPlaces,
+                Columns::SavedAreas,
                 Columns::CreatedAt,
                 Columns::UpdatedAt,
                 Columns::DeletedAt,
@@ -78,6 +84,8 @@ impl User {
                 name: row.get(Columns::Name.as_ref())?,
                 password: row.get(Columns::Password.as_ref())?,
                 roles: Self::parse_roles(row.get(Columns::Roles.as_ref())?),
+                saved_places: Self::parse_saved_items(row.get(Columns::SavedPlaces.as_ref())?),
+                saved_areas: Self::parse_saved_items(row.get(Columns::SavedAreas.as_ref())?),
                 created_at: row.get(Columns::CreatedAt.as_ref())?,
                 updated_at: row.get(Columns::UpdatedAt.as_ref())?,
                 deleted_at: row.get(Columns::DeletedAt.as_ref())?,
@@ -92,6 +100,20 @@ impl User {
             .filter_map(|s| Role::from_str(&s).ok())
             .collect()
     }
+
+    fn parse_saved_items(column_value: String) -> Vec<i64> {
+        column_value
+            .split(',')
+            .filter_map(|s| {
+                let s = s.trim();
+                if s.is_empty() {
+                    None
+                } else {
+                    s.parse().ok()
+                }
+            })
+            .collect()
+    }
 }
 
 impl FromStr for Role {

src/rpc/auth/whoami.rs

@@ -38,6 +38,8 @@ mod test {
             created_at: "2023-01-01T00:00:00Z".to_string(),
             updated_at: "2023-01-01T00:00:00Z".to_string(),
             deleted_at: None,
+            saved_places: vec![],
+            saved_areas: vec![],
         };
 
         let result = super::run(&user).await.unwrap();
@@ -61,6 +63,8 @@ mod test {
             created_at: "2023-01-01T00:00:00Z".to_string(),
             updated_at: "2023-01-01T00:00:00Z".to_string(),
             deleted_at: None,
+            saved_places: vec![],
+            saved_areas: vec![],
         };
 
         let result = super::run(&user).await.unwrap();
@@ -78,6 +82,8 @@ mod test {
             created_at: "2023-01-01T00:00:00Z".to_string(),
             updated_at: "2023-01-01T00:00:00Z".to_string(),
             deleted_at: None,
+            saved_places: vec![],
+            saved_areas: vec![],
         };
 
         let result = super::run(&user).await.unwrap();
@@ -95,6 +101,8 @@ mod test {
             created_at: "not-a-timestamp".to_string(),
             updated_at: "2023-01-01T00:00:00Z".to_string(),
             deleted_at: None,
+            saved_places: vec![],
+            saved_areas: vec![],
         };
 
         let result = super::run(&user).await;
@@ -113,6 +121,8 @@ mod test {
             created_at: future_date.format(&Rfc3339)?,
             updated_at: future_date.format(&Rfc3339)?,
             deleted_at: None,
+            saved_places: vec![],
+            saved_areas: vec![],
         };
 
         let result = super::run(&user).await?;