diff --git a/openatlas/api/endpoints/type.py b/openatlas/api/endpoints/type.py index 68e222263..5ec49dea3 100644 --- a/openatlas/api/endpoints/type.py +++ b/openatlas/api/endpoints/type.py @@ -19,7 +19,7 @@ def walk_type_tree(types: list[int]) -> list[dict[str, Any]]: item = g.types[id_] items.append({ 'id': item.id, - 'url': url_for('api_03.entity', id_=item.id, _external=True), + 'url': url_for('api.entity', id_=item.id, _external=True), 'label': item.name.replace("'", "'"), 'children': walk_type_tree(item.subs)}) return items diff --git a/openatlas/api/formats/linked_places.py b/openatlas/api/formats/linked_places.py index 7d97fa269..e8dfa59f7 100644 --- a/openatlas/api/formats/linked_places.py +++ b/openatlas/api/formats/linked_places.py @@ -51,7 +51,7 @@ def link_dict(link_: Link, inverse: bool = False) -> dict[str, Any]: 'label': link_.domain.name if inverse else link_.range.name, 'relationTo': url_for( - 'api_03.entity', + 'api.entity', id_=link_.domain.id if inverse else link_.range.id, _external=True), 'relationType': get_crm_relation(link_, inverse), @@ -88,7 +88,7 @@ def get_lp_file(links_inverse: list[Link]) -> list[dict[str, str]]: path = get_file_path(link.domain.id) files.append({ '@id': url_for( - 'api_03.entity', + 'api.entity', id_=link.domain.id, _external=True), 'title': link.domain.name, @@ -108,7 +108,7 @@ def get_lp_types(entity: Entity, links: list[Link]) -> list[dict[str, Any]]: for type_ in entity.types: type_dict = { 'identifier': url_for( - 'api_03.entity', id_=type_.id, _external=True), + 'api.entity', id_=type_.id, _external=True), 'descriptions': type_.description, 'label': type_.name, 'hierarchy': ' > '.join(map( diff --git a/openatlas/templates/admin/data.html b/openatlas/templates/admin/data.html index c2c1d269e..031608e5a 100644 --- a/openatlas/templates/admin/data.html +++ b/openatlas/templates/admin/data.html @@ -11,9 +11,9 @@

{{ _('data integrity checks')|uc_first }}

{{ _('data transfer')|uc_first }}

{{ _('import')|button(url_for('import_index'))|safe }}
-
{{ ('CSV ' + _('export'))|button(url_for('api_03.export_database', format_='csv'))|safe }}
-
{{ ('JSON ' + _('export'))|button(url_for('api_03.export_database', format_='json'))|safe }}
-
{{ ('XML ' + _('export'))|button(url_for('api_03.export_database', format_='xml'))|safe }}
+
{{ ('CSV ' + _('export'))|button(url_for('api.export_database', format_='csv'))|safe }}
+
{{ ('JSON ' + _('export'))|button(url_for('api.export_database', format_='json'))|safe }}
+
{{ ('XML ' + _('export'))|button(url_for('api.export_database', format_='xml'))|safe }}
{% if 'manager'|is_authorized %}
{{ ('SQL ' + _('export'))|button(url_for('export_sql'))|safe }}
{% endif %} diff --git a/openatlas/templates/util/api_links.html b/openatlas/templates/util/api_links.html index bfb343c38..25e471d20 100644 --- a/openatlas/templates/util/api_links.html +++ b/openatlas/templates/util/api_links.html @@ -27,6 +27,6 @@
diff --git a/tests/test_api.py b/tests/test_api.py index 9c3b3c656..bab1a5957 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -75,22 +75,22 @@ def test_api(self) -> None: file_without_file = entity # ---Content Endpoints--- - rv = self.app.get(url_for('api_03.class_mapping')).get_json() + rv = self.app.get(url_for('api_04.class_mapping')).get_json() assert self.get_class_mapping(rv) - rv = self.app.get(url_for('api_03.backend_details')).get_json() + rv = self.app.get(url_for('api_04.backend_details')).get_json() assert bool(rv['version'] == app.config['VERSION']) rv = self.app.get( - url_for('api_03.backend_details', download=True)).get_json() + url_for('api_04.backend_details', download=True)).get_json() assert bool(rv['version'] == app.config['VERSION']) - rv = self.app.get(url_for('api_03.system_class_count')).get_json() + rv = self.app.get(url_for('api_04.system_class_count')).get_json() assert bool(rv['person']) for rv in [ - self.app.get(url_for('api_03.geometric_entities')), + self.app.get(url_for('api_04.geometric_entities')), self.app.get( - url_for('api_03.geometric_entities', download=True))]: + url_for('api_04.geometric_entities', download=True))]: rv = rv.get_json() assert bool(rv['features'][0]['geometry']['coordinates']) assert self.get_geom_properties(rv, 'id') @@ -100,23 +100,23 @@ def test_api(self) -> None: assert self.get_geom_properties(rv, 'shapeType') rv = self.app.get( - url_for('api_03.export_database', format_='xml')) + url_for('api_04.export_database', format_='xml')) assert b'Shire' in rv.data assert 'application/xml' in rv.headers.get('Content-Type') rv = self.app.get( - url_for('api_03.export_database', format_='json')) + url_for('api_04.export_database', format_='json')) assert b'Shire' in rv.data assert 'application/json' in rv.headers.get('Content-Type') - rv = self.app.get(url_for('api_03.export_database', format_='csv')) + rv = self.app.get(url_for('api_04.export_database', format_='csv')) assert b'Shire' in rv.data assert 'application/zip' in rv.headers.get('Content-Type') # ---Entity Endpoints--- # Test Entity rv = self.app.get( - url_for('api_03.entity', id_=place.id, download=True)) + url_for('api_04.entity', id_=place.id, download=True)) assert 'application/json' in rv.headers.get('Content-Type') rv = rv.get_json()['features'][0] assert self.get_bool(rv, '@id') @@ -164,7 +164,7 @@ def test_api(self) -> None: # Test entity in GeoJSON format rv = self.app.get(url_for( - 'api_03.entity', id_=place.id, format='geojson')) + 'api_04.entity', id_=place.id, format='geojson')) assert 'application/json' in rv.headers.get('Content-Type') rv = rv.get_json()['features'][0] assert self.get_bool(rv['geometry'], 'type') @@ -182,7 +182,7 @@ def test_api(self) -> None: assert self.get_bool(rv['properties'], 'types') rv = self.app.get(url_for( - 'api_03.entity', id_=place.id, format='geojson-v2')) + 'api_04.entity', id_=place.id, format='geojson-v2')) assert 'application/json' in rv.headers.get('Content-Type') rv = rv.get_json()['features'][0] assert self.get_bool(rv['geometry'], 'type') @@ -202,7 +202,7 @@ def test_api(self) -> None: # Test entity in Linked Open Usable Data rv = self.app.get( - url_for('api_03.entity', id_=place.id, format='loud')) + url_for('api_04.entity', id_=place.id, format='loud')) assert 'application/json' in rv.headers.get('Content-Type') rv = rv.get_json() assert bool(rv['type'] == 'PhysicalThing') @@ -226,9 +226,9 @@ def test_api(self) -> None: # or GitHub Actions connection issues # for rv in [ # self.app.get( - # url_for('api_03.entity', id_=place.id, format='n3')), + # url_for('api_04.entity', id_=place.id, format='n3')), # self.app.get(url_for( - # 'api_03.view_class', + # 'api_04.view_class', # view_class='place', # format='n3'))]: # assert b'Shire' in rv.data @@ -236,9 +236,9 @@ def test_api(self) -> None: # Test Entity export and RDFS for rv in [ self.app.get( - url_for('api_03.entity', id_=place.id, export='csv')), + url_for('api_04.entity', id_=place.id, export='csv')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=location.id, cidoc_classes='E18', view_classes='artifact', @@ -249,9 +249,9 @@ def test_api(self) -> None: for rv in [ self.app.get(url_for( - 'api_03.entity', id_=place.id, export='csvNetwork')), + 'api_04.entity', id_=place.id, export='csvNetwork')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=location.id, cidoc_classes='E18', view_classes='artifact', @@ -262,36 +262,36 @@ def test_api(self) -> None: # Test Entities endpoints for rv in [ - self.app.get(url_for('api_03.cidoc_class', cidoc_class='E21')), + self.app.get(url_for('api_04.cidoc_class', cidoc_class='E21')), self.app.get(url_for( - 'api_03.view_class', + 'api_04.view_class', view_class='place', sort='desc', column='id', relation_type='P2', type_id=boundary_mark.id)), self.app.get(url_for( - 'api_03.view_class', + 'api_04.view_class', view_class='place', sort='desc', column='begin_from', relation_type='P2', type_id=boundary_mark.id)), - self.app.get(url_for('api_03.latest', limit=2)), + self.app.get(url_for('api_04.latest', limit=2)), self.app.get( - url_for('api_03.system_class', system_class='artifact')), + url_for('api_04.system_class', system_class='artifact')), self.app.get( - url_for('api_03.entities_linked_to_entity', id_=event.id)), + url_for('api_04.entities_linked_to_entity', id_=event.id)), self.app.get( - url_for('api_03.type_entities', id_=boundary_mark.id)), + url_for('api_04.type_entities', id_=boundary_mark.id)), self.app.get( - url_for('api_03.type_entities', id_=relation_sub.id)), + url_for('api_04.type_entities', id_=relation_sub.id)), self.app.get( - url_for('api_03.type_entities_all', id_=unit_node.id)), + url_for('api_04.type_entities_all', id_=unit_node.id)), self.app.get( - url_for('api_03.type_entities_all', id_=relation_sub.id)), + url_for('api_04.type_entities_all', id_=relation_sub.id)), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=location.id, classes='E18', codes='artifact', @@ -301,7 +301,7 @@ def test_api(self) -> None: download=True, last=actor.id)), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=location.id, classes='E18', codes='artifact', @@ -322,7 +322,7 @@ def test_api(self) -> None: # Test Entities with show=none rv = self.app.get(url_for( - 'api_03.cidoc_class', cidoc_class='E21', show='none')) + 'api_04.cidoc_class', cidoc_class='E21', show='none')) rv = rv.get_json()['results'][0]['features'][0] assert self.get_bool_inverse(rv, 'geometry') assert self.get_no_key(rv, 'depictions') @@ -331,7 +331,7 @@ def test_api(self) -> None: # Test if Query returns enough entities rv = self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=location.id, cidoc_classes='E18', view_classes='artifact', @@ -342,7 +342,7 @@ def test_api(self) -> None: # Test page parameter rv = self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=location.id, cidoc_classes='E18', view_classes='artifact', @@ -355,7 +355,7 @@ def test_api(self) -> None: # Test Entities count rv = self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=location.id, cidoc_classes='E18', view_classes='artifact', @@ -363,20 +363,20 @@ def test_api(self) -> None: count=True)) assert bool(rv.get_json() == 8) - rv = self.app.get(url_for('api_03.geometric_entities', count=True)) + rv = self.app.get(url_for('api_04.geometric_entities', count=True)) assert bool(rv.get_json() == 6) # Test entities with GeoJSON Format for rv in [ self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=location.id, cidoc_classes='E18', view_classes='artifact', system_classes='person', format='geojson')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=location.id, cidoc_classes='E18', view_classes='artifact', @@ -388,7 +388,7 @@ def test_api(self) -> None: # Test entities with Linked Open Usable Data Format rv = self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=location.id, cidoc_classes=['E18', 'E53'], view_classes='artifact', @@ -401,9 +401,9 @@ def test_api(self) -> None: # ---Type Endpoints--- for rv in [ - self.app.get(url_for('api_03.type_overview')), + self.app.get(url_for('api_04.type_overview')), self.app.get( - url_for('api_03.type_overview', download=True))]: + url_for('api_04.type_overview', download=True))]: found = False for item in rv.get_json()['place']: if found: @@ -416,9 +416,9 @@ def test_api(self) -> None: assert found for rv in [ - self.app.get(url_for('api_03.type_by_view_class')), + self.app.get(url_for('api_04.type_by_view_class')), self.app.get( - url_for('api_03.type_by_view_class', download=True))]: + url_for('api_04.type_by_view_class', download=True))]: found = False for item in rv.get_json()['place']: if item['name'] == 'Place': @@ -429,15 +429,15 @@ def test_api(self) -> None: assert found for rv in [ - self.app.get(url_for('api_03.type_tree')), - self.app.get(url_for('api_03.type_tree', download=True))]: + self.app.get(url_for('api_04.type_tree')), + self.app.get(url_for('api_04.type_tree', download=True))]: assert bool(rv.get_json()['typeTree']) - rv = self.app.get(url_for('api_03.type_tree', count=True)) + rv = self.app.get(url_for('api_04.type_tree', count=True)) assert rv.get_json() > 0 for rv in [ self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -446,7 +446,7 @@ def test_api(self) -> None: search="""{"entityCidocClass":[{"operator":"equal", "values":["E21"],"logicalOperator":"and"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -455,7 +455,7 @@ def test_api(self) -> None: search="""{"entitySystemClass":[{"operator":"equal", "values":["person"],"logicalOperator":"and"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, classes='E18', codes='artifact', @@ -467,7 +467,7 @@ def test_api(self) -> None: f'{change_of_property.id}],' f'"logicalOperator":"or"}}]}}')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -481,7 +481,7 @@ def test_api(self) -> None: # Test search parameter for rv in [ self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, classes='E18', codes='place', @@ -491,12 +491,12 @@ def test_api(self) -> None: f'"values":[({height.id},23.0)],' f'"logicalOperator":"or"}}]}}')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', system_classes='place', search="""{"entityName":[{"operator":"notEqual", "values":["Mordor"],"logicalOperator":"or"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -506,7 +506,7 @@ def test_api(self) -> None: "values":["Boundary Mark", "Height"], "logicalOperator":"and"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -516,7 +516,7 @@ def test_api(self) -> None: f'"values":[{place.id}],' f'"logicalOperator":"or"}}]}}')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -525,7 +525,7 @@ def test_api(self) -> None: search="""{"beginFrom":[{"operator":"lesserThan", "values":["2020-1-1"],"logicalOperator":"and"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -534,7 +534,7 @@ def test_api(self) -> None: search="""{"beginFrom":[{"operator":"lesserThan", "values":["2020-1-1"],"logicalOperator":"or"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -543,7 +543,7 @@ def test_api(self) -> None: search="""{"beginTo":[{"operator":"lesserThanEqual", "values":["2018-3-01"],"logicalOperator":"and"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -552,7 +552,7 @@ def test_api(self) -> None: search="""{"beginTo":[{"operator":"lesserThanEqual", "values":["2018-3-01"],"logicalOperator":"or"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -561,7 +561,7 @@ def test_api(self) -> None: search="""{"endFrom":[{"operator":"greaterThan", "values":["2013-2-1"],"logicalOperator":"and"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -570,7 +570,7 @@ def test_api(self) -> None: search="""{"endFrom":[{"operator":"greaterThan", "values":["2013-2-1"],"logicalOperator":"or"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -580,7 +580,7 @@ def test_api(self) -> None: '"values":["2019-03-01"],"logicalOperator":"and"}]}' )), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -589,7 +589,7 @@ def test_api(self) -> None: search="""{"endTo":[{"operator":"greaterThanEqual", "values":["2019-03-01"],"logicalOperator":"or"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='all', @@ -600,7 +600,7 @@ def test_api(self) -> None: ' hobbits.", "homeland"],' '"logicalOperator":"or"}]}')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -610,7 +610,7 @@ def test_api(self) -> None: '"values":["Fr"],' '"logicalOperator":"or"}]}')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -620,7 +620,7 @@ def test_api(self) -> None: '"values":["S"],' '"logicalOperator":"or"}]}')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -630,7 +630,7 @@ def test_api(self) -> None: '"values": ["Oun", "HeI"],' '"logicalOperator": "and"}]}')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', system_classes='place', view_classes='artifact', format='lp', @@ -638,7 +638,7 @@ def test_api(self) -> None: f'"values":[{boundary_mark.id}],' f'"logicalOperator":"and"}}]}}')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', system_classes='place', search="""{"entityName":[{"operator":"notEqual", "values":["Mordor"], @@ -647,7 +647,7 @@ def test_api(self) -> None: for rv in [ self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -658,7 +658,7 @@ def test_api(self) -> None: f'{height.id}],' f'"logicalOperator":"or"}}]}}')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', system_classes='place', view_classes='artifact', format='lp', @@ -666,7 +666,7 @@ def test_api(self) -> None: f'"values":[{boundary_mark.id}],' f'"logicalOperator":"and"}}]}}')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -680,7 +680,7 @@ def test_api(self) -> None: for rv in [ self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -690,7 +690,7 @@ def test_api(self) -> None: "values":["Boundary Mark", "Height"], "logicalOperator":"and"}]}""")), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -700,7 +700,7 @@ def test_api(self) -> None: f'"values":[{place.id}],' f'"logicalOperator":"and"}}]}}')), self.app.get(url_for( - 'api_03.query', + 'api_04.query', entities=place.id, cidoc_classes='E18', view_classes='artifact', @@ -711,9 +711,9 @@ def test_api(self) -> None: assert bool(rv.get_json()['pagination']['entities'] == 6) for rv in [ - self.app.get(url_for('api_03.subunits', id_=place.id)), + self.app.get(url_for('api_04.subunits', id_=place.id)), self.app.get( - url_for('api_03.subunits', id_=place.id, download=True))]: + url_for('api_04.subunits', id_=place.id, download=True))]: assert 'application/json' in rv.headers.get('Content-Type') rv = rv.get_json()[str(place.id)] for item in rv: @@ -732,14 +732,14 @@ def test_api(self) -> None: assert bool(item['types']) rv = self.app.get( - url_for('api_03.subunits', id_=place.id, count=True)) + url_for('api_04.subunits', id_=place.id, count=True)) assert b'3' in rv.data for rv in [ self.app.get( - url_for('api_03.subunits', id_=place.id, format='xml')), + url_for('api_04.subunits', id_=place.id, format='xml')), self.app.get(url_for( - 'api_03.subunits', + 'api_04.subunits', id_=place.id, format='xml', download=True))]: @@ -748,33 +748,33 @@ def test_api(self) -> None: # Test centroid for rv in [ self.app.get(url_for( - 'api_03.entity', id_=feature.id, centroid=True)), + 'api_04.entity', id_=feature.id, centroid=True)), self.app.get(url_for( - 'api_03.entity', + 'api_04.entity', id_=feature.id, format='geojson', centroid=True)), self.app.get(url_for( - 'api_03.entity', + 'api_04.entity', id_=feature_location.id, format='geojson', centroid=True)), self.app.get(url_for( - 'api_03.entity', + 'api_04.entity', id_=feature.id, format='geojson-v2', centroid=True)), self.app.get(url_for( - 'api_03.entity', + 'api_04.entity', id_=feature_location.id, format='geojson-v2', centroid=True)), self.app.get(url_for( - 'api_03.subunits', + 'api_04.subunits', id_=place.id, centroid=True)), self.app.get(url_for( - 'api_03.view_class', + 'api_04.view_class', view_class='all', centroid=True, limit=0))]: @@ -783,18 +783,18 @@ def test_api(self) -> None: # Test Error Handling for rv in [ - self.app.get(url_for('api_03.entity', id_=233423424)), + self.app.get(url_for('api_04.entity', id_=233423424)), self.app.get(url_for( - 'api_03.cidoc_class', cidoc_class='E18', last=1231))]: + 'api_04.cidoc_class', cidoc_class='E18', last=1231))]: rv = rv.get_json() assert 'Entity does not exist' in rv['title'] - rv = self.app.get(url_for('api_03.subunits', id_=actor.id)) + rv = self.app.get(url_for('api_04.subunits', id_=actor.id)) assert 'ID is not a valid place' in rv.get_json()['title'] rv = self.app.get( url_for( - 'api_03.query', + 'api_04.query', entities=location.id, cidoc_classes='E18', view_classes='artifact', @@ -807,31 +807,31 @@ def test_api(self) -> None: rv = self.app.get( url_for( - 'api_03.query', + 'api_04.query', system_classes='person', type_id=boundary_mark.id)) assert 'One entity ID is not a type' in rv.get_json()['title'] rv = self.app.get( - url_for('api_03.system_class', system_class='Wrong')) + url_for('api_04.system_class', system_class='Wrong')) assert 'Invalid system_classes value' in rv.get_json()['title'] - rv = self.app.get(url_for('api_03.query')) + rv = self.app.get(url_for('api_04.query')) assert 'No query parameters given' in rv.get_json()['title'] rv = self.app.get( - url_for('api_03.cidoc_class', cidoc_class='e99999999')) + url_for('api_04.cidoc_class', cidoc_class='e99999999')) assert 'Invalid cidoc_classes value' in rv.get_json()['title'] rv = self.app.get( - url_for('api_03.view_class', view_class='Invalid')) + url_for('api_04.view_class', view_class='Invalid')) assert 'Invalid view_classes value' in rv.get_json()['title'] - rv = self.app.get(url_for('api_03.latest', limit='99999999')) + rv = self.app.get(url_for('api_04.latest', limit='99999999')) assert 'Invalid limit value' in rv.get_json()['title'] rv = self.app.get(url_for( - 'api_03.view_class', + 'api_04.view_class', view_class='place', search='{"typeID":[{"operator":"equal",' '"values":["Boundary Mark", "Height", "Dimension"],' @@ -839,7 +839,7 @@ def test_api(self) -> None: assert 'Invalid search value' in rv.get_json()['title'] rv = self.app.get(url_for( - 'api_03.view_class', + 'api_04.view_class', view_class='place', search='{"All":[{"operator":"notEqual",' '"values":["Boundary Mark", "Height"],' @@ -847,7 +847,7 @@ def test_api(self) -> None: assert 'Invalid search category' in rv.get_json()['title'] rv = self.app.get(url_for( - 'api_03.view_class', + 'api_04.view_class', view_class='place', search='{"typeName":[{"operator":"notEqual",' '"values":[],' @@ -855,21 +855,21 @@ def test_api(self) -> None: assert 'No search values' in rv.get_json()['title'] rv = self.app.get(url_for( - 'api_03.view_class', + 'api_04.view_class', view_class='place', search='"beginFrom":[{"operator":"lesserThan",' '"values":["2000-1-1"],' '"logicalOperator":"or"}]}')) assert 'Invalid search syntax' in rv.get_json()['title'] - rv = self.app.get(url_for('api_03.type_entities', id_=1234)) + rv = self.app.get(url_for('api_04.type_entities', id_=1234)) assert 'Entity is not a type' in rv.get_json()['title'] - rv = self.app.get(url_for('api_03.type_entities_all', id_=1234)) + rv = self.app.get(url_for('api_04.type_entities_all', id_=1234)) assert 'Entity is not a type' in rv.get_json()['title'] rv = self.app.get(url_for( - 'api_03.view_class', + 'api_04.view_class', view_class='place', search='{"typeName":[{"operator":"notEqualT",' '"values":["Boundary Mark", "Height"],' @@ -877,7 +877,7 @@ def test_api(self) -> None: assert 'Invalid compare operator' in rv.get_json()['title'] rv = self.app.get(url_for( - 'api_03.view_class', + 'api_04.view_class', view_class='place', search='{"typeName":[{"operator":"notEqual",' '"values":["Boundary Mark", "Height"],' @@ -885,12 +885,12 @@ def test_api(self) -> None: assert 'Invalid logical operator' in rv.get_json()['title'] rv = self.app.get(url_for( - 'api_03.display', + 'api_04.display', filename=f'{file_without_licences.id}')) assert 'No license' in rv.get_json()['title'] rv = self.app.get(url_for( - 'api_03.display', + 'api_04.display', filename=f'{file_without_file.id}')) assert 'File not found' in rv.get_json()['title'] @@ -899,5 +899,5 @@ def test_api(self) -> None: self.app.get(url_for('logout')) app.config['ALLOWED_IPS'] = [] - rv = self.app.get(url_for('api_03.view_class', view_class='place')) + rv = self.app.get(url_for('api_04.view_class', view_class='place')) assert 'Access denied' in rv.get_json()['title'] diff --git a/tests/test_image.py b/tests/test_image.py index 60f3a72f1..abd79404e 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -86,7 +86,7 @@ def test_image(self) -> None: assert b'\xff' in rv.data rv = self.app.get(url_for( - 'api_03.display', + 'api.display', filename=file_name, image_size='thumbnail')) assert b'\xff' in rv.data