OxideTalis/oxidetalis
OxideTalis/oxidetalis
1
Fork 0
Code Issues 10 Pull requests Projects 1 Releases Activity Actions

feat: Chat request implementation #14

Manually merged
awiteb merged 55 commits from awiteb/chat-request-and-response into master 2024-07-18 14:21:39 +02:00 AGit
Conversation 5 Commits 55 Files changed 34 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit abbdec49e7 - Show all commits

2
crates/oxidetalis/src/database/user.rs
View file

@ -53,7 +53,7 @@ impl UserTableExt for DatabaseConnection {
.await .await
{ {
if let Some(SqlErr::UniqueConstraintViolation(_)) = err.sql_err() { if let Some(SqlErr::UniqueConstraintViolation(_)) = err.sql_err() {
return Err(ApiError::DuplicatedUser); return Err(ApiError::AlreadyRegistered);
} }
} }

4
crates/oxidetalis/src/errors.rs
View file

@ -48,7 +48,7 @@ pub enum ApiError {
RegistrationClosed, RegistrationClosed,
/// The entered public key is already registered (400 Bad Request) /// The entered public key is already registered (400 Bad Request)
#[error("The entered public key is already registered")] #[error("The entered public key is already registered")]
DuplicatedUser, AlreadyRegistered,
/// The user entered two different public keys /// The user entered two different public keys
/// one in the header and other in the request body /// one in the header and other in the request body
/// (400 Bad Request) /// (400 Bad Request)
@ -62,7 +62,7 @@ impl ApiError {
match self { match self {
Self::SeaOrm(_) => StatusCode::INTERNAL_SERVER_ERROR, Self::SeaOrm(_) => StatusCode::INTERNAL_SERVER_ERROR,
Self::RegistrationClosed => StatusCode::FORBIDDEN, Self::RegistrationClosed => StatusCode::FORBIDDEN,
Self::DuplicatedUser | Self::TwoDifferentKeys => StatusCode::BAD_REQUEST, Self::AlreadyRegistered | Self::TwoDifferentKeys => StatusCode::BAD_REQUEST,
} }
} }
} }