fix: Check if event id exists before deleting it

close #4936 Signed-off-by: Ginny Guan <ginny@iotechsys.com>
edgexfoundry · Oct 8, 2024 · d5aa4e6 · d5aa4e6
1 parent 97aa120
commit d5aa4e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/internal/core/data/application/event.go b/internal/core/data/application/event.go
@@ -130,8 +130,11 @@ func (a *CoreDataApp) DeleteEventById(id string, dic *di.Container) errors.EdgeX
 	}
 
 	dbClient := container.DBClientFrom(dic.Get)
-
-	err := dbClient.DeleteEventById(id)
+	_, err := dbClient.EventById(id)
+	if err != nil {
+		return errors.NewCommonEdgeXWrapper(err)
+	}
+	err = dbClient.DeleteEventById(id)
 	if err != nil {
 		return errors.NewCommonEdgeXWrapper(err)
 	}

diff --git a/internal/core/data/controller/http/event_test.go b/internal/core/data/controller/http/event_test.go
@@ -442,7 +442,8 @@ func TestDeleteEventById(t *testing.T) {
 	notFoundEventId := NonexistentEventID
 
 	dbClientMock := &dbMock.DBClient{}
-	dbClientMock.On("DeleteEventById", notFoundEventId).Return(errors.NewCommonEdgeX(errors.KindEntityDoesNotExist, "event doesn't exist in the database", nil))
+	dbClientMock.On("EventById", notFoundEventId).Return(models.Event{}, errors.NewCommonEdgeX(errors.KindEntityDoesNotExist, "event doesn't exist in the database", nil))
+	dbClientMock.On("EventById", validEventId).Return(persistedEvent, nil)
 	dbClientMock.On("DeleteEventById", validEventId).Return(nil)
 
 	dic := mocks.NewMockDIC()