revert 7f9c484540

revert Update: Commented out create, update, and delete query for security playground

src/calculation_time_constrains/class.py

@@ -218,8 +218,8 @@ class OptimumCostModel:
         fleet_optimal_index = np.argmin(total_costs)
         calculation.optimum_oh_day =fleet_optimal_index + 1
 
-        # db_session.add_all(fleet_results)
-        # await db_session.commit()
+        db_session.add_all(fleet_results)
+        await db_session.commit()
 
         return {
             'id': calculation.id,

src/calculation_time_constrains/model.py

@@ -104,8 +104,8 @@ class CalculationData(Base, DefaultMixin, IdentityMixin):
                 created_by=created_by,
             )
 
-            # db.add(params)
-            # await db.flush()
+            db.add(params)
+            await db.flush()
             params_id = params.id
 
         calculation_data = cls(
@@ -114,10 +114,10 @@ class CalculationData(Base, DefaultMixin, IdentityMixin):
             parameter_id=params_id,
         )
 
-        # db.add(calculation_data)
+        db.add(calculation_data)
 
-        # await db.commit()
-        # await db.refresh(calculation_data)
+        await db.commit()
+        await db.refresh(calculation_data)
 
         return calculation_data
 

src/calculation_time_constrains/service.py

@@ -522,8 +522,8 @@ class OptimumCostModelWithSpareparts:
         calculation.rbd_simulation_id = simulation_id
         
         # Save all results to database
-        # db_session.add_all(fleet_results)
-        # await db_session.commit()
+        db_session.add_all(fleet_results)
+        await db_session.commit()
         
         self.logger.info(f"Fleet optimization with spareparts completed:")
         self.logger.info(f"  - Fleet optimal month: {fleet_optimal_index + 1}")
