Refactor Kafka publishing without DB outbox

server/kafka_workbench_audit.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/segmentio/kafka-go"
-	"github.com/tinode/chat/server/logs"
 	"github.com/tinode/chat/server/store"
 	"github.com/tinode/chat/server/store/types"
 )
@@ -87,15 +86,7 @@ func enqueueKafkaAuditEvent(ctx context.Context, tenantID types.TenantID, actorT
 	return enqueueKafkaTypedEvent(ctx, tenantID, "audit_event", "audit."+action, "audit", resource+":"+resourceID, actor, payload)
 }
 
-func enqueueKafkaTypedEvent(_ context.Context, tenantID types.TenantID, topicName, eventType, bizType, bizID string, actor types.Uid, payload any) error {
-	tenantCode := ""
-	if store.Tenants != nil {
-		if tenant, err := store.Tenants.GetByID(tenantID); err == nil && tenant != nil {
-			tenantCode = tenant.Code
-		} else {
-			logs.Warn.Printf("kafka event: failed to resolve tenant code for tenant %d: %v", tenantID, err)
-		}
-	}
+func enqueueKafkaTypedEvent(ctx context.Context, tenantID types.TenantID, topicName, eventType, bizType, bizID string, actor types.Uid, payload any) error {
 	encoded, err := json.Marshal(payload)
 	if err != nil {
 		return err
@@ -103,7 +94,7 @@ func enqueueKafkaTypedEvent(_ context.Context, tenantID types.TenantID, topicNam
 	eventID := stableIMEventID(topicName, tenantID, eventType, bizID, encoded)
 	envelope := kafkaEnvelope{
 		EventID:       eventID,
-		TenantCode:    tenantCode,
+		TenantID:      tenantID,
 		SourceService: "im-server",
 		TargetService: "im-server",
 		EventType:     eventType,
@@ -115,11 +106,11 @@ func enqueueKafkaTypedEvent(_ context.Context, tenantID types.TenantID, topicNam
 	if !actor.IsZero() {
 		envelope.Actor = &kafkaActor{Type: "user", ID: actor.UserId()}
 	}
-	return enqueueKafkaOutbox(tenantID, topicName, bizID, envelope)
+	return publishKafkaEnvelope(ctx, topicName, bizID, envelope)
 }
 
 func handleKafkaWorkbenchEvent(ctx context.Context, envelope kafkaEnvelope, _ kafka.Message) error {
-	tenantID, err := kafkaTenantID(envelope.TenantCode)
+	tenantID, err := kafkaTenantIDFromEnvelope(envelope)
 	if err != nil {
 		return err
 	}