把对model的操作单独使用一个endpoint

Author: Chise1

.github/workflows/test.yml

@@ -5,7 +5,7 @@ name: Python package
 
 on:
   push:
-    branches: [ main ]
+    branches: [ dev ]
   pull_request:
     branches: [ main ]
 

fast_tmp/admin/constant.py

@@ -0,0 +1,2 @@
+model_router = "/endpoint"
+crud_root_rooter = "endpoint/"

fast_tmp/admin/server.py

@@ -18,6 +18,7 @@
 from fast_tmp.utils.token import create_access_token
 
 from ..jinja_extension.tags import register_tags
+from .constant import crud_root_rooter, model_router
 from .endpoint import router
 from .responses import BaseRes
 
@@ -30,7 +31,7 @@
 admin.mount("/static", app=StaticFiles(directory=base_path + "/static"), name="static")
 
 register_model_site({"Auth": [UserAdmin]})
-admin.include_router(router)
+admin.include_router(router, prefix=model_router)
 
 
 @admin.get(
@@ -63,8 +64,8 @@ def index_post(request: Request, user: Optional[User] = Depends(decode_access_to
 @admin.post("/login")
 def login(
     request: Request,
-    username: str = Form(...),
-    password: str = Form(...),
+    username: Optional[str] = Form(None),
+    password: Optional[str] = Form(None),
     session: Session = Depends(get_db_session),
 ):
     context = {
@@ -122,7 +123,7 @@ def get_site(request: Request, user: Optional[User] = Depends(decode_access_toke
                     {
                         "label": model.name(),
                         "url": model.name(),
-                        "schemaApi": model.name() + "/schema",
+                        "schemaApi": crud_root_rooter + model.name() + "/schema",
                     }
                     for model in ml
                 ],

fast_tmp/site/__init__.py

@@ -11,6 +11,7 @@
 from fast_tmp.admin.schema.frame import Dialog
 from fast_tmp.admin.schema.page import Page
 
+from ..admin.constant import crud_root_rooter
 from .utils import get_columns_from_model, get_controls_from_model, get_pk
 
 
@@ -60,7 +61,7 @@ def get_create_dialogation_button(cls):
                         name=f"新增{cls.name()}",
                         title=f"新增{cls.name()}",
                         body=get_controls_from_model(cls.create_fields),
-                        api=f"post:{cls.prefix}/{cls.name()}/create",
+                        api=f"post:{crud_root_rooter}{cls.name()}/create",
                     ),
                 ),
             )
@@ -87,7 +88,7 @@ def get_del_one_button(cls):
             type="button",
             level=ButtonLevelEnum.danger,
             confirmText="确认要删除？",
-            api="delete:" + cls.name() + "/delete?" + cls.pks(),
+            api="delete:" + crud_root_rooter + cls.name() + "/delete?" + cls.pks(),
         )
 
     @classmethod
@@ -99,8 +100,8 @@ def get_update_one_button(cls):
                 body=Form(
                     name=f"修改{cls.name()}",
                     body=get_controls_from_model(cls.update_fields),
-                    api="put:" + cls.name() + "/update?" + cls.pks(),
-                    initApi="get:" + cls.name() + "/update?" + cls.pks(),
+                    api="put:" + crud_root_rooter + cls.name() + "/update?" + cls.pks(),
+                    initApi="get:" + crud_root_rooter + cls.name() + "/update?" + cls.pks(),
                 ),
             ),
         )
@@ -122,7 +123,7 @@ def get_crud(cls):
         columns.append(cls.get_operation())
         body.append(
             CRUD(
-                api=cls.name() + "/list",
+                api=crud_root_rooter + cls.name() + "/list",
                 columns=columns,
             )
         )

tests/test_a.py

@@ -18,6 +18,17 @@ def test_sing_in():
     login_res = client.get("/admin/login")
     assert login_res.status_code == 200
     assert login_res.text.count("<h2 class=\"card-title text-center mb-4\">Login to your account</h2>") == 1
