From 790fd8f3931786d6a13edf7b9a1f4d01772e35ab Mon Sep 17 00:00:00 2001 From: Aravinth Manivannan Date: Fri, 5 Jan 2024 01:03:13 +0530 Subject: [PATCH] feat: create runner method for updating easy captchas --- src/api/v1/mcaptcha/easy.rs | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/src/api/v1/mcaptcha/easy.rs b/src/api/v1/mcaptcha/easy.rs index 14636447..50d66ec2 100644 --- a/src/api/v1/mcaptcha/easy.rs +++ b/src/api/v1/mcaptcha/easy.rs @@ -224,36 +224,15 @@ async fn update( ) -> ServiceResult { let username = id.identity().unwrap(); let payload = payload.into_inner(); - let pattern = (&payload.pattern).into(); - let levels = - calculate(&pattern, &data.settings.captcha.default_difficulty_strategy)?; - - let msg = UpdateCaptcha { - levels, - duration: data.settings.captcha.default_difficulty_strategy.duration, - description: payload.pattern.description, - key: payload.key, - publish_benchmarks: payload.pattern.publish_benchmarks, - }; - - update_captcha_runner(&msg, &data, &username).await?; - - data.db.delete_traffic_pattern(&username, &msg.key).await?; - - data.db - .add_traffic_pattern(&username, &msg.key, &pattern) - .await?; - + update_runner(&data, payload, username).await?; Ok(HttpResponse::Ok()) } -async fn update_runner( - payload: web::Json, - data: AppData, - id: Identity, -) -> ServiceResult { - let username = id.identity().unwrap(); - let payload = payload.into_inner(); +pub async fn update_runner( + data: &AppData, + payload: UpdateTrafficPattern, + username: String, +) -> ServiceResult<()> { let pattern = (&payload.pattern).into(); let levels = calculate(&pattern, &data.settings.captcha.default_difficulty_strategy)?; @@ -274,7 +253,7 @@ async fn update_runner( .add_traffic_pattern(&username, &msg.key, &pattern) .await?; - Ok(HttpResponse::Ok()) + Ok(()) } #[cfg(test)]