Skip to content

Delete any paper #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2025
Merged

Delete any paper #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions backend/src/db/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ impl Database {
pub async fn soft_delete(&self, id: i32) -> Result<bool, color_eyre::eyre::Error> {
let mut tx = self.connection.begin().await?;

let rows_affected = sqlx::query(queries::SOFT_DELETE_BY_ID)
let rows_affected = sqlx::query(queries::SOFT_DELETE_ANY_BY_ID)
.bind(id)
.execute(&mut *tx)
.await?
Expand Down Expand Up @@ -255,7 +255,10 @@ impl Database {
}

/// Permanently deletes a paper from the database
pub async fn hard_delete(&self, id: i32) -> Result<Transaction<'_, Postgres>, color_eyre::eyre::Error> {
pub async fn hard_delete(
&self,
id: i32,
) -> Result<Transaction<'_, Postgres>, color_eyre::eyre::Error> {
let mut tx = self.connection.begin().await?;
let rows_affected = sqlx::query(queries::HARD_DELETE_BY_ID)
.bind(id)
Expand All @@ -267,10 +270,10 @@ impl Database {
return Err(eyre!(
"Error: {} (> 1) papers were deleted. Rolling back.",
rows_affected
))
));
} else if rows_affected < 1 {
tx.rollback().await?;
return Err(eyre!("Error: No papers were deleted."))
return Err(eyre!("Error: No papers were deleted."));
}
Ok(tx)
}
Expand Down
6 changes: 3 additions & 3 deletions backend/src/routing/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ pub struct DeleteReq {
id: i32,
}

/// Deletes a given paper. Library papers cannot be deleted.
/// (Soft) Deletes a given paper.
///
/// Request format - [`DeleteReq`]
pub async fn delete(
Expand All @@ -468,7 +468,7 @@ pub async fn delete(
))
} else {
Ok(BackendResponse::error(
"No paper was changed. Either the paper does not exist, is a library paper (cannot be deleted), or is already deleted.".into(),
"No paper was changed. Either the paper does not exist, or is already deleted.".into(),
StatusCode::BAD_REQUEST,
))
}
Expand All @@ -485,7 +485,7 @@ pub struct HardDeleteReq {
pub struct DeleteStatus {
id: i32,
status: Status,
message: String
message: String,
}

/// Hard deletes papers from a list of ids.
Expand Down