Merge pull request #78 from filips123/database-improvements

filips123 · Aug 26, 2023 · f15b95d · f15b95d
2 parents 3ab905d + d777fea
commit f15b95d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/API/gimvicurnik/__init__.py b/API/gimvicurnik/__init__.py
@@ -157,7 +157,7 @@ def _sentry_profiler_sampler(context: dict[str, Any]) -> float | int | bool:
     def configure_database(self) -> None:
         """Configure database session."""
 
-        self.engine = create_engine(self.config.database, pool_recycle=3600)
+        self.engine = create_engine(self.config.database, pool_size=10, pool_recycle=14400)
         SessionFactory.configure(bind=self.engine)
 
     def create_error_hooks(self) -> None:

diff --git a/API/gimvicurnik/blueprints/calendar.py b/API/gimvicurnik/blueprints/calendar.py
@@ -75,8 +75,8 @@ def create_school_calendar(
                 # Create event and add internal properties
                 event = Event()
                 event.add("DTSTAMP", datetime.now())
-                event.add("CATEGORIES", ["NORMAL"])
-                event.add("COLOR", "green")
+                event.add("CATEGORIES", ["Lesson", "Normal"])
+                event.add("COLOR", "darkgreen")
                 event.add(
                     "UID",
                     sha256(
@@ -93,6 +93,7 @@ def create_school_calendar(
 
                 # Add basic lesson properties
                 event.add("SUMMARY", subject["subject"])
+                event.add("ATTENDEE", subject["class"])
                 event.add("ORGANIZER", subject["teacher"])
                 event.add("LOCATION", subject["classroom"])
                 event.add("DURATION", timedelta(minutes=45))
@@ -132,7 +133,7 @@ def create_school_calendar(
                 # Create event and add internal properties
                 event = Event()
                 event.add("DTSTAMP", datetime.now())
-                event.add("CATEGORIES", ["SUBSTITUTION"])
+                event.add("CATEGORIES", ["Lesson", "Substitution"])
                 event.add("COLOR", "darkred")
                 event.add(
                     "UID",
@@ -154,6 +155,7 @@ def create_school_calendar(
                 # Add basic substitution properties
                 event.add("SUMMARY", subject["subject"])
                 event.add("DESCRIPTION", subject["notes"] or "")
+                event.add("ATTENDEE", subject["class"])
                 event.add("ORGANIZER", subject["teacher"])
                 event.add("LOCATION", subject["classroom"])
 
@@ -212,7 +214,7 @@ def create_schedule_calendar(
             # Create event and add internal properties
             event = Event()
             event.add("DTSTAMP", datetime.now())
-            event.add("CATEGORIES", ["LUNCH"])
+            event.add("CATEGORIES", ["Lunch"])
             event.add("COLOR", "darkblue")
             event.add(
                 "UID",
@@ -233,6 +235,7 @@ def create_schedule_calendar(
             event.add("SUMMARY", "Kosilo")
             event.add("DESCRIPTION", model.notes or "")
             event.add("LOCATION", model.location or "")
+            event.add("ATTENDEE", classname)
             event.add("DTSTART", start)
             event.add("DTEND", end)
 

diff --git a/API/gimvicurnik/database/__init__.py b/API/gimvicurnik/database/__init__.py
@@ -91,7 +91,7 @@ class Entity:
     __tablename__: str
 
     id: Mapped[intpk]
-    name: Mapped[text]
+    name: Mapped[text] = mapped_column(unique=True, index=True)
 
     @classmethod
     def get_lessons(
@@ -237,10 +237,10 @@ class Substitution(Base):
     subject: Mapped[text | None]
     notes: Mapped[text | None]
 
-    original_teacher_id: Mapped[teacher_fk | None] = mapped_column()
+    original_teacher_id: Mapped[teacher_fk | None] = mapped_column(index=True)
     original_teacher: Mapped[Teacher | None] = relationship(foreign_keys=[original_teacher_id])
 
-    original_classroom_id: Mapped[classroom_fk | None] = mapped_column()
+    original_classroom_id: Mapped[classroom_fk | None] = mapped_column(index=True)
     original_classroom: Mapped[Classroom | None] = relationship(foreign_keys=[original_classroom_id])
 
     class_id: Mapped[class_fk] = mapped_column(index=True)

diff --git a/API/gimvicurnik/updaters/timetable.py b/API/gimvicurnik/updaters/timetable.py
@@ -121,6 +121,7 @@ def _parse(self, document: Document | None, raw_data: str, new_hash: str, span:
                 "classroom_id": get_or_create(self.session, model=Classroom, name=lesson[4])[0].id if lesson[4] else None,
             }
             for _, lesson in lessons.items()
+            if lesson[1]
         ]
         # fmt: on