Merge branch 'dev' into init-frontend

backend/app/controllers/models.py

@@ -0,0 +1,105 @@
+import datetime
+import uuid
+from typing import Optional
+
+from pydantic import BaseModel, Field, computed_field
+
+
+class NetologyCreds(BaseModel):
+    """Netology creds."""
+
+    username: str
+    password: str
+
+
+class ModeusCreds(BaseModel):
+    """Modeus creds."""
+
+    username: str
+    password: str
+
+
+class ModeusSearchEvents(BaseModel):
+    """Modeus search events body."""
+    size: int = Field(examples=[50], default=50)
+    time_min: datetime.datetime = Field(alias="timeMin", examples=[datetime.datetime.now()])
+    time_max: datetime.datetime = Field(alias="timeMax",
+                                        examples=[datetime.datetime.now() - datetime.timedelta(days=7)])
+    attendee_person_id: list[str] = Field(alias="attendeePersonId", default="d69c87c8-aece-4f39-b6a2-7b467b968211")
+
+
+class Location(BaseModel):
+    id: uuid.UUID = Field(alias="eventId")
+    custom_location: str = Field(alias="customLocation")
+
+    @computed_field  # type: ignore
+    @property
+    def is_lxp(self) -> float:
+        return self.custom_location == 'LXP'
+
+
+class Event(BaseModel):
+    name: str = Field(alias="name")
+    name_short: str = Field(alias="nameShort")
+    description: Optional[str] = Field(alias="description")
+    start_time: datetime.datetime = Field(alias="start")
+    end_time: datetime.datetime = Field(alias="end")
+    id: uuid.UUID
+
+
+class Href(BaseModel):
+    href: str
+
+    @computed_field  # type: ignore
+    @property
+    def id(self) -> uuid.UUID:
+        return uuid.UUID(self.href.replace('/', ''))
+
+class Link(BaseModel):
+    self: Href
+    event: Href
+    person: Href
+
+class Attender(BaseModel):
+    links: Link = Field(alias="_links")
+
+
+class Teacher(BaseModel):
+    id: uuid.UUID
+    full_name: str = Field(alias="fullName")
+
+
+class Embedded(BaseModel):
+    events: list[Event] = Field(alias="events")
+    locations: list[Location] = Field(alias="event-locations")
+    attendees: list[Attender] = Field(alias="event-attendees")
+    teacher: list[Teacher] = Field(alias="persons")
+
+
+class FullEvent(Event, Location):
+    teacher_full_name: str
+
+
+class ModeusCalendar(BaseModel):
+    """Modeus calendar response."""
+
+    embedded: Embedded = Field(alias="_embedded")
+
+    def parse_modeus_response(self) -> list[FullEvent]:
+        locations = {location.id: location for location in self.embedded.locations}
+        teachers = {teacher.id: teacher for teacher in self.embedded.teacher}
+        teachers_with_events = {teacher.links.event.id: teacher.links for teacher in self.embedded.attendees}
+        full_events = []
+        for event in self.embedded.events:
+            try:
+                teacher_event = teachers_with_events[event.id]
+                teacher = teachers[teacher_event.person.id]
+                teacher_full_name = teacher.full_name
+            except KeyError:
+                teacher_full_name = 'unknown'
+            location = locations[event.id]
+            full_events.append(FullEvent(**{
+                "teacher_full_name": teacher_full_name,
+                **event.model_dump(by_alias=True), **location.model_dump(by_alias=True),
+            }))
+        return full_events

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 = "bearer-token"
 
 
-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,7 +20,6 @@ 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)
@@ -33,7 +31,7 @@ def configure_application(
         allow_headers="*",
         max_age=300,
     )
-
+    
     return app