fix: delete stream with name

Signed-off-by: Enrique Lacal <[email protected]>
hyperledger · Jan 22, 2024 · 9fff21d · 9fff21d
1 parent ba21054
commit 9fff21d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/pkg/eventstreams/e2e_test.go b/pkg/eventstreams/e2e_test.go
@@ -471,7 +471,7 @@ func TestE2E_CRUDLifecycle(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Delete the first stream (which is running still)
-	err = mgr.DeleteStream(ctx, es1.GetID())
+	err = mgr.DeleteStream(ctx, *es1.Name)
 	assert.NoError(t, err)
 
 	// Check no streams left

diff --git a/pkg/eventstreams/manager.go b/pkg/eventstreams/manager.go
@@ -260,7 +260,7 @@ func (esm *esManager[CT, DT]) DeleteStream(ctx context.Context, nameOrID string)
 		return err
 	}
 	// Now we can delete it fully from the DB
-	if err := esm.persistence.EventStreams().Delete(ctx, nameOrID); err != nil {
+	if err := esm.persistence.EventStreams().Delete(ctx, es.spec.GetID()); err != nil {
 		return err
 	}
 	esm.removeStream(*es.spec.ID)

diff --git a/pkg/eventstreams/manager_test.go b/pkg/eventstreams/manager_test.go
@@ -460,6 +460,27 @@ func TestDeleteStreamFailDelete(t *testing.T) {
 
 }
 
+func TestDeleteStreamByName(t *testing.T) {
+	es := &EventStreamSpec[testESConfig]{
+		ID:     ptrTo(fftypes.NewUUID().String()),
+		Name:   ptrTo("stream1"),
+		Status: ptrTo(EventStreamStatusStopped),
+	}
+	ctx, esm, _, done := newMockESManager(t, func(mp *mockPersistence) {
+		mp.eventStreams.On("GetByUUIDOrName", mock.Anything, mock.Anything).Return(es, nil).Once()
+		mp.eventStreams.On("GetMany", mock.Anything, mock.Anything).Return([]*EventStreamSpec[testESConfig]{es}, &ffapi.FilterResult{}, nil).Once()
+		mp.eventStreams.On("GetMany", mock.Anything, mock.Anything).Return([]*EventStreamSpec[testESConfig]{}, &ffapi.FilterResult{}, nil).Once()
+		mp.eventStreams.On("Update", mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
+		// Expect the ID to be passed to delete
+		mp.eventStreams.On("Delete", mock.Anything, *es.ID).Return(nil).Once()
+	})
+	defer done()
+
+	err := esm.DeleteStream(ctx, *es.Name)
+	assert.Regexp(t, "pop", err)
+
+}
+
 func TestResetStreamStopFailTimeout(t *testing.T) {
 	existing := &eventStream[testESConfig, testData]{
 		activeState: &activeStream[testESConfig, testData]{},