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)
|
||||
|
||||
@@ -171,42 +171,46 @@ class ReservationService:
|
||||
if not reservation:
|
||||
raise ValueError(f"Reserva con ID {reservation_id} no encontrada.")
|
||||
|
||||
classroom_id = dto.classroom_id or reservation.classroom_id
|
||||
start_time = dto.start_time or reservation.start_time
|
||||
end_time = dto.end_time or reservation.end_time
|
||||
expected_attendees = dto.expected_attendees if dto.expected_attendees is not None else reservation.expected_attendees
|
||||
c_id = int(dto.classroom_id or getattr(reservation, 'classroom_id', 0) or 0)
|
||||
s_time = dto.start_time or getattr(reservation, 'start_time')
|
||||
e_time = dto.end_time or getattr(reservation, 'end_time')
|
||||
exp_att_raw = dto.expected_attendees if dto.expected_attendees is not None else getattr(reservation, 'expected_attendees', 0)
|
||||
exp_att = int(exp_att_raw) if exp_att_raw is not None else 0
|
||||
t_id = int(getattr(reservation, 'user_id')) if getattr(reservation, 'user_id', None) else None
|
||||
comm_id = int(getattr(reservation, 'commission_id')) if getattr(reservation, 'commission_id', None) else None
|
||||
r_id = int(getattr(reservation, 'id')) if getattr(reservation, 'id', None) else None
|
||||
|
||||
matrix = self.check_full_conflicts_matrix(
|
||||
classroom_id=classroom_id,
|
||||
start_time=start_time,
|
||||
end_time=end_time,
|
||||
teacher_id=reservation.user_id,
|
||||
commission_id=reservation.commission_id,
|
||||
expected_attendees=expected_attendees,
|
||||
classroom_id=c_id,
|
||||
start_time=s_time,
|
||||
end_time=e_time,
|
||||
teacher_id=t_id,
|
||||
commission_id=comm_id,
|
||||
expected_attendees=exp_att,
|
||||
allow_co_teaching_exception=getattr(dto, 'allow_co_teaching_exception', False),
|
||||
exclude_id=reservation.id
|
||||
exclude_id=r_id
|
||||
)
|
||||
if matrix['is_blocked']:
|
||||
raise ValueError(" | ".join(matrix['block_reasons']))
|
||||
|
||||
if dto.classroom_id is not None:
|
||||
reservation.classroom_id = dto.classroom_id
|
||||
setattr(reservation, 'classroom_id', dto.classroom_id)
|
||||
if dto.start_time is not None:
|
||||
reservation.start_time = dto.start_time
|
||||
setattr(reservation, 'start_time', dto.start_time)
|
||||
if dto.end_time is not None:
|
||||
reservation.end_time = dto.end_time
|
||||
setattr(reservation, 'end_time', dto.end_time)
|
||||
if dto.purpose is not None:
|
||||
reservation.purpose = dto.purpose
|
||||
setattr(reservation, 'purpose', dto.purpose)
|
||||
if dto.expected_attendees is not None:
|
||||
reservation.expected_attendees = dto.expected_attendees
|
||||
setattr(reservation, 'expected_attendees', dto.expected_attendees)
|
||||
if dto.shift is not None:
|
||||
reservation.shift = dto.shift
|
||||
setattr(reservation, 'shift', dto.shift)
|
||||
if dto.virtual_link is not None:
|
||||
reservation.virtual_link = dto.virtual_link
|
||||
setattr(reservation, 'virtual_link', dto.virtual_link)
|
||||
if dto.notes is not None:
|
||||
reservation.notes = dto.notes
|
||||
setattr(reservation, 'notes', dto.notes)
|
||||
if dto.status is not None:
|
||||
reservation.status = dto.status
|
||||
setattr(reservation, 'status', dto.status)
|
||||
|
||||
return self.reservation_repo.save(reservation)
|
||||
|
||||
@@ -215,7 +219,7 @@ class ReservationService:
|
||||
reservation = self.reservation_repo.get_by_id(reservation_id)
|
||||
if not reservation:
|
||||
return False
|
||||
reservation.status = ReservationStatus.CANCELLED.value
|
||||
setattr(reservation, 'status', ReservationStatus.CANCELLED.value)
|
||||
self.reservation_repo.save(reservation)
|
||||
return True
|
||||
|
||||
@@ -224,6 +228,6 @@ class ReservationService:
|
||||
reservation = self.reservation_repo.get_by_id(reservation_id)
|
||||
if not reservation:
|
||||
return False
|
||||
reservation.status = ReservationStatus.CONFIRMED.value
|
||||
setattr(reservation, 'status', ReservationStatus.CONFIRMED.value)
|
||||
self.reservation_repo.save(reservation)
|
||||
return True
|
||||
|
||||
@@ -750,7 +750,7 @@ class GoogleSheetsImporter:
|
||||
description=room_info['description'],
|
||||
is_active=True
|
||||
)
|
||||
classroom.code = room_info['code']
|
||||
setattr(classroom, 'code', str(room_info['code']))
|
||||
db.session.add(classroom)
|
||||
db.session.flush()
|
||||
classrooms_cache[room_key] = classroom
|
||||
|
||||
@@ -20,7 +20,7 @@ class UserService:
|
||||
return None
|
||||
|
||||
if user.check_password(password):
|
||||
user.last_login = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
setattr(user, 'last_login', datetime.now(timezone.utc).replace(tzinfo=None))
|
||||
self.repository.save(user)
|
||||
return user
|
||||
return None
|
||||
|
||||
Reference in New Issue
Block a user