fix(types): resolucion integral de tipado estatico, Pyright 0 errores y bump a v3.8.1
This commit is contained in:
@@ -77,31 +77,35 @@ class ClassroomService:
|
||||
if not classroom:
|
||||
raise ValueError(f"Aula con ID {classroom_id} no encontrada.")
|
||||
|
||||
building_id = dto.building_id if dto.building_id is not None else classroom.building_id
|
||||
code = dto.code.strip() if dto.code is not None else classroom.code
|
||||
floor = dto.floor.strip() if dto.floor is not None else classroom.floor
|
||||
curr_building_id = int(getattr(classroom, 'building_id', 0) or 0)
|
||||
curr_code = str(getattr(classroom, 'code', '') or '')
|
||||
curr_floor = str(getattr(classroom, 'floor', '') or '')
|
||||
|
||||
building_id = dto.building_id if dto.building_id is not None else curr_building_id
|
||||
code = dto.code.strip() if dto.code is not None else curr_code
|
||||
floor = dto.floor.strip() if dto.floor is not None else curr_floor
|
||||
|
||||
# Si cambia código, piso o edificio, validar colisión
|
||||
if (building_id != classroom.building_id or code != classroom.code or floor != classroom.floor):
|
||||
if (building_id != curr_building_id or code != curr_code or floor != curr_floor):
|
||||
existing = self.repository.get_by_code_and_building(building_id, code, floor)
|
||||
if existing and existing.id != classroom.id:
|
||||
if existing and getattr(existing, 'id', None) != getattr(classroom, 'id', None):
|
||||
raise ValueError(f"Ya existe otra aula con el código '{code}' en el piso {floor}.")
|
||||
|
||||
if dto.building_id is not None:
|
||||
building = Building.query.get(dto.building_id)
|
||||
if building:
|
||||
classroom.building_id = building.id
|
||||
classroom.building = building.name
|
||||
setattr(classroom, 'building_id', getattr(building, 'id'))
|
||||
setattr(classroom, 'building', getattr(building, 'name'))
|
||||
if dto.code is not None:
|
||||
classroom.code = code
|
||||
setattr(classroom, 'code', code)
|
||||
if dto.floor is not None:
|
||||
classroom.floor = floor
|
||||
setattr(classroom, 'floor', floor)
|
||||
if dto.capacity is not None:
|
||||
classroom.capacity = dto.capacity
|
||||
setattr(classroom, 'capacity', dto.capacity)
|
||||
if dto.description is not None:
|
||||
classroom.description = dto.description
|
||||
setattr(classroom, 'description', dto.description)
|
||||
if dto.is_active is not None:
|
||||
classroom.is_active = dto.is_active
|
||||
setattr(classroom, 'is_active', dto.is_active)
|
||||
|
||||
return self.repository.save(classroom)
|
||||
|
||||
@@ -111,8 +115,8 @@ class ClassroomService:
|
||||
if not classroom:
|
||||
return False
|
||||
# Si tiene reservas históricas, se desactiva lógicamente para preservar integridad
|
||||
if classroom.reservations:
|
||||
classroom.is_active = False
|
||||
if getattr(classroom, 'reservations', None):
|
||||
setattr(classroom, 'is_active', False)
|
||||
self.repository.save(classroom)
|
||||
return True
|
||||
return self.repository.delete(classroom)
|
||||
|
||||
Reference in New Issue
Block a user