Start doing stuff

pull/3707/head
dull b 2023-07-13 16:33:42 +00:00
parent 21a2e7b898
commit b33b459a66
1 changed files with 82 additions and 16 deletions

View File

@ -1,42 +1,108 @@
use crate::{ use crate::{
newtypes::{CommunityId, DbUrl, PersonId}, newtypes::{CommunityId, DbUrl, PersonId},
utils::{DbPool,get_conn}, utils::{get_conn, DbPool, DbConn},
}; };
use diesel::{result::Error,Identifiable, associations::HasTable,query_dsl::methods::FindDsl}; use diesel::{
associations::HasTable,
backend::Backend,
deserialize::{FromSqlRow, Queryable},
dsl::insert_into,
pg::Pg,
query_builder::{AsQuery, IntoUpdateTarget, Query, QueryFragment, QueryId},
query_dsl::methods::FindDsl,
result::Error,
AsChangeset,
Column,
Expression,
Identifiable,
Insertable,
QuerySource,
Table,
query_dsl::methods::LimitDsl,
};
use diesel_async::{AsyncConnection, RunQueryDsl,methods::LoadQuery};
use std::hash::Hash;
#[async_trait] #[async_trait]
pub trait Crud where Self: Identifiable, Self::Table: FindDsl<Self::Id> { pub trait Crud
where
Self: Send + HasTable + Send + 'static + FromSqlRow<<Self::Table as AsQuery>::SqlType, Pg>,
Self::Table: Send + FindDsl<Self::IdType>,
<Self::Table as FindDsl<Self::IdType>>::Output: LimitDsl + Send,
for<'conn> <<Self::Table as FindDsl<Self::IdType>>::Output as LimitDsl>::Output:
Send + LoadQuery<'static, DbConn<'conn>, Self> /*+ 'query*/ + Send,
<Self::Table as AsQuery>::SqlType: Send,
{
type InsertForm; type InsertForm;
type UpdateForm; type UpdateForm;
type IdType: Hash + Eq + Send;
async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error> async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error>
where where
Self: Sized; Self: Sized; /*{
async fn read(pool: &mut DbPool<'_>, id: Self::Id) -> Result<Self, Error> let conn = &mut get_conn(pool).await?;
insert_into(Self::table())
.values(form)
.get_result::<Self>(conn)
.await
}*/
async fn read(pool: &mut DbPool<'_>, id: Self::IdType) -> Result<Self, Error>
where where
Self: Sized; Self: Sized,
{
let mut conn = get_conn(pool).await?;
let table = Self::table();
let find_dsl_output = FindDsl::find(table, id);
RunQueryDsl::first::<Self>(find_dsl_output, &mut conn).await
}
/// when you want to null out a column, you have to send Some(None)), since sending None means you just don't want to update that column. /// when you want to null out a column, you have to send Some(None)), since sending None means you just don't want to update that column.
async fn update( async fn update(
pool: &mut DbPool<'_>, pool: &mut DbPool<'_>,
id: Self::Id, id: Self::IdType,
form: &Self::UpdateForm, form: &Self::UpdateForm,
) -> Result<Self, Error> ) -> Result<Self, Error>
where where
Self: Sized; Self: Sized; /*{
async fn delete(_pool: &mut DbPool<'_>, _id: Self::Id) -> Result<usize, Error> let conn = &mut get_conn(pool).await?;
diesel::update(Self::table().find(id))
.set(form)
.get_result::<Self>(conn)
.await
}*/
async fn delete(pool: &mut DbPool<'_>, id: Self::IdType) -> Result<usize, Error>
where where
Self: Sized, Self: Sized,
Self::Id: Send, Self::IdType: Send,
{ {
async { Err(Error::NotFound) }.await Err(Error::NotFound)
/*let conn = &mut get_conn(pool).await?;
diesel::delete(Self::table().find(id)).execute(conn).await*/
} }
} }
#[async_trait] #[async_trait]
pub trait Followable { pub trait Followable
where
Self: HasTable,
for<'a> &'a Self::Form: AsChangeset<Target = Self::Table> + Insertable<Self::Table>,
{
//type FollowerColumn: Column + Default + Send;
//type TargetColumn: Column + Default + Send;
type Form; type Form;
async fn follow(pool: &mut DbPool<'_>, form: &Self::Form) -> Result<Self, Error> async fn follow(pool: &mut DbPool<'_>, form: &Self::Form) -> Result<Self, Error>
where where
Self: Sized; Self: Sized; /*{
let conn = &mut get_conn(pool).await?;
insert_into(Self::table())
.values(form)
.on_conflict((
Self::TargetColumn::default(),
Self::FollowerColumn::default(),
))
.do_update()
.set(form)
.get_result::<Self>(conn)
.await
}*/
async fn follow_accepted( async fn follow_accepted(
pool: &mut DbPool<'_>, pool: &mut DbPool<'_>,
community_id: CommunityId, community_id: CommunityId,
@ -70,7 +136,7 @@ pub trait Likeable {
async fn remove( async fn remove(
pool: &mut DbPool<'_>, pool: &mut DbPool<'_>,
person_id: PersonId, person_id: PersonId,
item_id: Self::Id, item_id: Self::IdType,
) -> Result<usize, Error> ) -> Result<usize, Error>
where where
Self: Sized; Self: Sized;
@ -129,14 +195,14 @@ pub trait Reportable {
Self: Sized; Self: Sized;
async fn resolve( async fn resolve(
pool: &mut DbPool<'_>, pool: &mut DbPool<'_>,
report_id: Self::Id, report_id: Self::IdType,
resolver_id: PersonId, resolver_id: PersonId,
) -> Result<usize, Error> ) -> Result<usize, Error>
where where
Self: Sized; Self: Sized;
async fn unresolve( async fn unresolve(
pool: &mut DbPool<'_>, pool: &mut DbPool<'_>,
report_id: Self::Id, report_id: Self::IdType,
resolver_id: PersonId, resolver_id: PersonId,
) -> Result<usize, Error> ) -> Result<usize, Error>
where where