feat(server): add elective property in lesson

smart7even · Dec 16, 2023 · d87f467 · d87f467
1 parent 22877b7
commit d87f467
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,4 @@
 config.yaml
 __pycache__
 venv
-.idea
-dbdata
+.idea
diff --git a/Makefile b/Makefile
diff --git a/core/types/lesson.py b/core/types/lesson.py
@@ -41,6 +41,9 @@ def get_day_start_date(self) -> datetime:
         return day
 
     def get_lesson_type(self) -> Optional[str]:
-        match = re.search(r'\((.*?)\)$', self.name)
+        match = re.search(r'\(([^()]*)\)$', self.name)
 
         return match.group(1) if match else None
+
+    def get_is_elective(self) -> Optional[bool]:
+        return self.name.startswith("Выбор ")
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,13 +25,8 @@ services:
       - SCHEDULE_BOT_TOKEN=${SCHEDULE_BOT_TOKEN}
       - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
   db:
-    image: postgres:15.4
+    image: postgres:latest
     environment:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-    volumes:
-      - dbdata:/var/lib/postgresql/data
-
-volumes:
-  dbdata:
diff --git a/server.py b/server.py
@@ -163,7 +163,8 @@ def lessons_to_dict(lessons: list[Lesson]) -> list[dict]:
             'end': end_time,
             'professor': lesson.professor,
             'location': lesson.location,
-            'lesson_type': lesson.get_lesson_type()
+            'lesson_type': lesson.get_lesson_type(),
+            'is_elective': lesson.get_is_elective()
         }
 
         dict_lessons.append(dict_lesson)