Merge pull request #190 from kuudori/HYPERFLEET-1093

HYPERFLEET-1093 - feat: add descriptor-driven delete policies to ResourceService

Author: openshift-merge-bot[bot]

pkg/dao/mocks/resource.go

@@ -63,14 +63,13 @@ func (d *resourceDaoMock) Delete(_ context.Context, kind, id string) error {
 	return nil
 }
 
-func (d *resourceDaoMock) CountByOwner(_ context.Context, kind, ownerID string) (int64, error) {
-	var count int64
+func (d *resourceDaoMock) ExistsByOwner(_ context.Context, kind, ownerID string) (bool, error) {
 	for _, r := range d.resources {
-		if r.Kind == kind && r.OwnerID != nil && *r.OwnerID == ownerID {
-			count++
+		if r.Kind == kind && r.OwnerID != nil && *r.OwnerID == ownerID && r.DeletedTime == nil {
+			return true, nil
 		}
 	}
-	return count, nil
+	return false, nil
 }
 
 func (d *resourceDaoMock) FindByKind(_ context.Context, kind string) (api.ResourceList, error) {

pkg/dao/resource.go

@@ -17,7 +17,7 @@ type ResourceDao interface {
 	Create(ctx context.Context, resource *api.Resource) (*api.Resource, error)
 	Save(ctx context.Context, resource *api.Resource) error
 	Delete(ctx context.Context, kind, id string) error
-	CountByOwner(ctx context.Context, kind, ownerID string) (int64, error)
+	ExistsByOwner(ctx context.Context, kind, ownerID string) (bool, error)
 	FindByKind(ctx context.Context, kind string) (api.ResourceList, error)
 	FindByKindAndOwner(ctx context.Context, kind, ownerID string) (api.ResourceList, error)
 	FindByIDs(ctx context.Context, kind string, ids []string) (api.ResourceList, error)
@@ -99,14 +99,15 @@ func (d *sqlResourceDao) Delete(ctx context.Context, kind, id string) error {
 	return nil
 }
 
-func (d *sqlResourceDao) CountByOwner(ctx context.Context, kind, ownerID string) (int64, error) {
+func (d *sqlResourceDao) ExistsByOwner(ctx context.Context, kind, ownerID string) (bool, error) {
 	g2 := d.sessionFactory.New(ctx)
-	var count int64
-	if err := g2.Model(&api.Resource{}).Where(
-		"kind = ? AND owner_id = ?", kind, ownerID).Count(&count).Error; err != nil {
-		return 0, err
+	var exists bool
+	if err := g2.Raw(
+		"SELECT EXISTS(SELECT 1 FROM resources WHERE kind = ? AND owner_id = ? AND deleted_time IS NULL)",
+		kind, ownerID).Scan(&exists).Error; err != nil {
+		return false, err
 	}
-	return count, nil
+	return exists, nil
 }
 
 func (d *sqlResourceDao) FindByKind(ctx context.Context, kind string) (api.ResourceList, error) {

pkg/services/resource.go

@@ -9,6 +9,7 @@ import (
 	"github.com/openshift-hyperfleet/hyperfleet-api/pkg/api"
 	"github.com/openshift-hyperfleet/hyperfleet-api/pkg/auth"
 	"github.com/openshift-hyperfleet/hyperfleet-api/pkg/dao"
+	"github.com/openshift-hyperfleet/hyperfleet-api/pkg/db"
 	"github.com/openshift-hyperfleet/hyperfleet-api/pkg/errors"
 	"github.com/openshift-hyperfleet/hyperfleet-api/pkg/registry"
 )
@@ -128,7 +129,9 @@ func (s *sqlResourceService) Patch(
 
 // Delete performs a soft-delete by setting DeletedTime and DeletedBy, then incrementing generation.
 // Idempotent — returns the resource unchanged if already marked for deletion.
-// Child cascade policies are not enforced here (deferred to HYPERFLEET-1093).
+// Before deleting, enforces child delete policies from the entity registry:
+//   - restrict: blocks deletion (409) if active children of that type exist
+//   - cascade: recursively soft-deletes children (DFS, innermost first)
 func (s *sqlResourceService) Delete(ctx context.Context, kind, id string) (*api.Resource, *errors.ServiceError) {
 	if svcErr := validateKind(kind); svcErr != nil {
 		return nil, svcErr
@@ -138,7 +141,6 @@ func (s *sqlResourceService) Delete(ctx context.Context, kind, id string) (*api.
 		return nil, handleSoftDeleteError(kind, err)
 	}
 
-	// Already marked for deletion — return as-is to keep the operation idempotent.
 	if resource.DeletedTime != nil {
 		return resource, nil
 	}
@@ -151,13 +153,75 @@ func (s *sqlResourceService) Delete(ctx context.Context, kind, id string) (*api.
 	resource.MarkDeleted(username, deletedTime)
 	resource.IncrementGeneration()
 
+	if svcErr := s.enforceDeletePolicies(ctx, resource); svcErr != nil {
+		db.MarkForRollback(ctx, svcErr)
+		return nil, svcErr
+	}
+
 	if saveErr := s.resourceDao.Save(ctx, resource); saveErr != nil {
 		return nil, handleSoftDeleteError(kind, saveErr)
 	}
 
 	return resource, nil
 }
 
+func (s *sqlResourceService) enforceDeletePolicies(
+	ctx context.Context, resource *api.Resource,
+) *errors.ServiceError {
+	children := registry.ChildrenOf(resource.Kind)
+
+	for _, child := range children {
+		if child.OnParentDelete == registry.OnParentDeleteRestrict {
+			if svcErr := s.checkCanDelete(ctx, resource, child); svcErr != nil {
+				return svcErr
+			}
+		}
+	}
+
+	for _, child := range children {
+		if child.OnParentDelete == registry.OnParentDeleteCascade {
+			items, err := s.resourceDao.FindByKindAndOwner(ctx, child.Kind, resource.ID)
+			if err != nil {
+				return errors.GeneralError(
+					"Unable to find %s children for cascade delete: %s", child.Kind, err,
+				)
+			}
+			for _, item := range items {
+				if item.DeletedTime != nil {
+					continue
+				}
+				item.MarkDeleted(*resource.DeletedBy, *resource.DeletedTime)
+				item.IncrementGeneration()
+
+				if svcErr := s.enforceDeletePolicies(ctx, item); svcErr != nil {
+					return svcErr
+				}
+				if saveErr := s.resourceDao.Save(ctx, item); saveErr != nil {
+					return handleSoftDeleteError(child.Kind, saveErr)
+				}
+			}
+		}
+	}
+
+	return nil
+}
+
+func (s *sqlResourceService) checkCanDelete(
+	ctx context.Context, resource *api.Resource, child registry.EntityDescriptor,
+) *errors.ServiceError {
+	exists, err := s.resourceDao.ExistsByOwner(ctx, child.Kind, resource.ID)
+	if err != nil {
+		return errors.GeneralError("Unable to check %s children: %s", child.Kind, err)
+	}
+	if exists {
+		return errors.ConflictState(
+			"Cannot delete %s '%s': active %s(s) exist",
+			resource.Kind, resource.ID, child.Kind,
+		)
+	}
+	return nil
+}
+
 // FindByIDs returns resources matching the given IDs, scoped to the specified kind.
 func (s *sqlResourceService) FindByIDs(
 	ctx context.Context, kind string, ids []string,