Merge ~lloydwaltersj/maas:fix-last-delpoy-time into maas:master

[Jack Lloyd-Walters]

make last deployment work again

95fd52c... by Jack Lloyd-Walters on 2023-07-13

remove broken assert

Unmerged commits

95fd52c... by Jack Lloyd-Walters on 2023-07-13

remove broken assert

e3a7835... by Jack Lloyd-Walters on 2023-07-13

use only first field of arch

diff --git a/src/maasserver/models/bootresource.py b/src/maasserver/models/bootresource.py
index 04fb36d..9db0c9d 100644
--- a/src/maasserver/models/bootresource.py
+++ b/src/maasserver/models/bootresource.py
@@ -671,22 +671,15 @@ class BootResource(CleanSave, TimestampedModel):
                 return resource_set
         return None
 
-    def get_last_deploy(self) -> datetime:
+    def get_last_deploy(self) -> datetime | None:
         from maasserver.models.event import Event
         from provisioningserver.events import EVENT_TYPES
 
-        deploy_msg = f"deployed {self.name}/{self.architecture}"
-        try:
-            return (
-                Event.objects.filter(
-                    type__name=EVENT_TYPES.IMAGE_DEPLOYED,
-                    description=deploy_msg,
-                )
-                .latest("created")
-                .created
-            )
-        except Event.DoesNotExist:
-            pass
+        if events := Event.objects.filter(
+            type__name=EVENT_TYPES.IMAGE_DEPLOYED,
+            description__contains=f"{self.name}/{self.split_arch()[0]}",
+        ).order_by("created"):
+            return events.last().created
 
     def split_arch(self):
         return self.architecture.split("/")
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index d675b14..bf61139 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -4844,6 +4844,16 @@ class TestNode(MAASServerTestCase):
             {EVENT_TYPES.IMAGE_DEPLOYED, EVENT_TYPES.DEPLOYED},
         )
 
+    def test_end_deployment_emits_image_deploy_msg(self):
+        self.disable_node_query()
+        node = factory.make_Node(status=NODE_STATUS.DEPLOYING)
+        start_time = datetime.now()
+        node.end_deployment()
+        [event] = Event.objects.filter(
+            type__name=EVENT_TYPES.IMAGE_DEPLOYED,
+        )
+        assert event.created >= start_time
+
     def test_end_deployment_sets_first_last_sync_value(self):
         self.disable_node_query()
         node = factory.make_Node(
diff --git a/src/maasserver/websockets/handlers/bootresource.py b/src/maasserver/websockets/handlers/bootresource.py
index 66d45b9..773262a 100644
--- a/src/maasserver/websockets/handlers/bootresource.py
+++ b/src/maasserver/websockets/handlers/bootresource.py
@@ -496,8 +496,7 @@ class BootResourceHandler(Handler):
         """Return the most recent deploy time for all resources."""
         last_deployed = None
         for resource in resources:
-            this_deploy = resource.get_last_deploy()
-            if this_deploy is not None:
+            if this_deploy := resource.get_last_deploy():
                 last_deployed = self.pick_latest_datetime(
                     last_deployed, this_deploy
                 )