Release version 0.28.0

Cargo.toml

@@ -10,6 +10,7 @@ members = [
     "zino-derive",
     "zino-dioxus",
     "zino-extra",
+    "zino-http",
     "zino-middleware",
     "zino-model",
     "zino-ntex",

examples/actix-app/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "actix-app"
 description = "An example for actix-web integration."
-version = "0.9.0"
-rust-version = "1.75"
+version = "0.9.1"
+rust-version = "1.80"
 edition = "2021"
 publish = false
 
@@ -19,7 +19,7 @@ features = ["derive"]
 
 [dependencies.zino]
 path = "../../zino"
-version = "0.26.4"
+version = "0.27.0"
 features = [
     "actix",
     "i18n",
@@ -30,7 +30,7 @@ features = [
 
 [dependencies.zino-core]
 path = "../../zino-core"
-version = "0.27.4"
+version = "0.28.0"
 features = [
     "cookie",
     "env-filter",
@@ -40,8 +40,8 @@ features = [
 
 [dependencies.zino-derive]
 path = "../../zino-derive"
-version = "0.24.4"
+version = "0.25.0"
 
 [dependencies.zino-model]
 path = "../../zino-model"
-version = "0.24.4"
+version = "0.25.0"

examples/actix-app/src/controller/auth.rs

@@ -1,27 +1,27 @@
 use zino::{prelude::*, Request, Response, Result};
-use zino_model::user::{JwtAuthService, User};
+use zino_model::user::{JwtAuthService, User, UserColumn::*};
 
 pub async fn login(mut req: Request) -> Result {
-    let current_time = DateTime::now();
     let body: Map = req.parse_body().await?;
     let (user_id, mut data) = User::generate_token(body).await.extract(&req)?;
 
-    let user_updates = json!({
-        "status": "Active",
-        "last_login_at": data.remove("current_login_at").and_then(|v| v.as_date_time()),
-        "last_login_ip": data.remove("current_login_ip"),
-        "current_login_at": current_time,
-        "current_login_ip": req.client_ip(),
-        "$inc": { "login_count": 1 },
-    });
-
-    let mut user_mutations = user_updates.into_map_opt().unwrap_or_default();
-    let (validation, user) = User::mutate_by_id(&user_id, &mut user_mutations, None)
+    let last_login_ip = data.remove("current_login_ip");
+    let last_login_at = data
+        .remove("current_login_at")
+        .and_then(|v| v.as_date_time());
+    let mut mutation = MutationBuilder::<User>::new()
+        .set(Status, "Active")
+        .set_if_not_null(LastLoginIp, last_login_ip)
+        .set_if_some(LastLoginAt, last_login_at)
+        .set_if_some(CurrentLoginIp, req.client_ip())
+        .set_now(CurrentLoginAt)
+        .inc_one(LoginCount)
+        .set_now(UpdatedAt)
+        .inc_one(Version)
+        .build();
+    let user: User = User::update_by_id(&user_id, &mut mutation)
         .await
         .extract(&req)?;
-    if !validation.is_success() {
-        reject!(req, validation);
-    }
     data.upsert("entry", user.snapshot());
 
     let mut res = Response::default().context(&req);
@@ -40,20 +40,20 @@ pub async fn refresh(req: Request) -> Result {
 pub async fn logout(req: Request) -> Result {
     let user_session = req
         .get_data::<UserSession<_>>()
-        .ok_or_else(|| warn!("401 Unauthorized: the user session is invalid"))
+        .ok_or_else(|| warn!("401 Unauthorized: user session is invalid"))
         .extract(&req)?;
-
-    let mut mutations = Map::from_entry("status", "SignedOut");
     let user_id = user_session.user_id();
-    let (validation, user) = User::mutate_by_id(user_id, &mut mutations, None)
+
+    let mut mutation = MutationBuilder::<User>::new()
+        .set(Status, "SignedOut")
+        .set_now(UpdatedAt)
+        .inc_one(Version)
+        .build();
+    let user: User = User::update_by_id(user_id, &mut mutation)
         .await
         .extract(&req)?;
-    if !validation.is_success() {
-        reject!(req, validation);
-    }
 
-    let data = Map::data_entry(user.snapshot());
     let mut res = Response::default().context(&req);
-    res.set_json_data(data);
+    res.set_json_data(Map::data_entry(user.snapshot()));
     Ok(res.into())
 }

examples/amis-app/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "amis-app"
 description = "An example for amis UI generator."
-version = "0.1.0"
+version = "0.1.1"
 rust-version = "1.80"
 edition = "2021"
 publish = false
@@ -12,8 +12,8 @@ features = ["macros"]
 
 [dependencies.zino-amis]
 path = "../../zino-amis"
-version = "0.1.0"
+version = "0.1.1"
 
 [dependencies.zino-core]
 path = "../../zino-core"
-version = "0.27.4"
+version = "0.28.0"

examples/axum-app/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axum-app"
 description = "An example for axum integration."
-version = "0.15.0"
+version = "0.15.1"
 rust-version = "1.80"
 edition = "2021"
 publish = false
@@ -19,7 +19,7 @@ features = ["derive"]
 
 [dependencies.zino]
 path = "../../zino"
-version = "0.26.4"
+version = "0.27.0"
 features = [
     "axum",
     "i18n",
@@ -29,7 +29,7 @@ features = [
 
 [dependencies.zino-core]
 path = "../../zino-core"
-version = "0.27.4"
+version = "0.28.0"
 features = [
     "cookie",
     "env-filter",
@@ -40,8 +40,8 @@ features = [
 
 [dependencies.zino-derive]
 path = "../../zino-derive"
-version = "0.24.4"
+version = "0.25.0"
 
 [dependencies.zino-model]
 path = "../../zino-model"
-version = "0.24.4"
+version = "0.25.0"

examples/dioxus-desktop/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dioxus-desktop"
 description = "An example for Dioxus desktop integration."
-version = "0.6.0"
+version = "0.6.1"
 rust-version = "1.80"
 edition = "2021"
 publish = false
@@ -22,14 +22,14 @@ features = [
 
 [dependencies.zino]
 path = "../../zino"
-version = "0.26.4"
+version = "0.27.0"
 features = ["dioxus-desktop"]
 
 [dependencies.zino-core]
 path = "../../zino-core"
-version = "0.27.4"
+version = "0.28.0"
 features = ["env-filter", "tls-native"]
 
 [dependencies.zino-dioxus]
 path = "../../zino-dioxus"
-version = "0.9.3"
+version = "0.9.4"

examples/minimal-app/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "minimal-app"
 description = "A minimal example to run a server."
-version = "0.4.0"
+version = "0.5.0"
 rust-version = "1.80"
 edition = "2021"
 publish = false
 
 [dependencies.zino]
 path = "../../zino"
-version = "0.26.4"
+version = "0.27.0"
 features = ["axum"]
 

examples/ntex-app/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ntex-app"
 description = "An example for ntex integration."
-version = "0.3.0"
+version = "0.4.0"
 rust-version = "1.80"
 edition = "2021"
 publish = false
@@ -10,7 +10,7 @@ publish = false
 tracing = "0.1.41"
 
 [dependencies.ntex]
-version = "2.8.0"
+version = "2.9.0"
 default-features = false
 
 [dependencies.serde]
@@ -19,7 +19,7 @@ features = ["derive"]
 
 [dependencies.zino]
 path = "../../zino"
-version = "0.26.4"
+version = "0.27.0"
 features = [
     "i18n",
     "jwt",
@@ -29,7 +29,7 @@ features = [
 
 [dependencies.zino-core]
 path = "../../zino-core"
-version = "0.27.4"
+version = "0.28.0"
 features = [
     "cookie",
     "env-filter",
@@ -39,8 +39,8 @@ features = [
 
 [dependencies.zino-derive]
 path = "../../zino-derive"
-version = "0.24.4"
+version = "0.25.0"
 
 [dependencies.zino-model]
 path = "../../zino-model"
-version = "0.24.4"
+version = "0.25.0"

examples/ntex-app/src/controller/auth.rs

@@ -1,27 +1,27 @@
 use zino::{prelude::*, Request, Response, Result};
-use zino_model::user::{JwtAuthService, User};
+use zino_model::user::{JwtAuthService, User, UserColumn::*};
 
 pub async fn login(mut req: Request) -> Result {
-    let current_time = DateTime::now();
     let body: Map = req.parse_body().await?;
     let (user_id, mut data) = User::generate_token(body).await.extract(&req)?;
 
-    let user_updates = json!({
-        "status": "Active",
-        "last_login_at": data.remove("current_login_at").and_then(|v| v.as_date_time()),
-        "last_login_ip": data.remove("current_login_ip"),
-        "current_login_at": current_time,
-        "current_login_ip": req.client_ip(),
-        "$inc": { "login_count": 1 },
-    });
-
-    let mut user_mutations = user_updates.into_map_opt().unwrap_or_default();
-    let (validation, user) = User::mutate_by_id(&user_id, &mut user_mutations, None)
+    let last_login_ip = data.remove("current_login_ip");
+    let last_login_at = data
+        .remove("current_login_at")
+        .and_then(|v| v.as_date_time());
+    let mut mutation = MutationBuilder::<User>::new()
+        .set(Status, "Active")
+        .set_if_not_null(LastLoginIp, last_login_ip)
+        .set_if_some(LastLoginAt, last_login_at)
+        .set_if_some(CurrentLoginIp, req.client_ip())
+        .set_now(CurrentLoginAt)
+        .inc_one(LoginCount)
+        .set_now(UpdatedAt)
+        .inc_one(Version)
+        .build();
+    let user: User = User::update_by_id(&user_id, &mut mutation)
         .await
         .extract(&req)?;
-    if !validation.is_success() {
-        reject!(req, validation);
-    }
     data.upsert("entry", user.snapshot());
 
     let mut res = Response::default().context(&req);
@@ -40,20 +40,20 @@ pub async fn refresh(req: Request) -> Result {
 pub async fn logout(req: Request) -> Result {
     let user_session = req
         .get_data::<UserSession<_>>()
-        .ok_or_else(|| warn!("401 Unauthorized: the user session is invalid"))
+        .ok_or_else(|| warn!("401 Unauthorized: user session is invalid"))
         .extract(&req)?;
-
-    let mut mutations = Map::from_entry("status", "SignedOut");
     let user_id = user_session.user_id();
-    let (validation, user) = User::mutate_by_id(user_id, &mut mutations, None)
+
+    let mut mutation = MutationBuilder::<User>::new()
+        .set(Status, "SignedOut")
+        .set_now(UpdatedAt)
+        .inc_one(Version)
+        .build();
+    let user: User = User::update_by_id(user_id, &mut mutation)
         .await
         .extract(&req)?;
-    if !validation.is_success() {
-        reject!(req, validation);
-    }
 
-    let data = Map::data_entry(user.snapshot());
     let mut res = Response::default().context(&req);
-    res.set_json_data(data);
+    res.set_json_data(Map::data_entry(user.snapshot()));
     Ok(res.into())
 }

examples/ntex-app/src/model/tag.rs

@@ -30,11 +30,7 @@ pub struct Tag {
     // Info fields.
     #[schema(not_null, index_type = "hash", comment = "Tag category")]
     category: String,
-    #[schema(
-        snapshot,
-        reference = "Tag",
-        comment = "Optional parent tag"
-    )]
+    #[schema(snapshot, reference = "Tag", comment = "Optional parent tag")]
     parent_id: Option<Uuid>,
 
     // Extensions.

zino-actix/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "zino-actix"
 description = "Integrations with actix-web for zino."
-version = "0.1.1"
+version = "0.1.2"
 rust-version = "1.80"
 edition = "2021"
 license = "MIT"
@@ -33,7 +33,7 @@ features = ["actix-web"]
 
 [dependencies.zino-core]
 path = "../zino-core"
-version = "0.27.3"
+version = "0.28.0"
 features = [
     "http02",
     "openapi",

zino-amis/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "zino-amis"
 description = "UI generator for amis."
-version = "0.1.0"
+version = "0.1.1"
 rust-version = "1.80"
 edition = "2021"
 license = "MIT"
@@ -37,5 +37,5 @@ features = ["parse"]
 
 [dependencies.zino-core]
 path = "../zino-core"
-version = "0.27.3"
+version = "0.28.0"
 features = ["tracing-subscriber"]