Merge remote-tracking branch 'origin/main' into feat/queue-based-graph-engine

api/tests/unit_tests/services/test_clear_free_plan_tenant_expired_logs.py

@@ -57,7 +57,7 @@ class TestClearFreePlanTenantExpiredLogs:
     def test_clear_message_related_tables_no_records_found(self, mock_session, sample_message_ids):
         """Test when no related records are found."""
         with patch("services.clear_free_plan_tenant_expired_logs.storage") as mock_storage:
-            mock_session.query.return_value.filter.return_value.all.return_value = []
+            mock_session.query.return_value.where.return_value.all.return_value = []
 
             ClearFreePlanTenantExpiredLogs._clear_message_related_tables(mock_session, "tenant-123", sample_message_ids)
 
@@ -70,7 +70,7 @@ class TestClearFreePlanTenantExpiredLogs:
     ):
         """Test when records are found and have to_dict method."""
         with patch("services.clear_free_plan_tenant_expired_logs.storage") as mock_storage:
-            mock_session.query.return_value.filter.return_value.all.return_value = sample_records
+            mock_session.query.return_value.where.return_value.all.return_value = sample_records
 
             ClearFreePlanTenantExpiredLogs._clear_message_related_tables(mock_session, "tenant-123", sample_message_ids)
 
@@ -101,7 +101,7 @@ class TestClearFreePlanTenantExpiredLogs:
                 records.append(record)
 
             # Mock records for first table only, empty for others
-            mock_session.query.return_value.filter.return_value.all.side_effect = [
+            mock_session.query.return_value.where.return_value.all.side_effect = [
                 records,
                 [],
                 [],
@@ -123,13 +123,13 @@ class TestClearFreePlanTenantExpiredLogs:
         with patch("services.clear_free_plan_tenant_expired_logs.storage") as mock_storage:
             mock_storage.save.side_effect = Exception("Storage error")
 
-            mock_session.query.return_value.filter.return_value.all.return_value = sample_records
+            mock_session.query.return_value.where.return_value.all.return_value = sample_records
 
             # Should not raise exception
             ClearFreePlanTenantExpiredLogs._clear_message_related_tables(mock_session, "tenant-123", sample_message_ids)
 
             # Should still delete records even if backup fails
-            assert mock_session.query.return_value.filter.return_value.delete.called
+            assert mock_session.query.return_value.where.return_value.delete.called
 
     def test_clear_message_related_tables_serialization_error_continues(self, mock_session, sample_message_ids):
         """Test that method continues even when record serialization fails."""
@@ -138,30 +138,30 @@ class TestClearFreePlanTenantExpiredLogs:
             record.id = "record-1"
             record.to_dict.side_effect = Exception("Serialization error")
 
-            mock_session.query.return_value.filter.return_value.all.return_value = [record]
+            mock_session.query.return_value.where.return_value.all.return_value = [record]
 
             # Should not raise exception
             ClearFreePlanTenantExpiredLogs._clear_message_related_tables(mock_session, "tenant-123", sample_message_ids)
 
             # Should still delete records even if serialization fails
-            assert mock_session.query.return_value.filter.return_value.delete.called
+            assert mock_session.query.return_value.where.return_value.delete.called
 
     def test_clear_message_related_tables_deletion_called(self, mock_session, sample_message_ids, sample_records):
         """Test that deletion is called for found records."""
         with patch("services.clear_free_plan_tenant_expired_logs.storage") as mock_storage:
-            mock_session.query.return_value.filter.return_value.all.return_value = sample_records
+            mock_session.query.return_value.where.return_value.all.return_value = sample_records
 
             ClearFreePlanTenantExpiredLogs._clear_message_related_tables(mock_session, "tenant-123", sample_message_ids)
 
             # Should call delete for each table that has records
-            assert mock_session.query.return_value.filter.return_value.delete.called
+            assert mock_session.query.return_value.where.return_value.delete.called
 
     def test_clear_message_related_tables_logging_output(
         self, mock_session, sample_message_ids, sample_records, capsys
     ):
         """Test that logging output is generated."""
         with patch("services.clear_free_plan_tenant_expired_logs.storage") as mock_storage:
-            mock_session.query.return_value.filter.return_value.all.return_value = sample_records
+            mock_session.query.return_value.where.return_value.all.return_value = sample_records
 
             ClearFreePlanTenantExpiredLogs._clear_message_related_tables(mock_session, "tenant-123", sample_message_ids)