SQLAlchemy 1.0->SQLAlchemy 2.x
This commit is contained in:
@@ -9,6 +9,11 @@ from app.db.session import Base, get_db
|
||||
from app.db import models,schemas
|
||||
from app.main import app
|
||||
|
||||
|
||||
from app.core import security
|
||||
import jwt
|
||||
|
||||
|
||||
SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://kabAdmin:P%40ssw0rd!@kintonetooldb.postgres.database.azure.com/test"
|
||||
|
||||
engine = create_engine(SQLALCHEMY_DATABASE_URI,echo=True)
|
||||
@@ -100,6 +105,38 @@ def login_admin(test_db,test_client,admin,password):
|
||||
response = test_client.post("/api/token", data={"username": admin.email, "password":password })
|
||||
return response.json()["access_token"]
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
def login_user_id(login_user):
|
||||
payload = jwt.decode(login_user, security.SECRET_KEY, algorithms=[security.ALGORITHM])
|
||||
id = payload.get("sub")
|
||||
return id
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
def login_admin_id(login_admin):
|
||||
payload = jwt.decode(login_admin, security.SECRET_KEY, algorithms=[security.ALGORITHM])
|
||||
id = payload.get("sub")
|
||||
return id
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
def test_domain(test_db,login_user_id):
|
||||
domain = models.Domain(
|
||||
tenantid = "1",
|
||||
name = "テスト環境",
|
||||
url = "https://alicorn.cybozu.com",
|
||||
kintoneuser = "maxz",
|
||||
kintonepwd = security.chacha20Encrypt("maxz1205"),
|
||||
is_active = True,
|
||||
createuserid =login_user_id,
|
||||
updateuserid =login_user_id,
|
||||
ownerid = login_user_id
|
||||
)
|
||||
test_db.add(domain)
|
||||
test_db.commit()
|
||||
test_db.refresh(domain)
|
||||
return domain
|
||||
|
||||
|
||||
|
||||
# @pytest.fixture
|
||||
# def test_password() -> str:
|
||||
# return "securepassword"
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
|
||||
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 len(data["data"]) == 1
|
||||
assert data["data"][0]["name"] == test_domain.name
|
||||
|
||||
def test_create_domain(test_client, login_user,login_user_id):
|
||||
create_domain ={
|
||||
"id": 0,
|
||||
"tenantid": "1",
|
||||
"name": "abc",
|
||||
"url": "efg",
|
||||
"kintoneuser": "eee",
|
||||
"kintonepwd": "fff",
|
||||
"is_active": True,
|
||||
}
|
||||
response = test_client.post("/api/domain", json=create_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"] == create_domain["name"]
|
||||
assert data["data"]["url"] == create_domain["url"]
|
||||
assert data["data"]["kintoneuser"] == create_domain["kintoneuser"]
|
||||
assert data["data"]["is_active"] == create_domain["is_active"]
|
||||
assert data["data"]["owner"]["id"] == login_user_id
|
||||
|
||||
def test_edit_domain(test_client, test_domain, login_user):
|
||||
update_domain ={
|
||||
"id": test_domain.id,
|
||||
"tenantid": "1",
|
||||
"name": "テスト環境abc",
|
||||
"url": test_domain.url,
|
||||
"kintoneuser": test_domain.kintoneuser,
|
||||
"is_active": True
|
||||
}
|
||||
response = test_client.put("/api/domain", json=update_domain,headers={"Authorization": "Bearer " + login_user})
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["data"]["name"] == update_domain["name"]
|
||||
assert data["data"]["name"] == update_domain["name"]
|
||||
assert data["data"]["url"] == update_domain["url"]
|
||||
assert data["data"]["kintoneuser"] == update_domain["kintoneuser"]
|
||||
assert data["data"]["is_active"] == update_domain["is_active"]
|
||||
|
||||
|
||||
def test_delete_domain(test_client, login_user):
|
||||
delete_domain ={
|
||||
"id": 0,
|
||||
"tenantid": "1",
|
||||
"name": "delete",
|
||||
"url": "delete",
|
||||
"kintoneuser": "delete",
|
||||
"kintonepwd": "delete",
|
||||
"is_active": True,
|
||||
}
|
||||
response = test_client.post("/api/domain", json=delete_domain,headers={"Authorization": "Bearer " + login_user})
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert "data" in data
|
||||
assert data["data"] is not None
|
||||
id = data["data"]["id"]
|
||||
response = test_client.delete("/api/domain/"+ str(id),headers={"Authorization": "Bearer " + login_user})
|
||||
assert response.status_code == 200
|
||||
assert response.json()["data"]["name"] == delete_domain["name"]
|
||||
response = test_client.get("/api/domain/"+ str(id), headers={"Authorization": "Bearer " + login_user})
|
||||
assert response.status_code == 200
|
||||
assert "data" not in response.json()
|
||||
@@ -1,9 +1,4 @@
|
||||
|
||||
|
||||
from fastapi import security
|
||||
import jwt
|
||||
|
||||
|
||||
def test_users_list(test_client,login_user):
|
||||
|
||||
response = test_client.get("/api/v1/users", headers={"Authorization": "Bearer " + login_user})
|
||||
@@ -32,6 +27,7 @@ def test_user_create(test_client,login_user):
|
||||
data = response.json()
|
||||
assert "data" in data
|
||||
assert data["data"] is not None
|
||||
assert data["data"]["id"] > 0
|
||||
assert data["data"]["email"] == user_data["email"]
|
||||
assert data["data"]["first_name"] == user_data["first_name"]
|
||||
assert data["data"]["last_name"] == user_data["last_name"]
|
||||
@@ -66,20 +62,60 @@ def test_admin_create_for_admin(test_client,login_admin):
|
||||
data = response.json()
|
||||
assert "data" in data
|
||||
assert data["data"] is not None
|
||||
assert data["data"]["id"] > 0
|
||||
assert data["data"]["email"] == user_data["email"]
|
||||
assert data["data"]["first_name"] == user_data["first_name"]
|
||||
assert data["data"]["last_name"] == user_data["last_name"]
|
||||
assert data["data"]["is_active"] == user_data["is_active"]
|
||||
assert data["data"]["is_superuser"] == user_data["is_superuser"]
|
||||
|
||||
def test_user_details(test_client, login_user,user):
|
||||
payload = jwt.decode(login_user, security.SECRET_KEY, algorithms=[security.ALGORITHM])
|
||||
id = payload.get("sub")
|
||||
response = test_client.get("/api/v1/users/"+ id)
|
||||
assert response.status_code == 200
|
||||
assert response.json()["data"]["email"] ==user["email"]
|
||||
assert data["data"]["first_name"] == user["first_name"]
|
||||
assert data["data"]["last_name"] == user["last_name"]
|
||||
assert data["data"]["is_active"] == user["is_active"]
|
||||
assert data["data"]["is_superuser"] == user["is_superuser"]
|
||||
assert response.json()["data"]["id"] == id
|
||||
def test_user_details(test_client, login_user_id, login_user,user):
|
||||
id = login_user_id
|
||||
response = test_client.get("/api/v1/users/"+ str(id), headers={"Authorization": "Bearer " + login_user})
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["data"]["email"] ==user.email
|
||||
assert data["data"]["first_name"] == user.first_name
|
||||
assert data["data"]["last_name"] == user.last_name
|
||||
assert data["data"]["is_active"] == user.is_active
|
||||
assert data["data"]["is_superuser"] == user.is_superuser
|
||||
assert data["data"]["id"] == id
|
||||
|
||||
def test_user_edit(test_client, login_user_id,login_user,user):
|
||||
id = login_user_id
|
||||
user_data = {
|
||||
"email": user.email,
|
||||
"first_name": "Updated",
|
||||
"last_name": "test",
|
||||
"is_active": True,
|
||||
"is_superuser": False
|
||||
}
|
||||
response = test_client.put("/api/v1/users/" + str(id), json=user_data, headers={"Authorization": "Bearer " + login_user})
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["data"]["email"] == user.email
|
||||
assert data["data"]["first_name"] == user_data["first_name"]
|
||||
assert data["data"]["last_name"] == user_data["last_name"]
|
||||
assert data["data"]["is_active"] == user.is_active
|
||||
assert data["data"]["id"] == id
|
||||
|
||||
def test_user_delete(test_client, login_user):
|
||||
user_data = {
|
||||
"email": "delete@example.com",
|
||||
"password": "password123",
|
||||
"first_name": "delete",
|
||||
"last_name": "User",
|
||||
"is_active": True,
|
||||
"is_superuser": False
|
||||
}
|
||||
response = test_client.post("/api/v1/users", json=user_data, headers={"Authorization": "Bearer " + login_user})
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
id = data["data"]["id"]
|
||||
response = test_client.delete("/api/v1/users/"+ str(id),headers={"Authorization": "Bearer " + login_user})
|
||||
assert response.status_code == 200
|
||||
assert response.json()["data"]["email"] == "delete@example.com"
|
||||
response = test_client.get("/api/v1/users/"+ str(id), headers={"Authorization": "Bearer " + login_user})
|
||||
assert response.status_code == 200
|
||||
assert "data" not in response.json()
|
||||
Reference in New Issue
Block a user