From 8103f9d4e52c445a1a7b0a9f8ecf5fed49f24b45 Mon Sep 17 00:00:00 2001
From: Stefan Benz <46600784+stebenz@users.noreply.github.com>
Date: Thu, 7 Aug 2025 16:16:02 +0200
Subject: [PATCH] fix: remove fields entry with instance domain remove (#10406)

# Which Problems Are Solved

Fields table entry is not removed when removing instance domain.

# How the Problems Are Solved

Remove the fields entry, instead of setting it.

# Additional Changes

None

# Additional Context

Needs to be backported to v3.x
---
 internal/repository/instance/domain.go | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/internal/repository/instance/domain.go b/internal/repository/instance/domain.go
index 9e9b241ad2..2260b1b0d5 100644
--- a/internal/repository/instance/domain.go
+++ b/internal/repository/instance/domain.go
@@ -148,23 +148,10 @@ func (e *DomainRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint
 
 func (e *DomainRemovedEvent) Fields() []*eventstore.FieldOperation {
 	return []*eventstore.FieldOperation{
-		eventstore.SetField(
+		eventstore.RemoveSearchFieldsByAggregateAndObjectAndField(
 			e.Aggregate(),
 			domainSearchObject(e.Domain),
 			InstanceDomainSearchField,
-			&eventstore.Value{
-				Value:        e.Domain,
-				MustBeUnique: true,
-				ShouldIndex:  true,
-			},
-
-			eventstore.FieldTypeInstanceID,
-			eventstore.FieldTypeResourceOwner,
-			eventstore.FieldTypeAggregateType,
-			eventstore.FieldTypeAggregateID,
-			eventstore.FieldTypeObjectType,
-			eventstore.FieldTypeObjectID,
-			eventstore.FieldTypeFieldName,
 		),
 	}
 }