1 files changed, 103 insertions, 0 deletions

diff --git a/src/routers/account.rs b/src/routers/account.rs
index 0d6d4c1..8e51a69 100644
--- a/src/routers/account.rs
+++ b/src/routers/account.rs
@@ -82,6 +82,23 @@ struct ChangePasswordRequest {
 }
 
 #[derive(Deserialize, ToSchema)]
+#[schema(description = "Change account password data")]
+struct ChangeUsernameRequest {
+    #[schema(examples("ivanov_ivan", "john_doe"))]
+    new_username: String,
+}
+
+#[derive(Deserialize, ToSchema)]
+#[schema(description = "Change account name data")]
+#[serde(rename_all = "snake_case")]
+enum ChangeNameRequest {
+    #[schema(examples("John", "Иван"))]
+    FirstName(String),
+    #[schema(examples("Doe", "Иванов"))]
+    LastName(String),
+}
+
+#[derive(Deserialize, ToSchema)]
 #[schema(description = "Account delete data")]
 struct DeleteUserRequest {
     #[schema(examples("secret-password"))]
@@ -242,6 +259,90 @@ async fn change_password(
 }
 
 #[utoipa::path(
+    put,
+    path = "/change/username",
+    tag = ACCOUNT,
+    summary = "Change username",
+    request_body = ChangeUsernameRequest,
+    responses(
+        (
+            status = 200, body = SuccessResponse<Account>,
+            description = "Success response with changed account data"
+        ),
+        GlobalResponses
+    ),
+    security(("auth" = []))
+)]
+async fn change_username(
+    State(state): State<AppState>,
+    Auth(user): Auth,
+    ApiJson(req): ApiJson<ChangeUsernameRequest>,
+) -> ApiResult<Account> {
+    let user_exists = users::Entity::find()
+        .filter(users::Column::Username.eq(&req.new_username))
+        .one(&state.db)
+        .await?
+        .is_some();
+
+    if user_exists {
+        return Err(ClientError::UserAlreadyExists {
+            username: req.new_username,
+        }
+        .into());
+    }
+
+    let mut active_user = user.into_active_model();
+    active_user.username = Set(req.new_username);
+
+    let user = active_user.update(&state.db).await?;
+    Ok(SuccessResponse::ok(Account {
+        id: user.id,
+        username: user.username,
+        first_name: user.first_name,
+        last_name: user.last_name,
+    }))
+}
+
+#[utoipa::path(
+    put,
+    path = "/change/name",
+    tag = ACCOUNT,
+    summary = "Change name",
+    request_body = ChangeNameRequest,
+    responses(
+        (
+            status = 200, body = SuccessResponse<Account>,
+            description = "Success response with changed account data"
+        ),
+        GlobalResponses
+    ),
+    security(("auth" = []))
+)]
+async fn change_name(
+    State(state): State<AppState>,
+    Auth(user): Auth,
+    ApiJson(req): ApiJson<ChangeNameRequest>,
+) -> ApiResult<Account> {
+    let mut active_user = user.into_active_model();
+    match req {
+        ChangeNameRequest::FirstName(new_first_name) => {
+            active_user.first_name = Set(new_first_name);
+        }
+        ChangeNameRequest::LastName(new_last_name) => {
+            active_user.first_name = Set(new_last_name);
+        }
+    }
+
+    let user = active_user.update(&state.db).await?;
+    Ok(SuccessResponse::ok(Account {
+        id: user.id,
+        username: user.username,
+        first_name: user.first_name,
+        last_name: user.last_name,
+    }))
+}
+
+#[utoipa::path(
     delete,
     path = "/delete",
     tag = ACCOUNT,
@@ -281,5 +382,7 @@ pub(crate) fn router() -> OpenApiRouter<AppState> {
         .routes(routes!(register))
         .routes(routes!(login))
         .routes(routes!(change_password))
+        .routes(routes!(change_username))
+        .routes(routes!(change_name))
         .routes(routes!(delete))
 }