diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/edit_tts_result.rs b/crates/lib/database_queries/src/queries/tts/tts_results/edit_tts_result.rs index c373fd861d..92d49e76a9 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_results/edit_tts_result.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_results/edit_tts_result.rs @@ -3,7 +3,6 @@ use sqlx::MySqlPool; use enums::common::visibility::Visibility; use errors::AnyhowResult; - pub struct EditTtsResultArgs<'a> { pub tts_result_token: &'a str, pub creator_set_visibility: Visibility, diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs new file mode 100644 index 0000000000..2f60223a0e --- /dev/null +++ b/crates/lib/database_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs @@ -0,0 +1,75 @@ +use anyhow::anyhow; +use sqlx::MySqlPool; +use enums::common::visibility::Visibility; +use errors::AnyhowResult; + +pub struct EditW2lResultArgs<'a> { + pub w2l_result_token: &'a str, + pub creator_set_visibility: Visibility, + pub role_dependent_fields: CreatorOrModFields<'a>, + + pub mysql_pool: &'a MySqlPool, +} + +pub enum CreatorOrModFields<'a> { + CreatorFields { + creator_ip_address: &'a str, + }, + ModFields { + mod_user_token: &'a str, + } +} + +pub async fn edit_w2l_result(args: EditW2lResultArgs<'_>) -> AnyhowResult<()> { + let query_result = match args.role_dependent_fields { + // + // Creator + CreatorOrModFields::CreatorFields { creator_ip_address } => { + + // TODO: Don't update the original IP address. Create a new field. + // We need to store the IP address details. + sqlx::query!( + r#" +UPDATE w2l_results +SET + creator_set_visibility = ?, + creator_ip_address = ? +WHERE token = ? +LIMIT 1 + "#, + args.creator_set_visibility.to_str(), + creator_ip_address, + args.w2l_result_token, + ) + .execute(args.mysql_pool) + .await + }, + // + // Moderator + CreatorOrModFields::ModFields { mod_user_token } => { + + // We need to store the moderator details. + sqlx::query!( + r#" +UPDATE w2l_results +SET + creator_set_visibility = ?, + maybe_mod_user_token = ? +WHERE token = ? +LIMIT 1 + "#, + args.creator_set_visibility.to_str(), + mod_user_token, + args.w2l_result_token, + ) + .execute(args.mysql_pool) + .await + }, + }; + + + match query_result { + Ok(_) => Ok(()), + Err(err) => Err(anyhow!("Update W2L result DB error: {:?}", err)), + } +} diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_results/mod.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/mod.rs index 8189a79f96..776c41fd0c 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_results/mod.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_results/mod.rs @@ -1,3 +1,4 @@ pub mod delete_w2l_result_various_scopes; +pub mod edit_w2l_result; pub mod list_w2l_inference_results_query_builder; pub mod query_w2l_result; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs index d5fc7c6bd3..b3f30c2a85 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs @@ -13,9 +13,10 @@ use crate::server_state::ServerState; use database_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; -use log::warn; +use log::{error, warn}; use std::fmt; use std::sync::Arc; +use database_queries::queries::w2l::w2l_results::edit_w2l_result::{CreatorOrModFields, edit_w2l_result, EditW2lResultArgs}; /// For the URL PathInfo #[derive(Deserialize)] @@ -134,50 +135,27 @@ pub async fn edit_w2l_inference_result_handler( let ip_address = get_request_ip(&http_request); - let query_result = if is_author { - // TODO: Don't update the original IP address. Create a new field. - // We need to store the IP address details. - sqlx::query!( - r#" -UPDATE w2l_results -SET - creator_set_visibility = ?, - creator_ip_address = ? -WHERE token = ? -LIMIT 1 - "#, - &creator_set_visibility.to_str(), - &ip_address, - &inference_result.w2l_result_token, - ) - .execute(&server_state.mysql_pool) - .await - } else { - // We need to store the moderator details. - sqlx::query!( - r#" -UPDATE w2l_results -SET - creator_set_visibility = ?, - maybe_mod_user_token = ? -WHERE token = ? -LIMIT 1 - "#, - &creator_set_visibility.to_str(), - &user_session.user_token, - &inference_result.w2l_result_token, - ) - .execute(&server_state.mysql_pool) - .await + let args = EditW2lResultArgs { + w2l_result_token: &inference_result.w2l_result_token, + creator_set_visibility, + role_dependent_fields: if is_author { + CreatorOrModFields::CreatorFields { + creator_ip_address: &ip_address, + } + } else { + CreatorOrModFields::ModFields { + mod_user_token: &user_session.user_token, + } + }, + mysql_pool: &server_state.mysql_pool, }; - match query_result { - Ok(_) => {}, - Err(err) => { - warn!("Update W2L result DB error: {:?}", err); - return Err(EditW2lResultError::ServerError); - } - }; + edit_w2l_result(args) + .await + .map_err(|err| { + error!("Update W2L result DB error: {:?}", err); + EditW2lResultError::ServerError + })?; Ok(simple_json_success()) }