Refactor database error handling across repositories to use IntoDbResult for improved error management
Some checks failed
lint / lint (push) Has been cancelled
test / unit (push) Has been cancelled
test / integration (push) Has been cancelled
lint / lint (pull_request) Failing after 9m30s
test / unit (pull_request) Successful in 16m10s
test / integration (pull_request) Failing after 16m44s
Some checks failed
lint / lint (push) Has been cancelled
test / unit (push) Has been cancelled
test / integration (push) Has been cancelled
lint / lint (pull_request) Failing after 9m30s
test / unit (pull_request) Successful in 16m10s
test / integration (pull_request) Failing after 16m44s
- Updated PgNotificationRepository to utilize IntoDbResult for error handling in various methods. - Refactored PgRemoteActorRepository to replace manual error mapping with IntoDbResult. - Modified PgRemoteActorConnectionRepository to implement IntoDbResult for error handling. - Adjusted PgTagRepository to use IntoDbResult for consistent error management. - Introduced test_helpers module for seeding users and thoughts in tests. - Enhanced PgThoughtRepository to leverage IntoDbResult for error handling. - Updated PgTopFriendRepository to utilize IntoDbResult for error management. - Refactored PgUserRepository to implement IntoDbResult for error handling. - Added constants for pagination defaults in requests. - Introduced MAX_TOP_FRIENDS constant for top friends validation. - Refactored JWT expiration time to use a constant. - Improved rate limiter configuration with constants for better readability. - Added utility methods for FollowState and Visibility enums for string conversions. - Introduced maximum length constants for Username, Email, and Content value objects. - Cleaned up test modules by removing redundant code and utilizing a shared testing state.
This commit is contained in:
@@ -26,6 +26,24 @@ pub enum FollowState {
|
||||
Rejected,
|
||||
}
|
||||
|
||||
impl FollowState {
|
||||
pub fn as_str(&self) -> &'static str {
|
||||
match self {
|
||||
Self::Pending => "pending",
|
||||
Self::Accepted => "accepted",
|
||||
Self::Rejected => "rejected",
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_db_str(s: &str) -> Self {
|
||||
match s {
|
||||
"pending" => Self::Pending,
|
||||
"rejected" => Self::Rejected,
|
||||
_ => Self::Accepted,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Follow {
|
||||
pub follower_id: UserId,
|
||||
|
||||
@@ -34,6 +34,15 @@ impl Visibility {
|
||||
Visibility::Direct => "direct",
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_db_str(s: &str) -> Self {
|
||||
match s {
|
||||
"followers" => Self::Followers,
|
||||
"unlisted" => Self::Unlisted,
|
||||
"direct" => Self::Direct,
|
||||
_ => Self::Public,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Thought {
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
use crate::errors::DomainError;
|
||||
use uuid::Uuid;
|
||||
|
||||
const MAX_USERNAME_LENGTH: usize = 32;
|
||||
const MAX_EMAIL_LENGTH: usize = 255;
|
||||
const MAX_CONTENT_LENGTH: usize = 128;
|
||||
|
||||
macro_rules! uuid_id {
|
||||
($name:ident) => {
|
||||
#[derive(Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
|
||||
@@ -41,7 +45,7 @@ pub struct Username(String);
|
||||
impl Username {
|
||||
pub fn new(s: impl Into<String>) -> Result<Self, DomainError> {
|
||||
let s = s.into();
|
||||
if s.is_empty() || s.len() > 32 {
|
||||
if s.is_empty() || s.len() > MAX_USERNAME_LENGTH {
|
||||
return Err(DomainError::InvalidInput("username: 1-32 chars".into()));
|
||||
}
|
||||
if !s
|
||||
@@ -72,7 +76,7 @@ pub struct Email(String);
|
||||
impl Email {
|
||||
pub fn new(s: impl Into<String>) -> Result<Self, DomainError> {
|
||||
let s = s.into().to_lowercase();
|
||||
if !s.contains('@') || s.len() > 255 {
|
||||
if !s.contains('@') || s.len() > MAX_EMAIL_LENGTH {
|
||||
return Err(DomainError::InvalidInput("invalid email".into()));
|
||||
}
|
||||
Ok(Self(s))
|
||||
@@ -93,7 +97,7 @@ pub struct Content(String);
|
||||
impl Content {
|
||||
pub fn new_local(s: impl Into<String>) -> Result<Self, DomainError> {
|
||||
let s = s.into();
|
||||
if s.is_empty() || s.len() > 128 {
|
||||
if s.is_empty() || s.len() > MAX_CONTENT_LENGTH {
|
||||
return Err(DomainError::InvalidInput("content: 1-128 chars".into()));
|
||||
}
|
||||
Ok(Self(s))
|
||||
|
||||
Reference in New Issue
Block a user