From 2166a483cadd41f912c138a9404f0010c7459711 Mon Sep 17 00:00:00 2001
From: domrichardson <100129001+domrichardson@users.noreply.github.com>
Date: Tue, 16 Jun 2026 10:02:55 +0100
Subject: [PATCH] updates

---
 server/internal/services/keys.go | 12 +++++++-----
 web/app/servers/[id]/page.tsx    |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/server/internal/services/keys.go b/server/internal/services/keys.go
index 5200737..289d182 100644
--- a/server/internal/services/keys.go
+++ b/server/internal/services/keys.go
@@ -98,7 +98,10 @@ func DeleteKey(keyID string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
-	_, err := db.Col("keys").DeleteOne(ctx, bson.M{"key_id": keyID})
+	if _, err := db.Col("keys").DeleteOne(ctx, bson.M{"key_id": keyID}); err != nil {
+		return err
+	}
+	_, err := db.Col("assignments").DeleteMany(ctx, bson.M{"key_id": keyID})
 	return err
 }
 
@@ -212,12 +215,11 @@ func GetAssignmentsWithKeysForServer(serverID string) ([]AssignmentWithKey, erro
 
 	result := make([]AssignmentWithKey, 0, len(assignments))
 	for _, a := range assignments {
-		item := AssignmentWithKey{Assignment: a}
 		var key models.Key
-		if err := db.Col("keys").FindOne(ctx, bson.M{"key_id": a.KeyID}).Decode(&key); err == nil {
-			item.Key = &key
+		if err := db.Col("keys").FindOne(ctx, bson.M{"key_id": a.KeyID}).Decode(&key); err != nil {
+			continue
 		}
-		result = append(result, item)
+		result = append(result, AssignmentWithKey{Assignment: a, Key: &key})
 	}
 	return result, nil
 }
diff --git a/web/app/servers/[id]/page.tsx b/web/app/servers/[id]/page.tsx
index df986a8..28b74d9 100644
--- a/web/app/servers/[id]/page.tsx
+++ b/web/app/servers/[id]/page.tsx
@@ -204,7 +204,7 @@ export default function ServerDetailPage() {
                   </Tr>
                 </Thead>
                 <Tbody>
-                  {server.keys.map((assignment) => (
+                  {server.keys.filter(a => a.key).map((assignment) => (
                     <Tr key={assignment.key_id}>
                       <Td>
                         <span className="font-medium">{assignment.key.label}</span>