updated

ApiLayers/Schemas/event/event.py

@@ -348,29 +348,28 @@ class Event2Occupant(CrudCollection):
     )
 
     @classmethod
-    def get_event_codes(cls, build_living_space_id) -> list:
-        db = cls.new_session()
+    def get_event_codes(cls, build_living_space_id, db_session) -> list:
         occupant_events = cls.filter_all(
             cls.build_living_space_id == build_living_space_id,
-            db=db,
+            db=db_session,
         ).data
         active_event_ids = Service2Events.filter_all_system(
             Service2Events.service_id.in_(
                 [event.event_service_id for event in occupant_events]
             ),
-            db=db,
+            db=db_session,
         ).data
         active_events = Events.filter_all(
             Events.id.in_([event.event_id for event in active_event_ids]),
-            db=db,
+            db=db_session,
         ).data
         if extra_events := Event2OccupantExtra.filter_all(
             Event2OccupantExtra.build_living_space_id == build_living_space_id,
-            db=db,
+            db=db_session,
         ).data:
             events_extra = Events.filter_all(
                 Events.id.in_([event.event_id for event in extra_events]),
-                db=db,
+                db=db_session,
             ).data
             active_events.extend(events_extra)
         return [event.function_code for event in active_events]