aa-structures 4.0.3__tar.gz → 4.0.4__tar.gz

{aa_structures-4.0.3 → aa_structures-4.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: aa-structures
-Version: 4.0.3
+Version: 4.0.4
 Summary: An app for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <erik.kalkoken@gmail.com>
 Requires-Python: >=3.10
@@ -35,6 +35,7 @@ Requires-Dist: pook ; extra == "test"
 Project-URL: Documentation, https://aa-structures.readthedocs.io
 Project-URL: Homepage, https://github.com/AllianceAuth-Apps/aa-structures
 Provides-Extra: test
+Import-Name: structures
 
 # Structures
 
@@ -53,7 +54,7 @@ An app for managing Eve Online structures with Alliance Auth.
 
 ## Overview
 
-This app is for managing Eve Online structures with [Alliance Auth](https://gitlab.com/allianceauth/allianceauth). It allows all member corporations to see a current list of all their structures in Auth. In addition it allows forwarding Eve Online notifications to Discord.
+Built for [Alliance Auth](https://gitlab.com/allianceauth/allianceauth), it allows all member corporations to see a current list of all their structures in Auth. In addition it allows forwarding Eve Online notifications to Discord.
 
 ## Features
 
@@ -72,7 +73,7 @@ Structures adds the following main features to Alliance Auth:
 - Automatically adds timers from relevant notifications to [Alliance Auth Structure Timers](https://allianceauth.readthedocs.io/en/latest/features/apps/timerboard.html) or [Structure Timers II](https://github.com/AllianceAuth-Apps/aa-structuretimers) app (if installed)
 - Fittings, contents of Upwell structures (e.g. fuel blocks and ammo) and current fuel usage
 - Additional structure notifications generated by the app:
-  - Configurable alerts to warn about fuel running at in structures and POSes, and which can replace the ESI notifications
+  - Configurable alerts to warn about fuel running low in structures and POSes, and which can replace the ESI notifications
   - Notifications to inform when structures have been refueled (BETA)
   - Configurable alerts to warn about jump fuel (liquid ozone) running low in jump gates
   - POS reinforced (BETA)
@@ -80,7 +81,7 @@ Structures adds the following main features to Alliance Auth:
 - Permissions define which structures are visible to a user based on organization membership
 - Self-defined tags help to better organize structures
 - Ability to increase notification response time and sync resilience with multiple sync characters per structure owner
-- Automatically sends alerts to users and admin when token become invalid or sync from ESI fails
+- Automatically sends alerts to users and admins when tokens become invalid or sync from ESI fails
 - Interface for 3rd party monitoring of the services status
 - Chinese :cn:, English :us:, German :de: and Russian :ru: localization
 
@@ -103,7 +104,7 @@ The tax rate and access configuration of customs offices is visible too:
 
 And you can see the configuration for starbases:
 
-![Poco details](https://imgpile.com/images/GCxMPr.png)
+![Starbase details](https://imgpile.com/images/GCxMPr.png)
 
 This is an example for a notification posted on Discord:
 

{aa_structures-4.0.3 → aa_structures-4.0.4}/README.md

@@ -15,7 +15,7 @@ An app for managing Eve Online structures with Alliance Auth.
 
 ## Overview
 
-This app is for managing Eve Online structures with [Alliance Auth](https://gitlab.com/allianceauth/allianceauth). It allows all member corporations to see a current list of all their structures in Auth. In addition it allows forwarding Eve Online notifications to Discord.
+Built for [Alliance Auth](https://gitlab.com/allianceauth/allianceauth), it allows all member corporations to see a current list of all their structures in Auth. In addition it allows forwarding Eve Online notifications to Discord.
 
 ## Features
 
@@ -34,7 +34,7 @@ Structures adds the following main features to Alliance Auth:
 - Automatically adds timers from relevant notifications to [Alliance Auth Structure Timers](https://allianceauth.readthedocs.io/en/latest/features/apps/timerboard.html) or [Structure Timers II](https://github.com/AllianceAuth-Apps/aa-structuretimers) app (if installed)
 - Fittings, contents of Upwell structures (e.g. fuel blocks and ammo) and current fuel usage
 - Additional structure notifications generated by the app:
-  - Configurable alerts to warn about fuel running at in structures and POSes, and which can replace the ESI notifications
+  - Configurable alerts to warn about fuel running low in structures and POSes, and which can replace the ESI notifications
   - Notifications to inform when structures have been refueled (BETA)
   - Configurable alerts to warn about jump fuel (liquid ozone) running low in jump gates
   - POS reinforced (BETA)
@@ -42,7 +42,7 @@ Structures adds the following main features to Alliance Auth:
 - Permissions define which structures are visible to a user based on organization membership
 - Self-defined tags help to better organize structures
 - Ability to increase notification response time and sync resilience with multiple sync characters per structure owner
-- Automatically sends alerts to users and admin when token become invalid or sync from ESI fails
+- Automatically sends alerts to users and admins when tokens become invalid or sync from ESI fails
 - Interface for 3rd party monitoring of the services status
 - Chinese :cn:, English :us:, German :de: and Russian :ru: localization
 
@@ -65,7 +65,7 @@ The tax rate and access configuration of customs offices is visible too:
 
 And you can see the configuration for starbases:
 
-![Poco details](https://imgpile.com/images/GCxMPr.png)
+![Starbase details](https://imgpile.com/images/GCxMPr.png)
 
 This is an example for a notification posted on Discord:
 

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/__init__.py

@@ -3,5 +3,5 @@
 # pylint: disable = invalid-name
 default_app_config = "structures.apps.StructuresConfig"
 
-__version__ = "4.0.3"
+__version__ = "4.0.4"
 __title__ = "Structures"

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/admin.py

@@ -326,7 +326,6 @@ class NotificationBaseAdmin(admin.ModelAdmin):
             message = format_lazy("{first} {second}", first=first, second=second)
         else:
             message = first
-        message = format_lazy(first)
         self.message_user(request, message)
 
 

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/core/notification_embeds/corporate_embeds.py

@@ -38,12 +38,11 @@ class NotificationCorpAppNewMsg(NotificationCorpCharEmbed):
         self._description = _(
             "New application from %(character_name)s to join %(corporation_name)s:\n"
             "> %(application_text)s"
-            % {
-                "character_name": self._character_link,
-                "corporation_name": self._corporation_link,
-                "application_text": self._application_text,
-            }
-        )
+        ) % {
+            "character_name": self._character_link,
+            "corporation_name": self._corporation_link,
+            "application_text": self._application_text,
+        }
         self._color = Webhook.Color.INFO
 
 
@@ -178,11 +177,10 @@ class NotificationCorpGoalClosed(NotificationCorpGoalEmbed):
         self._description = _(
             "Project **%(goal_name)s** has ben closed by %(closer)s "
             "and will not accept further contributions."
-            % {
-                "goal_name": self._goal_name,
-                "closer": gen_eve_entity_link(closer),
-            }
-        )
+        ) % {
+            "goal_name": self._goal_name,
+            "closer": gen_eve_entity_link(closer),
+        }
         self._color = Webhook.Color.INFO
 
 
@@ -193,11 +191,10 @@ class NotificationCorpGoalCompleted(NotificationCorpGoalEmbed):
         self._description = _(
             "Project **%(goal_name)s** created by %(creator)s "
             "has been successfully completed after reaching it's target."
-            % {
-                "goal_name": self._goal_name,
-                "creator": self._creator_link,
-            }
-        )
+        ) % {
+            "goal_name": self._goal_name,
+            "creator": self._creator_link,
+        }
         self._color = Webhook.Color.SUCCESS
 
 
@@ -208,9 +205,8 @@ class NotificationCorpGoalCreated(NotificationCorpGoalEmbed):
         self._description = _(
             "Project **%(goal_name)s** has been created by %(creator)s "
             "and is open for contributions."
-            % {
-                "goal_name": self._goal_name,
-                "creator": self._creator_link,
-            }
-        )
+        ) % {
+            "goal_name": self._goal_name,
+            "creator": self._creator_link,
+        }
         self._color = Webhook.Color.INFO

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/core/notification_embeds/skyhook_embeds.py

@@ -77,12 +77,8 @@ class NotificationSkyhookUnderAttack(NotificationSkyhookEmbed):
     def __init__(self, n: Notification) -> None:
         super().__init__(n)
         self._title = _("Skyhook under attack")
-        self._description += _(
-            "is under attack by %(attacker)s.\n"
-            "%(damage_text)s"
-            % {
-                "attacker": self.gen_attacker_link(),
-                "damage_text": self.compile_damage_text("Percentage"),
-            }
-        )
+        self._description += _("is under attack by %(attacker)s.\n%(damage_text)s") % {
+            "attacker": self.gen_attacker_link(),
+            "damage_text": self.compile_damage_text("Percentage"),
+        }
         self._color = Webhook.Color.DANGER

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/core/notification_embeds/structures_embeds.py

@@ -95,7 +95,9 @@ class NotificationStructureJumpFuelAlert(NotificationStructureEmbed):
         super().__init__(notification)
         self._title = _("Jump gate low on Liquid Ozone")
         threshold_str = f"{self._data['threshold']:,}"
-        quantity_str = f"{self._structure.jump_fuel_quantity():,}"
+        quantity_str = (
+            f"{self._structure.jump_fuel_quantity():,}" if self._structure else "?"
+        )
         self._description += _(
             "is below %(threshold)s units on Liquid Ozone.\n"
             "Remaining units: %(remaining)s."
@@ -262,13 +264,19 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
 
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
+        structure_ids = [
+            structure_info[0] for structure_info in self._data["allStructureInfo"]
+        ]
+        structures_by_id = {
+            structure.id: structure
+            for structure in Structure.objects.select_related_defaults().filter(
+                id__in=structure_ids
+            )
+        }
         all_structure_info = []
         for structure_info in self._data["allStructureInfo"]:
-            try:
-                structure = Structure.objects.select_related_defaults().get(
-                    id=structure_info[0]
-                )
-            except Structure.DoesNotExist:
+            structure = structures_by_id.get(structure_info[0])
+            if structure is None:
                 all_structure_info.append(
                     self.StructureInfo(
                         name=structure_info[1],

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/core/notification_embeds/war_embeds.py

@@ -296,7 +296,7 @@ class NotificationCorpWarSurrenderMsg(NotificationWarBaseEmbed):
 class NotificationWarHQRemovedFromSpace(NotificationWarBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        war_hq = self._data["warHQ"]
+        war_hq = strip_tags(self._data["warHQ"])
         time_declared = ldap_time_2_datetime(self._data["timeDeclared"])
         self._title = _("WarHQ %s lost") % war_hq
         self._description = _(

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/core/notification_timers.py

@@ -323,8 +323,6 @@ def _gen_timer_moon_extraction(notif: Notification) -> bool:
                 timer_processed = True
 
         case NotificationType.MOONMINING_EXTRACTION_CANCELLED:
-            timer_processed = True
-
             for notification in Notification.objects.filter(
                 notif_type=NotificationType.MOONMINING_EXTRACTION_STARTED,
                 owner=notif.owner,
@@ -335,6 +333,7 @@ def _gen_timer_moon_extraction(notif: Notification) -> bool:
                 parsed_text_2 = notification.parsed_text()
                 my_structure_type_id = parsed_text_2["structureTypeID"]
                 if my_structure_type_id == parsed_text["structureTypeID"]:
+                    timer_processed = True
                     eve_time_2 = _extract_eve_time(parsed_text_2)
 
                     if AuthTimer:

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/core/serializers.py

@@ -140,10 +140,10 @@ class _AbstractStructureListSerializer(ABC):
         self, structure: Structure, row: dict, check_tags: bool = True
     ):
         structure_name_html = escape(structure.name)
-        tags = []
-        if check_tags and structure.tags.exists():
-            tags += [x.html for x in structure.tags.all()]
-            structure_name_html += format_html("<br>{}", mark_safe(" ".join(tags)))
+        if check_tags:
+            tags = [x.html for x in structure.tags.all()]
+            if tags:
+                structure_name_html += format_html("<br>{}", mark_safe(" ".join(tags)))
 
         row["structure_name_and_tags"] = structure_name_html
 

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/models/notifications.py

@@ -309,10 +309,7 @@ class NotificationBase(models.Model):
         else:
             structures_qs = self.calc_related_structures()
 
-        if (
-            structures_qs.exists()
-            and structures_qs.filter(webhooks__isnull=False).count() == 1
-        ):
+        if structures_qs.count() == 1 and structures_qs.first().webhooks.exists():
             webhooks_qs = structures_qs.first().webhooks
         else:
             webhooks_qs = self.owner.webhooks
@@ -896,6 +893,7 @@ class JumpFuelAlertConfig(BaseFuelAlertConfig):
             )
             .filter(is_active=True)
             .filter(Q(owners__isnull=False) | Q(structures__isnull=False))
+            .distinct()
         )
 
 

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/models/owners.py

@@ -633,6 +633,11 @@ class Owner(models.Model):
         self, token: Token, structures: List[dict]
     ) -> bool:
         count = 0
+        existing_names = dict(
+            self.structures.filter(
+                id__in=[s["structure_id"] for s in structures]
+            ).values_list("id", "name")
+        )
         for s in structures:
             try:
                 structure_info_obj = (
@@ -654,7 +659,8 @@ class Owner(models.Model):
                     self._report_esi_issue(
                         f"fetch structure #{s['structure_id']}", ex, token
                     )
-                s["name"] = "(no data)"
+                # Don't clobber a previously resolved name on a transient failure.
+                s["name"] = existing_names.get(s["structure_id"]) or "(no data)"
             else:
                 structure_info = structure_info_obj.model_dump()
                 count += 1
@@ -1215,6 +1221,7 @@ class Owner(models.Model):
         )
         for notif in new_eve_notifications:
             notif.send_to_configured_webhooks()
+            notifications_count += 1
 
         new_generated_notifications: models.QuerySet[GeneratedNotification] = (
             self.generatednotification_set.filter(**my_filter)
@@ -1223,6 +1230,7 @@ class Owner(models.Model):
         )
         for notif in new_generated_notifications:
             notif.send_to_configured_webhooks()
+            notifications_count += 1
 
         if (
             not new_eve_notifications.exists()

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/models/structures_1.py

@@ -259,6 +259,8 @@ class Structure(models.Model):  # pylint: disable = too-many-public-methods
         verbose_name=_("fuel expires at"),
         help_text=_("Date on which the structure will run out of fuel"),
     )
+    # despite the name, also true when the structure only has fuel/cargo/fighters, not just a fit
+    # TODO: rename to has_items with the next migration
     has_fitting = models.BooleanField(
         null=True,
         default=None,

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/providers.py

@@ -20,10 +20,8 @@ esi = ESIClientProvider(
         "GetCorporationsCorporationIdStructures",
         "GetSovereigntyMap",
         "GetUniverseStructuresStructureId",
-        "GetUniverseStructuresStructureId",
         "PostCorporationsCorporationIdAssetsNames",
         "PostCorporationsCorporationIdAssetsLocations",
-        "PostCorporationsCorporationIdAssetsNames",
     ],
     spec_file=spec_file,
 )

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/tasks.py

@@ -49,14 +49,15 @@ def update_sov_map(_self):
 @shared_task(time_limit=STRUCTURES_TASKS_TIME_LIMIT)
 def update_structures():
     """Update all structures for all active owners from ESI."""
-    for owner in Owner.objects.all():
-        if owner.is_active:
-            update_structures_for_owner.delay(owner.pk)
+    has_active_owner = False
+    has_alliance_main = False
+    for owner in Owner.objects.filter(is_active=True):
+        has_active_owner = True
+        update_structures_for_owner.delay(owner.pk)
+        if owner.is_alliance_main:
+            has_alliance_main = True
 
-    if (
-        Owner.objects.filter(is_active=True).count() > 0
-        and Owner.objects.filter(is_active=True, is_alliance_main=True).count() == 0
-    ):
+    if has_active_owner and not has_alliance_main:
         logger.warning(
             "No owner configured to process alliance wide notifications. "
             "Please set 'is alliance main' to True for the designated owner."
@@ -204,7 +205,11 @@ def generate_new_timers_for_owner(owner_pk: int):
     owner.add_or_remove_timers_from_notifications()
 
 
-@shared_task(time_limit=STRUCTURES_TASKS_TIME_LIMIT)
+@shared_task(
+    base=QueueOnce,
+    once={"keys": ["owner_pk"]},
+    time_limit=STRUCTURES_TASKS_TIME_LIMIT,
+)
 def send_new_notifications_for_owner(owner_pk: int):
     """Send new notifications to Discord."""
     owner = Owner.objects.get(pk=owner_pk)

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/tests/core/notification_embeds/test_main.py

@@ -1,9 +1,12 @@
 import datetime as dt
+import re
 
 import dhooks_lite
 
 from django.core.cache import cache
+from django.db import connection
 from django.test import TestCase, override_settings
+from django.test.utils import CaptureQueriesContext
 from django.utils.timezone import now
 from eveuniverse.tests.testdata.factories_2 import EveMoonFactory, EveSolarSystemFactory
 
@@ -240,6 +243,23 @@ class TestNotificationEmbedsGenerate(NoSocketsTestCase):
         self.assertEqual(discord_embed.footer.text, "Structures")
         self.assertIn("structures_logo.png", discord_embed.footer.icon_url)
 
+    def test_should_generate_jump_fuel_alert_embed_when_structure_no_longer_exists(
+        self,
+    ):
+        # given
+        structure = StructureFactory(owner=self.owner)
+        notification = Notification.create_from_structure(
+            structure,
+            notif_type=NotificationType.STRUCTURE_JUMP_FUEL_ALERT,
+            threshold=1000,
+        )
+        structure.delete()
+        notification_embed = NotificationBaseEmbed.create(notification)
+        # when
+        discord_embed = notification_embed.generate_embed()
+        # then
+        self.assertIsInstance(discord_embed, dhooks_lite.Embed)
+
     def test_should_not_break_with_too_large_description(self):
         # given
         notification = Notification.objects.get(notification_id=1000000403)
@@ -404,4 +424,52 @@ class TestEveNotificationEmbeds(NoSocketsTestCase):
         self.assertTrue(obj.description)
         self.assertTrue(obj.description)
         self.assertTrue(obj.description)
+
+
+class TestNotificationStructureReinforceChange(NoSocketsTestCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.owner = OwnerFactory()
+
+    def test_should_batch_fetch_structures_and_handle_missing_ones(self):
+        # given
+        structure_1 = StructureFactory(owner=self.owner)
+        structure_2 = StructureFactory(owner=self.owner)
+        missing_structure_id = 1_599_999_999_999
+        notif = NotificationFactory(
+            owner=self.owner,
+            notif_type=NotificationType.STRUCTURE_REINFORCEMENT_CHANGED,
+            text_from_dict={
+                "allStructureInfo": [
+                    [structure_1.id, structure_1.name, structure_1.eve_type_id],
+                    [
+                        missing_structure_id,
+                        "Ghost Structure",
+                        structure_2.eve_type_id,
+                    ],
+                    [structure_2.id, structure_2.name, structure_2.eve_type_id],
+                ],
+                "hour": 19,
+                "numStructures": 3,
+                "timestamp": 132141703753688216,
+                "weekday": 255,
+            },
+        )
+        # when
+        with CaptureQueriesContext(connection) as ctx:
+            embed = NotificationBaseEmbed.create(notif)
+        # then: structures are fetched with a single batched query, not one per entry
+        structure_queries = [
+            query
+            for query in ctx.captured_queries
+            if re.search(r"\bstructures_structure\b", query["sql"])
+        ]
+        self.assertEqual(len(structure_queries), 1)
+
+        obj = embed.generate_embed()
+        self.assertIn(structure_1.name, obj.description)
+        self.assertIn(structure_2.name, obj.description)
+        self.assertIn("Ghost Structure", obj.description)
+        self.assertIn("(unknown)", obj.description)
         self.assertTrue(obj.description)

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/tests/models/test_notifications_1.py

@@ -369,6 +369,58 @@ class TestNotificationRelevantWebhooks(NoSocketsTestCase):
             result_qs, Webhook.objects.filter(pk=webhook_structure.pk)
         )
 
+    def test_should_return_structure_webhooks_when_structure_has_multiple_webhooks(
+        self,
+    ):
+        # given
+        webhook_owner = WebhookFactory(
+            notification_types=[NotificationType.STRUCTURE_UNDER_ATTACK]
+        )
+        owner = OwnerFactory(webhooks=[webhook_owner])
+        structure = StructureFactory(owner=owner)
+        webhook_structure_1 = WebhookFactory(
+            notification_types=[NotificationType.STRUCTURE_UNDER_ATTACK]
+        )
+        webhook_structure_2 = WebhookFactory(
+            notification_types=[NotificationType.STRUCTURE_UNDER_ATTACK]
+        )
+        structure.webhooks.add(webhook_structure_1, webhook_structure_2)
+        notif = NotificationFactory(
+            owner=owner,
+            notif_type=NotificationType.STRUCTURE_UNDER_ATTACK,
+            text_from_dict={
+                "allianceID": 3011,
+                "allianceLinkData": ["showinfo", 16159, 3011],
+                "allianceName": "Big Bad Alliance",
+                "armorPercentage": 98.65129050962584,
+                "charID": 1011,
+                "corpLinkData": ["showinfo", 2, 2011],
+                "corpName": "Bad Company",
+                "hullPercentage": 100.0,
+                "shieldPercentage": 4.704536686417284e-14,
+                "solarsystemID": structure.eve_solar_system_id,
+                "structureID": structure.id,
+                "structureShowInfoData": [
+                    "showinfo",
+                    structure.eve_type_id,
+                    structure.id,
+                ],
+                "structureTypeID": structure.eve_type_id,
+            },
+        )
+        # when
+        result_qs = notif.relevant_webhooks()
+        # then
+        # A structure with 2+ direct webhooks must still use its own webhooks,
+        # not silently fall back to the owner's defaults.
+        self.assertQuerySetEqual(
+            result_qs,
+            Webhook.objects.filter(
+                pk__in=[webhook_structure_1.pk, webhook_structure_2.pk]
+            ),
+            ordered=False,
+        )
+
     def test_should_return_owner_webhooks_when_notif_has_multiple_structures(self):
         # given
         webhook_owner = WebhookFactory(

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/tests/models/test_notifications_3.py

@@ -15,8 +15,10 @@ from structures.tests.testdata.factories import (
     StarbaseFactory,
     StructureFactory,
 )
+from structures.tests.testdata.helpers import load_notification_entities
 
 MODULE_PATH = "structures.models.notifications"
+TIMERS_MODULE_PATH = "structures.core.notification_timers"
 
 
 class TestGeneratedNotification(NoSocketsTestCase):
@@ -194,3 +196,36 @@ class TestProcessTimers(NoSocketsTestCase):
             result = notif.add_or_remove_timer()
         # then
         self.assertFalse(result)
+
+
+@mock.patch(MODULE_PATH + ".STRUCTURES_ADD_TIMERS", True)
+@mock.patch(TIMERS_MODULE_PATH + ".STRUCTURES_MOON_EXTRACTION_TIMERS_ENABLED", True)
+class TestMoonExtractionCancelledTimer(NoSocketsTestCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.owner = OwnerFactory()
+        load_notification_entities(cls.owner)
+
+    def test_should_not_mark_processed_when_no_matching_started_notification(self):
+        # given
+        notif = NotificationFactory(
+            owner=self.owner,
+            notif_type=NotificationType.MOONMINING_EXTRACTION_CANCELLED,
+            text_from_dict={
+                "cancelledBy": 1001,
+                "cancelledByLink": '<a href="showinfo:1383//1001">Bruce Wayne</a>',
+                "moonID": 40161465,
+                "solarSystemID": 30002537,
+                "structureID": 1000000000002,
+                "structureLink": ('<a href="showinfo:35835//1000000000002">Dummy</a>'),
+                "structureName": "Dummy",
+                "structureTypeID": 35835,
+            },
+        )
+        # when
+        result = notif.add_or_remove_timer()
+        # then
+        self.assertFalse(result)
+        notif.refresh_from_db()
+        self.assertFalse(notif.is_timer_added)

{aa_structures-4.0.3 → aa_structures-4.0.4}/structures/tests/models/test_owners_2.py

@@ -343,6 +343,50 @@ class TestUpdateStructuresEsi(TestCaseWithClearCache):
         structure = Structure.objects.get(id=structure_id)
         self.assertEqual(structure.name, "(no data)")
 
+    @pook.on
+    def test_should_keep_last_known_name_when_universe_endpoint_fails(self):
+        # given
+        owner = OwnerFactory(user=self.user, structures_last_update_at=None)
+        structure_id = 1000000000001
+        solar_system = EveSolarSystemFactory()
+        structure_type = CitadelTypeFactory()
+        StructureFactory(
+            id=structure_id,
+            owner=owner,
+            eve_type=structure_type,
+            eve_solar_system=solar_system,
+            name="My Awesome Structure",
+        )
+        pook.get(
+            f"https://esi.evetech.net/corporations/{self.corporation_id}/structures",
+            reply=200,
+            response_json=[
+                {
+                    "corporation_id": self.corporation_id,
+                    "profile_id": 101853,
+                    "reinforce_hour": 18,
+                    "state": "shield_vulnerable",
+                    "structure_id": structure_id,
+                    "system_id": solar_system.id,
+                    "type_id": structure_type.id,
+                },
+            ],
+        )
+        pook.get(
+            f"https://esi.evetech.net/universe/structures/{structure_id}",
+            reply=500,
+            response_json={"error": "internal_error"},
+        )
+
+        # when
+        owner.update_structures_esi()
+
+        # then
+        owner.refresh_from_db()
+        self.assertFalse(owner.is_structure_sync_fresh)
+        structure = Structure.objects.get(id=structure_id)
+        self.assertEqual(structure.name, "My Awesome Structure")
+
     @pook.on
     def test_tags_are_not_modified_by_update(self):
         # given