Merge branch 'dev' into init-frontend

backend/app/controllers/models.py

@@ -0,0 +1,31 @@
+from datetime import datetime
+
+from pydantic import BaseModel, Field
+
+
+class NetologyCreds(BaseModel):
+    """Netology creds."""
+
+    username: str
+    password: str
+
+
+class ModeusCreds(BaseModel):
+    """Modeus creds."""
+
+    username: str
+    password: str
+
+
+"""
+{"size":500,"timeMin":"2024-09-23T00:00:00+03:00","timeMax":"2024-09-29T23:59:59+03:00","attendeePersonId":["d69c87c8-aece-4f39-b6a2-7b467b968211"]}
+_"""
+
+
+class ModeusSearchEvents(BaseModel):
+    """Modeus search events body."""
+
+    size: int
+    time_min: datetime = Field(alias="timeMin")
+    time_max: datetime = Field(alias="timeMax")
+    attendee_person_id: list[str] = Field(alias="attendeePersonId")

backend/app/controllers/modeus.py

@@ -5,22 +5,20 @@
 from typing import Optional
 
 from blacksheep import Response
-from blacksheep.server.bindings import FromJson
+from blacksheep.server.bindings import FromJson, FromHeader
 from blacksheep.server.controllers import Controller, post
-from integration import modeus
-from integration.exceptions import ModeusError
-from pydantic import BaseModel
 from requests import RequestException
 
+from integration import modeus
+from integration.exceptions import ModeusError
+from . import models
 
-class ModeusCreds(BaseModel):
-    """Modeus creds."""
 
-    username: str
-    password: str
+class FromAuthorizationHeader(FromHeader[str]):
+    name = "Authorization"
 
 
-class NetologyController(Controller):
+class ModeusController(Controller):
     """Controller for Modeus API."""
 
     @classmethod
@@ -34,7 +32,7 @@ def class_name(cls) -> str:
         return "Modeus"
 
     @post()
-    async def get_modeus_cookies(self, item: FromJson[ModeusCreds]) -> Response:
+    async def get_modeus_cookies(self, item: FromJson[models.ModeusCreds]) -> Response:
         """
         Auth in Modeus and return cookies.
         """
@@ -44,3 +42,22 @@ async def get_modeus_cookies(self, item: FromJson[ModeusCreds]) -> Response:
             )
         except (RequestException, ModeusError) as exception:
             return self.json({"error": f"can't authenticate {exception}"}, status=400)
+
+    @post("/events/")
+    async def get_modeus_events(
+        self,
+        auth: FromAuthorizationHeader,
+        item: FromJson[models.ModeusSearchEvents],
+    ) -> Response:
+        """
+        Get events from Modeus.
+        """
+        try:
+            jwt = auth.value.split()[1]
+            return self.json(await modeus.get_events(jwt, item.value))
+        except IndexError as exception:
+            return self.json(
+                {"error": f"cannot parse authorization header {exception}"},
+            )
+        except (RequestException, ModeusError) as exception:
+            return self.json({"error": f"can't authenticate {exception}"}, status=400)

backend/app/controllers/netology.py

@@ -7,16 +7,10 @@
 from blacksheep import Response
 from blacksheep.server.bindings import FromJson
 from blacksheep.server.controllers import Controller, post
-from integration import netology
-from pydantic import BaseModel
 from requests import RequestException
 
-
-class NetologyCreds(BaseModel):
-    """Netology creds."""
-
-    username: str
-    password: str
+from integration import netology
+from . import models
 
 
 class NetologyController(Controller):
@@ -33,7 +27,10 @@ def class_name(cls) -> str:
         return "Netology"
 
     @post()
-    async def get_netology_cookies(self, item: FromJson[NetologyCreds]) -> Response:
+    async def get_netology_cookies(
+        self,
+        item: FromJson[models.NetologyCreds],
+    ) -> Response:
         """
         Auth in Netology and return cookies.
         """

backend/app/docs/__init__.py

@@ -9,7 +9,7 @@
 from app.settings import Settings
 from blacksheep import Application
 from blacksheep.server.openapi.v3 import OpenAPIHandler
-from openapidocs.v3 import Info  # type: ignore[import-untyped]
+from openapidocs.v3 import Info
 
 
 def configure_docs(app: Application, settings: Settings) -> None:

backend/app/docs/binders.py

@@ -4,7 +4,7 @@
 
 from app.binders import PageOptionsBinder
 from blacksheep.server.openapi.v3 import OpenAPIHandler
-from openapidocs.v3 import (  # type: ignore[import-untyped]
+from openapidocs.v3 import (
     Parameter,
     ParameterLocation,
     Schema,

backend/app/errors.py

@@ -14,7 +14,9 @@
 
 def configure_error_handlers(app: Application) -> None:
     async def not_found_handler(
-        app: Application, request: Request, exception: Exception
+        app: Application,
+        request: Request,
+        exception: Exception,
     ) -> Response:
         return text(str(exception) or "Not found", 404)
 
@@ -37,5 +39,5 @@ async def accepted(*args: Any) -> Response:
             UnauthorizedException: unauthorized,
             ForbiddenException: forbidden,
             AcceptedException: accepted,
-        }
+        },
     )

backend/app/main.py

@@ -7,7 +7,6 @@
 from app.errors import configure_error_handlers
 from app.services import configure_services
 from app.settings import Settings, load_settings
-from app.templating import configure_templating
 from blacksheep import Application
 from rodi import Container
 
@@ -21,11 +20,9 @@ def configure_application(
         show_error_details=settings.app.show_error_details,
     )
 
-    app.serve_files("app/static")
     configure_error_handlers(app)
     configure_authentication(app, settings)
     configure_docs(app, settings)
-    configure_templating(app, settings)
     return app