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
69 lines
1.7 KiB
Rust
69 lines
1.7 KiB
Rust
use crate::{
|
|
schema::{category, category::dsl::*},
|
|
Crud,
|
|
};
|
|
use diesel::{dsl::*, result::Error, *};
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
|
#[table_name = "category"]
|
|
pub struct Category {
|
|
pub id: i32,
|
|
pub name: String,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone, Serialize, Deserialize)]
|
|
#[table_name = "category"]
|
|
pub struct CategoryForm {
|
|
pub name: String,
|
|
}
|
|
|
|
impl Crud<CategoryForm> for Category {
|
|
fn read(conn: &PgConnection, category_id: i32) -> Result<Self, Error> {
|
|
category.find(category_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn delete(conn: &PgConnection, category_id: i32) -> Result<usize, Error> {
|
|
diesel::delete(category.find(category_id)).execute(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, new_category: &CategoryForm) -> Result<Self, Error> {
|
|
insert_into(category)
|
|
.values(new_category)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(
|
|
conn: &PgConnection,
|
|
category_id: i32,
|
|
new_category: &CategoryForm,
|
|
) -> Result<Self, Error> {
|
|
diesel::update(category.find(category_id))
|
|
.set(new_category)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Category {
|
|
pub fn list_all(conn: &PgConnection) -> Result<Vec<Self>, Error> {
|
|
category.load::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{category::Category, tests::establish_unpooled_connection};
|
|
|
|
#[test]
|
|
fn test_crud() {
|
|
let conn = establish_unpooled_connection();
|
|
|
|
let categories = Category::list_all(&conn).unwrap();
|
|
let expected_first_category = Category {
|
|
id: 1,
|
|
name: "Discussion".into(),
|
|
};
|
|
|
|
assert_eq!(expected_first_category, categories[0]);
|
|
}
|
|
}
|