|
|
|
|
@ -288,8 +288,8 @@ async def add_equipment_to_session(
|
|
|
|
|
|
|
|
|
|
if dummy_workscope not in existing_equipment.workscope_groups:
|
|
|
|
|
dummy_workscope.location_tag = location_tag
|
|
|
|
|
await db_session.commit()
|
|
|
|
|
await db_session.refresh(existing_equipment)
|
|
|
|
|
# await db_session.commit()
|
|
|
|
|
# await db_session.refresh(existing_equipment)
|
|
|
|
|
|
|
|
|
|
return existing_equipment
|
|
|
|
|
|
|
|
|
|
@ -306,9 +306,9 @@ async def add_equipment_to_session(
|
|
|
|
|
)
|
|
|
|
|
dummy_workscope.location_tag = location_tag
|
|
|
|
|
|
|
|
|
|
db_session.add(new_equipment)
|
|
|
|
|
await db_session.commit()
|
|
|
|
|
await db_session.refresh(new_equipment)
|
|
|
|
|
# db_session.add(new_equipment)
|
|
|
|
|
# await db_session.commit()
|
|
|
|
|
# await db_session.refresh(new_equipment)
|
|
|
|
|
|
|
|
|
|
return new_equipment
|
|
|
|
|
|
|
|
|
|
@ -342,9 +342,9 @@ async def get_or_create_dummy_workscope(
|
|
|
|
|
|
|
|
|
|
if not master_activity:
|
|
|
|
|
master_activity = MasterActivity(workscope=dummy_name)
|
|
|
|
|
db_session.add(master_activity)
|
|
|
|
|
await db_session.commit()
|
|
|
|
|
await db_session.refresh(master_activity)
|
|
|
|
|
# db_session.add(master_activity)
|
|
|
|
|
# await db_session.commit()
|
|
|
|
|
# await db_session.refresh(master_activity)
|
|
|
|
|
|
|
|
|
|
# --- Step 2: Ensure WorkscopeOHType link exists ---
|
|
|
|
|
mt_query = select(MaintenanceType).filter(MaintenanceType.name == maintenance_type_name)
|
|
|
|
|
@ -365,17 +365,17 @@ async def get_or_create_dummy_workscope(
|
|
|
|
|
workscope_group=master_activity,
|
|
|
|
|
oh_type=maintenance_type,
|
|
|
|
|
)
|
|
|
|
|
db_session.add(workscope_oh_type)
|
|
|
|
|
await db_session.commit()
|
|
|
|
|
await db_session.refresh(workscope_oh_type)
|
|
|
|
|
# db_session.add(workscope_oh_type)
|
|
|
|
|
# await db_session.commit()
|
|
|
|
|
# await db_session.refresh(workscope_oh_type)
|
|
|
|
|
|
|
|
|
|
# --- Step 3: Create new EquipmentWorkscopeGroup ---
|
|
|
|
|
equipment_workscope_group = EquipmentWorkscopeGroup(
|
|
|
|
|
workscope_group=master_activity,
|
|
|
|
|
)
|
|
|
|
|
db_session.add(equipment_workscope_group)
|
|
|
|
|
await db_session.commit()
|
|
|
|
|
await db_session.refresh(equipment_workscope_group)
|
|
|
|
|
# db_session.add(equipment_workscope_group)
|
|
|
|
|
# await db_session.commit()
|
|
|
|
|
# await db_session.refresh(equipment_workscope_group)
|
|
|
|
|
|
|
|
|
|
return equipment_workscope_group
|
|
|
|
|
|
|
|
|
|
@ -438,11 +438,11 @@ async def update(
|
|
|
|
|
"""Updates a document."""
|
|
|
|
|
data = overhaul_activity_in.model_dump()
|
|
|
|
|
|
|
|
|
|
update_data = overhaul_activity_in.model_dump(exclude_defaults=True)
|
|
|
|
|
# update_data = overhaul_activity_in.model_dump(exclude_defaults=True)
|
|
|
|
|
|
|
|
|
|
update_model(activity, update_data)
|
|
|
|
|
# update_model(activity, update_data)
|
|
|
|
|
|
|
|
|
|
await db_session.commit()
|
|
|
|
|
# await db_session.commit()
|
|
|
|
|
|
|
|
|
|
return activity
|
|
|
|
|
|
|
|
|
|
@ -520,14 +520,14 @@ async def remove_equipment_from_session(
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if dummy_group:
|
|
|
|
|
equipment.workscope_groups.remove(dummy_group)
|
|
|
|
|
await db_session.commit()
|
|
|
|
|
await db_session.refresh(equipment)
|
|
|
|
|
# equipment.workscope_groups.remove(dummy_group)
|
|
|
|
|
# await db_session.commit()
|
|
|
|
|
# await db_session.refresh(equipment)
|
|
|
|
|
|
|
|
|
|
# --- Step 3 (optional): Delete StandardScope if no groups left ---
|
|
|
|
|
if not equipment.workscope_groups:
|
|
|
|
|
await db_session.delete(equipment)
|
|
|
|
|
await db_session.commit()
|
|
|
|
|
# await db_session.delete(equipment)
|
|
|
|
|
# await db_session.commit()
|
|
|
|
|
print(f"Equipment {location_tag} completely removed from StandardScope")
|
|
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
|