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

refactor: decide to not create separate table for subscriptions

Browse source
This commit is contained in:
Jef Roosens 2025-03-04 08:46:49 +01:00
parent 3e79bec974
commit 064365fb4f
Signed by: Jef Roosens
GPG key ID: 21FD3D77D56BAF49
7 changed files with 119 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

88
src/db/repository/subscription.rs
View file

@ -13,10 +13,10 @@ impl gpodder::SubscriptionRepository for SqliteRepository {
&self,
user: &gpodder::User,
) -> Result<Vec<String>, gpodder::AuthErr> {
Ok(subscriptions::table
Ok(device_subscriptions::table
.inner_join(devices::table)
.filter(devices::user_id.eq(user.id))
.select(subscriptions::url)
.select(device_subscriptions::podcast_url)
.distinct()
.get_results(&mut self.pool.get()?)?)
}
@ -26,14 +26,14 @@ impl gpodder::SubscriptionRepository for SqliteRepository {
user: &gpodder::User,
device_id: &str,
) -> Result<Vec<String>, gpodder::AuthErr> {
Ok(subscriptions::table
Ok(device_subscriptions::table
.inner_join(devices::table)
.filter(
devices::user_id
.eq(user.id)
.and(devices::device_id.eq(device_id)),
)
.select(subscriptions::url)
.select(device_subscriptions::podcast_url)
.get_results(&mut self.pool.get()?)?)
}
@ -61,9 +61,9 @@ impl gpodder::SubscriptionRepository for SqliteRepository {
// 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))
let urls_in_db: HashSet<String> = device_subscriptions::table
.select(device_subscriptions::podcast_url)
.filter(device_subscriptions::device_id.eq(device.id))
.get_results(conn)?
.into_iter()
.collect();
@ -81,41 +81,41 @@ impl gpodder::SubscriptionRepository for SqliteRepository {
// Mark the URLs to delete as properly deleted
diesel::update(
subscriptions::table.filter(
subscriptions::device_id
device_subscriptions::table.filter(
device_subscriptions::device_id
.eq(device.id)
.and(subscriptions::url.eq_any(urls_to_delete)),
.and(device_subscriptions::podcast_url.eq_any(urls_to_delete)),
),
)
.set((
subscriptions::deleted.eq(true),
subscriptions::time_changed.eq(timestamp),
device_subscriptions::deleted.eq(true),
device_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
device_subscriptions::table.filter(
device_subscriptions::device_id
.eq(device.id)
.and(subscriptions::url.eq_any(urls_to_update))
.and(subscriptions::deleted.eq(true)),
.and(device_subscriptions::podcast_url.eq_any(urls_to_update))
.and(device_subscriptions::deleted.eq(true)),
),
)
.set((
subscriptions::deleted.eq(false),
subscriptions::time_changed.eq(timestamp),
device_subscriptions::deleted.eq(false),
device_subscriptions::time_changed.eq(timestamp),
))
.execute(conn)?;
// Insert the new values into the database
diesel::insert_into(subscriptions::table)
diesel::insert_into(device_subscriptions::table)
.values(
urls_to_insert
.into_iter()
.map(|url| db::NewSubscription {
.map(|url| db::NewDeviceSubscription {
device_id: device.id,
url: url.to_string(),
podcast_url: url.to_string(),
deleted: false,
time_changed: timestamp,
})
@ -154,9 +154,9 @@ impl gpodder::SubscriptionRepository for SqliteRepository {
)
.get_result(conn)?;
let urls_in_db: HashSet<String> = subscriptions::table
.select(subscriptions::url)
.filter(subscriptions::device_id.eq(device.id))
let urls_in_db: HashSet<String> = device_subscriptions::table
.select(device_subscriptions::podcast_url)
.filter(device_subscriptions::device_id.eq(device.id))
.get_results(conn)?
.into_iter()
.collect();
@ -168,16 +168,16 @@ impl gpodder::SubscriptionRepository for SqliteRepository {
let urls_to_delete = remove.intersection(&urls_in_db);
diesel::update(
subscriptions::table.filter(
subscriptions::device_id
device_subscriptions::table.filter(
device_subscriptions::device_id
.eq(device.id)
.and(subscriptions::url.eq_any(urls_to_delete))
.and(subscriptions::deleted.eq(false)),
.and(device_subscriptions::podcast_url.eq_any(urls_to_delete))
.and(device_subscriptions::deleted.eq(false)),
),
)
.set((
subscriptions::deleted.eq(true),
subscriptions::time_changed.eq(timestamp),
device_subscriptions::deleted.eq(true),
device_subscriptions::time_changed.eq(timestamp),
))
.execute(conn)?;
@ -186,16 +186,16 @@ impl gpodder::SubscriptionRepository for SqliteRepository {
let urls_to_update = add.intersection(&urls_in_db);
diesel::update(
subscriptions::table.filter(
subscriptions::device_id
device_subscriptions::table.filter(
device_subscriptions::device_id
.eq(device.id)
.and(subscriptions::url.eq_any(urls_to_update))
.and(subscriptions::deleted.eq(true)),
.and(device_subscriptions::podcast_url.eq_any(urls_to_update))
.and(device_subscriptions::deleted.eq(true)),
),
)
.set((
subscriptions::deleted.eq(false),
subscriptions::time_changed.eq(timestamp),
device_subscriptions::deleted.eq(false),
device_subscriptions::time_changed.eq(timestamp),
))
.execute(conn)?;
@ -203,13 +203,13 @@ impl gpodder::SubscriptionRepository for SqliteRepository {
// added list
let urls_to_insert = add.difference(&urls_in_db);
diesel::insert_into(subscriptions::table)
diesel::insert_into(device_subscriptions::table)
.values(
urls_to_insert
.into_iter()
.map(|url| db::NewSubscription {
.map(|url| db::NewDeviceSubscription {
device_id: device.id,
url: url.to_string(),
podcast_url: url.to_string(),
deleted: false,
time_changed: timestamp,
})
@ -231,23 +231,23 @@ impl gpodder::SubscriptionRepository for SqliteRepository {
) -> Result<(i64, Vec<String>, Vec<String>), gpodder::AuthErr> {
let (mut timestamp, mut added, mut removed) = (0, Vec::new(), Vec::new());
let query = subscriptions::table
let query = device_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)),
.and(device_subscriptions::time_changed.ge(since)),
)
.select(db::Subscription::as_select());
.select(db::DeviceSubscription::as_select());
for sub in query.load_iter(&mut self.pool.get()?)? {
let sub = sub?;
if sub.deleted {
removed.push(sub.url);
removed.push(sub.podcast_url);
} else {
added.push(sub.url);
added.push(sub.podcast_url);
}
timestamp = timestamp.max(sub.time_changed);