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

feat(db): store name and description inputs in the properties table other than the items table

Browse source
This commit is contained in:
ryan 2025-03-11 23:27:52 +03:00
parent 414e91a825
commit 7e5f3400ef
1 changed files with 60 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/db.rs
View file

@ -258,12 +258,13 @@ mod db_impl {
"CREATE TABLE IF NOT EXISTS items ( "CREATE TABLE IF NOT EXISTS items (
id TEXT PRIMARY KEY, id TEXT PRIMARY KEY,
url_id INTEGER NOT NULL, url_id INTEGER NOT NULL,
name TEXT NOT NULL,
description TEXT,
wikidata_id TEXT, wikidata_id TEXT,
item_order INTEGER NOT NULL DEFAULT 0, item_order INTEGER NOT NULL DEFAULT 0,
FOREIGN KEY (url_id) REFERENCES urls(id) ON DELETE CASCADE FOREIGN KEY (url_id) REFERENCES urls(id) ON DELETE CASCADE
);", );
INSERT OR IGNORE INTO properties (name) VALUES
('name'),
('description');",
) )
.map_err(|e| { .map_err(|e| {
eprintln!("Failed creating items table: {}", e); eprintln!("Failed creating items table: {}", e);
@ -381,8 +382,6 @@ mod db_impl {
"WITH ordered_items AS ( "WITH ordered_items AS (
SELECT SELECT
i.id, i.id,
i.name,
i.description,
i.wikidata_id, i.wikidata_id,
i.item_order i.item_order
FROM items i FROM items i
@ -391,52 +390,47 @@ mod db_impl {
) )
SELECT SELECT
oi.id, oi.id,
oi.name,
oi.description,
oi.wikidata_id, oi.wikidata_id,
p.name AS prop_name, name_ip.value AS name,
ip.value desc_ip.value AS description,
json_group_object(p.name, ip.value) as custom_properties
FROM ordered_items oi FROM ordered_items oi
LEFT JOIN item_properties ip ON oi.id = ip.item_id LEFT JOIN item_properties ip
LEFT JOIN properties p ON ip.property_id = p.id ON oi.id = ip.item_id
AND ip.property_id NOT IN (
SELECT id FROM properties WHERE name IN ('name', 'description')
)
LEFT JOIN properties p
ON ip.property_id = p.id
LEFT JOIN item_properties name_ip
ON oi.id = name_ip.item_id
AND name_ip.property_id = (SELECT id FROM properties WHERE name = 'name')
LEFT JOIN item_properties desc_ip
ON oi.id = desc_ip.item_id
AND desc_ip.property_id = (SELECT id FROM properties WHERE name = 'description')
GROUP BY oi.id
ORDER BY oi.item_order ASC" ORDER BY oi.item_order ASC"
)?; )?;
// Change from HashMap to Vec to preserve order // Change from HashMap to Vec to preserve order
let mut items: Vec<Item> = Vec::new();
let mut current_id: Option<String> = None;
let rows = stmt.query_map([url_id], |row| { let rows = stmt.query_map([url_id], |row| {
Ok(( let custom_props_json: String = row.get(4)?;
row.get::<_, String>(0)?, // id let custom_properties: HashMap<String, String> = serde_json::from_str(&custom_props_json)
row.get::<_, String>(1)?, // name .unwrap_or_default();
row.get::<_, String>(2)?, // description
row.get::<_, Option<String>>(3)?, // wikidata_id Ok(Item {
row.get::<_, Option<String>>(4)?, // prop_name id: row.get(0)?,
row.get::<_, Option<String>>(5)?, // value name: row.get::<_, Option<String>>(2)?.unwrap_or_default(), // Handle NULL values for name
)) description: row.get::<_, Option<String>>(3)?.unwrap_or_default(), // Handle NULL values for description
wikidata_id: row.get(1)?,
custom_properties,
})
})?; })?;
let mut items = Vec::new();
for row in rows { for row in rows {
let (id, name, desc, wd_id, prop, val) = row?; items.push(row?);
if current_id.as_ref() != Some(&id) {
// New item - push to vector
items.push(Item {
id: id.clone(),
name,
description: desc,
wikidata_id: wd_id,
custom_properties: HashMap::new(),
});
current_id = Some(id);
}
if let (Some(p), Some(v)) = (prop, val) {
if let Some(last_item) = items.last_mut() {
last_item.custom_properties.insert(p, v);
}
}
} }
Ok(items) Ok(items)
@ -503,23 +497,41 @@ mod db_impl {
// 4. Item insertion // 4. Item insertion
log!("[DB] Upserting item"); log!("[DB] Upserting item");
tx.execute( tx.execute(
"INSERT INTO items (id, url_id, name, description, wikidata_id, item_order) "INSERT INTO items (id, url_id, wikidata_id, item_order)
VALUES (?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?)
ON CONFLICT(id) DO UPDATE SET ON CONFLICT(id) DO UPDATE SET
url_id = excluded.url_id, url_id = excluded.url_id,
name = excluded.name, wikidata_id = excluded.wikidata_id,
description = excluded.description, item_order = excluded.item_order",
wikidata_id = excluded.wikidata_id",
rusqlite::params![ rusqlite::params![
&item.id, &item.id,
url_id, url_id,
&item.name,
&item.description,
&item.wikidata_id, &item.wikidata_id,
max_order + 1 max_order + 1
], ],
)?; )?;
log!("[DB] Item upserted successfully"); log!("[DB] Item upserted successfully");
// Combine core properties with custom ones
let core_properties = vec![
("name", &item.name),
("description", &item.description)
];
for (prop, value) in core_properties.into_iter().chain(
item.custom_properties.iter().map(|(k, v)| (k.as_str(), v))
) {
let prop_id = self.get_or_create_property(&mut tx, prop).await?;
tx.execute(
"INSERT INTO item_properties (item_id, property_id, value)
VALUES (?, ?, ?)
ON CONFLICT(item_id, property_id) DO UPDATE SET
value = excluded.value",
rusqlite::params![&item.id, prop_id, value],
)?;
}
// Property handling with enhanced logging // Property handling with enhanced logging
log!("[DB] Synchronizing properties for item {}", item.id); log!("[DB] Synchronizing properties for item {}", item.id);
let existing_props = { let existing_props = {