migrator functions updated
This commit is contained in:
@@ -66,7 +66,7 @@ class EventBindOccupantEventMethods(MethodToEvent):
|
||||
|
||||
events_to_add_to_occupant = Events.filter_all(
|
||||
Events.uu_id.in_(list(data.event_uu_id_list)),
|
||||
*Events.valid_record_args(Events)
|
||||
*Events.valid_record_args(Events),
|
||||
)
|
||||
if not events_to_add_to_occupant.data:
|
||||
return JSONResponse(
|
||||
|
||||
@@ -38,15 +38,14 @@ class ServiceBindOccupantEventMethods(MethodToEvent):
|
||||
|
||||
living_space = BuildLivingSpace.filter_one(
|
||||
BuildLivingSpace.id == build_living_space_id,
|
||||
*BuildLivingSpace.valid_record_args(BuildLivingSpace)
|
||||
*BuildLivingSpace.valid_record_args(BuildLivingSpace),
|
||||
).data
|
||||
service = Services.filter_one(
|
||||
Services.id == service_id,
|
||||
*Services.valid_record_args(Services)
|
||||
Services.id == service_id, *Services.valid_record_args(Services)
|
||||
).data
|
||||
add_events_list = Service2Events.filter_all(
|
||||
Service2Events.service_id == service.id,
|
||||
*Service2Events.valid_record_args(Service2Events)
|
||||
*Service2Events.valid_record_args(Service2Events),
|
||||
).data
|
||||
if not add_events_list:
|
||||
raise Exception(
|
||||
@@ -106,7 +105,9 @@ class ServiceBindOccupantEventMethods(MethodToEvent):
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
)
|
||||
|
||||
occupant_occupant_type = OccupantTypes.filter_by_one(uu_id=data.occupant_uu_id).data
|
||||
occupant_occupant_type = OccupantTypes.filter_by_one(
|
||||
uu_id=data.occupant_uu_id
|
||||
).data
|
||||
if not occupant_occupant_type:
|
||||
return JSONResponse(
|
||||
content={
|
||||
@@ -142,7 +143,7 @@ class ServiceBindOccupantEventMethods(MethodToEvent):
|
||||
BuildLivingSpace.build_parts_id == occupants_build_part.id,
|
||||
BuildLivingSpace.occupant_types_id == occupant_occupant_type.id,
|
||||
BuildLivingSpace.person_id == token_dict.person_id,
|
||||
*BuildLivingSpace.valid_record_args(BuildLivingSpace)
|
||||
*BuildLivingSpace.valid_record_args(BuildLivingSpace),
|
||||
).data
|
||||
if not living_space:
|
||||
return JSONResponse(
|
||||
@@ -188,8 +189,12 @@ class ServiceBindEmployeeEventMethods(MethodToEvent):
|
||||
def bind_services_employee(cls, service_id: int, employee_id: int):
|
||||
from sqlalchemy.dialects.postgresql import insert
|
||||
|
||||
employee = Employees.filter_by_one(id=employee_id, **Employees.valid_record_dict).data
|
||||
service = Services.filter_by_one(id=service_id, **Services.valid_record_dict).data
|
||||
employee = Employees.filter_by_one(
|
||||
id=employee_id, **Employees.valid_record_dict
|
||||
).data
|
||||
service = Services.filter_by_one(
|
||||
id=service_id, **Services.valid_record_dict
|
||||
).data
|
||||
service_events = Service2Events.filter_all(
|
||||
Service2Events.service_id == service.id,
|
||||
*Service2Events.valid_record_args(Service2Events),
|
||||
@@ -220,6 +225,9 @@ class ServiceBindEmployeeEventMethods(MethodToEvent):
|
||||
count_row = session_execute.rowcount
|
||||
print(f"{count_row} events are added to employee {employee.uu_id}")
|
||||
Services.save()
|
||||
for service_event in service_events:
|
||||
service_event.is_confirmed = True
|
||||
Service2Events.save()
|
||||
|
||||
@classmethod
|
||||
def bind_services_employee_super_user(
|
||||
@@ -263,7 +271,7 @@ class ServiceBindEmployeeEventMethods(MethodToEvent):
|
||||
|
||||
service_events = Service2Events.filter_all(
|
||||
Service2Events.service_id == service.id,
|
||||
*Service2Events.valid_record_args(Service2Events)
|
||||
*Service2Events.valid_record_args(Service2Events),
|
||||
).data
|
||||
if not service_events:
|
||||
raise HTTPException(
|
||||
|
||||
Reference in New Issue
Block a user