feat: update example with new api

Author: tqwewe

examples/ecom/Cargo.lock

@@ -1,23 +1,29 @@
-use std::env;
+use std::{env, error};
 
-use awto::schema::Schema;
+use awto::schema::Role;
 use awto_compile::database::compile_database;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
+async fn main() -> Result<(), Box<dyn error::Error>> {
     dotenv::dotenv().ok();
+
     let pg_schema = env::var("DATABASE_SCHEMA").unwrap_or_else(|_| "public".to_string());
     let uri = env::var("DATABASE_URL").expect("missing env DATABASE_URL");
 
-    compile_database(&uri, schema::Schema::database_schemas()).await?;
+    compile_database(&uri, schema::MODELS.to_vec()).await?;
 
     sea_orm_build::generate_models(
         &pg_schema,
         &uri,
-        &schema::Schema::database_schemas()
-            .iter()
-            .map(|schema| schema.table_name.as_str())
-            .collect::<Vec<_>>(),
+        &schema::MODELS.iter().fold(Vec::new(), |mut acc, model| {
+            for role in &model.roles {
+                if let Role::DatabaseTable(table) = role {
+                    acc.push(table.name.as_str())
+                }
+            }
+
+            acc
+        }),
     )
     .await?;
 

examples/ecom/awto/database/build.rs

@@ -1,10 +1,5 @@
-// This file is automatically @generated by awto-cli v0.1.0
+// This file is automatically @generated by awto-cli v0.1.1
 
 pub use sea_orm;
 
 include!(concat!(env!("OUT_DIR"), "/app.rs"));
-
-/// Product database model
-pub mod product {
-    sea_orm::include_model!("product");
-}

examples/ecom/awto/database/src/lib.rs

@@ -1,9 +1,9 @@
-use awto::{schema::Schema, service::Service};
+use awto::service::Service;
 use awto_compile::protobuf::compile_protobuf;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     compile_protobuf(
-        schema::Schema::protobuf_schemas(),
+        schema::MODELS.to_vec(),
         service::Service::protobuf_services(),
     )
 }

examples/ecom/awto/protobuf/build.rs

@@ -1,3 +1,3 @@
-// This file is automatically @generated by awto-cli v0.1.0
+// This file is automatically @generated by awto-cli v0.1.1
 
 include!(concat!(env!("OUT_DIR"), "/app.rs"));

examples/ecom/awto/protobuf/src/lib.rs

@@ -5,5 +5,3 @@ edition = "2018"
 
 [dependencies]
 awto = { path = "../../../awto" }
-chrono = "0.4"
-uuid = { version = "0.8", features = ["v4"] }

examples/ecom/schema/Cargo.toml

@@ -1,39 +1,49 @@
 use awto::prelude::*;
-use chrono::{DateTime, FixedOffset};
-use uuid::Uuid;
 
-register_schemas!(Product);
+schema! {
+    #[database_table]
+    #[protobuf_message]
+    pub struct Product {
+        pub id: Uuid,
+        pub created_at: DateTime<FixedOffset>,
+        pub updated_at: DateTime<FixedOffset>,
+        pub name: String,
+        #[awto(default = 0)]
+        pub price: i64,
+        #[awto(max_len = 120)]
+        pub description: Option<String>,
+        pub category: Option<String>,
+    }
 
-#[derive(Model)]
-pub struct Product {
-    pub id: Uuid,
-    pub created_at: DateTime<FixedOffset>,
-    pub updated_at: DateTime<FixedOffset>,
-    pub name: String,
-    #[awto(default = 0)]
-    pub price: i64,
-    #[awto(max_len = 120)]
-    pub description: Option<String>,
-    pub category: Option<String>,
-}
+    #[protobuf_message]
+    pub struct Empty {}
 
-#[derive(ProtobufModel)]
-pub struct Empty {}
+    #[protobuf_message]
+    pub struct ProductId {
+        pub id: Uuid,
+    }
 
-#[derive(ProtobufModel)]
-pub struct ProductId {
-    pub id: Uuid,
-}
+    #[protobuf_message]
+    #[database_sub_table(Product)]
+    pub struct NewProduct {
+        pub name: String,
+        pub price: Option<i64>,
+        pub description: Option<String>,
+        pub category: Option<String>,
+    }
 
-#[derive(ProtobufModel)]
-pub struct NewProduct {
-    pub name: String,
-    pub price: Option<i64>,
-    pub description: Option<String>,
-    pub category: Option<String>,
+    #[protobuf_message]
+    pub struct ProductList {
+        pub products: Vec<Product>,
+    }
 }
 
-#[derive(ProtobufModel)]
-pub struct ProductList {
-    pub products: Vec<Product>,
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn models() {
+        println!("{:#?}", &*MODELS);
+    }
 }

examples/ecom/schema/src/lib.rs

@@ -1,7 +1,7 @@
 use awto::macros::protobuf_service;
 use database::{
     product,
-    sea_orm::{ActiveModelTrait, EntityTrait, IntoActiveValue},
+    sea_orm::{ActiveModelTrait, EntityTrait, IntoActiveModel},
 };
 use schema::*;
 use tonic::Status;
@@ -13,13 +13,7 @@ pub struct ProductService {
 #[protobuf_service]
 impl ProductService {
     pub async fn create_product(&self, request: NewProduct) -> Result<ProductId, Status> {
-        let active_model = product::ActiveModel {
-            name: request.name.into_active_value(),
-            price: request.price.unwrap_or_default().into_active_value(),
-            description: request.description.into_active_value(),
-            category: request.category.into_active_value(),
-            ..Default::default()
-        };
+        let active_model = request.into_active_model();
 
         let result = active_model
             .insert(&self.conn)