diff --git a/pkgs/clan-cli/clan_cli/webui/sql_app.db b/pkgs/clan-cli/clan_cli/webui/sql_app.db index 382350b..409166a 100644 Binary files a/pkgs/clan-cli/clan_cli/webui/sql_app.db and b/pkgs/clan-cli/clan_cli/webui/sql_app.db differ diff --git a/pkgs/clan-cli/clan_cli/webui/sql_db.py b/pkgs/clan-cli/clan_cli/webui/sql_db.py index eb3f767..fbf8aec 100644 --- a/pkgs/clan-cli/clan_cli/webui/sql_db.py +++ b/pkgs/clan-cli/clan_cli/webui/sql_db.py @@ -1,8 +1,8 @@ from typing import Generator from sqlalchemy import create_engine -from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.orm import Session, sessionmaker +#from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import Session, sessionmaker, declarative_base URL = "sqlite:///./sql_app.db" diff --git a/pkgs/clan-cli/clan_cli/webui/tests/test_api.py b/pkgs/clan-cli/clan_cli/webui/tests/test_api.py deleted file mode 100644 index e69de29..0000000 diff --git a/pkgs/clan-cli/clan_cli/webui/tests/test_db_api.py b/pkgs/clan-cli/clan_cli/webui/tests/test_db_api.py deleted file mode 100644 index b7d7a20..0000000 --- a/pkgs/clan-cli/clan_cli/webui/tests/test_db_api.py +++ /dev/null @@ -1,26 +0,0 @@ -import pytest -from api import TestClient -from fixtures_flakes import FlakeForTest - - - -def test_producer(api: TestClient, test_flake: FlakeForTest) -> None: - request_body = """{ - "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30df", - "service_name": "Carlo's Printing", - "service_type": "3D Printing", - "endpoint_url": "http://127.0.0.1:8000", - "status": "unknown", - "other": { - "test": "test" - }, - "entity_did": "did:sov:test:1234" - }""" - response = api.post(f"/api/v1/create_producer", json=request_body) - assert response.status_code == 200 - assert response.json() == request_body - response = api.get( - f"api/v1/get_producer?entity_did=did%3Asov%3Atest%3A1234&skip=0&limit=100", json={} - ) - assert response.status_code == 200 - assert response.json() == request_body diff --git a/pkgs/clan-cli/tests/test_db_api.py b/pkgs/clan-cli/tests/test_db_api.py new file mode 100644 index 0000000..8c47083 --- /dev/null +++ b/pkgs/clan-cli/tests/test_db_api.py @@ -0,0 +1,33 @@ +import pytest +import json +from api import TestClient + + + +######################### +# # +# Producer # +# # +######################### +def test_producer(api: TestClient) -> None: + request_body = { + "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30df", + "service_name": "Carlo'\''s Printing", + "service_type": "3D Printing", + "endpoint_url": "http://127.0.0.1:8000", + "status": "unknown", + "other": { + "test": "test" + }, + "entity_did": "did:sov:test:1234" + } + #test post + response = api.post(f"/api/v1/create_producer", + data=json.dumps(request_body), + headers={"Content-Type": "application/json"}) + assert response.status_code == 200 + assert response.json() == request_body + #test get + response = api.get(f"api/v1/get_producer?entity_did=did%3Asov%3Atest%3A1234&skip=0&limit=100") + assert response.status_code == 200 + assert response.json() == [request_body]