cleanup

Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>

Author: golanglemonade

internal/ent/hooks/listeners_entitlements.go

@@ -71,9 +71,7 @@ func handleOrganizationSettingMutationGala(ctx gala.HandlerContext, payload even
 	}
 }
 
-// handleOrganizationSubscriptionDeactivationGala deactivates an organization's customer subscription when deleted.
-// The cascade delete of everything the organization owns is handled by its own listener, it must not
-// be gated on entitlements being enabled
+// handleOrganizationSubscriptionDeactivationGala deactivates an organization's customer subscription when deleted
 func handleOrganizationSubscriptionDeactivationGala(ctx gala.HandlerContext, payload eventqueue.MutationGalaPayload) error {
 	inv, ok := newEntitlementInvocation(ctx, payload, softDeleteAllowContext)
 	if !ok {
@@ -103,7 +101,7 @@ func handleOrganizationSubscriptionDeactivationGala(ctx gala.HandlerContext, pay
 	return nil
 }
 
-// handleOrganizationCreatedGala reconciles entitlements after organization creation.
+// handleOrganizationCreatedGala reconciles entitlements after organization creation
 func handleOrganizationCreatedGala(ctx gala.HandlerContext, payload eventqueue.MutationGalaPayload) error {
 	inv, ok := newEntitlementInvocation(ctx, payload, orgAllowContext)
 	if !ok {
@@ -113,7 +111,7 @@ func handleOrganizationCreatedGala(ctx gala.HandlerContext, payload eventqueue.M
 	return inv.reconcile()
 }
 
-// handleOrganizationSettingsUpdateOneGala updates Stripe customer details for billing changes.
+// handleOrganizationSettingsUpdateOneGala updates Stripe customer details for billing changes
 func handleOrganizationSettingsUpdateOneGala(ctx gala.HandlerContext, payload eventqueue.MutationGalaPayload) error {
 	if !lo.SomeBy([]string{"billing_email", "billing_phone", "billing_address"}, func(field string) bool {
 		return eventqueue.MutationFieldChanged(payload, field)

internal/ent/hooks/listeners_organization_cleanup.go

@@ -16,9 +16,7 @@ import (
 	"github.com/theopenlane/core/pkg/logx"
 )
 
-// RegisterGalaOrganizationCleanupListeners registers the organization cascade delete on Gala.
-// This is deliberately independent of the entitlement listeners, the cascade has to run whether or
-// not billing is configured, otherwise the records an organization owns are left behind entirely
+// RegisterGalaOrganizationCleanupListeners registers the organization cascade delete on Gala
 func RegisterGalaOrganizationCleanupListeners(registry *gala.Registry) ([]gala.ListenerID, error) {
 	return gala.RegisterListeners(registry,
 		gala.Definition[eventqueue.MutationGalaPayload]{
@@ -35,8 +33,7 @@ func RegisterGalaOrganizationCleanupListeners(registry *gala.Registry) ([]gala.L
 }
 
 // handleOrganizationCascadeDelete removes everything an organization owns once it is deleted.
-// The records are hard deleted and their history rows purged, leaving them soft deleted would keep
-// the rows, the uploaded objects and the full field values in the history tables indefinitely
+// The records are hard deleted and their history rows purged along with files stored in object storage
 func handleOrganizationCascadeDelete(ctx gala.HandlerContext, payload eventqueue.MutationGalaPayload) error {
 	handlerCtx, client, ok := eventqueue.ClientFromHandler(ctx)
 	if !ok {
@@ -50,30 +47,34 @@ func handleOrganizationCascadeDelete(ctx gala.HandlerContext, payload eventqueue
 
 	cleanupCtx := entgen.NewContext(organizationCleanupContext(handlerCtx.Context), client)
 
+	cleanupCtx = logx.WithFields(cleanupCtx, logx.LogFields{
+		"organization_id": orgID,
+	})
+
 	if err := entgen.OrganizationEdgeCleanup(cleanupCtx, orgID); err != nil {
-		logx.FromContext(cleanupCtx).Error().Err(err).Str("organization_id", orgID).
+		logx.FromContext(cleanupCtx).Error().Err(err).
 			Msg("failed to cascade delete organization edges")
 
 		return err
 	}
 
 	// this has to run before the organization row is removed
 	if err := entgen.PurgeOrganizationHistory(cleanupCtx, organization.ID(orgID)); err != nil {
-		logx.FromContext(cleanupCtx).Error().Err(err).Str("organization_id", orgID).
+		logx.FromContext(cleanupCtx).Error().Err(err).
 			Msg("failed to purge organization history")
 
 		return err
 	}
 
 	// the organization row goes last, once everything it owned is gone
 	if _, err := client.Organization.Delete().Where(organization.ID(orgID)).Exec(cleanupCtx); err != nil {
-		logx.FromContext(cleanupCtx).Error().Err(err).Str("organization_id", orgID).
+		logx.FromContext(cleanupCtx).Error().Err(err).
 			Msg("failed to delete organization")
 
 		return err
 	}
 
-	logx.FromContext(cleanupCtx).Info().Str("organization_id", orgID).Msg("organization cascade delete completed")
+	logx.FromContext(cleanupCtx).Info().Msg("organization cascade delete completed")
 
 	return nil
 }
@@ -84,8 +85,6 @@ func organizationCleanupContext(ctx context.Context) context.Context {
 	allowCtx := privacy.DecisionContext(ctx, privacy.Allow)
 	allowCtx = auth.WithCaller(allowCtx, auth.NewWebhookCaller(""))
 
-	// without this the cascaded deletes are rewritten into soft deletes by the mixin, which also
-	// means the file hook never fires and the uploaded objects are orphaned in object storage
 	allowCtx = entx.SkipSoftDelete(allowCtx)
 
 	return contextx.WithPurgeHistory(allowCtx)

internal/graphapi/organization_cascade_test.go

@@ -16,9 +16,6 @@ import (
 	"github.com/theopenlane/core/internal/ent/historygenerated/taskhistory"
 )
 
-// TestMutationDeleteOrganizationCascade covers what happens to the records an organization owns once
-// it is deleted, they must be hard deleted, their history rows purged and the objects backing any
-// files removed from object storage rather than left orphaned
 func TestMutationDeleteOrganizationCascade(t *testing.T) {
 	orgUser := suite.seedFreshMinimalOrgUsers(t, false)