uuid layer metadata comparison endpoint

Author: honza2

doc/client-proxy.md

@@ -82,4 +82,4 @@ Currently, value of X-Forwarded headers affects following URLs:
   * [WFS endpoints](endpoints.md#web-feature-service)
     * all operations URLs
 
-Values of X-Forwarded headers does not affect responses of [GET Workspace Layer Metadata Comparison](rest.md#get-workspace-layer-metadata-comparison) and [GET Workspace Map Metadata Comparison](rest.md#get-workspace-map-metadata-comparison) intentionally, in order to keep URLs in canonical form.
+Values of X-Forwarded headers does not affect responses of [GET Layer Metadata Comparison](rest.md#get-layer-metadata-comparison) and [GET Workspace Map Metadata Comparison](rest.md#get-workspace-map-metadata-comparison) intentionally, in order to keep URLs in canonical form.

doc/rest.md

@@ -9,7 +9,11 @@
 |Layer Thumbnail|`/rest/layers/<uuid>/thumbnail`|[GET](#get-layer-thumbnail)| x | x | x |
 |Layer Style|`/rest/layers/<uuid>/style`|[GET](#get-layer-style)| x | x | x |
 |Layer Chunk|`/rest/layers/<uuid>/chunk`|[GET](#get-layer-chunk)| [POST](#post-layer-chunk) | x | x |
+<<<<<<< HEAD
 |Workspace Layer Metadata Comparison|`/rest/workspaces/<workspace_name>/layers/<layername>/metadata-comparison`|[GET](#get-workspace-layer-metadata-comparison) | x | x | x |
+=======
+|Layer Metadata Comparison|`/rest/layers/<uuid>/metadata-comparison`|[GET](#get-layer-metadata-comparison) | x | x | x |
+>>>>>>> 580dffe1 (uuid layer metadata comparison endpoint)
 |Maps|`/rest/maps`|[GET](#get-maps)| [POST](#post-maps) | x | [DELETE](#delete-maps) |
 |[Map](models.md#map)|`/rest/maps/<uuid>`|[GET](#get-map)| x | [PATCH](#patch-map) | [DELETE](#delete-map) |
 |Map Thumbnail|`/rest/maps/<uuid>/thumbnail`|[GET](#get-map-thumbnail)| x | x | x |
@@ -330,7 +334,7 @@ JSON object with following structure:
   - *identifier*: String. Identifier of metadata record in CSW instance.
   - *record_url*: String. URL of metadata record accessible by web browser, probably with some editing capabilities.
   - *csw_url*: String. URL of CSW endpoint. It points to CSW endpoint of Micka.
-  - *comparison_url*: String. URL of [GET Workspace Layer Metadata Comparison](#get-workspace-layer-metadata-comparison).
+  - *comparison_url*: String. URL of [GET Layer Metadata Comparison](#get-layer-metadata-comparison).
   - *status*: Status information about metadata import and availability. See [GET Layer](#get-layer) **wms** property for meaning.
   - *error*: If status is FAILURE, this may contain error object.
 - **access_rights**:
@@ -505,7 +509,7 @@ Content-Type: `application/json`
 HTTP status code 200 if chunk was successfully saved.
 
 
-### GET Workspace Layer Metadata Comparison
+### GET Layer Metadata Comparison
 Get comparison of metadata properties among Layman, CSW, WMS and WFS.
 
 #### Request

src/layman/layer/__init__.py

@@ -39,9 +39,9 @@ def get_layer_patch_keys():
 
 from ..common import InternalSourceTypeDef
 from .rest_layer_chunk import bp as layer_chunk_bp
+from .rest_layer_metadata_comparison import bp as layer_metadata_comparison_bp
 from .rest_layer_thumbnail import bp as layer_thumbnail_bp
 from .rest_layer_style import bp as layer_style_bp
-from .rest_workspace_layer_metadata_comparison import bp as workspace_layer_metadata_comparison_bp
 from .rest_layers import bp as layers_bp
 from .rest_layer import bp as layer_bp
 
@@ -52,11 +52,11 @@ def get_layer_patch_keys():
         'name': PUBLICATION_TYPE_NAME,
         'rest_path_name': LAYER_REST_PATH_NAME,
         'workspace_blueprints': [  # blueprints to register
-            workspace_layer_metadata_comparison_bp,
         ],
         'blueprints': [  # blueprints to register
             layers_bp,
             layer_bp,
+            layer_metadata_comparison_bp,
             layer_thumbnail_bp,
             layer_style_bp,
             layer_chunk_bp,

src/layman/layer/micka/csw.py

@@ -46,8 +46,7 @@ def get_layer_info(workspace, layername, *, x_forwarded_items=None):
                 'identifier': muuid,
                 'csw_url': settings.CSW_PROXY_URL,
                 'record_url': common_util.get_metadata_url(layer.uuid, url_type=common_util.RecordUrlType.BASIC),
-                'comparison_url': url_for('rest_workspace_layer_metadata_comparison.get', workspace=workspace, layername=layername,
-                                          x_forwarded_items=x_forwarded_items),
+                'comparison_url': url_for('rest_layer_metadata_comparison.get', uuid=layer.uuid, x_forwarded_items=x_forwarded_items),
             }
         }
     return {}

src/layman/layer/rest_layer_metadata_comparison.py

@@ -0,0 +1,27 @@
+from flask import Blueprint, current_app as app, g, jsonify
+
+from layman.authn import authenticate
+from layman.authz import authorize_uuid_publication_decorator
+from layman.util import check_uuid_decorator
+from . import util, LAYER_REST_PATH_NAME, LAYER_TYPE
+from .layer_class import Layer
+
+bp = Blueprint('rest_layer_metadata_comparison', __name__)
+
+
+@bp.before_request
+@check_uuid_decorator
+@authenticate
+@authorize_uuid_publication_decorator(expected_publication_type=LAYER_TYPE)
+def before_request():
+    pass
+
+
+@bp.route(f"/{LAYER_REST_PATH_NAME}/<uuid>/metadata-comparison", methods=['GET'])
+def get(uuid):
+    app.logger.info(f"GET Layer Metadata Comparison, actor={g.user}")
+
+    layer = Layer(uuid=uuid)
+    md_props = util.get_metadata_comparison(layer)
+
+    return jsonify(md_props), 200

src/layman/layer/rest_workspace_layer_metadata_comparison.py

@@ -180,8 +180,8 @@ def test_post_layers_simple():
     md_record_url = f"http://micka:80/record/basic/m-{layeruuid}"
     assert layer_info['metadata']['record_url'].replace("http://localhost:3080", "http://micka:80") == md_record_url
     with app.app_context():
-        assert layer_info['metadata']['comparison_url'] == test_util.url_for_external('rest_workspace_layer_metadata_comparison.get',
-                                                                                      workspace=workspace, layername=layername)
+        assert layer_info['metadata']['comparison_url'] == test_util.url_for_external('rest_layer_metadata_comparison.get',
+                                                                                      uuid=layeruuid)
     assert 'id' not in layer_info.keys()
     assert 'type' not in layer_info.keys()
 

src/layman/layer/rest_workspace_test.py

@@ -122,8 +122,7 @@ class TestResponsesClass:
         'geodata_type': 'vector',
         'file': {'paths': [f'layers/{layer_uuid}/input_file/{layer_uuid}.geojson'],
                  },
-        'metadata': {'comparison_url': f'http://{settings.LAYMAN_PROXY_SERVER_NAME}/rest/workspaces/{workspace}/layers/{publication}/'
-                                       f'metadata-comparison',
+        'metadata': {'comparison_url': f'http://{settings.LAYMAN_PROXY_SERVER_NAME}/rest/layers/{layer_uuid}/metadata-comparison',
                      'csw_url': f'{settings.CSW_PROXY_URL}',
                      'identifier': f"m-{layer_uuid}",
                      'record_url': None},

src/layman/rest_responses_test.py

@@ -80,7 +80,7 @@
                                                         'rest_layers.delete',
                                                         layer_keys_to_check,
                                                         'sample/layman.layer/small_layer.geojson',
-                                                        'rest_workspace_layer_metadata_comparison.get',
+                                                        'rest_layer_metadata_comparison.get',
                                                         'rest_layer_chunk.post',
                                                         ),
                          None: PublicationTypeDef('publicationname',
@@ -492,7 +492,13 @@ def get_workspace_publication_metadata_comparison(publication_type, workspace, n
 
     publication_type_def = PUBLICATION_TYPES_DEF[publication_type]
     with app.app_context():
-        r_url = url_for(publication_type_def.get_workspace_metadata_comparison_url, **{publication_type_def.url_param_name: name}, workspace=workspace)
+        if publication_type == LAYER_TYPE:
+            uuid = layman_util.get_publication_uuid(workspace, publication_type, name)
+            r_url = url_for(publication_type_def.get_workspace_metadata_comparison_url, uuid=uuid)
+        else:
+            r_url = url_for(publication_type_def.get_workspace_metadata_comparison_url,
+                            **{publication_type_def.url_param_name: name},
+                            workspace=workspace)
     response = requests.get(r_url, headers=headers, timeout=HTTP_TIMEOUT)
     raise_layman_error(response)
     return response.json()

test_tools/process_client.py

@@ -158,6 +158,9 @@ def _correct_values_in_detail_common(
     publ_type_dir = util.get_directory_name_from_publ_type(publ_type)
 
     thumbnail_url = f'http://{settings.LAYMAN_PROXY_SERVER_NAME}/rest/{publ_type_dir}/{uuid}/thumbnail'
+    comparison_url = f'http://{settings.LAYMAN_PROXY_SERVER_NAME}/rest/workspaces/{workspace}/{publ_type_dir}/{name}/metadata-comparison'
+    if publ_type == process_client.LAYER_TYPE:
+        comparison_url = f'http://{settings.LAYMAN_PROXY_SERVER_NAME}/rest/{publ_type_dir}/{uuid}/metadata-comparison'
 
     expected_detail = {
         'name': name,
@@ -166,9 +169,7 @@ def _correct_values_in_detail_common(
         'type': publ_type,
         'thumbnail': {'url': thumbnail_url,
                       'path': f'{publ_type_dir}/{uuid}/thumbnail/{uuid}.png'},
-        'metadata': {'comparison_url':
-                     f'http://{settings.LAYMAN_PROXY_SERVER_NAME}/rest/workspaces/'
-                     f'{workspace}/{publ_type_dir}/{name}/metadata-comparison',
+        'metadata': {'comparison_url': comparison_url,
                      'csw_url': 'http://localhost:3080/csw'},
         '_thumbnail': {'path': f'/layman_data_test/{publ_type_dir}/{uuid}/thumbnail/{uuid}.png'},
         'access_rights': {'read': ['EVERYONE'], 'write': ['EVERYONE']},