use crate::{
newtypes::{CommentReportId, PersonId},
+ schema::comment_report::dsl::{comment_report, resolved, resolver_id, updated},
source::comment_report::{CommentReport, CommentReportForm},
traits::Reportable,
- utils::naive_now,
+ utils::{get_conn, naive_now, DbPool},
};
-use diesel::{dsl::*, result::Error, *};
+use diesel::{
+ dsl::{insert_into, update},
+ result::Error,
+ ExpressionMethods,
+ QueryDsl,
+};
+use diesel_async::RunQueryDsl;
+#[async_trait]
impl Reportable for CommentReport {
type Form = CommentReportForm;
type IdType = CommentReportId;
///
/// * `conn` - the postgres connection
/// * `comment_report_form` - the filled CommentReportForm to insert
- fn report(
- conn: &mut PgConnection,
+ async fn report(
+ pool: &mut DbPool<'_>,
comment_report_form: &CommentReportForm,
) -> Result<Self, Error> {
- use crate::schema::comment_report::dsl::*;
+ let conn = &mut get_conn(pool).await?;
insert_into(comment_report)
.values(comment_report_form)
.get_result::<Self>(conn)
+ .await
}
/// resolve a comment report
/// * `conn` - the postgres connection
/// * `report_id` - the id of the report to resolve
/// * `by_resolver_id` - the id of the user resolving the report
- fn resolve(
- conn: &mut PgConnection,
- report_id: Self::IdType,
+ async fn resolve(
+ pool: &mut DbPool<'_>,
+ report_id_: Self::IdType,
by_resolver_id: PersonId,
) -> Result<usize, Error> {
- use crate::schema::comment_report::dsl::*;
- update(comment_report.find(report_id))
+ let conn = &mut get_conn(pool).await?;
+ update(comment_report.find(report_id_))
.set((
resolved.eq(true),
resolver_id.eq(by_resolver_id),
updated.eq(naive_now()),
))
.execute(conn)
+ .await
}
/// unresolve a comment report
/// * `conn` - the postgres connection
/// * `report_id` - the id of the report to unresolve
/// * `by_resolver_id` - the id of the user unresolving the report
- fn unresolve(
- conn: &mut PgConnection,
- report_id: Self::IdType,
+ async fn unresolve(
+ pool: &mut DbPool<'_>,
+ report_id_: Self::IdType,
by_resolver_id: PersonId,
) -> Result<usize, Error> {
- use crate::schema::comment_report::dsl::*;
- update(comment_report.find(report_id))
+ let conn = &mut get_conn(pool).await?;
+ update(comment_report.find(report_id_))
.set((
resolved.eq(false),
resolver_id.eq(by_resolver_id),
updated.eq(naive_now()),
))
.execute(conn)
+ .await
}
}