matous-volf/todo-baggins
1
0
Fork 0
Code Issues 27 Pull Requests 1 Actions Projects 1 Activity

chore: upgrade to Dioxus 0.7
All checks were successful
actionlint check / actionlint check (pull_request) Successful in 5s
Details
conventional commit messages check / conventional commit messages check (pull_request) Successful in 7s
Details
conventional pull request title check / conventional pull request title check (pull_request) Successful in 5s
Details
dotenv-linter check / dotenv-linter check (pull_request) Successful in 10s
Details
hadolint check / hadolint check (pull_request) Successful in 16s
Details
GitLeaks check / GitLeaks check (pull_request) Successful in 10s
Details
htmlhint check / htmlhint check (pull_request) Successful in 35s
Details
Prettier check / Prettier check (pull_request) Successful in 26s
Details
markdownlint check / markdownlint check (pull_request) Successful in 31s
Details
checkov check / checkov check (pull_request) Successful in 1m15s
Details
ShellCheck check / ShellCheck check (pull_request) Successful in 30s
Details
Stylelint check / Stylelint check (pull_request) Successful in 29s
Details
yamllint check / yamllint check (pull_request) Successful in 27s
Details
Rust check / Rust check (pull_request) Successful in 11m44s
Details

Browse Source
This commit is contained in:
Matouš Volf
2025-12-17 19:47:28 +01:00
parent 16db7ac2b9
commit 2f933d5302
109 changed files with 3465 additions and 11983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/server/subtasks.rs
View File

