Rest errors to error_handlers and test for tree and not found files

portal/rest/__init__.py

@@ -56,6 +56,6 @@ def register_namespaces(app: Flask):  # pylint: disable=cyclic-import
 
     rest_api.init_app(app)
 
-    from .errors import load_errors
+    from .error_handlers import load_errors
     load_errors(app)
     return app

portal/rest/errors.py → portal/rest/error_handlers.py

@@ -60,6 +60,12 @@ def handle_not_implemented_error():
     return flask.jsonify({'message': f'Not implemented yet!'}), 404
 
 
+@rest_api.errorhandler(storage.errors.NotFoundError)
+def handle_storage_not_found_error(ex: storage.errors.NotFoundError):
+    log.warning(f"[STORAGE] Storage not found warning: {ex}")
+    return flask.jsonify({'message': str(ex)}), 404
+
+
 @rest_api.errorhandler(storage.errors.KontrStorageError)
 def handle_storage_error(ex: storage.errors.KontrStorageError):
     log.warning(f"[STORAGE] Storage error: {ex}")

portal/rest/submissions.py

-import flask
 from flask_jwt_extended import jwt_required
 from flask_restplus import Namespace
 
@@ -149,8 +148,7 @@ class SubmissionResultFilesTree(CustomResource):
         self.permissions(course=course).require.read_submission_group(submission)
         storage_entity = storage.results.get(submission.id)
         service = self.rest.submissions(submission)
-        tree = service.send_files_tree(storage_entity)
-        return flask.jsonify(tree), 200
+        return service.send_files_tree(storage_entity)
 
 
 @submissions_namespace.route('/<string:sid>/files/results')

tests/rest/test_submission_files.py

+from pathlib import Path
+
 import pytest
 
 from portal.database import ProjectConfig
@@ -19,6 +21,15 @@ def expected(fpath):
     return f'This is a test file: {fpath}'
 
 
+def assert_path(data: dict, path: str):
+    current = data
+    path = Path(path)
+    for part in path.parts:
+        current = current.get(part)
+
+    assert Path(current) == path
+
+
 def test_submission_sources_are_available(client, mocked_submission):
     s = mocked_submission
     response = utils.make_request(client, f'/submissions/{s.id}/files/sources?path=src/main.c')
@@ -27,6 +38,26 @@ def test_submission_sources_are_available(client, mocked_submission):
     assert response.data.decode('utf-8') == expected('src/main.c')
 
 
+def test_submission_sources_are_not_available(client, mocked_submission):
+    s = mocked_submission
+    response = utils.make_request(client, f'/submissions/{s.id}/files/sources?path=nonexisting.c')
+    assert response.status_code == 404
+
+
+def test_submission_test_files_are_not_available(client, mocked_submission):
+    s = mocked_submission
+    url = f'/submissions/{s.id}/files/test_files?path=nonexisting.c'
+    response = utils.make_request(client, url)
+    assert response.status_code == 404
+
+
+def test_submission_results_are_not_available(client, mocked_submission):
+    s = mocked_submission
+    url = f'/submissions/{s.id}/files/results?path=nonexisting.c'
+    response = utils.make_request(client, url)
+    assert response.status_code == 404
+
+
 def test_submission_results_are_available(client, mocked_submission):
     s = mocked_submission
     response = utils.make_request(client, f'/submissions/{s.id}/files/results?path=student.json')
@@ -41,3 +72,33 @@ def test_submission_test_files_are_available(client, mocked_submission):
     assert response.status_code == 200
     assert response.data
     assert response.data.decode('utf-8') == expected('test_main.c')
+
+
+def test_submission_sources_tree(client, mocked_submission):
+    s = mocked_submission
+    response = utils.make_request(client, f'/submissions/{s.id}/files/sources/tree')
+    assert response.status_code == 200
+    assert response.data
+    data = utils.extract_data(response=response)
+    assert_path(data, 'src/main.c')
+    assert_path(data, 'src/foo.c')
+
+
+def test_submission_test_files_tree(client, mocked_submission):
+    s = mocked_submission
+    response = utils.make_request(client, f'/submissions/{s.id}/files/test_files/tree')
+    assert response.status_code == 200
+    assert response.data
+    data = utils.extract_data(response=response)
+    assert_path(data, 'test_main.c')
+
+
+def test_submission_results_tree(client, mocked_submission):
+    s = mocked_submission
+    response = utils.make_request(client, f'/submissions/{s.id}/files/results/tree')
+    assert response.status_code == 200
+    assert response.data
+    data = utils.extract_data(response)
+
+    assert_path(data, 'results.json')
+    assert_path(data, 'student.json')