Add Router

Author: owjs3901

__tests__/api/index.test.ts

@@ -10,6 +10,8 @@ describe('api', () => {
   it('should return devup models', async () => {
     const res = await fetch('http://localhost:8000/devup-models')
     const data = await res.json()
-    expect(data).toEqual(['Board', 'User'])
+    expect(data).toEqual(
+      expect.arrayContaining(['Board', 'User', 'GlobalInfo']),
+    )
   })
 })

core/api/src/lib.rs

@@ -3,7 +3,7 @@ pub mod auth;
 pub mod router;
 
 use crate::router::{
-    AuthRouter, CrudRouter, CustomRouter, DevupRouter, ProxyRouter, SingletonRouter,
+    AuthRouter, CrudRouter, CustomRouter, ProxyRouter, SingletonRouter,
 };
 use once_cell::sync::Lazy;
 use schema::DevupSchema;

libs/python/core/src/lib.rs

@@ -1,19 +1,14 @@
 mod py_utils;
 mod router;
-use std::collections::HashSet;
 use std::sync::Mutex;
 
-use crate::py_utils::get_route_path;
 use crate::router::auth_router::{get_all_auth_routers, PyAuthRouter};
 use crate::router::crud_router::{get_all_crud_routers, PyCrudRouter};
 use crate::router::custom_router::{get_all_custom_routers, PyCustomRouter};
 use crate::router::proxy_router::{get_all_proxy_routers, PyProxyRouter};
 use crate::router::singleton_router::{get_all_singleton_routers, PySingletonRouter};
 use ::utils::collect_files;
-use api::{
-    add_auth_router, add_crud_router, add_custom_router, add_model, add_proxy_router,
-    add_singleton_router,
-};
+use api::add_model;
 use model::column::{DevupModelColumn, DevupModelColumnType, DevupModelFieldType};
 use model::DevupModel;
 use once_cell::sync::Lazy;

libs/python/core/src/py_utils.rs

@@ -72,6 +72,7 @@ pub fn convert_to_route_path(path: &str) -> String {
     result
 }
 
+#[cfg(test)]
 mod tests {
     use super::*;
 

libs/python/core/src/router/crud_router.rs

@@ -1,5 +1,4 @@
 use crate::py_utils::{convert_to_route_path, get_route_path};
-use crate::Model;
 use api::add_crud_router;
 use api::router::CrudRouter;
 use pyo3::prelude::*;

libs/python/core/src/router/singleton_router.rs

@@ -1,28 +1,45 @@
 use api::{add_singleton_router, router::SingletonRouter};
-use pyo3::prelude::*;
+use pyo3::{prelude::*, types::PyType};
 use std::sync::Arc;
 
-use crate::py_utils::get_route_path;
+use crate::py_utils::{convert_to_route_path, get_route_path};
 
 // routes
 #[pyclass(name = "SingletonRouter")]
 pub struct PySingletonRouter(Arc<SingletonRouter>);
 #[pymethods]
 impl PySingletonRouter {
     #[new]
-    fn new() -> PyResult<Self> {
+    fn new(model: &Bound<'_, PyType>) -> PyResult<Self> {
+        let model_name = model.getattr("name")?.extract::<String>()?;
+        let path = convert_to_route_path(get_route_path()?.as_str());
         Ok(Self(
             add_singleton_router(SingletonRouter {
-                path: get_route_path()?,
-                name: "test".to_string(),
-                model: "test".to_string(),
+                path,
+                name: model_name.clone(),
+                model: model_name.clone(),
                 default: Default::default(),
                 route: Default::default(),
                 auth: Default::default(),
             })
             .map_err(|e| PyErr::new::<pyo3::exceptions::PyValueError, _>(e.to_string()))?,
         ))
     }
+
+    #[getter]
+    fn path(&self) -> &str {
+        &self.0.path
+    }
+
+    #[getter]
+    fn name(&self) -> &str {
+        &self.0.name
+    }
+
+    #[getter]
+    fn model(&self) -> &str {
+        &self.0.model
+    }
 }
 
 #[pyfunction]

project/python/fastapi/routes/(singleton)/global_info.py

@@ -1,5 +1,6 @@
 from devup_api_core import SingletonRouter
-from devup_api_fastapi import GlobalInfo
+
+from models.global_info import GlobalInfo
 
 SingletonRouter(
     GlobalInfo

sql/core/devup_database/src/lib.rs

@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use sqlx::{
-    Any, Database, Error, Executor, Pool, Transaction,
+    Any, Error, Pool, Transaction,
     any::{AnyPoolOptions, install_default_drivers},
 };
 

sql/core/devup_sql/src/lib.rs

@@ -137,13 +137,11 @@ pub fn generate_sql(
     fields.to_sql()
 }
 
+#[cfg(test)]
 mod test {
 
-    use model::column::{
-        DevupModelColumn, DevupModelColumnType, DevupModelFieldType, DevupModelRelation,
-    };
-
     use super::*;
+    use model::column::{DevupModelColumn, DevupModelColumnType, DevupModelRelation};
 
     #[test]
     fn test_generate_sql() {

sql/libs/node/pool/src/lib.rs

@@ -2,10 +2,9 @@ use std::collections::HashMap;
 
 use devup_database::{DevupSqlPool, DevupSqlPoolOptions};
 use napi::{
-    Env, Error, JsUndefined, Result, Status, Task,
-    bindgen_prelude::{AsyncTask, Undefined},
+    Error, Result, Status,
 };
-use sqlx::{Any, AnyConnection, Column, Execute, Executor, Pool, Row, Transaction, query};
+use sqlx::{Any, Column, Executor, Pool, Row, Transaction, query};
 
 #[macro_use]
 extern crate napi_derive;