+    login_post_res = client.post("/admin/login", data={"password": "root1"})
+    assert login_post_res.status_code == 200
+    assert login_post_res.text.count('Username can not be null.') == 1
+    login_post_res = client.post("/admin/login", data={"username": "root1"})
+    assert login_post_res.status_code == 200
+    assert login_post_res.text.count('Password can not be null.') == 1
+
+    login_post_res = client.post("/admin/login", data={"username": "root1", "password": "sadf"})
+    assert login_post_res.status_code == 200
+    assert login_post_res.text.count('Username or password is error!') == 1
+
     login_post_res = client.post("/admin/login", data={"username": "root", "password": "root"})
     assert login_post_res.status_code == 307
     assert login_post_res.headers.get("location") == 'http://testserver/admin/'
@@ -28,31 +39,32 @@ def test_site():
     get_cookie(client)
     site_res = client.get("/admin/site")
     assert site_res.status_code == 200
-    assert site_res.json() == {"status": 0, "msg": "", "data": {
-        "pages": [{"label": "Auth", "children": [{"label": "User", "url": "User", "schemaApi": "User/schema"}]}]}}
+    assert site_res.json() == {'data': {'pages': [
+        {'children': [{'label': 'User', 'schemaApi': 'endpoint/User/schema', 'url': 'User'}], 'label': 'Auth'}]},
+        'msg': '', 'status': 0}
 
 
 def test_schema():
     client = TestClient(app)
     get_cookie(client)
-    user_schema = client.get("/admin/User/schema")
+    user_schema = client.get("/admin/endpoint/User/schema")
     assert user_schema.status_code == 200
-    assert user_schema.text == '{"status":0,"msg":"","data":{"type":"page","title":"User","body":[{"type":"button","label":"新增","actionType":"dialog","size":"md","level":"primary","dialog":{"title":"新增","nextCondition":true,"size":"md","body":{"type":"form","name":"新增User","title":"新增User","api":"post:/admin/User/create","body":[{"type":"input-text","name":"username","label":"username","inline":false,"submitOnChange":false,"disabled":false,"required":false,"validations":{"maxLength":128},"mode":"normal","size":"full"},{"type":"input-text","name":"password","label":"password","inline":false,"submitOnChange":false,"disabled":false,"required":false,"validations":{"maxLength":128},"mode":"normal","size":"full"}]}}},{"type":"crud","api":"User/list","columns":[{"type":"text","name":"id","label":"id"},{"type":"text","name":"username","label":"username"},{"type":"text","name":"is_active","label":"is_active"},{"buttons":[{"type":"button","label":"删除","actionType":"ajax","size":"md","level":"danger","confirmText":"确认要删除？","api":"delete:User/delete?id=$id"},{"type":"button","label":"修改","actionType":"dialog","size":"md","level":"primary","dialog":{"title":"修改","nextCondition":true,"size":"md","body":{"type":"form","name":"修改User","api":"put:User/update?id=$id","initApi":"get:User/update?id=$id","body":[{"type":"input-text","name":"password","label":"password","inline":false,"submitOnChange":false,"disabled":false,"required":false,"validations":{"maxLength":128},"mode":"normal","size":"full"}]}}}],"type":"operation","label":"操作"}],"affixHeader":false}],"initFetch":false}}'
+    assert user_schema.text == '{"status":0,"msg":"","data":{"type":"page","title":"User","body":[{"type":"button","label":"新增","actionType":"dialog","size":"md","level":"primary","dialog":{"title":"新增","nextCondition":true,"size":"md","body":{"type":"form","name":"新增User","title":"新增User","api":"post:endpoint/User/create","body":[{"type":"input-text","name":"username","label":"username","inline":false,"submitOnChange":false,"disabled":false,"required":false,"validations":{"maxLength":128},"mode":"normal","size":"full"},{"type":"input-text","name":"password","label":"password","inline":false,"submitOnChange":false,"disabled":false,"required":false,"validations":{"maxLength":128},"mode":"normal","size":"full"}]}}},{"type":"crud","api":"endpoint/User/list","columns":[{"type":"text","name":"id","label":"id"},{"type":"text","name":"username","label":"username"},{"type":"text","name":"is_active","label":"is_active"},{"buttons":[{"type":"button","label":"删除","actionType":"ajax","size":"md","level":"danger","confirmText":"确认要删除？","api":"delete:endpoint/User/delete?id=$id"},{"type":"button","label":"修改","actionType":"dialog","size":"md","level":"primary","dialog":{"title":"修改","nextCondition":true,"size":"md","body":{"type":"form","name":"修改User","api":"put:endpoint/User/update?id=$id","initApi":"get:endpoint/User/update?id=$id","body":[{"type":"input-text","name":"password","label":"password","inline":false,"submitOnChange":false,"disabled":false,"required":false,"validations":{"maxLength":128},"mode":"normal","size":"full"}]}}}],"type":"operation","label":"操作"}],"affixHeader":false}],"initFetch":false}}'
 
 
 def test_crud():
     client = TestClient(app)
     get_cookie(client)
     # create
