2021-10-16 13:33:38 +00:00
|
|
|
use crate::{newtypes::DbUrl, source::activity::*, traits::Crud};
|
2021-11-01 13:05:20 +00:00
|
|
|
use diesel::{dsl::*, result::Error, *};
|
2021-11-11 19:49:15 +00:00
|
|
|
use serde_json::Value;
|
|
|
|
use std::io::{Error as IoError, ErrorKind};
|
2020-04-27 22:17:02 +00:00
|
|
|
|
2021-08-17 18:04:58 +00:00
|
|
|
impl Crud for Activity {
|
|
|
|
type Form = ActivityForm;
|
|
|
|
type IdType = i32;
|
2020-04-27 22:17:02 +00:00
|
|
|
fn read(conn: &PgConnection, activity_id: i32) -> Result<Self, Error> {
|
2021-10-16 13:33:38 +00:00
|
|
|
use crate::schema::activity::dsl::*;
|
2020-04-27 22:17:02 +00:00
|
|
|
activity.find(activity_id).first::<Self>(conn)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn create(conn: &PgConnection, new_activity: &ActivityForm) -> Result<Self, Error> {
|
2021-10-16 13:33:38 +00:00
|
|
|
use crate::schema::activity::dsl::*;
|
2020-04-27 22:17:02 +00:00
|
|
|
insert_into(activity)
|
|
|
|
.values(new_activity)
|
|
|
|
.get_result::<Self>(conn)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn update(
|
|
|
|
conn: &PgConnection,
|
|
|
|
activity_id: i32,
|
|
|
|
new_activity: &ActivityForm,
|
|
|
|
) -> Result<Self, Error> {
|
2021-10-16 13:33:38 +00:00
|
|
|
use crate::schema::activity::dsl::*;
|
2020-04-27 22:17:02 +00:00
|
|
|
diesel::update(activity.find(activity_id))
|
|
|
|
.set(new_activity)
|
|
|
|
.get_result::<Self>(conn)
|
|
|
|
}
|
2020-11-10 16:11:08 +00:00
|
|
|
fn delete(conn: &PgConnection, activity_id: i32) -> Result<usize, Error> {
|
2021-10-16 13:33:38 +00:00
|
|
|
use crate::schema::activity::dsl::*;
|
2020-11-10 16:11:08 +00:00
|
|
|
diesel::delete(activity.find(activity_id)).execute(conn)
|
|
|
|
}
|
2020-04-27 22:17:02 +00:00
|
|
|
}
|
|
|
|
|
2021-10-16 13:33:38 +00:00
|
|
|
impl Activity {
|
2021-11-11 19:49:15 +00:00
|
|
|
pub fn insert(
|
2020-10-23 12:29:56 +00:00
|
|
|
conn: &PgConnection,
|
2021-03-02 12:41:48 +00:00
|
|
|
ap_id: DbUrl,
|
2021-11-11 19:49:15 +00:00
|
|
|
data: Value,
|
2020-10-23 12:29:56 +00:00
|
|
|
local: bool,
|
2020-11-06 13:06:47 +00:00
|
|
|
sensitive: bool,
|
2021-11-11 19:49:15 +00:00
|
|
|
) -> Result<Activity, IoError> {
|
2020-10-23 12:29:56 +00:00
|
|
|
let activity_form = ActivityForm {
|
|
|
|
ap_id,
|
2021-11-11 19:49:15 +00:00
|
|
|
data,
|
2021-03-20 20:59:07 +00:00
|
|
|
local: Some(local),
|
2020-11-06 13:06:47 +00:00
|
|
|
sensitive,
|
2020-10-23 12:29:56 +00:00
|
|
|
updated: None,
|
|
|
|
};
|
2021-07-05 16:07:26 +00:00
|
|
|
let result = Activity::create(conn, &activity_form);
|
2020-10-23 12:29:56 +00:00
|
|
|
match result {
|
|
|
|
Ok(s) => Ok(s),
|
|
|
|
Err(e) => Err(IoError::new(
|
|
|
|
ErrorKind::Other,
|
|
|
|
format!("Failed to insert activity into database: {}", e),
|
|
|
|
)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-16 13:33:38 +00:00
|
|
|
pub fn read_from_apub_id(conn: &PgConnection, object_id: &DbUrl) -> Result<Activity, Error> {
|
|
|
|
use crate::schema::activity::dsl::*;
|
2020-10-23 12:29:56 +00:00
|
|
|
activity.filter(ap_id.eq(object_id)).first::<Self>(conn)
|
2020-07-10 18:15:41 +00:00
|
|
|
}
|
2021-01-27 14:02:28 +00:00
|
|
|
|
2021-10-16 13:33:38 +00:00
|
|
|
pub fn delete_olds(conn: &PgConnection) -> Result<usize, Error> {
|
|
|
|
use crate::schema::activity::dsl::*;
|
2021-01-29 16:38:27 +00:00
|
|
|
diesel::delete(activity.filter(published.lt(now - 6.months()))).execute(conn)
|
|
|
|
}
|
2020-05-14 12:26:44 +00:00
|
|
|
}
|
|
|
|
|
2020-04-27 22:17:02 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2021-03-02 12:41:48 +00:00
|
|
|
use super::*;
|
2021-10-16 13:33:38 +00:00
|
|
|
use crate::{
|
|
|
|
establish_unpooled_connection,
|
|
|
|
newtypes::DbUrl,
|
|
|
|
source::{
|
|
|
|
activity::{Activity, ActivityForm},
|
|
|
|
person::{Person, PersonForm},
|
|
|
|
},
|
2020-07-10 18:15:41 +00:00
|
|
|
};
|
|
|
|
use serde_json::Value;
|
2021-02-25 19:43:39 +00:00
|
|
|
use serial_test::serial;
|
2021-03-02 12:41:48 +00:00
|
|
|
use url::Url;
|
2020-04-27 22:17:02 +00:00
|
|
|
|
|
|
|
#[test]
|
2021-02-25 19:43:39 +00:00
|
|
|
#[serial]
|
2020-04-27 22:17:02 +00:00
|
|
|
fn test_crud() {
|
|
|
|
let conn = establish_unpooled_connection();
|
|
|
|
|
2021-02-26 13:49:58 +00:00
|
|
|
let creator_form = PersonForm {
|
2020-04-27 22:17:02 +00:00
|
|
|
name: "activity_creator_pm".into(),
|
2021-03-20 20:59:07 +00:00
|
|
|
..PersonForm::default()
|
2020-04-27 22:17:02 +00:00
|
|
|
};
|
|
|
|
|
2021-02-26 13:49:58 +00:00
|
|
|
let inserted_creator = Person::create(&conn, &creator_form).unwrap();
|
2020-04-27 22:17:02 +00:00
|
|
|
|
2021-03-02 12:41:48 +00:00
|
|
|
let ap_id: DbUrl = Url::parse(
|
|
|
|
"https://enterprise.lemmy.ml/activities/delete/f1b5d57c-80f8-4e03-a615-688d552e946c",
|
|
|
|
)
|
|
|
|
.unwrap()
|
|
|
|
.into();
|
2020-04-27 22:17:02 +00:00
|
|
|
let test_json: Value = serde_json::from_str(
|
|
|
|
r#"{
|
2020-10-23 12:29:56 +00:00
|
|
|
"@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"
|
|
|
|
}"#,
|
2020-04-27 22:17:02 +00:00
|
|
|
)
|
|
|
|
.unwrap();
|
|
|
|
let activity_form = ActivityForm {
|
2021-03-02 12:41:48 +00:00
|
|
|
ap_id: ap_id.clone(),
|
2020-04-27 22:17:02 +00:00
|
|
|
data: test_json.to_owned(),
|
2021-03-20 20:59:07 +00:00
|
|
|
local: Some(true),
|
2020-11-06 13:06:47 +00:00
|
|
|
sensitive: false,
|
2020-04-27 22:17:02 +00:00
|
|
|
updated: None,
|
|
|
|
};
|
|
|
|
|
|
|
|
let inserted_activity = Activity::create(&conn, &activity_form).unwrap();
|
|
|
|
|
|
|
|
let expected_activity = Activity {
|
2021-03-02 12:41:48 +00:00
|
|
|
ap_id: Some(ap_id.clone()),
|
2020-04-27 22:17:02 +00:00
|
|
|
id: inserted_activity.id,
|
|
|
|
data: test_json,
|
|
|
|
local: true,
|
2020-11-10 16:11:08 +00:00
|
|
|
sensitive: Some(false),
|
2020-04-27 22:17:02 +00:00
|
|
|
published: inserted_activity.published,
|
|
|
|
updated: None,
|
|
|
|
};
|
|
|
|
|
|
|
|
let read_activity = Activity::read(&conn, inserted_activity.id).unwrap();
|
2021-03-02 12:41:48 +00:00
|
|
|
let read_activity_by_apub_id = Activity::read_from_apub_id(&conn, &ap_id).unwrap();
|
2021-02-26 13:49:58 +00:00
|
|
|
Person::delete(&conn, inserted_creator.id).unwrap();
|
2020-11-10 16:11:08 +00:00
|
|
|
Activity::delete(&conn, inserted_activity.id).unwrap();
|
2020-04-27 22:17:02 +00:00
|
|
|
|
|
|
|
assert_eq!(expected_activity, read_activity);
|
2020-10-23 12:29:56 +00:00
|
|
|
assert_eq!(expected_activity, read_activity_by_apub_id);
|
2020-04-27 22:17:02 +00:00
|
|
|
assert_eq!(expected_activity, inserted_activity);
|
|
|
|
}
|
|
|
|
}
|