Correlations: improve error handling (#87810)

Improve error handling

pkg/services/correlations/database.go

@@ -82,10 +82,16 @@ func (s CorrelationsService) deleteCorrelation(ctx context.Context, cmd DeleteCo
 		}
 
 		deletedCount, err := session.Delete(&Correlation{UID: cmd.UID, SourceUID: cmd.SourceUID})
+
+		if err != nil {
+			return err
+		}
+
 		if deletedCount == 0 {
 			return ErrCorrelationNotFound
 		}
-		return err
+
+		return nil
 	})
 }
 
@@ -142,10 +148,16 @@ func (s CorrelationsService) updateCorrelation(ctx context.Context, cmd UpdateCo
 		}
 
 		updateCount, err := session.Where("uid = ? AND source_uid = ?", correlation.UID, correlation.SourceUID).Limit(1).Update(correlation)
+
+		if err != nil {
+			return err
+		}
+
 		if updateCount == 0 {
 			return ErrCorrelationNotFound
 		}
-		return err
+
+		return nil
 	})
 
 	if err != nil {

pkg/tests/api/correlations/correlations_update_test.go

@@ -16,8 +16,6 @@ import (
 )
 
 func TestIntegrationUpdateCorrelation(t *testing.T) {
-	// TODO: #82520 Possibly a flaky test
-	t.Skip()
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}