From ebfdf29f7bca9e199e39527cb682f3a4814f69cb Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Thu, 30 Nov 2023 00:54:44 +0100 Subject: [PATCH] recommit ? added pytest and 1 to many for repo --- pkgs/clan-cli/clan_cli/webui/sql_db.py | 5 +- pkgs/clan-cli/clan_cli/webui/sql_models.py | 3 +- pkgs/clan-cli/tests/test_db_api.py | 102 +++++++++++---------- 3 files changed, 57 insertions(+), 53 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/webui/sql_db.py b/pkgs/clan-cli/clan_cli/webui/sql_db.py index fbf8aec..f5db1e8 100644 --- a/pkgs/clan-cli/clan_cli/webui/sql_db.py +++ b/pkgs/clan-cli/clan_cli/webui/sql_db.py @@ -1,8 +1,9 @@ from typing import Generator from sqlalchemy import create_engine -#from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.orm import Session, sessionmaker, declarative_base + +# from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import Session, declarative_base, sessionmaker URL = "sqlite:///./sql_app.db" diff --git a/pkgs/clan-cli/clan_cli/webui/sql_models.py b/pkgs/clan-cli/clan_cli/webui/sql_models.py index 390a938..88231ca 100644 --- a/pkgs/clan-cli/clan_cli/webui/sql_models.py +++ b/pkgs/clan-cli/clan_cli/webui/sql_models.py @@ -35,7 +35,8 @@ class Entity(Base): producers = relationship("Producer", back_populates="entity") consumers = relationship("Consumer", back_populates="entity") repository = relationship("Repository", back_populates="entity") - #TODO maby refactor to repositories + # TODO maby refactor to repositories + class ProducerAbstract(Base): __abstract__ = True diff --git a/pkgs/clan-cli/tests/test_db_api.py b/pkgs/clan-cli/tests/test_db_api.py index 7c1b745..589d52b 100644 --- a/pkgs/clan-cli/tests/test_db_api.py +++ b/pkgs/clan-cli/tests/test_db_api.py @@ -1,42 +1,52 @@ -import pytest import json -from api import TestClient +from api import TestClient default_entity_did_url = "entity_did=did%3Asov%3Atest%3A1234" default_entity_did = "did:sov:test:1234" + def assert_extra_info(infos, request_body, response) -> None: for info in infos: assert info in response.keys() - #TODO maybe check the content of the extra info ... + # TODO maybe check the content of the extra info ... response.pop(info) assert response == request_body -def make_test_post_and_get(api, request_body, paramter, get_request=default_entity_did_url, apiversion="v1") -> None: - #test post - response = api.post(f"/api/{apiversion}/create_{paramter}", - data=json.dumps(request_body), - headers={"Content-Type": "application/json"}) +def make_test_post_and_get( + api, request_body, paramter, get_request=default_entity_did_url, apiversion="v1" +) -> None: + # test post + response = api.post( + f"/api/{apiversion}/create_{paramter}", + data=json.dumps(request_body), + headers={"Content-Type": "application/json"}, + ) assert response.status_code == 200 if paramter == "repository": assert_extra_info(["time_created"], request_body, response.json()) elif paramter == "consumer": assert_extra_info(["id"], request_body, response.json()) elif paramter == "entity": - assert_extra_info(["consumers", "producers", "repository"], request_body, response.json()) + assert_extra_info( + ["consumers", "producers", "repository"], request_body, response.json() + ) else: assert response.json() == request_body - #test get - response = api.get(f"api/{apiversion}/get_{paramter}?{get_request}&skip=0&limit=100") + # test get + response = api.get( + f"api/{apiversion}/get_{paramter}?{get_request}&skip=0&limit=100" + ) assert response.status_code == 200 if paramter == "repository": assert_extra_info(["time_created"], request_body, response.json()[0]) elif paramter == "consumer": assert_extra_info(["id"], request_body, response.json()[0]) elif paramter == "entity": - assert_extra_info(["consumers", "producers", "repository"], request_body, response.json()) + assert_extra_info( + ["consumers", "producers", "repository"], request_body, response.json() + ) else: assert response.json() == [request_body] @@ -48,18 +58,16 @@ def make_test_post_and_get(api, request_body, paramter, get_request=default_enti ######################### 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": default_entity_did - } + "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": default_entity_did, + } paramter = "producer" - #get_request = "entity_did=did%3Asov%3Atest%3A1234" + # get_request = "entity_did=did%3Asov%3Atest%3A1234" make_test_post_and_get(api, request_body, paramter) @@ -70,14 +78,12 @@ def test_producer(api: TestClient) -> None: ######################### def test_consumer(api: TestClient) -> None: request_body = { - "entity_did": default_entity_did, - "producer_uuid": "8e285c0c-4e40-430a-a477-26b3b81e30df", - "other": { - "test": "test" - } - } + "entity_did": default_entity_did, + "producer_uuid": "8e285c0c-4e40-430a-a477-26b3b81e30df", + "other": {"test": "test"}, + } paramter = "consumer" - #get_request = "entity_did=did%3Asov%3Atest%3A1234" + # get_request = "entity_did=did%3Asov%3Atest%3A1234" make_test_post_and_get(api, request_body, paramter) @@ -88,18 +94,16 @@ def test_consumer(api: TestClient) -> None: ######################### def test_repository(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": default_entity_did - } + "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": default_entity_did, + } paramter = "repository" - #get_request = "entity_did=did%3Asov%3Atest%3A1234" + # get_request = "entity_did=did%3Asov%3Atest%3A1234" make_test_post_and_get(api, request_body, paramter) @@ -110,14 +114,12 @@ def test_repository(api: TestClient) -> None: ######################### def test_entity(api: TestClient) -> None: request_body = { - "did": default_entity_did, - "name": "C1", - "ip": "127.0.0.1", - "attached": False, - "other": { - "test": "test" - } - } + "did": default_entity_did, + "name": "C1", + "ip": "127.0.0.1", + "attached": False, + "other": {"test": "test"}, + } paramter = "entity" - #get_request = "entity_did=did%3Asov%3Atest%3A1234" + # get_request = "entity_did=did%3Asov%3Atest%3A1234" make_test_post_and_get(api, request_body, paramter)