-    create_user = client.post("/admin/User/create", json={"username": "crud_user", "password": "crud_user"})
+    create_user = client.post("/admin/endpoint/User/create", json={"username": "crud_user", "password": "crud_user"})
     assert create_user.status_code == 200
     assert create_user.text == '{"status":0,"msg":"","data":{"username":"crud_user","password":"crud_user"}}'
     # login
     login_post_res = client.post("/admin/login", data={"username": "crud_user", "password": "crud_user"})
     assert login_post_res.status_code == 307
     assert login_post_res.next.path_url == "/admin/"
     # list
-    user_list = client.get("/admin/User/list")
+    user_list = client.get("/admin/endpoint/User/list")
     assert user_list.status_code == 200
     assert user_list.text.count('"username":"crud_user"') == 1
     user_data = user_list.json()["data"]
@@ -64,30 +76,34 @@ def test_crud():
     else:
         raise Exception("not found user id")
     # update
-    user_update = client.get(f"/admin/User/update?id={user_id}")
+    user_update = client.get(f"/admin/endpoint/User/update?id={user_id}")
     assert user_update.status_code == 200
     assert user_update.text.count('"password":') == 1
-    user_update_p = client.put(f"/admin/User/update?id={user_id}", json={"password": "root"})
+    user_update_p = client.put(f"/admin/endpoint/User/update?id={user_id}", json={"password": "root"})
     assert user_update_p.status_code == 200
     assert user_update_p.json()["status"] == 0
     # test error pk
-    user_delete_err = client.delete(f"/admin/User/delete?ids={user_id}")
+    user_delete_err = client.delete(f"/admin/endpoint/User/delete?ids={user_id}")
     error_data = user_delete_err.json()
     assert error_data["status"] == 400
     assert error_data["msg"] == "主键错误"
-    error_data = client.put(f"/admin/User/update?ids={user_id}", json={"password": "root"}).json()
+    error_data = client.put(f"/admin/endpoint/User/update?ids={user_id}", json={"password": "root"}).json()
     assert error_data["status"] == 400
     assert error_data["msg"] == "主键错误"
     # delete
-    user_delete = client.delete(f"/admin/User/delete?id={user_id}")
+    user_delete = client.delete(f"/admin/endpoint/User/delete?id={user_id}")
     assert user_delete.status_code == 200
 
 
 def test_not_singin():
     client = TestClient(app)
-    assert client.get("/admin/User/list").text.count("Login to your account") == 1
-    assert client.post("/admin/User/create", json={"username": "crud_user1", "password": "tt"}).status_code == 307
-    assert client.get("/admin/User/update?id=1").text.count("Login to your account") == 1
-    assert client.put("/admin/User/update?id=1", json={"password": "asdfadf"}).status_code == 307
-    assert client.delete("/admin/User/delete?id=1").status_code == 307
-    assert client.get("/admin/User/schema").text.count("Login to your account") == 1
+    assert client.get("/admin/endpoint/User/list").text.count("Login to your account") == 1
+    assert client.post("/admin/endpoint/User/create",
+                       json={"username": "crud_user1", "password": "tt"}).status_code == 307
+    assert client.get("/admin/endpoint/User/update?id=1").text.count("Login to your account") == 1
+    assert client.put("/admin/endpoint/User/update?id=1", json={"password": "asdfadf"}).status_code == 307
+    assert client.delete("/admin/endpoint/User/delete?id=1").status_code == 307
+    assert client.get("/admin/endpoint/User/schema").text.count("Login to your account") == 1
+    assert client.get("/admin/site").text.count("Login to your account") == 1
+    assert client.get("/admin/").text.count("Login to your account") == 1
+    assert client.post("/admin/").status_code == 307