diff --git a/nshm_model_graphql_api/schema/nshm_model_schema.py b/nshm_model_graphql_api/schema/nshm_model_schema.py index 29fafda..a44bda6 100644 --- a/nshm_model_graphql_api/schema/nshm_model_schema.py +++ b/nshm_model_graphql_api/schema/nshm_model_schema.py @@ -39,7 +39,8 @@ def get_node(cls, info, version: str): def get_nshm_models() -> Iterator[NshmModel]: for version in nm.all_model_versions(): - yield NshmModel(version=version) + model = nm.get_model_version(version) + yield NshmModel(version=model.version, title=model.title) def get_nshm_model(version: Optional[str] = None) -> Optional[NshmModel]: diff --git a/tests/test_schema_models.py b/tests/test_schema_models.py index f02d1ce..ff8350f 100644 --- a/tests/test_schema_models.py +++ b/tests/test_schema_models.py @@ -1,5 +1,6 @@ import pytest from graphene.test import Client +from graphql_relay import to_global_id from nshm_model_graphql_api import schema @@ -13,13 +14,19 @@ def test_get_models(client): QUERY = """ query { get_models { + id version + title } } """ executed = client.execute(QUERY) print(executed) assert executed["data"]["get_models"][0]["version"] == "NSHM_v1.0.0" + assert executed["data"]["get_models"][0]["title"] == "Initial version" + assert executed["data"]["get_models"][0]["id"] == to_global_id( + "NshmModel", "NSHM_v1.0.0" + ) def test_get_model_default(client):