Merge ~r00ta/maas:lp-2027625-3.4 into maas:3.4

[Jacopo Rota]

backport of 0b90769fbe5f1c064e180557070b6e4a79a97055 - fix bootresource last_deployed property

backport of 0b90769fbe5f1c064e180557070b6e4a79a97055 - fix bootresource last_deployed property

[Jacopo Rota (r00ta)]

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp-2027625-3.4 lp:~r00ta/maas/+git/maas into -b 3.4 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 63c3f618ee07f7eabf4aedbd3a5c7f8622d2f21a

review: Approve

diff --git a/src/maasserver/models/bootresource.py b/src/maasserver/models/bootresource.py
index 04fb36d..a843d5f 100644
--- a/src/maasserver/models/bootresource.py
+++ b/src/maasserver/models/bootresource.py
@@ -5,6 +5,7 @@
 
 from datetime import datetime
 from operator import attrgetter
+from typing import Optional
 
 from django.core.exceptions import ValidationError
 from django.db.models import (
@@ -671,22 +672,19 @@ class BootResource(CleanSave, TimestampedModel):
                 return resource_set
         return None
 
-    def get_last_deploy(self) -> datetime:
+    def get_last_deploy(self) -> Optional[datetime]:
         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
+        # Ignore subarch/platform/supported_platforms
+        arch, _ = self.split_arch()
+        deploy_msg_prefix = f"deployed {self.name}/{arch}/"
+        if event := Event.objects.filter(
+            type__name=EVENT_TYPES.IMAGE_DEPLOYED,
+            description__startswith=deploy_msg_prefix,
+        ):
+            return event.latest("created").created
+        return None
 
     def split_arch(self):
         return self.architecture.split("/")
diff --git a/src/maasserver/websockets/handlers/tests/test_bootresource.py b/src/maasserver/websockets/handlers/tests/test_bootresource.py
index 01bda2c..a6c898f 100644
--- a/src/maasserver/websockets/handlers/tests/test_bootresource.py
+++ b/src/maasserver/websockets/handlers/tests/test_bootresource.py
@@ -373,11 +373,12 @@ class TestBootResourcePoll(MAASServerTestCase, PatchOSInfoMixin):
         os_name, series = resource.name.split("/")
         # The polled datetime only has granularity of order seconds
         start_time = datetime.datetime.now().replace(microsecond=0)
+        architecture = BootResource.objects.get_usable_architectures()[0]
         node = factory.make_Node(
             status=NODE_STATUS.DEPLOYED,
             osystem=os_name,
             distro_series=series,
-            architecture=resource.architecture,
+            architecture=architecture,
         )
         node.end_deployment()
         response = handler.poll({})