aa-structures 2.3.0__py3-none-any.whl → 2.3.1b1__py3-none-any.whl

{aa_structures-2.3.0.dist-info → aa_structures-2.3.1b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-structures
-Version: 2.3.0
+Version: 2.3.1b1
 Summary: App for managing Eve Online structures with Alliance Auth
 Project-URL: Homepage, https://gitlab.com/ErikKalkoken/aa-structures
 Project-URL: Documentation, https://aa-structures.readthedocs.io/en/latest/

{aa_structures-2.3.0.dist-info → aa_structures-2.3.1b1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-structures/__init__.py,sha256=1RZykJ8KDupKof3pl0_1nk1EzfoL7Pn44T9SgOIxINA,104
+structures/__init__.py,sha256=9GX_0x7w1T8qGTZtM8aB70qyhAOu8S1HmvNWarR-CXE,106
 structures/admin.py,sha256=C83NxL0kGX5cOePUD53Xj5mVdgDEEQM_x14w_9Sisrg,36110
 structures/app_settings.py,sha256=mhEr3RtTJrrgb50ZPZNQWd_Sls7yyFKQfnb0oVocap4,6228
 structures/apps.py,sha256=TSbhF_vhCupKlxhVZnMHIF-Gh18MozBrc4WprT3IXd4,268
@@ -47,7 +47,7 @@ structures/migrations/0003_add_localization_and_unique_key.py,sha256=ZxJMfUtgUH2
 structures/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/models/__init__.py,sha256=T712-e_T-Fp44tFO-cpf-F2ngehxoDSQlDqoKs6pV2s,505
 structures/models/eveuniverse.py,sha256=iQlZC6zMueg0F-a6iOgacHrIa9ZBvl0utpIhoCoL920,2073
-structures/models/notifications.py,sha256=4TEkILbHrszoKjZqX8QwmVC30DztQTW75PHosGQstkk,42691
+structures/models/notifications.py,sha256=zPwsUO_nwmmlB2c4t7Hn1cRXVmQeFdjwSuY8378gd7g,42745
 structures/models/owners.py,sha256=GJTn74pE-ZMSYPUSimclnSLIJ1r9UPnORFUEv4_m0Lc,53967
 structures/models/structures.py,sha256=u6XGozfc3Sngm2BRAS7z4dHsMmEVUWLxogo8knZtFmw,37256
 structures/static/structures/css/global.css,sha256=R4LEH9PwLoN77qkqBK7u2y_vzRC3fq8X_zKnAW7yhiA,1165
@@ -126,7 +126,7 @@ structures/tests/__init__.py,sha256=9MrJzKr8DdsQY3-79v188pTpwqT4TDQ46vKnBJAGqic,
 structures/tests/test_admin.py,sha256=57eFbtevnBQ_oTGJHUYweJzRp9BID6ylWUXHO6F-LI8,21127
 structures/tests/test_checks.py,sha256=bqM9fOZDybHp7Emp8CJUt2PXKvde7B22AaQW2pH-dqg,1242
 structures/tests/test_helpers.py,sha256=YNJC5in0H6Mb2qsW4nznP2PFGkrgmdjfT93AVLtH00I,1861
-structures/tests/test_integration.py,sha256=2ysd5txGxWz598pOAv5XNugK0lHShPiQ9EX9hT2jRkY,20151
+structures/tests/test_integration.py,sha256=dxvg8htNnwl6lzPeTAgRWe15fgf7NGELWWgETskUT3U,23524
 structures/tests/test_managers_1.py,sha256=gQFaUZPg7iLWNyzYkE0HTNGqE5quB2eT9aQzk2436JU,26102
 structures/tests/test_managers_3.py,sha256=MMAJp6m3C_LsE8vK2udW17RLFx2W6_0dKwsSKWCl384,1567
 structures/tests/test_tasks.py,sha256=hzcRbiHI0fsfUIp2376yRZPLOpg_H-mtXKM0cBRha8c,18409
@@ -140,7 +140,7 @@ structures/tests/core/test_sovereignty.py,sha256=jR7AX3j35DeHhKPN846QMJp5g6koyGg
 structures/tests/core/test_starbases.py,sha256=qVzE1Yk_P0yN6U0uyeaYr08sqD07kTkyXYQwUFWSahI,3163
 structures/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/models/test_eveuniverse.py,sha256=6o1im7H4lB26xnVBo58jl0Y57oNVElQ4L4E7dVE_uv0,1600
-structures/tests/models/test_notifications_1.py,sha256=JOjejNjfx4jfrz_9wnrxHo9F2EVWliQJdm5uDKgv2FM,38429
+structures/tests/models/test_notifications_1.py,sha256=vziy9QWLTPc2z6k0cT7Z7CmORlfn-Ib7rxUkRY9sL_s,39346
 structures/tests/models/test_notifications_2.py,sha256=ZsQcJ5pbi8tJHDnCUfqZsyOGNsbERdkO6n7qGt-cW_Y,31553
 structures/tests/models/test_notifications_3.py,sha256=_s2Qj7nZIObFW_sOPFtC8k3WaTIYuCiQIqA6FAnocRk,6004
 structures/tests/models/test_notifications_discord.py,sha256=snykVVAtQQ9xfHpk8X8pDrlle266ZpfcT3itE8AUaCo,5318
@@ -154,7 +154,7 @@ structures/tests/testdata/entities.json,sha256=EPla7cAARMIMjiwO4rZELyyDSeZv3V5Wn
 structures/tests/testdata/esi_data.json,sha256=DX47oSlRZIPxlPueMfiNElbZbAip2cp3LAUmv8GAPJ0,13864
 structures/tests/testdata/eveuniverse.json,sha256=dPI-aBrHsMBW2XpE6C827bSQEYqC0tCsIF7qy6n1n2w,979813
 structures/tests/testdata/factories.py,sha256=IUKm-Kud2lTOFFnznJjXwquTVlavOpIIyq78GWVPDXs,7827
-structures/tests/testdata/factories_2.py,sha256=mVROR_3yKdcPaZO9QpFhwBjEjmtr8vyAj5GVCwsN2BI,9910
+structures/tests/testdata/factories_2.py,sha256=p9reEVY8LeYHIJC_9d2kAk2zwYeRJn37XEe_-NYY4F4,10857
 structures/tests/testdata/generate_notifications.py,sha256=nE077mVHVmOVudKIGMtHUfBIcV5Ch5Z0IngD1gp5yQk,5746
 structures/tests/testdata/generate_notifications_2.py,sha256=K5Bs5Xs08GkgA8BjCciopAbX0RR58Tsscs2MkOjblpk,1415
 structures/tests/testdata/generate_structures.py,sha256=wzuLjsTZrmErB7664YoTdSsqjy6Q5Z26LAKXKgy_ZTA,6238
@@ -169,7 +169,7 @@ structures/webhooks/models.py,sha256=3J51A2EXIpxoH5iOWJcFGaPTtaaPQTo0zl-yyl6wwHQ
 structures/webhooks/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/webhooks/tests/test_core.py,sha256=VHzfA2GQPlhA7trsIOUBA5U8kfsvzH81Nt6iJjELFIk,6395
 structures/webhooks/tests/test_utils.py,sha256=ekADFv0JOEtXeqdiejbeqrABO__Q1flJHzVieQ7L9e0,459
-aa_structures-2.3.0.dist-info/METADATA,sha256=mmKWmxJCl0aWhtcUAhW-ogP-n0gsdM6vzJbiHBYP6lk,5927
-aa_structures-2.3.0.dist-info/WHEEL,sha256=9MIigYJ7D5sOqAPqr0-o6tSMY_nQ7c6kvtvyeUB99YQ,87
-aa_structures-2.3.0.dist-info/licenses/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_structures-2.3.0.dist-info/RECORD,,
+aa_structures-2.3.1b1.dist-info/METADATA,sha256=zSW6E4hrOdu0rjMfLZxOKQqDrIxYm3IrsW4FS19ey9A,5929
+aa_structures-2.3.1b1.dist-info/WHEEL,sha256=y1bSCq4r5i4nMmpXeUJMqs3ipKvkZObrIXSvJHm1qCI,87
+aa_structures-2.3.1b1.dist-info/licenses/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-2.3.1b1.dist-info/RECORD,,

{aa_structures-2.3.0.dist-info → aa_structures-2.3.1b1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.14.1
+Generator: hatchling 1.17.0
 Root-Is-Purelib: true
 Tag: py3-none-any

structures/__init__.py

@@ -1,4 +1,4 @@
 default_app_config = "structures.apps.StructuresConfig"
 
-__version__ = "2.3.0"
+__version__ = "2.3.1b1"
 __title__ = "Structures"

structures/models/notifications.py

@@ -239,7 +239,7 @@ class NotificationType(models.TextChoices):
             cls.SOV_STRUCTURE_REINFORCED,
             cls.SOV_STRUCTURE_DESTROYED,
             cls.SOV_ALL_CLAIM_LOST_MSG,
-            cls.SOV_ALL_ANCHORING_MSG,
+            # cls.SOV_ALL_ANCHORING_MSG, # This notif is not broadcasted to all corporations
             # wars
             cls.WAR_ALLY_JOINED_WAR_AGGRESSOR_MSG,
             cls.WAR_ALLY_JOINED_WAR_AllY_MSG,

structures/tests/models/test_notifications_1.py

@@ -121,47 +121,73 @@ class TestNotificationFilterForAllianceLevel(NoSocketsTestCase):
         # given
         self.owner.is_alliance_main = False
         self.owner.save()
-        notif = self.owner.notification_set.get(notification_id=1000000509)
+        notifs = self.owner.notification_set.exclude(
+            notif_type__in=NotificationType.relevant_for_alliance_level
+        )
         # when/then
-        self.assertFalse(notif.filter_for_alliance_level())
+        for notif in notifs:
+            with self.subTest(notif=str(notif)):
+                self.assertFalse(notif.filter_for_alliance_level())
 
     def test_should_not_filter_non_alliance_notifications_2(self):
         # given
         self.owner.is_alliance_main = True
         self.owner.save()
-        notif = self.owner.notification_set.get(notification_id=1000000509)
+        notifs = self.owner.notification_set.exclude(
+            notif_type__in=NotificationType.relevant_for_alliance_level
+        )
         # when/then
-        self.assertFalse(notif.filter_for_alliance_level())
+        for notif in notifs:
+            with self.subTest(notif=str(notif)):
+                self.assertFalse(notif.filter_for_alliance_level())
 
     def test_should_filter_alliance_notifications(self):
         # given
         self.owner.is_alliance_main = False
         self.owner.save()
-        notif = self.owner.notification_set.get(notification_id=1000000803)
+        notifs = self.owner.notification_set.filter(
+            notif_type__in=NotificationType.relevant_for_alliance_level
+        )
         # when/then
-        self.assertTrue(notif.filter_for_alliance_level())
+        for notif in notifs:
+            with self.subTest(notif=str(notif)):
+                self.assertTrue(notif.filter_for_alliance_level())
 
     def test_should_not_filter_alliance_notifications_1(self):
         # given
         self.owner.is_alliance_main = True
         self.owner.save()
+        notifs = self.owner.notification_set.filter(
+            notif_type__in=NotificationType.relevant_for_alliance_level
+        )
         # when/then
-        notif = self.owner.notification_set.get(notification_id=1000000803)
-        self.assertFalse(notif.filter_for_alliance_level())
+        for notif in notifs:
+            with self.subTest(notif=str(notif)):
+                self.assertFalse(notif.filter_for_alliance_level())
 
     def test_should_not_filter_alliance_notifications_2(self):
         # given
         self.owner.is_alliance_main = True
         self.owner.save()
-        notif = self.owner.notification_set.get(notification_id=1000000803)
-        self.assertFalse(notif.filter_for_alliance_level())
+        notifs = self.owner.notification_set.filter(
+            notif_type__in=NotificationType.relevant_for_alliance_level
+        )
+        # when/then
+        for notif in notifs:
+            with self.subTest(notif=str(notif)):
+                self.assertFalse(notif.filter_for_alliance_level())
 
     def test_should_not_filter_alliance_notifications_3(self):
         # given
         _, owner = set_owner_character(character_id=1102)  # corp with no alliance
         load_notification_entities(owner)
-        notif = owner.notification_set.get(notification_id=1000000803)
-        self.assertFalse(notif.filter_for_alliance_level())
+        notifs = self.owner.notification_set.filter(
+            notif_type__in=NotificationType.relevant_for_alliance_level
+        )
+        # when/then
+        for notif in notifs:
+            with self.subTest(notif=str(notif)):
+                self.assertFalse(notif.filter_for_alliance_level())
 
 
 class TestNotificationCreateFromStructure(NoSocketsTestCase):

structures/tests/test_integration.py

@@ -16,9 +16,11 @@ from app_utils.esi_testing import EsiClientStub, EsiEndpoint
 from .. import tasks
 from ..models import NotificationType, Structure
 from .testdata.factories_2 import (
+    EveEntityAllianceFactory,
     EveEntityCorporationFactory,
     NotificationFactory,
     OwnerFactory,
+    RawNotificationFactory,
     StarbaseFactory,
     StructureFactory,
     WebhookFactory,
@@ -431,6 +433,91 @@ class TestTasks(TestCase):
         if AuthTimer:
             self.assertTrue(AuthTimer.objects.exists())
 
+    def test_should_fetch_and_send_notification_when_enabled_for_webhook(
+        self, mock_esi_2, mock_esi, mock_execute
+    ):
+        # given
+        webhook = WebhookFactory(
+            notification_types=[NotificationType.WAR_CORPORATION_BECAME_ELIGIBLE]
+        )
+        owner = OwnerFactory(webhooks=[webhook], is_alliance_main=True)
+        eve_character = owner.characters.first().character_ownership.character
+        # corporation_id = owner.corporation.corporation_id
+        notif = RawNotificationFactory()
+        endpoints = [
+            EsiEndpoint(
+                "Character",
+                "get_characters_character_id_notifications",
+                "character_id",
+                needs_token=True,
+                data={
+                    str(eve_character.character_id): [notif],
+                },
+            ),
+        ]
+        mock_esi.client = mock_esi_2.client = EsiClientStub.create_from_endpoints(
+            endpoints
+        )
+        # when
+        tasks.fetch_all_notifications.delay()
+        # then
+        self.assertTrue(mock_execute.called)
+        embed = mock_execute.call_args[1]["embeds"][0]
+        self.assertIn("now eligible", embed.description)
+
+    def test_should_fetch_and_send_notification_when_enabled_for_webhook_all_anchoring(
+        self, mock_esi_2, mock_esi, mock_execute
+    ):
+        # given
+        webhook = WebhookFactory(
+            notification_types=[NotificationType.SOV_ALL_ANCHORING_MSG]
+        )
+        owner = OwnerFactory(webhooks=[webhook], is_alliance_main=False)
+        eve_character = owner.characters.first().character_ownership.character
+        alliance = EveEntityAllianceFactory(
+            id=owner.corporation.alliance_id,
+            name=owner.corporation.alliance.alliance_name,
+        )
+        corporation = EveEntityCorporationFactory(
+            id=owner.corporation.corporation_id, name=owner.corporation.corporation_name
+        )
+        starbase = StarbaseFactory(owner=owner)
+        notif = RawNotificationFactory(
+            type="AllAnchoringMsg",
+            sender=corporation,
+            data={
+                "allianceID": alliance.id,
+                "corpID": corporation.id,
+                "corpsPresent": [{"allianceID": alliance.id, "corpID": corporation.id}],
+                "moonID": starbase.eve_moon.id,
+                "solarSystemID": starbase.eve_solar_system.id,
+                "towers": [
+                    {"moonID": starbase.eve_moon.id, "typeID": starbase.eve_type.id}
+                ],
+                "typeID": starbase.eve_type.id,
+            },
+        )
+        endpoints = [
+            EsiEndpoint(
+                "Character",
+                "get_characters_character_id_notifications",
+                "character_id",
+                needs_token=True,
+                data={
+                    str(eve_character.character_id): [notif],
+                },
+            ),
+        ]
+        mock_esi.client = mock_esi_2.client = EsiClientStub.create_from_endpoints(
+            endpoints
+        )
+        # when
+        tasks.fetch_all_notifications.delay()
+        # then
+        self.assertTrue(mock_execute.called)
+        embed = mock_execute.call_args[1]["embeds"][0]
+        self.assertIn("has anchored in", embed.description)
+
     @patch(NOTIFICATIONS_PATH + ".STRUCTURES_ADD_TIMERS", True)
     def test_should_fetch_new_notification_from_esi_and_send_to_webhook_and_create_timers(
         self, mock_esi_2, mock_esi, mock_execute
@@ -508,7 +595,7 @@ class TestTasks(TestCase):
                 NotificationType.SOV_ALL_CLAIM_LOST_MSG,
             ]
         )
-        owner = OwnerFactory(webhooks=[webhook])
+        owner = OwnerFactory(webhooks=[webhook], is_alliance_main=True)
         NotificationFactory(
             owner=owner, notif_type=NotificationType.STRUCTURE_DESTROYED
         )

structures/tests/testdata/factories_2.py

@@ -142,7 +142,7 @@ class OwnerFactory(factory.django.DjangoModelFactory):
     assets_last_update_at = factory.LazyFunction(now)
     character_ownership = None  # no longer used
     forwarding_last_update_at = factory.LazyFunction(now)
-    is_alliance_main = True
+    is_alliance_main = False
     is_up = True
     notifications_last_update_at = factory.LazyFunction(now)
     structures_last_update_at = factory.LazyFunction(now)
@@ -330,3 +330,36 @@ class GeneratedNotificationFactory(factory.django.DjangoModelFactory):
             state_timer_end=reinforced_until,
         )
         obj.structures.add(starbase)
+
+
+class RawNotificationFactory(factory.DictFactory):
+    """Create a raw notification as received from ESI."""
+
+    class Meta:
+        exclude = ("data", "timestamp_dt", "sender")
+
+    # excluded
+    data = None
+    timestamp_dt = None
+    sender = factory.SubFactory(EveEntityCorporationFactory, id=2902, name="CONCORD")
+
+    # included
+    notification_id = factory.Sequence(lambda o: 1999000000 + o)
+    type = "CorpBecameWarEligible"
+    sender_id = factory.LazyAttribute(lambda o: o.sender.id)
+    sender_type = factory.LazyAttribute(lambda o: o.sender.category)
+    is_read = True
+
+    @factory.lazy_attribute
+    def timestamp(self):
+        if not self.timestamp_dt:
+            timestamp_dt = now()
+        else:
+            timestamp_dt = self.timestamp_dt
+        return datetime_to_esi(timestamp_dt)
+
+    @factory.lazy_attribute
+    def text(self):
+        if not self.data:
+            return ""
+        return yaml.dump(self.data)