fix feature tuple deletion

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

Author: golanglemonade

internal/ent/hooks/orgmodule.go

@@ -62,13 +62,14 @@ func HookOrgModuleUpdate() ent.Hook {
 				return handleOrgModuleUpdate(ctx, omm, next)
 			case ent.OpDeleteOne:
 				return handleOrgModuleDelete(ctx, omm, next)
-			case ent.OpUpdate:
+			case ent.OpUpdate, ent.OpDelete:
+				// OpUpdate is a soft delete, OpDelete is the hard delete the organization cascade uses
 				return handleOrgModuleBulkDelete(ctx, omm, next)
 			default:
 				return next.Mutate(ctx, omm)
 			}
 		})
-	}, ent.OpUpdateOne|ent.OpDeleteOne|ent.OpUpdate)
+	}, ent.OpUpdateOne|ent.OpDeleteOne|ent.OpUpdate|ent.OpDelete)
 }
 
 func handleOrgModuleUpdate(ctx context.Context, omm *generated.OrgModuleMutation, next ent.Mutator) (generated.Value, error) {
@@ -163,7 +164,8 @@ func handleOrgModuleDelete(ctx context.Context, omm *generated.OrgModuleMutation
 }
 
 func handleOrgModuleBulkDelete(ctx context.Context, omm *generated.OrgModuleMutation, next ent.Mutator) (generated.Value, error) {
-	if !entx.CheckIsSoftDeleteType(ctx, omm.Type()) {
+	// a bulk update is only a delete when it is the soft delete rewrite, a bulk delete always is
+	if !omm.Op().Is(ent.OpDelete) && !entx.CheckIsSoftDeleteType(ctx, omm.Type()) {
 		return next.Mutate(ctx, omm)
 	}
 

internal/graphapi/organization_test.go

@@ -1135,6 +1135,15 @@ func TestMutationOrganizationCascadeDelete(t *testing.T) {
 	orgTuples, err := suite.client.fga.GetTuplesForObject(context.Background(), "organization:"+org.ID)
 	assert.NilError(t, err)
 	assert.Check(t, is.Len(orgTuples, 0), "organization relationship tuples should be cleaned out of FGA")
+
+	// ensure all tuples, like feature tuples are cleaned up
+	allTuples, err := suite.client.fga.GetAllTuples(context.Background())
+	assert.NilError(t, err)
+
+	for _, tup := range allTuples {
+		assert.Check(t, tup.Key.User != "organization:"+org.ID,
+			"tuple %s#%s@%s should have been cleaned out of FGA", tup.Key.Object, tup.Key.Relation, tup.Key.User)
+	}
 }
 
 // assertHistoryExists checks whether the history rows for the given task and file are present