refactor: place domain logic into controller

Author: janbritz

questionpy_sdk/webserver/controllers/file.py

@@ -1,10 +1,8 @@
 #  This file is part of the QuestionPy SDK. (https://questionpy.org)
 #  The QuestionPy SDK is free software released under terms of the MIT license. See LICENSE.md.
 #  (c) Technische Universität Berlin, innoCampus <[email protected]>
-
 from typing import TYPE_CHECKING
 
-from questionpy_common.manifest import Manifest
 from questionpy_sdk.webserver.controllers.base import BaseController
 from questionpy_server.worker import PackageFileData
 
@@ -13,10 +11,12 @@
 
 
 class FileController(BaseController):
-    async def get_static_file(self, path: str) -> PackageFileData:
+    async def get_static_file(self, namespace: str, short_name: str, path: str) -> PackageFileData:
+        if self._manifest.namespace != namespace or self._manifest.short_name != short_name:
+            # TODO: Support static files in non-main packages by using namespace and short_name.
+            msg = "Static file retrieval from non-main packages is not supported yet."
+            raise ValueError(msg)
+
         worker: Worker
         async with self._worker_pool.get_worker(self._package_location, 0, None) as worker:
             return await worker.get_static_file(path)
-
-    def get_manifest(self) -> Manifest:
-        return self._manifest

questionpy_sdk/webserver/routes/file.py

@@ -21,15 +21,12 @@ async def get(self) -> web.Response:
         short_name = self.request.match_info["short_name"]
         path = self.request.match_info["path"]
 
-        manifest = self.controller.get_manifest()
-        if manifest.namespace != namespace or manifest.short_name != short_name:
-            # TODO: Support static files in non-main packages by using namespace and short_name.
-            raise HTTPNotImplemented(text="Static file retrieval from non-main packages is not supported yet.")
-
         try:
-            file = await self.controller.get_static_file(path)
+            file = await self.controller.get_static_file(namespace, short_name, path)
         except FileNotFoundError as e:
             raise web.HTTPNotFound(text="File not found.") from e
+        except ValueError as e:
+            raise HTTPNotImplemented(text=str(e)) from e
 
         return web.Response(
             body=file.data,