From 62b6d7a878ee7cc2ac117074c0d77cf825e79221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=20=E6=9F=8F?= Date: Sun, 8 Dec 2024 17:23:51 +0900 Subject: [PATCH] sqlalchemy2.x --- backend/app/db/cruddb/dbdomain.py | 6 +++--- backend/app/tests/test_domain.py | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/backend/app/db/cruddb/dbdomain.py b/backend/app/db/cruddb/dbdomain.py index 7638779..b6e94a7 100644 --- a/backend/app/db/cruddb/dbdomain.py +++ b/backend/app/db/cruddb/dbdomain.py @@ -1,7 +1,7 @@ from datetime import datetime from fastapi import HTTPException, status from sqlalchemy.orm import Session -from sqlalchemy import and_ +from sqlalchemy import select,and_ import typing as t from app.db.cruddb.crudbase import crudbase @@ -142,7 +142,7 @@ class dbdomain(crudbase): def get_shareddomain_users(self,db: Session,ownerid:int,domainid: int) -> ApiReturnPage[models.Base]: - users = db.query(models.User).join(models.UserDomain,models.UserDomain.userid == models.User.id).filter(models.UserDomain.domainid ==domainid) - return paginate(users) + users = select(models.User).join(models.UserDomain,models.UserDomain.userid == models.User.id).filter(models.UserDomain.domainid ==domainid) + return paginate(db,users) dbdomain = dbdomain() \ No newline at end of file diff --git a/backend/app/tests/test_domain.py b/backend/app/tests/test_domain.py index d41984e..dc3a474 100644 --- a/backend/app/tests/test_domain.py +++ b/backend/app/tests/test_domain.py @@ -3,6 +3,8 @@ def test_get_domains(test_client,test_domain,login_user): response = test_client.get("/api/domains",headers={"Authorization": "Bearer " + login_user}) assert response.status_code == 200 data = response.json() + assert "data" in data + assert data["data"] is not None assert len(data["data"]) == 1 assert data["data"][0]["name"] == test_domain.name @@ -69,11 +71,23 @@ def test_get_defaultuserdomain(test_client, test_domain,login_user): response = test_client.get("/api/defaultdomain", headers={"Authorization": "Bearer " + login_user}) assert response.status_code == 200 data = response.json() + assert "data" in data + assert data["data"] is not None assert data["data"]["name"] == test_domain.name assert data["data"]["url"] == test_domain.url assert data["data"]["kintoneuser"] == test_domain.kintoneuser assert data["data"]["is_active"] == test_domain.is_active + +def test_get_domainshareduser(test_client, test_domain,login_user,login_user_id): + response = test_client.get("/api/domainshareduser/"+str(test_domain.id), headers={"Authorization": "Bearer " + login_user}) + assert response.status_code == 200 + data = response.json() + assert "data" in data + assert data["data"] is not None + assert len(data["data"]) == 1 + assert data["data"][0]["id"] == login_user_id + def test_edit_domain(test_client, test_domain, login_user): update_domain ={ "id": test_domain.id, @@ -86,6 +100,8 @@ def test_edit_domain(test_client, test_domain, login_user): response = test_client.put("/api/domain", json=update_domain,headers={"Authorization": "Bearer " + login_user}) assert response.status_code == 200 data = response.json() + assert "data" in data + assert data["data"] is not None assert data["data"]["name"] == update_domain["name"] assert data["data"]["url"] == update_domain["url"] assert data["data"]["kintoneuser"] == update_domain["kintoneuser"]