HYPERFLEET-856 - fix: use SoftDeleteByOwner row count for metrics to prevent overcounting

Author: rafabene

pkg/dao/mocks/node_pool.go

@@ -58,8 +58,10 @@ func (d *nodePoolDaoMock) Delete(ctx context.Context, id string) error {
 	return errors.NotImplemented("NodePool").AsError()
 }
 
-func (d *nodePoolDaoMock) SoftDeleteByOwner(ctx context.Context, ownerID string, t time.Time, deletedBy string) error {
-	return errors.NotImplemented("NodePool").AsError()
+func (d *nodePoolDaoMock) SoftDeleteByOwner(
+	ctx context.Context, ownerID string, t time.Time, deletedBy string,
+) (int64, error) {
+	return 0, errors.NotImplemented("NodePool").AsError()
 }
 
 func (d *nodePoolDaoMock) FindSoftDeletedByOwner(ctx context.Context, ownerID string) (api.NodePoolList, error) {

pkg/dao/node_pool.go

@@ -23,7 +23,7 @@ type NodePoolDao interface {
 	FindByIDs(ctx context.Context, ids []string) (api.NodePoolList, error)
 	FindByOwner(ctx context.Context, ownerID string) (api.NodePoolList, error)
 	FindSoftDeletedByOwner(ctx context.Context, ownerID string) (api.NodePoolList, error)
-	SoftDeleteByOwner(ctx context.Context, ownerID string, t time.Time, deletedBy string) error
+	SoftDeleteByOwner(ctx context.Context, ownerID string, t time.Time, deletedBy string) (int64, error)
 	UpdateStatusConditionsByIDs(ctx context.Context, updates map[string][]byte) error
 	ExistsByOwner(ctx context.Context, ownerID string) (bool, error)
 	All(ctx context.Context) (api.NodePoolList, error)
@@ -120,7 +120,9 @@ func (d *sqlNodePoolDao) Delete(ctx context.Context, id string) error {
 	return nil
 }
 
-func (d *sqlNodePoolDao) SoftDeleteByOwner(ctx context.Context, ownerID string, t time.Time, deletedBy string) error {
+func (d *sqlNodePoolDao) SoftDeleteByOwner(
+	ctx context.Context, ownerID string, t time.Time, deletedBy string,
+) (int64, error) {
 	g2 := (*d.sessionFactory).New(ctx)
 	result := g2.Model(&api.NodePool{}).
 		Where("owner_id = ? AND deleted_time IS NULL", ownerID).
@@ -131,9 +133,9 @@ func (d *sqlNodePoolDao) SoftDeleteByOwner(ctx context.Context, ownerID string,
 		})
 	if result.Error != nil {
 		db.MarkForRollback(ctx, result.Error)
-		return result.Error
+		return 0, result.Error
 	}
-	return nil
+	return result.RowsAffected, nil
 }
 
 func (d *sqlNodePoolDao) FindSoftDeletedByOwner(ctx context.Context, ownerID string) (api.NodePoolList, error) {

pkg/services/cluster.go

@@ -120,19 +120,20 @@ func (s *sqlClusterService) SoftDelete(ctx context.Context, id string) (*api.Clu
 
 	metrics.RecordPendingDeletion("cluster")
 
-	if cascadeErr := s.nodePoolDao.SoftDeleteByOwner(ctx, id, t, deletedBy); cascadeErr != nil {
+	cascadeCount, cascadeErr := s.nodePoolDao.SoftDeleteByOwner(ctx, id, t, deletedBy)
+	if cascadeErr != nil {
 		return nil, handleSoftDeleteError("NodePool", cascadeErr)
 	}
 
+	for range cascadeCount {
+		metrics.RecordPendingDeletion("nodepool")
+	}
+
 	nodePools, err := s.nodePoolDao.FindSoftDeletedByOwner(ctx, id)
 	if err != nil {
 		return nil, errors.GeneralError("Failed to fetch cascade-deleted nodepools: %s", err)
 	}
 
-	for range nodePools {
-		metrics.RecordPendingDeletion("nodepool")
-	}
-
 	cluster, svcErr := s.UpdateClusterStatusFromAdapters(ctx, cluster.ID)
 	if svcErr != nil {
 		return nil, svcErr

pkg/services/node_pool_test.go

@@ -87,16 +87,20 @@ func (d *mockNodePoolDao) Delete(ctx context.Context, id string) error {
 	return nil
 }
 
-func (d *mockNodePoolDao) SoftDeleteByOwner(ctx context.Context, ownerID string, t time.Time, deletedBy string) error {
+func (d *mockNodePoolDao) SoftDeleteByOwner(
+	ctx context.Context, ownerID string, t time.Time, deletedBy string,
+) (int64, error) {
+	var count int64
 	for id, np := range d.nodePools {
 		if np.OwnerID == ownerID && np.DeletedTime == nil {
 			np.DeletedTime = &t
 			np.DeletedBy = &deletedBy
 			np.Generation++
 			d.nodePools[id] = np
+			count++
 		}
 	}
-	return nil
+	return count, nil
 }
 
 func (d *mockNodePoolDao) FindSoftDeletedByOwner(ctx context.Context, ownerID string) (api.NodePoolList, error) {