feat: remove expected revision check (#939)

Author: FoseFx

libs/hwes/eventstoredb/aggregate_store.go

@@ -19,35 +19,16 @@ type AggregateStore struct {
 	es *esdb.Client
 }
 
-// getExpectedRevision is for our strategy pattern to resolve the expected version
-// before a commit to EventStore between the aggregate and EventStore.
-type getExpectedRevision = func(ctx context.Context, aggregate hwes.Aggregate) (esdb.ExpectedRevision, error)
-
 func NewAggregateStore(es *esdb.Client) *AggregateStore {
 	return &AggregateStore{es: es}
 }
 
 var ErrNoAppliedEvents = errors.New("aggregate has no applied events. " +
 	"Consider to persist and load the aggregate first")
 
-// getExpectedRevisionByPreviousRead implements a strategy for our getExpectedRevision strategy pattern.
-// This function resolves the version by returning the version of the last applied event of our aggregate.
-func (as *AggregateStore) getExpectedRevisionByPreviousRead(
-	_ context.Context,
-	a hwes.Aggregate,
-) (esdb.ExpectedRevision, error) {
-	if len(a.GetAppliedEvents()) == 0 {
-		return nil, ErrNoAppliedEvents
-	}
-	lastAppliedEvent := a.GetAppliedEvents()[len(a.GetAppliedEvents())-1]
-	eventNumber := lastAppliedEvent.GetVersion()
-	return esdb.Revision(eventNumber), nil
-}
-
 func (as *AggregateStore) doSave(
 	ctx context.Context,
 	a hwes.Aggregate,
-	getExpectedRevision getExpectedRevision,
 ) (common.ConsistencyToken, error) {
 	ctx, span, log := telemetry.StartSpan(ctx, "AggregateStore.doSave")
 	defer span.End()
@@ -67,24 +48,10 @@ func (as *AggregateStore) doSave(
 			fmt.Errorf("AggregateStore.doSave: could not convert one uncommitted event to event data: %w", err)
 	}
 
-	var expectedRevision esdb.ExpectedRevision
-
-	// If AppliedEvents are empty, we imply that this entity was not loaded from an event store and therefore non-existing.
-	if len(a.GetAppliedEvents()) == 0 {
-		// Create a stream
-		expectedRevision = esdb.NoStream{}
-	} else {
-		// We resolve the expectedRevision by the passed strategy of the caller
-		expectedRevision, err = getExpectedRevision(ctx, a)
-		if err != nil {
-			return 0, fmt.Errorf("AggregateStore.doSave: could not resolve expected revision: %w", err)
-		}
-	}
-
 	r, err := as.es.AppendToStream(
 		ctx,
 		a.GetTypeID(),
-		esdb.AppendToStreamOptions{ExpectedRevision: expectedRevision},
+		esdb.AppendToStreamOptions{},
 		eventsData...,
 	)
 	if err != nil {
@@ -143,11 +110,7 @@ func (as *AggregateStore) Load(ctx context.Context, aggregate hwes.Aggregate) er
 }
 
 func (as *AggregateStore) Save(ctx context.Context, aggregate hwes.Aggregate) (common.ConsistencyToken, error) {
-	// We can switch out the getExpectedRevision strategy for testing optimistic concurrency.
-	// It is not intended to switch the strategy in production.
-	// To ensure consistency and correctly applied events during another read,
-	// getExpectedRevisionByPreviousRead is the preferred method for production use.
-	return as.doSave(ctx, aggregate, as.getExpectedRevisionByPreviousRead)
+	return as.doSave(ctx, aggregate)
 }
 
 func (as *AggregateStore) Exists(ctx context.Context, aggregate hwes.Aggregate) (bool, error) {