From cb7978d272d8057fd7757dda6891abf592c7bf37 Mon Sep 17 00:00:00 2001 From: Oleg Date: Sun, 12 Nov 2023 22:40:28 +0300 Subject: [PATCH] feat(server): add lesson type in lesson --- core/types/lesson.py | 7 +++++++ server.py | 2 ++ 2 files changed, 9 insertions(+) diff --git a/core/types/lesson.py b/core/types/lesson.py index 9d64136..851655f 100644 --- a/core/types/lesson.py +++ b/core/types/lesson.py @@ -1,5 +1,7 @@ +import re from dataclasses import dataclass from datetime import datetime +from typing import Optional @dataclass(frozen=True) @@ -37,3 +39,8 @@ def get_day_start_date(self) -> datetime: day_pattern = '%d.%m.%Y' day = datetime.strptime(self.day, day_pattern) return day + + def get_lesson_type(self) -> Optional[str]: + match = re.search(r'\((.*?)\)$', self.name) + + return match.group(1) if match else None diff --git a/server.py b/server.py index 2c0ef2f..071ac89 100644 --- a/server.py +++ b/server.py @@ -1,3 +1,4 @@ +import re from typing import Optional from datetime import datetime @@ -162,6 +163,7 @@ def lessons_to_dict(lessons: list[Lesson]) -> list[dict]: 'end': end_time, 'professor': lesson.professor, 'location': lesson.location, + 'lesson_type': lesson.get_lesson_type() } dict_lessons.append(dict_lesson)