@@ -745,7 +745,7 @@ async def run_simulation_with_spareparts(*, db_session, calculation, token: str,
     
     calculation_data.optimum_analysis = stats
     
-    # await db_session.commit()
+    await db_session.commit()
     
     return {
         "id": calculation_data.id,
@@ -972,7 +972,7 @@ async def get_calculation_result(db_session: DbSession, calculation_id: str, tok
         optimum_day = np.argmin([month.total_cost for month in calculation_results])
         
         scope_calculation.optimum_oh_day = int(optimum_day)
-        # await db_session.commit()
+        await db_session.commit()
 
         # Update fleet statistics
         fleet_statistics['equipment_with_sparepart_constraints'] = len([
@@ -1384,7 +1384,7 @@ async def create_calculation_result_service(
         total_costs += np.array(total_costs)
 
 
-    # db_session.add_all(results)
+    db_session.add_all(results)
 
     total_costs_point = total_corrective_costs + total_overhaul_costs
 
@@ -1401,7 +1401,7 @@ async def create_calculation_result_service(
     )
     calculation.optimum_oh_day = optimum.days
 
-    # await db_session.commit()
+    await db_session.commit()
 
     # Return results including individual equipment data
     return CalculationTimeConstrainsRead(
@@ -1471,22 +1471,22 @@ async def bulk_update_equipment(
         for location_tag, is_included in case_mappings.items()
     ]
 
-    # # Build the update statement
-    # stmt = (
-    #     update(CalculationEquipmentResult)
-    #     .where(CalculationEquipmentResult.calculation_data_id == calculation_data_id)
-    #     .where(CalculationEquipmentResult.location_tag.in_(location_tags))
-    #     .values(
-    #         {
-    #             "is_included": case(
-    #                 *when_clauses
-    #             ) ,
-    #             "is_initial" : False
-    #         }
-    #     )
-    # )
-
-    # await db.execute(stmt)
-    # await db.commit()
+    # Build the update statement
+    stmt = (
+        update(CalculationEquipmentResult)
+        .where(CalculationEquipmentResult.calculation_data_id == calculation_data_id)
+        .where(CalculationEquipmentResult.location_tag.in_(location_tags))
+        .values(
+            {
+                "is_included": case(
+                    *when_clauses
+                ) ,
+                "is_initial" : False
+            }
+        )
+    )
+
+    await db.execute(stmt)
+    await db.commit()
 
     return location_tags

src/database/core.py

@@ -69,29 +69,25 @@ class CollectorBase(DeclarativeBase):
 async def get_main_session():
     session = async_session()
     try:
-        # yield session
-        # await session.commit()
-        pass
+        yield session
+        await session.commit()
     except:
-        # await session.rollback()
+        await session.rollback()
         raise
     finally:
-        # await session.close()
-        pass
+        await session.close()
 
 @asynccontextmanager
 async def get_collector_session():
-    # session = async_collector_session()
+    session = async_collector_session()
     try:
-        # yield session
-        # await session.commit()
-        pass
+        yield session
+        await session.commit()
     except:
-        # await session.rollback()
+        await session.rollback()
         raise
     finally:
-        # await session.close()
-        pass
+        await session.close()
 
 def resolve_table_name(name):
     """Resolves table names to their mapped names."""

src/equipment_workscope_group/service.py

@@ -91,8 +91,8 @@ async def create(
         scope_equipment_job = ScopeEquipmentJob(assetnum=assetnum, job_id=job_id)
         scope_jobs.append(scope_equipment_job)
 
-    # db_session.add_all(scope_jobs)
-    # await db_session.commit()
+    db_session.add_all(scope_jobs)
+    await db_session.commit()
     return
 
 
@@ -141,8 +141,8 @@ async def delete(
             )
 
         # Perform deletion
-        # await db_session.delete(scope_job)
-        # await db_session.commit()
+        await db_session.delete(scope_job)
+        await db_session.commit()
 
         return True
 

src/overhaul_activity/service.py

@@ -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

src/overhaul_gantt/router.py

@@ -87,10 +87,10 @@ async def update_gantt_spreadsheet(db_session: DbSession, spreadsheet_in: Overha
             spreadsheet_id=spreadsheet_id,
             spreadsheet_link=spreadsheet_in.spreadsheet_link
         )
-        # db_session.add(spreadsheet)
+        db_session.add(spreadsheet)
         
     
-    # await db_session.commit()
+    await db_session.commit()
     
     if data:
         result = {

src/overhaul_job/service.py

@@ -58,8 +58,8 @@ async def create(
 
         overhaul_jobs.append(overhaul_equipment_job)
 
-    # db_session.add_all(overhaul_jobs)
-    # await db_session.commit()
+    db_session.add_all(overhaul_jobs)
+    await db_session.commit()
     return overhaul_job_in.job_ids
 
 
@@ -93,13 +93,13 @@ async def delete(
             )
 
         # Perform deletion
-        # await db_session.delete(scope_job)
-        # await db_session.commit()
+        await db_session.delete(scope_job)
+        await db_session.commit()
 
         return True
 
     except Exception as e:
-        # await db_session.rollback()
+        await db_session.rollback()
         raise
 
 

src/overhaul_schedule/router.py

@@ -46,7 +46,7 @@ async def create_overhaul_equipment_jobs(
 async def update_overhaul_schedule(
     db_session: DbSession, overhaul_job_id: str, overhaul_job_in: OverhaulScheduleUpdate
 ):
-    # await update(db_session=db_session, overhaul_schedule_id=overhaul_job_id, overhaul_job_in=overhaul_job_in)
+    await update(db_session=db_session, overhaul_schedule_id=overhaul_job_id, overhaul_job_in=overhaul_job_in)
 
     return StandardResponse(
         data=None,

src/overhaul_schedule/service.py

@@ -29,8 +29,8 @@ async def create(
 
 
     schedule = OverhaulSchedule(**overhaul_job_in.model_dump())
-    # db_session.add(schedule)
-    # await db_session.commit()
+    db_session.add(schedule)
+    await db_session.commit()
     return schedule
 
 
@@ -40,17 +40,17 @@ async def update(*, db_session: DbSession, overhaul_schedule_id: str, overhaul_j
     data = overhaul_job_in.model_dump()
     overhaul_schedule = await db_session.get(OverhaulSchedule, overhaul_schedule_id)
 
-    # update_data = overhaul_job_in.model_dump(exclude_defaults=True)
+    update_data = overhaul_job_in.model_dump(exclude_defaults=True)
 
-    # update_model(overhaul_schedule, update_data)
+    update_model(overhaul_schedule, update_data)
 
-    # await db_session.commit()
+    await db_session.commit()
 
     return overhaul_schedule
 
 
 async def delete(*, db_session: DbSession, overhaul_schedule_id: str):
     """Deletes a document."""
-    # query = Delete(OverhaulSchedule).where(OverhaulSchedule.id == overhaul_schedule_id)
-    # await db_session.execute(query)
-    # await db_session.commit()
+    query = Delete(OverhaulSchedule).where(OverhaulSchedule.id == overhaul_schedule_id)
+    await db_session.execute(query)
+    await db_session.commit()

src/overhaul_scope/service.py

@@ -77,8 +77,8 @@ async def create(*, db_session: DbSession, scope_in: ScopeCreate):
 
     if maintenance_type is None:
         maintenance_type = MaintenanceType(name=scope_in.type)
-        # db_session.add(maintenance_type)
-        # await db_session.flush()
+        db_session.add(maintenance_type)
+        await db_session.flush()
 
     # Create the OverhaulScope object with all hardcoded values
     overhaul_session = OverhaulScope(
@@ -92,9 +92,9 @@ async def create(*, db_session: DbSession, scope_in: ScopeCreate):
 
     # raise Exception(overhaul_session.start_date)
 
-    # db_session.add(overhaul_session)
-    # # Need to flush to get the id
-    # await db_session.flush()
+    db_session.add(overhaul_session)
+    # Need to flush to get the id
+    await db_session.flush()
 
 
     scope_name = scope_in.type
@@ -120,10 +120,9 @@ async def create(*, db_session: DbSession, scope_in: ScopeCreate):
     ]
 
     if scope_equipments:  # Only add if there are items
-        # db_session.add_all(scope_equipments)
-        pass
+        db_session.add_all(scope_equipments)
 
-    # await db_session.commit()
+    await db_session.commit()
     return overhaul_session
 
 
@@ -131,20 +130,20 @@ async def update(*, db_session: DbSession, scope: OverhaulScope, scope_in: Scope
     """Updates a document."""
     data = scope_in.model_dump()
 
-    # update_data = scope_in.model_dump(exclude_defaults=True)
+    update_data = scope_in.model_dump(exclude_defaults=True)
 
-    # update_model(scope, update_data)
+    update_model(scope, update_data)
 
-    # await db_session.commit()
+    await db_session.commit()
 
     return scope
 
 
 async def delete(*, db_session: DbSession, scope_id: str):
     """Deletes a document."""
-    # query = Delete(OverhaulScope).where(OverhaulScope.id == scope_id)
-    # await db_session.execute(query)
-    # await db_session.commit()
+    query = Delete(OverhaulScope).where(OverhaulScope.id == scope_id)
+    await db_session.execute(query)
+    await db_session.commit()
 
 
 async def get_overview_overhaul(*, db_session: DbSession):

src/sparepart/service.py

@@ -1406,8 +1406,8 @@ async def create_remark(*, db_session, collector_db_session, remark_in):
     if existing_remark:
         # Option B: Update existing remark (if needed)
         existing_remark.remark = remark_in.remark
-        # await db_session.commit()
-        # await db_session.refresh(existing_remark)
+        await db_session.commit()
+        await db_session.refresh(existing_remark)
         return existing_remark
 
     # Step 3: If it doesn’t exist, create new one
@@ -1416,8 +1416,8 @@ async def create_remark(*, db_session, collector_db_session, remark_in):
         remark=remark_in.remark,
     )
     
-    # db_session.add(new_remark)
-    # await db_session.commit()
-    # await db_session.refresh(new_remark)
+    db_session.add(new_remark)
+    await db_session.commit()
+    await db_session.refresh(new_remark)
 
     return new_remark

src/standard_scope/service.py

@@ -140,7 +140,7 @@ async def create(*, db_session: DbSession, scope_equipment_in: ScopeEquipmentCre
         await db_session.execute(stmt)
         results.append(assetnum)
 
-    # await db_session.commit()
+    await db_session.commit()
     return results
 
 
@@ -153,20 +153,20 @@ async def update(
     """Updates a document."""
     data = scope_equipment_in.model_dump()
 
-    # update_data = scope_equipment_in.model_dump(exclude_defaults=True)
+    update_data = scope_equipment_in.model_dump(exclude_defaults=True)
 
-    # update_model(scope_equipment, update_data)
+    update_model(scope_equipment, update_data)
 
-    # await db_session.commit()
+    await db_session.commit()
 
     return scope_equipment
 
 
 async def delete(*, db_session: DbSession, assetnum: str):
     """Deletes a document."""
-    # query = Delete(StandardScope).where(StandardScope.assetnum == assetnum)
-    # await db_session.execute(query)
-    # await db_session.commit()
+    query = Delete(StandardScope).where(StandardScope.assetnum == assetnum)
+    await db_session.execute(query)
+    await db_session.commit()
 
     return assetnum
 

src/workscope_group/service.py

@@ -28,8 +28,8 @@ async def get_all(common: CommonParameters):
 
 async def create(*, db_session: DbSession, activty_in: ActivityMasterCreate):
     activity = MasterActivity(**activty_in.model_dump())
-    # db_session.add(activity)
-    # await db_session.commit()
+    db_session.add(activity)
+    await db_session.commit()
     return activity
 
 
@@ -40,13 +40,13 @@ async def update(
     activity_in: ActivityMasterCreate
 ):
     """Updates a document."""
-    # data = activity_in.model_dump()
+    data = activity_in.model_dump()
 
-    # update_data = activity_in.model_dump(exclude_defaults=True)
+    update_data = 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
 
@@ -54,5 +54,5 @@ async def update(
 async def delete(*, db_session: DbSession, activity_id: str):
     """Deletes a document."""
     activity = await db_session.get(MasterActivity, activity_id)
-    # await db_session.delete(activity)
-    # await db_session.commit()
+    await db_session.delete(activity)
+    await db_session.commit()

src/workscope_group_maintenance_type/service.py

@@ -28,8 +28,8 @@ async def get_all(common: CommonParameters):
 
 async def create(*, db_session: DbSession, activty_in: ActivityMasterCreate):
     activity = MasterActivity(**activty_in.model_dump())
-    # db_session.add(activity)
-    # await db_session.commit()
+    db_session.add(activity)
+    await db_session.commit()
     return activity
 
 
@@ -42,11 +42,11 @@ async def update(
     """Updates a document."""
     data = activity_in.model_dump()
 
-    # update_data = activity_in.model_dump(exclude_defaults=True)
+    update_data = 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
 
@@ -54,5 +54,5 @@ async def update(
 async def delete(*, db_session: DbSession, activity_id: str):
     """Deletes a document."""
     activity = await db_session.get(MasterActivity, activity_id)
-    # await db_session.delete(activity)
-    # await db_session.commit()
+    await db_session.delete(activity)
+    await db_session.commit()