Merge pull request #23 from Clarilab/revert/outbox-in-transaction

Revert "fix[event-stores] let event-handler-in-tx (outbox) run in database transaction"

Author: nicoandrewss

eventstore/mongodb/eventstore.go

@@ -211,6 +211,8 @@ func (s *EventStore) Save(ctx context.Context, events []eh.Event, originalVersio
 		return nil
 	}
 
+	var handleEvents bool
+
 	// Run the operation in a transaction if using an outbox, otherwise it's not needed.
 	if s.eventHandlerInTX != nil {
 		if err := s.database.CollectionExecWithTransaction(ctx, s.collectionName, func(txCtx mongo.SessionContext, c *mongo.Collection) error {
@@ -225,12 +227,6 @@ func (s *EventStore) Save(ctx context.Context, events []eh.Event, originalVersio
 				}
 			}
 
-			for i := range events {
-				if err := s.eventHandlerInTX.HandleEvent(ctx, events[i]); err != nil {
-					return fmt.Errorf("could not handle event in transaction: %w", err)
-				}
-			}
-
 			return nil
 		}); err != nil {
 			return &eh.EventStoreError{
@@ -242,6 +238,8 @@ func (s *EventStore) Save(ctx context.Context, events []eh.Event, originalVersio
 				Events:           events,
 			}
 		}
+
+		handleEvents = true
 	} else {
 		if err := s.database.CollectionExec(ctx, s.collectionName, func(ctx context.Context, c *mongo.Collection) error {
 			dummySessionCtx := mongo.NewSessionContext(ctx, nil)
@@ -263,6 +261,14 @@ func (s *EventStore) Save(ctx context.Context, events []eh.Event, originalVersio
 		}
 	}
 
+	if handleEvents {
+		for i := range events {
+			if err := s.eventHandlerInTX.HandleEvent(ctx, events[i]); err != nil {
+				return fmt.Errorf("could not handle event in transaction: %w", err)
+			}
+		}
+	}
+
 	// Let the optional event handler handle the events.
 	if s.eventHandlerAfterSave != nil {
 		for _, e := range events {

eventstore/mongodb_v2/eventstore.go

@@ -332,14 +332,6 @@ func (s *EventStore) Save(ctx context.Context, events []eh.Event, originalVersio
 			}
 		}
 
-		if s.eventHandlerInTX != nil {
-			for i := range events {
-				if err := s.eventHandlerInTX.HandleEvent(ctx, events[i]); err != nil {
-					return fmt.Errorf("could not handle event: %w", err)
-				}
-			}
-		}
-
 		return nil
 	}); err != nil {
 		return &eh.EventStoreError{
@@ -352,6 +344,14 @@ func (s *EventStore) Save(ctx context.Context, events []eh.Event, originalVersio
 		}
 	}
 
+	if s.eventHandlerInTX != nil {
+		for i := range events {
+			if err := s.eventHandlerInTX.HandleEvent(ctx, events[i]); err != nil {
+				return fmt.Errorf("could not handle event: %w", err)
+			}
+		}
+	}
+
 	// Let the optional event handler handle the events.
 	if s.eventHandlerAfterSave != nil {
 		for i := range events {