mirror of
https://github.com/LemmyNet/lemmy.git
synced 2025-01-01 15:51:31 +00:00
1d38aad9d3
* a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit48a033b87f
. * Revert "Add blank lines under each line with `conn =`" This reverts commit773a6d3beb
. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commitd2c6263ea1
. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit2bf8574bc8
. * Revert "Fix apub::api::resolve_object" This reverts commit3e4059aabb
. * Revert "Fix apub::activities::block" This reverts commit3b02389abd
. * Revert "Fix api_common::utils" This reverts commit7dc73de613
. * Revert "Revert "Fix api_common::utils"" This reverts commitf740f115e5
. * Revert "Revert "Fix apub::activities::block"" This reverts commit2ee206af7c
. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit96ed8bf2e9
. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commitacc9ca1aed
. * Revert "Revert "aaaa"" This reverts commit443a2a00a5
. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commitab4e94aea5
. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commite4d1712646
. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
143 lines
4.1 KiB
Rust
143 lines
4.1 KiB
Rust
use crate::{
|
|
newtypes::DbUrl,
|
|
schema::activity::dsl::{activity, ap_id},
|
|
source::activity::{Activity, ActivityInsertForm, ActivityUpdateForm},
|
|
traits::Crud,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
#[async_trait]
|
|
impl Crud for Activity {
|
|
type InsertForm = ActivityInsertForm;
|
|
type UpdateForm = ActivityUpdateForm;
|
|
type IdType = i32;
|
|
async fn read(pool: &mut DbPool<'_>, activity_id: i32) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
activity.find(activity_id).first::<Self>(conn).await
|
|
}
|
|
|
|
async fn create(pool: &mut DbPool<'_>, new_activity: &Self::InsertForm) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
insert_into(activity)
|
|
.values(new_activity)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
async fn update(
|
|
pool: &mut DbPool<'_>,
|
|
activity_id: i32,
|
|
new_activity: &Self::UpdateForm,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(activity.find(activity_id))
|
|
.set(new_activity)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
async fn delete(pool: &mut DbPool<'_>, activity_id: i32) -> Result<usize, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::delete(activity.find(activity_id))
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
impl Activity {
|
|
pub async fn read_from_apub_id(
|
|
pool: &mut DbPool<'_>,
|
|
object_id: &DbUrl,
|
|
) -> Result<Activity, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
activity
|
|
.filter(ap_id.eq(object_id))
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::{
|
|
newtypes::DbUrl,
|
|
source::{
|
|
activity::{Activity, ActivityInsertForm},
|
|
instance::Instance,
|
|
person::{Person, PersonInsertForm},
|
|
},
|
|
utils::build_db_pool_for_tests,
|
|
};
|
|
use serde_json::Value;
|
|
use serial_test::serial;
|
|
use url::Url;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_crud() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
let pool = &mut pool.into();
|
|
|
|
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
|
|
.await
|
|
.unwrap();
|
|
|
|
let creator_form = PersonInsertForm::builder()
|
|
.name("activity_creator_ pm".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_creator = Person::create(pool, &creator_form).await.unwrap();
|
|
|
|
let ap_id_: DbUrl = Url::parse(
|
|
"https://enterprise.lemmy.ml/activities/delete/f1b5d57c-80f8-4e03-a615-688d552e946c",
|
|
)
|
|
.unwrap()
|
|
.into();
|
|
let test_json: Value = serde_json::from_str(
|
|
r#"{
|
|
"@context": "https://www.w3.org/ns/activitystreams",
|
|
"id": "https://enterprise.lemmy.ml/activities/delete/f1b5d57c-80f8-4e03-a615-688d552e946c",
|
|
"type": "Delete",
|
|
"actor": "https://enterprise.lemmy.ml/u/riker",
|
|
"to": "https://www.w3.org/ns/activitystreams#Public",
|
|
"cc": [
|
|
"https://enterprise.lemmy.ml/c/main/"
|
|
],
|
|
"object": "https://enterprise.lemmy.ml/post/32"
|
|
}"#,
|
|
)
|
|
.unwrap();
|
|
let activity_form = ActivityInsertForm {
|
|
ap_id: ap_id_.clone(),
|
|
data: test_json.clone(),
|
|
local: Some(true),
|
|
sensitive: Some(false),
|
|
updated: None,
|
|
};
|
|
|
|
let inserted_activity = Activity::create(pool, &activity_form).await.unwrap();
|
|
|
|
let expected_activity = Activity {
|
|
ap_id: ap_id_.clone(),
|
|
id: inserted_activity.id,
|
|
data: test_json,
|
|
local: true,
|
|
sensitive: false,
|
|
published: inserted_activity.published,
|
|
updated: None,
|
|
};
|
|
|
|
let read_activity = Activity::read(pool, inserted_activity.id).await.unwrap();
|
|
let read_activity_by_apub_id = Activity::read_from_apub_id(pool, &ap_id_).await.unwrap();
|
|
Person::delete(pool, inserted_creator.id).await.unwrap();
|
|
Activity::delete(pool, inserted_activity.id).await.unwrap();
|
|
|
|
assert_eq!(expected_activity, read_activity);
|
|
assert_eq!(expected_activity, read_activity_by_apub_id);
|
|
assert_eq!(expected_activity, inserted_activity);
|
|
}
|
|
}
|