@@ -1,86 +1,64 @@
use crate::errors::error::Error;
use crate::errors::error_vec::ErrorVec;
use crate::errors::subtask_error::SubtaskError;
use crate::models::subtask::{NewSubtask, Subtask};
#[cfg(feature = "server")]
use crate::server::database_connection::establish_database_connection;
#[cfg(feature = "server")]
use crate::server::tasks::trigger_task_updated_at;
#[cfg(feature = "server")]
use crate::server::updates::publish_update;
#[cfg(feature = "server")]
use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl, SelectableHelper};
use dioxus::prelude::*;
#[cfg(feature = "server")]
use validator::Validate;
#[server]
pub(crate) async fn create_subtask(
new_subtask: NewSubtask,
) -> Result<Subtask, ServerFnError<ErrorVec<SubtaskError>>> {
pub(crate) async fn create_subtask(new_subtask: NewSubtask) -> Result<Subtask> {
use crate::schema::subtasks;
// TODO: replace with model sanitization (https://github.com/matous-volf/todo-baggins/issues/13)
let mut new_subtask = new_subtask;
new_subtask.title = new_subtask.title.trim().to_owned();
new_subtask
.validate()
.map_err::<ErrorVec<SubtaskError>, _>(|errors| errors.into())?;
new_subtask.validate()?;
let mut connection =
establish_database_connection().map_err::<ErrorVec<SubtaskError>, _>(|_| {
vec![SubtaskError::Error(Error::ServerInternal)].into()
})?;
let mut connection = establish_database_connection()?;
let created_subtask = diesel::insert_into(subtasks::table)
.values(&new_subtask)
.returning(Subtask::as_returning())
.get_result(&mut connection)
.map_err::<ErrorVec<SubtaskError>, _>(|error| vec![error.into()].into())?;
.get_result(&mut connection)?;
trigger_task_updated_at(new_subtask.task_id)
.await
.map_err::<ErrorVec<SubtaskError>, _>(|error_vec| error_vec.into())?;
trigger_task_updated_at(new_subtask.task_id).await?;
publish_update().await;
Ok(created_subtask)
}
#[server]
pub(crate) async fn get_subtasks_of_task(
filtered_task_id: i32,
) -> Result<Vec<Subtask>, ServerFnError<ErrorVec<Error>>> {
pub(crate) async fn get_subtasks_of_task(filtered_task_id: i32) -> Result<Vec<Subtask>> {
use crate::schema::subtasks::dsl::*;
let mut connection = establish_database_connection()
.map_err::<ErrorVec<Error>, _>(|_| vec![Error::ServerInternal].into())?;
let mut connection = establish_database_connection()?;
let results = subtasks
.select(Subtask::as_select())
.filter(task_id.eq(filtered_task_id))
.load::<Subtask>(&mut connection)
.map_err::<ErrorVec<Error>, _>(|_| vec![Error::ServerInternal].into())?;
.load::<Subtask>(&mut connection)?;
Ok(results)
}
#[server]
pub(crate) async fn edit_subtask(
subtask_id: i32,
new_subtask: NewSubtask,
) -> Result<Subtask, ServerFnError<ErrorVec<SubtaskError>>> {
pub(crate) async fn edit_subtask(subtask_id: i32, new_subtask: NewSubtask) -> Result<Subtask> {
use crate::schema::subtasks::dsl::*;
// TODO: replace with model sanitization (https://github.com/matous-volf/todo-baggins/issues/13)
let mut new_subtask = new_subtask;
new_subtask.title = new_subtask.title.trim().to_owned();
new_subtask
.validate()
.map_err::<ErrorVec<SubtaskError>, _>(|errors| errors.into())?;
new_subtask.validate()?;
let mut connection =
establish_database_connection().map_err::<ErrorVec<SubtaskError>, _>(|_| {
vec![SubtaskError::Error(Error::ServerInternal)].into()
})?;
let mut connection = establish_database_connection()?;
let updated_task = diesel::update(subtasks)
.filter(id.eq(subtask_id))
@@ -89,50 +67,41 @@ pub(crate) async fn edit_subtask(
is_completed.eq(new_subtask.is_completed),
))
.returning(Subtask::as_returning())
.get_result(&mut connection)
.map_err::<ErrorVec<SubtaskError>, _>(|error| vec![error.into()].into())?;
.get_result(&mut connection)?;
trigger_task_updated_at(new_subtask.task_id)
.await
.map_err::<ErrorVec<SubtaskError>, _>(|error_vec| error_vec.into())?;
trigger_task_updated_at(new_subtask.task_id).await?;
publish_update().await;
Ok(updated_task)
}
#[server]
pub(crate) async fn restore_subtasks_of_task(
filtered_task_id: i32,
) -> Result<Vec<Subtask>, ServerFnError<ErrorVec<Error>>> {
#[cfg(feature = "server")]
pub(super) async fn restore_subtasks_of_task(filtered_task_id: i32) -> Result<Vec<Subtask>> {
use crate::schema::subtasks::dsl::*;
let mut connection = establish_database_connection()
.map_err::<ErrorVec<Error>, _>(|_| vec![Error::ServerInternal].into())?;
let mut connection = establish_database_connection()?;
let updated_subtasks = diesel::update(subtasks)
.filter(task_id.eq(filtered_task_id))
.set(is_completed.eq(false))
.returning(Subtask::as_returning())
.get_results(&mut connection)
.map_err::<ErrorVec<Error>, _>(|error| vec![error.into()].into())?;
.get_results(&mut connection)?;
Ok(updated_subtasks)
}
// TODO: Get rid of this suppression.
//noinspection DuplicatedCode
#[server]
pub(crate) async fn delete_subtask(subtask_id: i32) -> Result<(), ServerFnError<ErrorVec<Error>>> {
pub(crate) async fn delete_subtask(subtask_id: i32) -> Result<()> {
use crate::schema::subtasks::dsl::*;
let mut connection = establish_database_connection()
.map_err::<ErrorVec<Error>, _>(|_| vec![Error::ServerInternal].into())?;
let mut connection = establish_database_connection()?;
let deleted_subtask = diesel::delete(subtasks.filter(id.eq(subtask_id)))
.returning(Subtask::as_returning())
.get_result(&mut connection)
.map_err::<ErrorVec<Error>, _>(|error| vec![error.into()].into())?;
.get_result(&mut connection)?;
trigger_task_updated_at(deleted_subtask.task_id()).await?;
trigger_task_updated_at(deleted_subtask.task_id).await?;
publish_update().await;
Ok(())
}