bugfix kintone get apps

This commit is contained in:
2024-12-09 15:33:47 +09:00
parent 9b1ae3bb5b
commit 21e0b9d6df
7 changed files with 14 additions and 8 deletions

View File

@@ -12,13 +12,13 @@ from app.db.session import SessionLocal
from app.db.crud import get_flows_by_app,get_kintoneformat from app.db.crud import get_flows_by_app,get_kintoneformat
from app.core.auth import get_current_active_user,get_current_user from app.core.auth import get_current_active_user,get_current_user
from app.core.apiexception import APIException from app.core.apiexception import APIException
from app.db.cruddb.dbdomain import dbdomain from app.db.cruddb import domainService
kinton_router = r = APIRouter() kinton_router = r = APIRouter()
def getkintoneenv(user = Depends(get_current_user)): def getkintoneenv(user = Depends(get_current_user)):
db = SessionLocal() db = SessionLocal()
domain = dbdomain.get_default_domain(db,user.id) #get_activedomain(db, user.id) domain = domainService.get_default_domain(db,user.id) #get_activedomain(db, user.id)
db.close() db.close()
kintoneevn = config.KINTONE_ENV(domain) kintoneevn = config.KINTONE_ENV(domain)
return kintoneevn return kintoneevn

View File

@@ -100,5 +100,5 @@ class crudbase:
query = self._apply_filters(query, filters) query = self._apply_filters(query, filters)
if sort_by: if sort_by:
query = self._apply_sorting(query, sort_by, sort_order) query = self._apply_sorting(query, sort_by, sort_order)
print(str(query)) #print(str(query))
return query return query

View File

@@ -13,7 +13,6 @@ from app.main import app
from app.core import security from app.core import security
import jwt import jwt
SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://kabAdmin:P%40ssw0rd!@kintonetooldb.postgres.database.azure.com/test" SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://kabAdmin:P%40ssw0rd!@kintonetooldb.postgres.database.azure.com/test"
engine = create_engine(SQLALCHEMY_DATABASE_URI,echo=True) engine = create_engine(SQLALCHEMY_DATABASE_URI,echo=True)

View File

@@ -0,0 +1,5 @@
[pytest]
log_cli = 1
log_cli_level = CRITICAL
log_cli_format = %(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)
log_cli_date_format=%Y-%m-%d %H:%M:%S

View File

@@ -1,6 +1,9 @@
import logging
def test_usr_login(test_client,test_user): def test_usr_login(test_client,test_user):
response = test_client.post("/api/token", data={"username": test_user["email"], "password": test_user["password"]}) response = test_client.post("/api/token", data={"username": test_user["email"], "password": test_user["password"]})
data = response.json()
logging.error(data)
assert response.status_code == 200 assert response.status_code == 200
assert "access_token" in response.json() assert "access_token" in response.json()
assert "token_type" in response.json() assert "token_type" in response.json()

View File

@@ -1,8 +1,9 @@
import logging
def test_get_domains(test_client,test_domain,login_user): def test_get_domains(test_client,test_domain,login_user):
response = test_client.get("/api/domains",headers={"Authorization": "Bearer " + login_user}) response = test_client.get("/api/domains",headers={"Authorization": "Bearer " + login_user})
assert response.status_code == 200
data = response.json() data = response.json()
logging.error(data)
assert response.status_code == 200
assert "data" in data assert "data" in data
assert data["data"] is not None assert data["data"] is not None
assert len(data["data"]) == 1 assert len(data["data"]) == 1

View File

@@ -1,5 +1,3 @@
import json
def test_create_flow(test_client,test_domain,test_app_id,login_user): def test_create_flow(test_client,test_domain,test_app_id,login_user):
test_flow={ test_flow={
"flowid": "73e82bee-76a2-4347-a069-e21bf5e21111", "flowid": "73e82bee-76a2-4347-a069-e21bf5e21111",