event list token updated

api_events/events/building/building_living_spaces.py

@@ -1,6 +1,9 @@
 from typing import Union
 
-from api_events.events.events.events_bind_modules import ModulesBindOccupantEventMethods
+
+from api_events.events.events.events_bind_services import (
+    ServiceBindOccupantEventMethods,
+)
 from databases import (
     Modules,
     BuildParts,
@@ -17,9 +20,10 @@ from api_validations.validations_request import (
     UpdateBuildLivingSpace,
     ListOptions,
 )
+from databases.sql_models.event.event import Services
 
 
-class BuildingLivingSpacesPartsListEventMethods(MethodToEvent):
+class BuildingLivingSpacesListEventMethods(MethodToEvent):
 
     event_type = "SELECT"
     __event_keys__ = {
@@ -27,7 +31,7 @@ class BuildingLivingSpacesPartsListEventMethods(MethodToEvent):
     }
 
     @classmethod
-    def building_build_parts_list(
+    def building_live_space_list(
         cls,
         list_options: ListOptions,
         token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
@@ -98,7 +102,7 @@ class BuildingLivingSpacesPartsListEventMethods(MethodToEvent):
         )
 
 
-class BuildingLivingSpacesPartsCreateEventMethods(MethodToEvent):
+class BuildingLivingSpacesCreateEventMethods(MethodToEvent):
 
     event_type = "CREATE"
     __event_keys__ = {
@@ -187,13 +191,17 @@ class BuildingLivingSpacesPartsCreateEventMethods(MethodToEvent):
                 last_living_space.save()
 
         created_living_space.save_and_confirm()
-        ModulesBindOccupantEventMethods.bind_default_module_for_first_init_occupant(
+        occupants_service = Services.retrieve_service_via_occupant_code(
+            occupant_code=occupant_type.occupant_code
+        )
+        ServiceBindOccupantEventMethods.bind_services_occupant_system(
             build_living_space_id=created_living_space.id,
+            service_id=occupants_service.id,
         )
         return created_living_space
 
 
-class BuildingLivingSpacesPartsUpdateEventMethods(MethodToEvent):
+class BuildingLivingSpacesUpdateEventMethods(MethodToEvent):
 
     event_type = "UPDATE"
     __event_keys__ = {
@@ -273,16 +281,16 @@ class BuildingLivingSpacesPartsUpdateEventMethods(MethodToEvent):
             del data_dict["build_parts_uu_id"], data_dict["life_person_uu_id"]
 
 
-BuildingLivingSpacesPartsListEventMethod = BuildingLivingSpacesPartsListEventMethods(
+BuildingLivingSpacesListEventMethod = BuildingLivingSpacesListEventMethods(
     action=ActionsSchema(endpoint="/building/living_space/list")
 )
-BuildingLivingSpacesPartsCreateEventMethod = (
-    BuildingLivingSpacesPartsCreateEventMethods(
+BuildingLivingSpacesCreateEventMethod = (
+    BuildingLivingSpacesCreateEventMethods(
         action=ActionsSchema(endpoint="/building/living_space/create")
     )
 )
-BuildingLivingSpacesPartsUpdateEventMethod = (
-    BuildingLivingSpacesPartsUpdateEventMethods(
+BuildingLivingSpacesUpdateEventMethod = (
+    BuildingLivingSpacesUpdateEventMethods(
         action=ActionsSchema(endpoint="/building/living_space/update")
     )
 )