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

fix(db): fix property and item deletion

Browse source
This commit is contained in:
ryan 2025-02-25 16:47:58 +03:00
parent 0a05b41ffa
commit a47d6b2e3a
4 changed files with 118 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/api.rs
View file

@ -74,15 +74,16 @@ pub async fn create_item(
#[cfg(feature = "ssr")] #[cfg(feature = "ssr")]
pub async fn delete_item( pub async fn delete_item(
db: web::Data<Arc<Mutex<Database>>>, db: web::Data<Arc<Mutex<Database>>>,
url: web::Query<String>, path: web::Path<(String, String)>, // (url, item_id)
item_id: web::Path<String>,
) -> HttpResponse { ) -> HttpResponse {
let (url, item_id) = path.into_inner();
log!("[API] Deleting item {} from URL {}", item_id, url);
let db = db.lock().await; let db = db.lock().await;
match db.delete_item_by_url(&url, &item_id).await { match db.delete_item_by_url(&url, &item_id).await {
Ok(_) => HttpResponse::Ok().body("Item deleted"), Ok(_) => HttpResponse::Ok().finish(),
Err(err) => { Err(e) => {
leptos::logging::error!("Failed to delete item: {:?}", err); log!("[API] Delete error: {:?}", e);
HttpResponse::InternalServerError().body("Failed to delete item") HttpResponse::InternalServerError().body(e.to_string())
} }
} }
} }
@ -90,15 +91,16 @@ pub async fn delete_item(
#[cfg(feature = "ssr")] #[cfg(feature = "ssr")]
pub async fn delete_property( pub async fn delete_property(
db: web::Data<Arc<Mutex<Database>>>, db: web::Data<Arc<Mutex<Database>>>,
url: web::Query<String>, path: web::Path<(String, String)>, // (url, property)
property: web::Path<String>,
) -> HttpResponse { ) -> HttpResponse {
let (url, property) = path.into_inner();
log!("[API] Deleting property {} from URL {}", property, url);
let db = db.lock().await; let db = db.lock().await;
match db.delete_property_by_url(&url, &property).await { match db.delete_property_by_url(&url, &property).await {
Ok(_) => HttpResponse::Ok().body("Property deleted"), Ok(_) => HttpResponse::Ok().finish(),
Err(err) => { Err(e) => {
leptos::logging::error!("Failed to delete property: {:?}", err); log!("[API] Delete error: {:?}", e);
HttpResponse::InternalServerError().body("Failed to delete property") HttpResponse::InternalServerError().body(e.to_string())
} }
} }
} }

103
src/components/items_list.rs
View file

@ -223,57 +223,75 @@ pub fn ItemsList(
} }
} }
let current_url_for_remove_item = Rc::clone(&current_url);
// Function to remove an item // Function to remove an item
let remove_item = move |index: usize| { let remove_item = {
let item_id = items.get()[index].id.clone(); let set_items = set_items.clone();
spawn_local(async move { move |index: usize| {
let response = gloo_net::http::Request::delete(&format!("/api/items/{}", item_id)) let item_id = items.get()[index].id.clone();
let current_url = Rc::clone(&current_url_for_remove_item);
spawn_local(async move {
let response = gloo_net::http::Request::delete(
&format!("/api/urls/{}/items/{}", encode(&current_url), item_id)
)
.send() .send()
.await; .await;
match response {
Ok(resp) => { match response {
if resp.status() == 200 { Ok(resp) => {
set_items.update(|items| { if resp.status() == 200 {
items.remove(index); set_items.update(|items| {
}); items.remove(index);
log!("Item deleted: {}", item_id); });
} else { log!("Item deleted: {}", item_id);
log!("Failed to delete item: {}", resp.status_text()); } else {
log!("Failed to delete item: {}", resp.status_text());
}
} }
Err(err) => log!("Failed to delete item: {:?}", err),
} }
Err(err) => log!("Failed to delete item: {:?}", err), });
} }
});
}; };
let current_url_for_remove_property = Rc::clone(&current_url);
// Function to remove a property // Function to remove a property
let remove_property = move |property: String| { let remove_property = {
spawn_local(async move { let set_custom_properties = set_custom_properties.clone();
let response = gloo_net::http::Request::delete(&format!("/api/properties/{}", property)) let set_selected_properties = set_selected_properties.clone();
let set_items = set_items.clone();
move |property: String| {
let current_url = Rc::clone(&current_url_for_remove_property);
spawn_local(async move {
let response = gloo_net::http::Request::delete(
&format!("/api/urls/{}/properties/{}", encode(&current_url), property)
)
.send() .send()
.await; .await;
match response {
Ok(resp) => { match response {
if resp.status() == 200 { Ok(resp) => {
set_custom_properties.update(|props| { if resp.status() == 200 {
props.retain(|p| p != &property); set_custom_properties.update(|props| {
}); props.retain(|p| p != &property);
set_selected_properties.update(|selected| { });
selected.remove(&property); set_selected_properties.update(|selected| {
}); selected.remove(&property);
set_items.update(|items| { });
for item in items { set_items.update(|items| {
item.custom_properties.remove(&property); for item in items {
} item.custom_properties.remove(&property);
}); }
log!("Property deleted: {}", property); });
} else { log!("Property deleted: {}", property);
log!("Failed to delete property: {}", resp.status_text()); } else {
log!("Failed to delete property: {}", resp.status_text());
}
} }
Err(err) => log!("Failed to delete property: {:?}", err),
} }
Err(err) => log!("Failed to delete property: {:?}", err), });
} }
});
}; };
// State to store Wikidata suggestions // State to store Wikidata suggestions
@ -596,9 +614,10 @@ pub fn ItemsList(
<tr> <tr>
<th>{ "Property" }</th> <th>{ "Property" }</th>
{move || items.get().iter().enumerate().map(|(index, item)| { {move || items.get().iter().enumerate().map(|(index, item)| {
let remove_item = remove_item.clone();
view! { view! {
<th> <th>
{ item.name.clone() } {item.name.clone()}
<button on:click=move |_| remove_item(index)>{ "Delete" }</button> <button on:click=move |_| remove_item(index)>{ "Delete" }</button>
</th> </th>
} }
@ -753,7 +772,9 @@ pub fn ItemsList(
move || { move || {
let update_item = Arc::clone(&update_item_outer); let update_item = Arc::clone(&update_item_outer);
let custom_props = custom_properties.get().clone(); let custom_props = custom_properties.get().clone();
let remove_property = remove_property.clone();
custom_props.into_iter().map(move |property| { custom_props.into_iter().map(move |property| {
let remove_property_clone = remove_property.clone();
let update_item_inner = Arc::clone(&update_item); let update_item_inner = Arc::clone(&update_item);
let normalized_property = property.replace("http://www.wikidata.org/prop/", ""); let normalized_property = property.replace("http://www.wikidata.org/prop/", "");
let property_label = property_labels.get().get(&normalized_property).cloned().unwrap_or_else(|| normalized_property.clone()); let property_label = property_labels.get().get(&normalized_property).cloned().unwrap_or_else(|| normalized_property.clone());
@ -765,7 +786,7 @@ pub fn ItemsList(
{ property_label } { property_label }
<button class="delete-property" on:click=move |_| { <button class="delete-property" on:click=move |_| {
log!("Deleting property: {}", property_clone_for_button); log!("Deleting property: {}", property_clone_for_button);
remove_property(property_clone_for_button.clone()); remove_property_clone(property_clone_for_button.clone());
set_custom_properties.update(|props| { set_custom_properties.update(|props| {
props.retain(|p| p != &property_clone_for_button); props.retain(|p| p != &property_clone_for_button);
}); });

61
src/db.rs
View file

@ -274,7 +274,7 @@ mod db_impl {
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)?))
})?; })?;
@ -326,35 +326,54 @@ mod db_impl {
// Delete an item from the database for a specific URL // Delete an item from the database for a specific URL
pub async fn delete_item_by_url(&self, url: &str, item_id: &str) -> Result<(), Error> { pub async fn delete_item_by_url(&self, url: &str, item_id: &str) -> Result<(), Error> {
let conn = self.conn.lock().await; let mut conn = self.conn.lock().await;
let url_id: i64 = conn.query_row("SELECT id FROM urls WHERE url = ?", &[url], |row| row.get(0))?; let tx = conn.transaction()?;
conn.execute("DELETE FROM items WHERE id = ? AND url_id = ?", &[item_id, &url_id.to_string()])?;
logging::log!("Item deleted from the database for URL: {}", url); // Get URL ID
let url_id: i64 = tx.query_row(
"SELECT id FROM urls WHERE url = ?",
[url],
|row| row.get(0)
)?;
// Delete item and properties
tx.execute(
"DELETE FROM items WHERE id = ? AND url_id = ?",
[item_id, &url_id.to_string()],
)?;
tx.commit()?;
Ok(()) Ok(())
} }
// Delete a property from the database for a specific URL // Delete a property from the database for a specific URL
pub async fn delete_property_by_url(&self, url: &str, property: &str) -> Result<(), Error> { pub async fn delete_property_by_url(&self, url: &str, property: &str) -> Result<(), Error> {
let conn = self.conn.lock().await; let mut conn = self.conn.lock().await;
let url_id: i64 = conn.query_row("SELECT id FROM urls WHERE url = ?", &[url], |row| row.get(0))?; let tx = conn.transaction()?;
// Delete from junction table instead of JSON // Get URL ID
conn.execute( let url_id: i64 = tx.query_row(
"DELETE FROM item_properties "SELECT id FROM urls WHERE url = ?",
WHERE property_id IN ( [url],
SELECT id FROM properties WHERE name = ? |row| row.get(0)
) AND item_id IN (
SELECT id FROM items WHERE url_id = ?
)",
rusqlite::params![
property, // &str
url_id // i64
],
)?; )?;
logging::log!("Property deleted from the database for URL: {}", url); // Delete property from all items in this URL
tx.execute(
"DELETE FROM item_properties
WHERE property_id IN (
SELECT id FROM properties WHERE name = ?
)
AND item_id IN (
SELECT id FROM items WHERE url_id = ?
)",
[property, &url_id.to_string()],
)?;
tx.commit()?;
Ok(()) Ok(())
} }
// function to log database state // function to log database state
pub async fn debug_dump(&self) -> Result<(), Error> { pub async fn debug_dump(&self) -> Result<(), Error> {
let conn = self.conn.lock().await; let conn = self.conn.lock().await;

4
src/main.rs
View file

@ -49,9 +49,9 @@ async fn main() -> std::io::Result<()> {
web::scope("/urls/{url}") web::scope("/urls/{url}")
.route("/items", web::get().to(get_items_handler)) // GET items by URL .route("/items", web::get().to(get_items_handler)) // GET items by URL
.route("/items", web::post().to(create_item_handler)) // Create item for URL .route("/items", web::post().to(create_item_handler)) // Create item for URL
.route("/items/{item_id}", web::delete().to(delete_item_handler)) // Delete item .route("/items/{item_id}", web::delete().to(delete_item)) // Delete item for URL
.route("/properties/{property}", web::delete().to(delete_property)) // Delete property for URL
) )
.route("/properties/{property}", web::delete().to(delete_property)), // DELETE /api/properties/{property}
) )
// Register server functions // Register server functions
.route("/api/{tail:.*}", leptos_actix::handle_server_fns()) .route("/api/{tail:.*}", leptos_actix::handle_server_fns())