nutomic/ibis
1
0
Fork 0
mirror of https://github.com/Nutomic/ibis.git synced 2024-11-29 04:11:09 +00:00
Code Projects Releases Packages Activity

change get_article to take ap_id instead of title param

Browse source
This commit is contained in:
Felix Ableitner 2023-11-28 14:29:51 +01:00
parent 80ad6aa8d6
commit 782ddd30f3
3 changed files with 35 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/api.rs
View file

@ -130,7 +130,7 @@ async fn edit_article(
#[derive(Deserialize, Serialize, Clone)] #[derive(Deserialize, Serialize, Clone)]
pub struct GetArticleData { pub struct GetArticleData {
pub title: String, pub ap_id: ObjectId<DbArticle>,
} }
#[debug_handler] #[debug_handler]
@ -141,7 +141,7 @@ async fn get_article(
let articles = data.articles.lock().unwrap(); let articles = data.articles.lock().unwrap();
let article = articles let article = articles
.iter() .iter()
.find(|a| a.1.title == query.title) .find(|a| a.1.ap_id == query.ap_id)
.ok_or(anyhow!("not found"))? .ok_or(anyhow!("not found"))?
.1 .1
.clone(); .clone();

17
tests/common.rs
View file

@ -1,3 +1,4 @@
use activitypub_federation::fetch::object_id::ObjectId;
use fediwiki::api::{ use fediwiki::api::{
ApiConflict, CreateArticleData, EditArticleData, FollowInstance, GetArticleData, ResolveObject, ApiConflict, CreateArticleData, EditArticleData, FollowInstance, GetArticleData, ResolveObject,
}; };
@ -80,12 +81,12 @@ pub async fn create_article(hostname: &str, title: String) -> MyResult<DbArticle
previous_version: article.latest_version, previous_version: article.latest_version,
resolve_conflict_id: None, resolve_conflict_id: None,
}; };
edit_article(hostname, &title, &edit_form).await edit_article(hostname, &edit_form).await
} }
pub async fn get_article(hostname: &str, title: &str) -> MyResult<DbArticle> { pub async fn get_article(hostname: &str, ap_id: &ObjectId<DbArticle>) -> MyResult<DbArticle> {
let get_article = GetArticleData { let get_article = GetArticleData {
title: title.to_string(), ap_id: ap_id.clone(),
}; };
get_query::<DbArticle, _>(hostname, "article", Some(get_article.clone())).await get_query::<DbArticle, _>(hostname, "article", Some(get_article.clone())).await
} }
@ -103,21 +104,17 @@ pub async fn edit_article_with_conflict(
.await?) .await?)
} }
pub async fn edit_article( pub async fn edit_article(hostname: &str, edit_form: &EditArticleData) -> MyResult<DbArticle> {
hostname: &str,
title: &str,
edit_form: &EditArticleData,
) -> MyResult<DbArticle> {
let edit_res: Option<ApiConflict> = CLIENT let edit_res: Option<ApiConflict> = CLIENT
.patch(format!("http://{}/api/v1/article", hostname)) .patch(format!("http://{}/api/v1/article", hostname))
.form(edit_form) .form(&edit_form)
.send() .send()
.await? .await?
.json() .json()
.await?; .await?;
assert!(edit_res.is_none()); assert!(edit_res.is_none());
let get_article = GetArticleData { let get_article = GetArticleData {
title: title.to_string(), ap_id: edit_form.ap_id.clone(),
}; };
let updated_article: DbArticle = get_query(hostname, "article", Some(get_article)).await?; let updated_article: DbArticle = get_query(hostname, "article", Some(get_article)).await?;
Ok(updated_article) Ok(updated_article)

53
tests/test.rs
View file

@ -21,22 +21,22 @@ use url::Url;
async fn test_create_read_and_edit_article() -> MyResult<()> { async fn test_create_read_and_edit_article() -> MyResult<()> {
let data = TestData::start(); let data = TestData::start();
// error on nonexistent article
let title = "Manu_Chao".to_string();
let not_found = get_article(data.hostname_alpha, &title).await;
assert!(not_found.is_err());
// create article // create article
let title = "Manu_Chao".to_string();
let create_res = create_article(data.hostname_alpha, title.clone()).await?; let create_res = create_article(data.hostname_alpha, title.clone()).await?;
assert_eq!(title, create_res.title); assert_eq!(title, create_res.title);
assert!(create_res.local); assert!(create_res.local);
// now article can be read // now article can be read
let get_res = get_article(data.hostname_alpha, &create_res.title).await?; let get_res = get_article(data.hostname_alpha, &create_res.ap_id).await?;
assert_eq!(title, get_res.title); assert_eq!(title, get_res.title);
assert_eq!(TEST_ARTICLE_DEFAULT_TEXT, get_res.text); assert_eq!(TEST_ARTICLE_DEFAULT_TEXT, get_res.text);
assert!(get_res.local); assert!(get_res.local);
// error on article which wasnt federated
let not_found = get_article(data.hostname_beta, &create_res.ap_id).await;
assert!(not_found.is_err());
// edit article // edit article
let edit_form = EditArticleData { let edit_form = EditArticleData {
ap_id: create_res.ap_id.clone(), ap_id: create_res.ap_id.clone(),
@ -44,7 +44,7 @@ async fn test_create_read_and_edit_article() -> MyResult<()> {
previous_version: get_res.latest_version, previous_version: get_res.latest_version,
resolve_conflict_id: None, resolve_conflict_id: None,
}; };
let edit_res = edit_article(data.hostname_alpha, &create_res.title, &edit_form).await?; let edit_res = edit_article(data.hostname_alpha, &edit_form).await?;
assert_eq!(edit_form.new_text, edit_res.text); assert_eq!(edit_form.new_text, edit_res.text);
assert_eq!(2, edit_res.edits.len()); assert_eq!(2, edit_res.edits.len());
@ -73,7 +73,6 @@ async fn test_follow_instance() -> MyResult<()> {
data.stop() data.stop()
} }
#[tokio::test] #[tokio::test]
#[serial] #[serial]
async fn test_synchronize_articles() -> MyResult<()> { async fn test_synchronize_articles() -> MyResult<()> {
@ -93,10 +92,10 @@ async fn test_synchronize_articles() -> MyResult<()> {
previous_version: create_res.latest_version, previous_version: create_res.latest_version,
resolve_conflict_id: None, resolve_conflict_id: None,
}; };
edit_article(data.hostname_alpha, &title, &edit_form).await?; edit_article(data.hostname_alpha, &edit_form).await?;
// article is not yet on beta // article is not yet on beta
let get_res = get_article(data.hostname_beta, &create_res.title).await; let get_res = get_article(data.hostname_beta, &create_res.ap_id).await;
assert!(get_res.is_err()); assert!(get_res.is_err());
// fetch alpha instance on beta, articles are also fetched automatically // fetch alpha instance on beta, articles are also fetched automatically
@ -107,7 +106,7 @@ async fn test_synchronize_articles() -> MyResult<()> {
.await?; .await?;
// get the article and compare // get the article and compare
let get_res = get_article(data.hostname_beta, &create_res.title).await?; let get_res = get_article(data.hostname_beta, &create_res.ap_id).await?;
assert_eq!(create_res.ap_id, get_res.ap_id); assert_eq!(create_res.ap_id, get_res.ap_id);
assert_eq!(title, get_res.title); assert_eq!(title, get_res.title);
assert_eq!(2, get_res.edits.len()); assert_eq!(2, get_res.edits.len());
@ -131,7 +130,7 @@ async fn test_edit_local_article() -> MyResult<()> {
assert!(create_res.local); assert!(create_res.local);
// article should be federated to alpha // article should be federated to alpha
let get_res = get_article(data.hostname_alpha, &create_res.title).await?; let get_res = get_article(data.hostname_alpha, &create_res.ap_id).await?;
assert_eq!(create_res.title, get_res.title); assert_eq!(create_res.title, get_res.title);
assert_eq!(1, get_res.edits.len()); assert_eq!(1, get_res.edits.len());
assert!(!get_res.local); assert!(!get_res.local);
@ -144,7 +143,7 @@ async fn test_edit_local_article() -> MyResult<()> {
previous_version: get_res.latest_version, previous_version: get_res.latest_version,
resolve_conflict_id: None, resolve_conflict_id: None,
}; };
let edit_res = edit_article(data.hostname_beta, &create_res.title, &edit_form).await?; let edit_res = edit_article(data.hostname_beta, &edit_form).await?;
assert_eq!(edit_res.text, edit_form.new_text); assert_eq!(edit_res.text, edit_form.new_text);
assert_eq!(edit_res.edits.len(), 2); assert_eq!(edit_res.edits.len(), 2);
assert!(edit_res.edits[0] assert!(edit_res.edits[0]
@ -153,7 +152,7 @@ async fn test_edit_local_article() -> MyResult<()> {
.starts_with(&edit_res.ap_id.to_string())); .starts_with(&edit_res.ap_id.to_string()));
// edit should be federated to alpha // edit should be federated to alpha
let get_res = get_article(data.hostname_alpha, &edit_res.title).await?; let get_res = get_article(data.hostname_alpha, &edit_res.ap_id).await?;
assert_eq!(edit_res.title, get_res.title); assert_eq!(edit_res.title, get_res.title);
assert_eq!(edit_res.edits.len(), 2); assert_eq!(edit_res.edits.len(), 2);
assert_eq!(edit_res.text, get_res.text); assert_eq!(edit_res.text, get_res.text);
@ -176,22 +175,22 @@ async fn test_edit_remote_article() -> MyResult<()> {
assert!(create_res.local); assert!(create_res.local);
// article should be federated to alpha and gamma // article should be federated to alpha and gamma
let get_res = get_article(data.hostname_alpha, &title).await?; let get_res = get_article(data.hostname_alpha, &create_res.ap_id).await?;
assert_eq!(create_res.title, get_res.title); assert_eq!(create_res.title, get_res.title);
assert_eq!(1, get_res.edits.len()); assert_eq!(1, get_res.edits.len());
assert!(!get_res.local); assert!(!get_res.local);
let get_res = get_article(data.hostname_gamma, &title).await?; let get_res = get_article(data.hostname_gamma, &create_res.ap_id).await?;
assert_eq!(create_res.title, get_res.title); assert_eq!(create_res.title, get_res.title);
assert_eq!(create_res.text, get_res.text); assert_eq!(create_res.text, get_res.text);
let edit_form = EditArticleData { let edit_form = EditArticleData {
ap_id: create_res.ap_id, ap_id: create_res.ap_id.clone(),
new_text: "Lorem Ipsum 2".to_string(), new_text: "Lorem Ipsum 2".to_string(),
previous_version: get_res.latest_version, previous_version: get_res.latest_version,
resolve_conflict_id: None, resolve_conflict_id: None,
}; };
let edit_res = edit_article(data.hostname_alpha, &title, &edit_form).await?; let edit_res = edit_article(data.hostname_alpha, &edit_form).await?;
assert_eq!(edit_form.new_text, edit_res.text); assert_eq!(edit_form.new_text, edit_res.text);
assert_eq!(2, edit_res.edits.len()); assert_eq!(2, edit_res.edits.len());
assert!(!edit_res.local); assert!(!edit_res.local);
@ -201,12 +200,12 @@ async fn test_edit_remote_article() -> MyResult<()> {
.starts_with(&edit_res.ap_id.to_string())); .starts_with(&edit_res.ap_id.to_string()));
// edit should be federated to beta and gamma // edit should be federated to beta and gamma
let get_res = get_article(data.hostname_alpha, &title).await?; let get_res = get_article(data.hostname_alpha, &create_res.ap_id).await?;
assert_eq!(edit_res.title, get_res.title); assert_eq!(edit_res.title, get_res.title);
assert_eq!(edit_res.edits.len(), 2); assert_eq!(edit_res.edits.len(), 2);
assert_eq!(edit_res.text, get_res.text); assert_eq!(edit_res.text, get_res.text);
let get_res = get_article(data.hostname_gamma, &title).await?; let get_res = get_article(data.hostname_gamma, &create_res.ap_id).await?;
assert_eq!(edit_res.title, get_res.title); assert_eq!(edit_res.title, get_res.title);
assert_eq!(edit_res.edits.len(), 2); assert_eq!(edit_res.edits.len(), 2);
assert_eq!(edit_res.text, get_res.text); assert_eq!(edit_res.text, get_res.text);
@ -232,7 +231,7 @@ async fn test_local_edit_conflict() -> MyResult<()> {
previous_version: create_res.latest_version.clone(), previous_version: create_res.latest_version.clone(),
resolve_conflict_id: None, resolve_conflict_id: None,
}; };
let edit_res = edit_article(data.hostname_alpha, &create_res.title, &edit_form).await?; let edit_res = edit_article(data.hostname_alpha, &edit_form).await?;
assert_eq!(edit_res.text, edit_form.new_text); assert_eq!(edit_res.text, edit_form.new_text);
assert_eq!(2, edit_res.edits.len()); assert_eq!(2, edit_res.edits.len());
@ -259,7 +258,7 @@ async fn test_local_edit_conflict() -> MyResult<()> {
previous_version: edit_res.previous_version, previous_version: edit_res.previous_version,
resolve_conflict_id: Some(edit_res.id), resolve_conflict_id: Some(edit_res.id),
}; };
let edit_res = edit_article(data.hostname_alpha, &create_res.title, &edit_form).await?; let edit_res = edit_article(data.hostname_alpha, &edit_form).await?;
assert_eq!(edit_form.new_text, edit_res.text); assert_eq!(edit_form.new_text, edit_res.text);
let conflicts: Vec<ApiConflict> = let conflicts: Vec<ApiConflict> =
@ -297,7 +296,7 @@ async fn test_federated_edit_conflict() -> MyResult<()> {
previous_version: create_res.latest_version.clone(), previous_version: create_res.latest_version.clone(),
resolve_conflict_id: None, resolve_conflict_id: None,
}; };
let edit_res = edit_article(data.hostname_alpha, &create_res.title, &edit_form).await?; let edit_res = edit_article(data.hostname_alpha, &edit_form).await?;
assert_eq!(edit_res.text, edit_form.new_text); assert_eq!(edit_res.text, edit_form.new_text);
assert_eq!(2, edit_res.edits.len()); assert_eq!(2, edit_res.edits.len());
assert!(!edit_res.local); assert!(!edit_res.local);
@ -314,7 +313,7 @@ async fn test_federated_edit_conflict() -> MyResult<()> {
previous_version: create_res.latest_version, previous_version: create_res.latest_version,
resolve_conflict_id: None, resolve_conflict_id: None,
}; };
let edit_res = edit_article(data.hostname_gamma, &title, &edit_form).await?; let edit_res = edit_article(data.hostname_gamma, &edit_form).await?;
assert_ne!(edit_form.new_text, edit_res.text); assert_ne!(edit_form.new_text, edit_res.text);
assert_eq!(2, edit_res.edits.len()); assert_eq!(2, edit_res.edits.len());
assert!(!edit_res.local); assert!(!edit_res.local);
@ -330,7 +329,7 @@ async fn test_federated_edit_conflict() -> MyResult<()> {
previous_version: conflicts[0].previous_version.clone(), previous_version: conflicts[0].previous_version.clone(),
resolve_conflict_id: Some(conflicts[0].id), resolve_conflict_id: Some(conflicts[0].id),
}; };
let edit_res = edit_article(data.hostname_gamma, &title, &edit_form).await?; let edit_res = edit_article(data.hostname_gamma, &edit_form).await?;
assert_eq!(edit_form.new_text, edit_res.text); assert_eq!(edit_form.new_text, edit_res.text);
assert_eq!(3, edit_res.edits.len()); assert_eq!(3, edit_res.edits.len());
@ -359,7 +358,7 @@ async fn test_overlapping_edits_no_conflict() -> MyResult<()> {
previous_version: create_res.latest_version.clone(), previous_version: create_res.latest_version.clone(),
resolve_conflict_id: None, resolve_conflict_id: None,
}; };
let edit_res = edit_article(data.hostname_alpha, &create_res.title, &edit_form).await?; let edit_res = edit_article(data.hostname_alpha, &edit_form).await?;
assert_eq!(edit_res.text, edit_form.new_text); assert_eq!(edit_res.text, edit_form.new_text);
assert_eq!(2, edit_res.edits.len()); assert_eq!(2, edit_res.edits.len());
@ -370,7 +369,7 @@ async fn test_overlapping_edits_no_conflict() -> MyResult<()> {
previous_version: create_res.latest_version, previous_version: create_res.latest_version,
resolve_conflict_id: None, resolve_conflict_id: None,
}; };
let edit_res = edit_article(data.hostname_alpha, &title, &edit_form).await?; let edit_res = edit_article(data.hostname_alpha, &edit_form).await?;
let conflicts: Vec<ApiConflict> = let conflicts: Vec<ApiConflict> =
get_query(data.hostname_alpha, "edit_conflicts", None::<()>).await?; get_query(data.hostname_alpha, "edit_conflicts", None::<()>).await?;
assert_eq!(0, conflicts.len()); assert_eq!(0, conflicts.len());