refactor(domain): move DB string conversions out of domain enums
This commit is contained in:
@@ -1,10 +1,33 @@
|
||||
use async_trait::async_trait;
|
||||
use chrono::{DateTime, Utc};
|
||||
|
||||
fn notif_type_from_str(s: &str) -> domain::models::notification::NotificationType {
|
||||
use domain::models::notification::NotificationType;
|
||||
match s {
|
||||
"like" => NotificationType::Like,
|
||||
"boost" => NotificationType::Boost,
|
||||
"follow" => NotificationType::Follow,
|
||||
"mention" => NotificationType::Mention,
|
||||
_ => NotificationType::Reply,
|
||||
}
|
||||
}
|
||||
|
||||
fn notif_type_as_str(t: &domain::models::notification::NotificationType) -> &'static str {
|
||||
use domain::models::notification::NotificationType;
|
||||
match t {
|
||||
NotificationType::Like => "like",
|
||||
NotificationType::Boost => "boost",
|
||||
NotificationType::Follow => "follow",
|
||||
NotificationType::Mention => "mention",
|
||||
NotificationType::Reply => "reply",
|
||||
}
|
||||
}
|
||||
|
||||
use domain::{
|
||||
errors::DomainError,
|
||||
models::{
|
||||
feed::{PageParams, Paginated},
|
||||
notification::{Notification, NotificationType},
|
||||
notification::Notification,
|
||||
},
|
||||
ports::NotificationRepository,
|
||||
value_objects::{NotificationId, ThoughtId, UserId},
|
||||
@@ -26,7 +49,7 @@ impl NotificationRepository for PgNotificationRepository {
|
||||
sqlx::query(
|
||||
"INSERT INTO notifications(id,user_id,type,from_user_id,thought_id,read,created_at) VALUES($1,$2,$3,$4,$5,$6,$7)"
|
||||
)
|
||||
.bind(n.id.as_uuid()).bind(n.user_id.as_uuid()).bind(n.notification_type.as_str())
|
||||
.bind(n.id.as_uuid()).bind(n.user_id.as_uuid()).bind(notif_type_as_str(&n.notification_type))
|
||||
.bind(n.from_user_id.as_ref().map(|u| u.as_uuid()))
|
||||
.bind(n.thought_id.as_ref().map(|t| t.as_uuid()))
|
||||
.bind(n.read).bind(n.created_at)
|
||||
@@ -62,7 +85,7 @@ impl NotificationRepository for PgNotificationRepository {
|
||||
.map(|r| Notification {
|
||||
id: NotificationId::from_uuid(r.id),
|
||||
user_id: UserId::from_uuid(r.user_id),
|
||||
notification_type: NotificationType::from_db_str(&r.r#type),
|
||||
notification_type: notif_type_from_str(&r.r#type),
|
||||
from_user_id: r.from_user_id.map(UserId::from_uuid),
|
||||
thought_id: r.thought_id.map(ThoughtId::from_uuid),
|
||||
read: r.read,
|
||||
|
||||
Reference in New Issue
Block a user