mirror of
https://github.com/LemmyNet/lemmy
synced 2024-10-30 15:21:20 +00:00
80aef61aed
More fixes - fixed docker builds - fixed mentions regex test - fixed DATABASE_URL stuff - change schema path in diesel.toml Address review comments - add jsonb column back into activity table - remove authors field from cargo.toml - adjust LEMMY_DATABASE_URL env var usage - rename all occurences of LEMMY_DATABASE_URL to DATABASE_URL Decouple utils and db Split code into cargo workspaces Co-authored-by: Felix Ableitner <me@nutomic.com> Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/67
166 lines
4.2 KiB
Rust
166 lines
4.2 KiB
Rust
use crate::{schema::activity, Crud};
|
|
use diesel::{dsl::*, result::Error, *};
|
|
use log::debug;
|
|
use serde::{Deserialize, Serialize};
|
|
use serde_json::Value;
|
|
use std::{
|
|
fmt::Debug,
|
|
io::{Error as IoError, ErrorKind},
|
|
};
|
|
|
|
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
|
#[table_name = "activity"]
|
|
pub struct Activity {
|
|
pub id: i32,
|
|
pub user_id: i32,
|
|
pub data: Value,
|
|
pub local: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone, Serialize, Deserialize)]
|
|
#[table_name = "activity"]
|
|
pub struct ActivityForm {
|
|
pub user_id: i32,
|
|
pub data: Value,
|
|
pub local: bool,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
}
|
|
|
|
impl Crud<ActivityForm> for Activity {
|
|
fn read(conn: &PgConnection, activity_id: i32) -> Result<Self, Error> {
|
|
use crate::schema::activity::dsl::*;
|
|
activity.find(activity_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn delete(conn: &PgConnection, activity_id: i32) -> Result<usize, Error> {
|
|
use crate::schema::activity::dsl::*;
|
|
diesel::delete(activity.find(activity_id)).execute(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, new_activity: &ActivityForm) -> Result<Self, Error> {
|
|
use crate::schema::activity::dsl::*;
|
|
insert_into(activity)
|
|
.values(new_activity)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(
|
|
conn: &PgConnection,
|
|
activity_id: i32,
|
|
new_activity: &ActivityForm,
|
|
) -> Result<Self, Error> {
|
|
use crate::schema::activity::dsl::*;
|
|
diesel::update(activity.find(activity_id))
|
|
.set(new_activity)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
pub fn do_insert_activity<T>(
|
|
conn: &PgConnection,
|
|
user_id: i32,
|
|
data: &T,
|
|
local: bool,
|
|
) -> Result<Activity, IoError>
|
|
where
|
|
T: Serialize + Debug,
|
|
{
|
|
debug!("inserting activity for user {}, data {:?}", user_id, &data);
|
|
let activity_form = ActivityForm {
|
|
user_id,
|
|
data: serde_json::to_value(&data)?,
|
|
local,
|
|
updated: None,
|
|
};
|
|
let result = Activity::create(&conn, &activity_form);
|
|
match result {
|
|
Ok(s) => Ok(s),
|
|
Err(e) => Err(IoError::new(
|
|
ErrorKind::Other,
|
|
format!("Failed to insert activity into database: {}", e),
|
|
)),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{
|
|
activity::{Activity, ActivityForm},
|
|
tests::establish_unpooled_connection,
|
|
user::{UserForm, User_},
|
|
Crud,
|
|
ListingType,
|
|
SortType,
|
|
};
|
|
use serde_json::Value;
|
|
|
|
#[test]
|
|
fn test_crud() {
|
|
let conn = establish_unpooled_connection();
|
|
|
|
let creator_form = UserForm {
|
|
name: "activity_creator_pm".into(),
|
|
preferred_username: None,
|
|
password_encrypted: "nope".into(),
|
|
email: None,
|
|
matrix_user_id: None,
|
|
avatar: None,
|
|
admin: false,
|
|
banned: false,
|
|
updated: None,
|
|
show_nsfw: false,
|
|
theme: "darkly".into(),
|
|
default_sort_type: SortType::Hot as i16,
|
|
default_listing_type: ListingType::Subscribed as i16,
|
|
lang: "browser".into(),
|
|
show_avatars: true,
|
|
send_notifications_to_email: false,
|
|
actor_id: "http://fake.com".into(),
|
|
bio: None,
|
|
local: true,
|
|
private_key: None,
|
|
public_key: None,
|
|
last_refreshed_at: None,
|
|
};
|
|
|
|
let inserted_creator = User_::create(&conn, &creator_form).unwrap();
|
|
|
|
let test_json: Value = serde_json::from_str(
|
|
r#"{
|
|
"street": "Article Circle Expressway 1",
|
|
"city": "North Pole",
|
|
"postcode": "99705",
|
|
"state": "Alaska"
|
|
}"#,
|
|
)
|
|
.unwrap();
|
|
let activity_form = ActivityForm {
|
|
user_id: inserted_creator.id,
|
|
data: test_json.to_owned(),
|
|
local: true,
|
|
updated: None,
|
|
};
|
|
|
|
let inserted_activity = Activity::create(&conn, &activity_form).unwrap();
|
|
|
|
let expected_activity = Activity {
|
|
id: inserted_activity.id,
|
|
user_id: inserted_creator.id,
|
|
data: test_json,
|
|
local: true,
|
|
published: inserted_activity.published,
|
|
updated: None,
|
|
};
|
|
|
|
let read_activity = Activity::read(&conn, inserted_activity.id).unwrap();
|
|
let num_deleted = Activity::delete(&conn, inserted_activity.id).unwrap();
|
|
User_::delete(&conn, inserted_creator.id).unwrap();
|
|
|
|
assert_eq!(expected_activity, read_activity);
|
|
assert_eq!(expected_activity, inserted_activity);
|
|
assert_eq!(1, num_deleted);
|
|
}
|
|
}
|