From 91befd177b44d177c3cca032098cd5370e9a38f1 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Thu, 1 Dec 2022 14:12:42 +0100
Subject: [PATCH] fix for issue of deleting wrong (in this case always the
 first) mne in database, also checked other entities for the same bug

---
 controller/nucleus/databaseNetworkElementStore.go | 3 ++-
 controller/nucleus/databasePndStore.go            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/controller/nucleus/databaseNetworkElementStore.go b/controller/nucleus/databaseNetworkElementStore.go
index 2440de405..f2192be58 100644
--- a/controller/nucleus/databaseNetworkElementStore.go
+++ b/controller/nucleus/databaseNetworkElementStore.go
@@ -251,7 +251,8 @@ func (s *DatabaseNetworkElementStore) Delete(networkElementToDelete networkeleme
 
 	db := client.Database(database.DatabaseName)
 	collection := db.Collection(s.storeName)
-	_, err = collection.DeleteOne(ctx, bson.D{primitive.E{Key: networkElementToDelete.ID().String()}})
+
+	_, err = collection.DeleteOne(ctx, bson.D{primitive.E{Key: "_id", Value: networkElementToDelete.ID().String()}})
 	if err != nil {
 		return customerrs.CouldNotDeleteError{Identifier: networkElementToDelete.ID(), Type: networkElementToDelete, Err: err}
 	}
diff --git a/controller/nucleus/databasePndStore.go b/controller/nucleus/databasePndStore.go
index e79b73f65..aa70d0fdf 100644
--- a/controller/nucleus/databasePndStore.go
+++ b/controller/nucleus/databasePndStore.go
@@ -163,7 +163,7 @@ func (s *DatabasePndStore) Delete(pndToDelete networkdomain.NetworkDomain) (err
 	}()
 	db := client.Database(database.DatabaseName)
 	collection := db.Collection(s.pndStoreName)
-	_, err = collection.DeleteOne(ctx, bson.D{primitive.E{Key: pndToDelete.ID().String()}})
+	_, err = collection.DeleteOne(ctx, bson.D{primitive.E{Key: "_id", Value: pndToDelete.ID().String()}})
 	if err != nil {
 		return customerrs.CouldNotDeleteError{Identifier: pndToDelete.ID(), Type: pndToDelete, Err: err}
 	}
-- 
GitLab