Implement save

Author: owjs3901

Cargo.lock

@@ -101,13 +101,32 @@ describe.sequential('sqlite', async () => {
       await pool.migrate(nextRevision)
 
       expect(await pool.getCurrentRevision()).toBe(1)
+      const date = new Date()
       const user = User.create({
         username: 'devup',
-        createdAt: new Date(),
+        createdAt: date,
+        id: 1,
+        tag: '',
+      })
+      expect(user).toEqual({
+        username: 'devup',
+        createdAt: date.toISOString(),
         id: 1,
         tag: '',
+        __devup_name: 'User',
       })
       await pool.save(user)
+
+      expect(user).toEqual({
+        username: 'devup',
+        createdAt: date.toISOString(),
+        id: 1,
+        tag: '',
+        __devup_instance_id: {
+          id: 1,
+        },
+        __devup_name: 'User',
+      })
       expect(await pool.fetchAll('SELECT COUNT(*) as count FROM user')).toEqual(
         [
           {
@@ -117,15 +136,13 @@ describe.sequential('sqlite', async () => {
       )
       const ac = await pool.begin()
       // assign __devup_instance_id to user
-      await pool.save(
-        User.create({
-          username: 'devup',
-          createdAt: new Date(),
-          id: 3,
-          tag: '',
-        }),
-        ac,
-      )
+      const user2 = User.create({
+        username: 'devup',
+        createdAt: new Date(),
+        id: 3,
+        tag: '',
+      })
+      await pool.save(user2, ac)
 
       expect(await pool.fetchAll('SELECT COUNT(*) as count FROM user')).toEqual(
         [
@@ -143,7 +160,13 @@ describe.sequential('sqlite', async () => {
           },
         ],
       )
-      console.log(user)
+
+      const user3 = User.create({
+        username: 'devup',
+        tag: '',
+      })
+      await pool.save(user3)
+      console.log(user, user2, user3)
 
       // user.id = 100
       // await pool.save(user)

__tests__/sql/index.test.ts

@@ -5,9 +5,11 @@ pub mod router;
 use crate::router::{AuthRouter, CrudRouter, CustomRouter, ProxyRouter, SingletonRouter};
 use once_cell::sync::Lazy;
 use schema::DevupSchema;
-use std::collections::HashMap;
-use std::error::Error;
-use std::sync::{Arc, Mutex};
+use std::{
+    collections::HashMap,
+    error::Error,
+    sync::{Arc, Mutex},
+};
 
 // Router
 static CRUD_ROUTER_MAP: Lazy<Mutex<HashMap<String, Arc<CrudRouter>>>> =

core/api/src/lib.rs

@@ -4,11 +4,10 @@ mod custom_router;
 mod proxy_router;
 mod singleton_router;
 
-pub use crate::router::auth_router::AuthRouter;
-pub use crate::router::crud_router::CrudRouter;
-pub use crate::router::custom_router::CustomRouter;
-pub use crate::router::proxy_router::ProxyRouter;
-pub use crate::router::singleton_router::SingletonRouter;
+pub use crate::router::{
+    auth_router::AuthRouter, crud_router::CrudRouter, custom_router::CustomRouter,
+    proxy_router::ProxyRouter, singleton_router::SingletonRouter,
+};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize)]

core/api/src/router/mod.rs

@@ -21,14 +21,10 @@ pub struct DevupModel {
 static INIT: Lazy<Mutex<bool>> = Lazy::new(|| Mutex::new(false));
 
 fn get_shmem_ptr() -> Result<Shmem, ShmemError> {
-    let shmem = match ShmemConf::new()
-        .size(4096)
-        .os_id("devup_model_map")
-        .create()
-    {
+    let shmem = match ShmemConf::new().size(4096).os_id("devup_model").create() {
         Ok(m) => m,
         Err(ShmemError::MappingIdExists | ShmemError::LinkExists) => {
-            ShmemConf::new().os_id("devup_model_map").open().unwrap()
+            ShmemConf::new().os_id("devup_model").open().unwrap()
         }
         Err(e) => {
             eprintln!("Unable to create or open shmem file devup_model_map : {e}");
@@ -56,7 +52,6 @@ pub fn add_model(model: DevupModel) -> Result<(), Box<dyn std::error::Error>> {
     unsafe {
         shmem.as_slice_mut()[0..serialized.len()].copy_from_slice(&serialized);
     };
-
     Ok(())
 }
 

core/model/src/lib.rs

@@ -3,7 +3,7 @@ use std::error::Error;
 
 /// Collect all files
 pub fn collect_files(dir: &str, extension: &str) -> Result<Vec<String>, Box<dyn Error>> {
-    Ok(glob(&format!("{}/**/*.{}", dir, extension))?
+    Ok(glob(&format!("{dir}/**/*.{extension}"))?
         .map(|path| path.unwrap().to_str().unwrap().to_string())
         .collect())
 }

core/utils/src/lib.rs

@@ -4,7 +4,7 @@ export class DevupModel {
     this: T,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     params: {
-      [key in ExtractFieldKeys<InstanceType<T>>]: InstanceType<T>[key]
+      [key in ExtractFieldKeys<InstanceType<T>>]?: InstanceType<T>[key]
     },
   ): InstanceType<T> {
     throw new Error('Method not implemented.')

libs/node/model/main.d.ts

@@ -1,7 +1,7 @@
-use model::{DevupModel, add_model};
+use model::{DevupModel, add_model, get_all_models, get_model};
 use napi::{Env, JsFunction, JsObject, JsString, bindgen_prelude::*};
 
-use crate::utils::{console_dir, log};
+use crate::utils::console_dir;
 
 /// Model decorator
 #[napi(js_name = "Model")]
@@ -20,35 +20,20 @@ pub fn model(env: Env, name: Option<String>) -> Result<JsFunction> {
         .unwrap()
         .to_string()
     });
-    let cls = cls.into_unknown();
 
-    println!("get_metadata:");
-    let f = get_metadata.call(
-      None,
-      &[
-        &ctx.env.create_string("devup-api:fields")?.into_unknown(),
-        &cls,
-      ],
-    )?;
-    {
-      let f = get_metadata.call(
+    let model = DevupModel {
+      name: model_name.clone(),
+      fields: ctx.env.from_js_value(get_metadata.call(
         None,
         &[
           &ctx.env.create_string("devup-api:fields")?.into_unknown(),
-          &cls,
+          &cls.into_unknown(),
         ],
-      )?;
-      console_dir(&env, f)?;
-    }
-
-    let fields = ctx.env.from_js_value(f);
-    println!("fields: {:?}", fields);
-    add_model(DevupModel {
-      name: model_name,
-      fields: fields?,
-    })
-    .map_err(|e| napi::Error::from_reason(e.to_string()))?;
+      )?)?,
+    };
+    add_model(model).map_err(|e| napi::Error::from_reason(e.to_string()))?;
 
+    get_all_models().unwrap();
     Ok(ctx.env.get_undefined())
   })
 }

libs/node/model/src/model.rs

@@ -1,17 +1,21 @@
 mod py_utils;
 use pyo3_stub_gen::{
-    define_stub_info_gatherer, derive::gen_stub_pyclass, derive::gen_stub_pyfunction,
+    define_stub_info_gatherer,
+    derive::{gen_stub_pyclass, gen_stub_pyfunction},
 };
 use std::sync::Mutex;
 
 use api::add_model;
-use model::DevupModel;
-use model::column::{DevupModelColumn, DevupModelColumnType, DevupModelFieldType};
+use model::{
+    DevupModel,
+    column::{DevupModelColumn, DevupModelColumnType, DevupModelFieldType},
+};
 use once_cell::sync::Lazy;
-use pyo3::prelude::*;
-use pyo3::types::{PyDict, PyType};
-use schema::DevupSchema;
-use schema::field::DevupSchemaField;
+use pyo3::{
+    prelude::*,
+    types::{PyDict, PyType},
+};
+use schema::{DevupSchema, field::DevupSchemaField};
 use utils::collect_files;
 
 #[gen_stub_pyclass]

libs/python/model/src/lib.rs

@@ -71,7 +71,7 @@ pub fn convert_to_route_path(path: &str) -> String {
     }
 
     if !result.starts_with("/") {
-        result = format!("/{}", result);
+        result = format!("/{result}");
     }
 
     if result.len() > 1 && result.ends_with("/") {