Chewing_Bever/otter
1
0
Fork 0
Code Issues 25 Releases 4 Packages 2 Activity

feat: migrate subscriptions api to repository

Browse source
This commit is contained in:
Jef Roosens 2025-02-27 22:48:34 +01:00
parent a2233d9da8
commit adda030c3b
Signed by: Jef Roosens
GPG key ID: 21FD3D77D56BAF49
5 changed files with 347 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

258
src/db/repository/subscription.rs Normal file
View file

@ -0,0 +1,258 @@
use std::collections::HashSet;
use diesel::prelude::*;
use super::SqliteRepository;
use crate::{
db::{self, schema::*},
gpodder,
};
impl gpodder::SubscriptionRepository for SqliteRepository {
fn subscriptions_for_user(
&self,
user: &gpodder::User,
) -> Result<Vec<String>, gpodder::AuthErr> {
Ok(subscriptions::table
.inner_join(devices::table)
.filter(devices::user_id.eq(user.id))
.select(subscriptions::url)
.distinct()
.get_results(&mut self.pool.get()?)?)
}
fn subscriptions_for_device(
&self,
user: &gpodder::User,
device_id: &str,
) -> Result<Vec<String>, gpodder::AuthErr> {
Ok(subscriptions::table
.inner_join(devices::table)
.filter(
devices::user_id
.eq(user.id)
.and(devices::device_id.eq(device_id)),
)
.select(subscriptions::url)
.get_results(&mut self.pool.get()?)?)
}
fn set_subscriptions_for_device(
&self,
user: &gpodder::User,
device_id: &str,
urls: Vec<String>,
) -> Result<i64, gpodder::AuthErr> {
// TODO use a better timestamp
let timestamp = chrono::Utc::now().timestamp_millis();
self.pool.get()?.transaction(|conn| {
let device = devices::table
.select(db::Device::as_select())
.filter(
devices::user_id
.eq(user.id)
.and(devices::device_id.eq(device_id)),
)
.get_result(conn)?;
// https://github.com/diesel-rs/diesel/discussions/2826
// SQLite doesn't support default on conflict set values, so we can't handle this using
// on conflict. Therefore, we instead calculate which URLs should be inserted and which
// updated, so we avoid conflicts.
let urls: HashSet<String> = urls.into_iter().collect();
let urls_in_db: HashSet<String> = subscriptions::table
.select(subscriptions::url)
.filter(subscriptions::device_id.eq(device.id))
.get_results(conn)?
.into_iter()
.collect();
// URLs originally in the database that are no longer in the list
let urls_to_delete = urls_in_db.difference(&urls);
// URLs not in the database that are in the new list
let urls_to_insert = urls.difference(&urls_in_db);
// URLs that are in both the database and the new list. For these, those marked as
// "deleted" in the database are updated so they're no longer deleted, with their
// timestamp updated.
let urls_to_update = urls.intersection(&urls_in_db);
// Mark the URLs to delete as properly deleted
diesel::update(
subscriptions::table.filter(
subscriptions::device_id
.eq(device.id)
.and(subscriptions::url.eq_any(urls_to_delete)),
),
)
.set((
subscriptions::deleted.eq(true),
subscriptions::time_changed.eq(timestamp),
))
.execute(conn)?;
// Update the existing deleted URLs that are reinserted as no longer deleted
diesel::update(
subscriptions::table.filter(
subscriptions::device_id
.eq(device.id)
.and(subscriptions::url.eq_any(urls_to_update))
.and(subscriptions::deleted.eq(true)),
),
)
.set((
subscriptions::deleted.eq(false),
subscriptions::time_changed.eq(timestamp),
))
.execute(conn)?;
// Insert the new values into the database
diesel::insert_into(subscriptions::table)
.values(
urls_to_insert
.into_iter()
.map(|url| db::NewSubscription {
device_id: device.id,
url: url.to_string(),
deleted: false,
time_changed: timestamp,
})
.collect::<Vec<_>>(),
)
.execute(conn)?;
Ok::<_, diesel::result::Error>(())
})?;
Ok(timestamp + 1)
}
fn update_subscriptions_for_device(
&self,
user: &gpodder::User,
device_id: &str,
add: Vec<String>,
remove: Vec<String>,
) -> Result<i64, gpodder::AuthErr> {
// TODO use a better timestamp
let timestamp = chrono::Utc::now().timestamp_millis();
// TODO URLs that are in both the added and removed lists will currently get "re-added",
// meaning their change timestamp will be updated even though they haven't really changed.
let add: HashSet<_> = add.into_iter().collect();
let remove: HashSet<_> = remove.into_iter().collect();
self.pool.get()?.transaction(|conn| {
let device = devices::table
.select(db::Device::as_select())
.filter(
devices::user_id
.eq(user.id)
.and(devices::device_id.eq(device_id)),
)
.get_result(conn)?;
let urls_in_db: HashSet<String> = subscriptions::table
.select(subscriptions::url)
.filter(subscriptions::device_id.eq(device.id))
.get_results(conn)?
.into_iter()
.collect();
// Subscriptions to remove are those that were already in the database and are now part
// of the removed list. Subscriptions that were never added in the first place don't
// need to be marked as deleted. We also only update those that aren't already marked
// as deleted.
let urls_to_delete = remove.intersection(&urls_in_db);
diesel::update(
subscriptions::table.filter(
subscriptions::device_id
.eq(device.id)
.and(subscriptions::url.eq_any(urls_to_delete))
.and(subscriptions::deleted.eq(false)),
),
)
.set((
subscriptions::deleted.eq(true),
subscriptions::time_changed.eq(timestamp),
))
.execute(conn)?;
// Subscriptions to update are those that are already in the database, but are also in
// the added list. Only those who were originally marked as deleted get updated.
let urls_to_update = add.intersection(&urls_in_db);
diesel::update(
subscriptions::table.filter(
subscriptions::device_id
.eq(device.id)
.and(subscriptions::url.eq_any(urls_to_update))
.and(subscriptions::deleted.eq(true)),
),
)
.set((
subscriptions::deleted.eq(false),
subscriptions::time_changed.eq(timestamp),
))
.execute(conn)?;
// Subscriptions to insert are those that aren't in the database and are part of the
// added list
let urls_to_insert = add.difference(&urls_in_db);
diesel::insert_into(subscriptions::table)
.values(
urls_to_insert
.into_iter()
.map(|url| db::NewSubscription {
device_id: device.id,
url: url.to_string(),
deleted: false,
time_changed: timestamp,
})
.collect::<Vec<_>>(),
)
.execute(conn)?;
Ok::<_, diesel::result::Error>(())
})?;
Ok(timestamp + 1)
}
fn subscription_updates_for_device(
&self,
user: &gpodder::User,
device_id: &str,
since: i64,
) -> Result<(i64, Vec<String>, Vec<String>), gpodder::AuthErr> {
let (mut timestamp, mut added, mut removed) = (0, Vec::new(), Vec::new());
let query = subscriptions::table
.inner_join(devices::table)
.filter(
devices::user_id
.eq(user.id)
.and(devices::device_id.eq(device_id))
.and(subscriptions::time_changed.ge(since)),
)
.select(db::Subscription::as_select());
for sub in query.load_iter(&mut self.pool.get()?)? {
let sub = sub?;
if sub.deleted {
removed.push(sub.url);
} else {
added.push(sub.url);
}
timestamp = timestamp.max(sub.time_changed);
}
Ok((timestamp + 1, added, removed))
}
}