From 20050e4a67282d4c9a9e6cd30328e8d3c9a40fdf Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sat, 17 Oct 2026 11:43:53 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20(seaorm):=20Reexporta=20IntoActiveM?= =?UTF-8?q?odel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extensions/pagetop-seaorm/src/db.rs | 7 ++++--- extensions/pagetop-user/src/auth.rs | 6 +++--- extensions/pagetop-user/src/token.rs | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/extensions/pagetop-seaorm/src/db.rs b/extensions/pagetop-seaorm/src/db.rs index 57f6f8ee..2d984f22 100644 --- a/extensions/pagetop-seaorm/src/db.rs +++ b/extensions/pagetop-seaorm/src/db.rs @@ -27,7 +27,8 @@ //! - **Transacciones**: [`TransactionTrait`], [`DatabaseTransaction`], [`flatten_txn_err`] //! (para convertir [`TransactionError`] a `E`). //! - **Modelos activos**: [`ActiveModelTrait`], [`ActiveValue`] ([`ActiveValue::Set`], -//! [`ActiveValue::Unchanged`], [`ActiveValue::NotSet`]). +//! [`ActiveValue::Unchanged`], [`ActiveValue::NotSet`]), [`IntoActiveModel`] (para modificar un +//! modelo leído: `model.into_active_model()`). //! - **Macros de derivación**: [`DeriveEntityModel`], [`DeriveColumn`], [`DerivePrimaryKey`], //! [`DeriveRelation`], [`EnumIter`]. //! - **Errores**: [`DbErr`], [`TransactionError`]. @@ -167,8 +168,8 @@ pub use sea_orm::prelude::*; pub use sea_orm; pub use sea_orm::{ - ActiveValue, Condition, DatabaseTransaction, DbBackend, ExecResult, NotSet, Order, QueryOrder, - QuerySelect, Set, TransactionError, TransactionTrait, Unchanged, + ActiveValue, Condition, DatabaseTransaction, DbBackend, ExecResult, IntoActiveModel, NotSet, + Order, QueryOrder, QuerySelect, Set, TransactionError, TransactionTrait, Unchanged, }; /// Re-exporta `sea_query` para construir sentencias SQL en tiempo de ejecución. diff --git a/extensions/pagetop-user/src/auth.rs b/extensions/pagetop-user/src/auth.rs index 04712964..7ba951d2 100644 --- a/extensions/pagetop-user/src/auth.rs +++ b/extensions/pagetop-user/src/auth.rs @@ -2,8 +2,8 @@ use pagetop::prelude::*; use pagetop_seaorm::db::{ - ActiveModelTrait, ActiveValue, ColumnTrait, Condition, EntityTrait, PaginatorTrait, - QueryFilter, Set, dbconn, + ActiveModelTrait, ActiveValue, ColumnTrait, Condition, EntityTrait, IntoActiveModel, + PaginatorTrait, QueryFilter, Set, dbconn, }; use crate::account::UserStatus; @@ -61,7 +61,7 @@ pub async fn login( // Actualizar last_login_at y resetear contador de fallos. let user_id = user_model.id; let needs_rehash = password::needs_rehash(&user_model.password_hash); - let mut active: user::ActiveModel = user_model.into(); + let mut active = user_model.into_active_model(); active.last_login_at = Set(Some(now)); active.last_access_at = Set(Some(now)); active.failed_login_count = Set(0); diff --git a/extensions/pagetop-user/src/token.rs b/extensions/pagetop-user/src/token.rs index 8dba8418..8f343d8f 100644 --- a/extensions/pagetop-user/src/token.rs +++ b/extensions/pagetop-user/src/token.rs @@ -3,7 +3,8 @@ use pagetop::prelude::*; use pagetop_seaorm::db::{ - ActiveModelTrait, ActiveValue, ColumnTrait, EntityTrait, QueryFilter, Set, dbconn, + ActiveModelTrait, ActiveValue, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter, Set, + dbconn, }; use crate::entity::user_token; @@ -116,7 +117,7 @@ pub async fn consume_token(token: &str, kind: TokenKind) -> Result