ryanmwangi/Compware
1
0
Fork 0
Code Issues Pull requests Releases Activity

fix(db): retain name and description values upon refresh

Browse source
This commit is contained in:
ryan 2025-03-12 01:46:17 +03:00
parent 7e5f3400ef
commit 11e4935055
1 changed files with 16 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/db.rs
View file

@ -488,13 +488,13 @@ mod db_impl {
Err(e) => return Err(e.into()), Err(e) => return Err(e.into()),
}; };
// 4. Item insertion
let max_order: i32 = tx.query_row( let max_order: i32 = tx.query_row(
"SELECT COALESCE(MAX(item_order), 0) FROM items WHERE url_id = ?", "SELECT COALESCE(MAX(item_order), 0) FROM items WHERE url_id = ?",
[url_id], [url_id],
|row| row.get(0), |row| row.get(0),
)?; )?;
// 4. Item insertion
log!("[DB] Upserting item"); log!("[DB] Upserting item");
tx.execute( tx.execute(
"INSERT INTO items (id, url_id, wikidata_id, item_order) "INSERT INTO items (id, url_id, wikidata_id, item_order)
@ -512,7 +512,7 @@ mod db_impl {
)?; )?;
log!("[DB] Item upserted successfully"); log!("[DB] Item upserted successfully");
// Combine core properties with custom ones // property handling
let core_properties = vec![ let core_properties = vec![
("name", &item.name), ("name", &item.name),
("description", &item.description) ("description", &item.description)
@ -532,58 +532,35 @@ mod db_impl {
)?; )?;
} }
// Property handling with enhanced logging // Property synchronization
log!("[DB] Synchronizing properties for item {}", item.id); log!("[DB] Synchronizing properties for item {}", item.id);
let existing_props = { let existing_props = {
// Prepare statement and collect existing properties
let mut stmt = tx.prepare( let mut stmt = tx.prepare(
"SELECT p.name, ip.value "SELECT p.name, ip.value
FROM item_properties ip FROM item_properties ip
JOIN properties p ON ip.property_id = p.id JOIN properties p ON ip.property_id = p.id
WHERE ip.item_id = ?", WHERE ip.item_id = ?",
)?; )?;
let mapped_rows = stmt.query_map([&item.id], |row| { let mapped_rows = stmt.query_map([&item.id], |row| {
Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?)) Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?))
})?; })?;
mapped_rows.collect::<Result<HashMap<String, String>, _>>()? mapped_rows.collect::<Result<HashMap<String, String>, _>>()?
}; };
for (prop, value) in &item.custom_properties { // Include core properties in current_props check
// Update existing or insert new let mut current_props: HashSet<&str> = item.custom_properties.keys()
let prop_id = self.get_or_create_property(&mut tx, prop).await?; .map(|s| s.as_str())
if let Some(existing_value) = existing_props.get(prop) { .collect();
if existing_value != value { current_props.insert("name");
log!( current_props.insert("description");
"[DB] Updating property {} from '{}' to '{}'",
prop, // Cleanup with core property protection
existing_value,
value
);
tx.execute(
"UPDATE item_properties
SET value = ?
WHERE item_id = ?
AND property_id = (SELECT id FROM properties WHERE name = ?)",
rusqlite::params![value, &item.id, prop],
)?;
}
} else {
log!("[DB] Adding new property {}", prop);
tx.execute(
"INSERT INTO item_properties (item_id, property_id, value)
VALUES (?, ?, ?)",
rusqlite::params![&item.id, prop_id, value],
)?;
}
}
// Remove deleted properties
let current_props: HashSet<&str> =
item.custom_properties.keys().map(|s| s.as_str()).collect();
for (existing_prop, _) in existing_props { for (existing_prop, _) in existing_props {
if !current_props.contains(existing_prop.as_str()) { if !current_props.contains(existing_prop.as_str())
&& !["name", "description"].contains(&existing_prop.as_str())
{
log!("[DB] Removing deleted property {}", existing_prop); log!("[DB] Removing deleted property {}", existing_prop);
tx.execute( tx.execute(
"DELETE FROM item_properties "DELETE FROM item_properties