aa-structures 2.14.0__py3-none-any.whl → 2.15.0__py3-none-any.whl

{aa_structures-2.14.0.dist-info → aa_structures-2.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-structures
-Version: 2.14.0
+Version: 2.15.0
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8

{aa_structures-2.14.0.dist-info → aa_structures-2.15.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-structures/__init__.py,sha256=OXqNqbUO5Qpf5_RjpBoWJz1oygLBj3q-5FymboOnAeQ,204
-structures/admin.py,sha256=cA04JFghU-zIGC168fhZ5Hj_FYAQxlF6TFVDb8sgO4A,40066
+structures/__init__.py,sha256=DW_FAyoVYr5DMbDmmJQ_yaBVMMVB07QHRZP71oApKTA,204
+structures/admin.py,sha256=K7wh8mHFfGHONn7oLdqXsBAxq0rmYrwbZ7S3uIOuMtg,41303
 structures/app_settings.py,sha256=aWA2bTcv_vVwIyisx-G7GBSpfM6JDyt2MWcXKtHnjK0,6651
 structures/apps.py,sha256=MNZH9l3qWCwuS7OGiKGkBVrDzKoOFlqwDdEgyEFzxVA,195
 structures/auth_hooks.py,sha256=nRbrixFkAE5gphDokB1E8xhH8FY2VtXVwu0XMmSGBAw,1013
@@ -65,7 +65,7 @@ structures/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 structures/models/__init__.py,sha256=Da0-Z4BtsZ_mlnI6XtyvoE0UtTuOA0psGCuVhVPVKrM,916
 structures/models/eveuniverse.py,sha256=vTIfzZL9guEDuZHQvRdG6pI4zSEdMqfVE-2SkHdqbRo,2213
 structures/models/notifications.py,sha256=HwQc-ChdP0ULuJgxUym9_CBsCWCmcHT7whlk9tB2vzw,35364
-structures/models/owners.py,sha256=9LLjOv7QAICAodx6XUEGGuO6RxLY4h6hZs8EWWiobs0,57875
+structures/models/owners.py,sha256=7CKpwHlw4Nz8lTJUgQZxI-GHon5FrlMEILxe7q7Vfgg,58391
 structures/models/structures_1.py,sha256=zk380uG2DuQ7exO7THbq5TE5Ro2jr6EyVCIxRJXHIJI,29958
 structures/models/structures_2.py,sha256=g5Pct5jNmZC-n7fnpLs5UyiP9JLrGdI1vjYucHTV_wQ,10371
 structures/static/structures/css/global.css,sha256=R4LEH9PwLoN77qkqBK7u2y_vzRC3fq8X_zKnAW7yhiA,1165
@@ -136,7 +136,7 @@ structures/static/structures/vendor/datatables/plugins/rowGroup.dataTables.min.c
 structures/templates/structures/base.html,sha256=ND0JjP2Pa537FXOrIj3cziHfDbTh0ZNzrLFJ_zpVhw8,337
 structures/templates/structures/public.html,sha256=R3kjhr1MLC5r9r8L3t-1-Nh7-ngKbRiiZNIwgpsGg70,3239
 structures/templates/structures/statistics.html,sha256=rVI_wPW4VXIO3IoWna8_GoqWCc5ra-6Jc9iekfusS78,1736
-structures/templates/structures/structures.html,sha256=WdtBxY3XumtpO4b23Arw8lVqGJf_gHIeD2AAxaKf7cU,8327
+structures/templates/structures/structures.html,sha256=q0c7Wlaxvt2dg1B236JIEmmSBgQyX5F_QlBLokt-W0E,8329
 structures/templates/structures/modals/fitting_assets.html,sha256=0GSpDAk-wgvaZdxM9JzteUYhoPsek5y-L4TdG2q5Sbg,264
 structures/templates/structures/modals/fitting_gfx.html,sha256=hmdU1Zv09woGKigUugbBRxScKQun8l81yEPUMGrok2g,9530
 structures/templates/structures/modals/poco_details.html,sha256=uwaEM0jDvkdu_Lff2mUKwm7pn1KXePcgN9yBwFHsQO4,2705
@@ -148,9 +148,9 @@ structures/templates/structures/partials/menu.html,sha256=pxN_Tvo_vON0Fauyg_XPYl
 structures/templates/structures/partials/public/poco_list.html,sha256=tVAsGXS7rh7Qr5x2X26buyt7jwJJ-YoNLs9eMs0gDM4,1222
 structures/templates/structures/partials/statistics/structure_summary.html,sha256=ZCEBOPhfOUyih7C8TzaQi9OI2AsMzZGBb9ZGHsShzmk,1133
 structures/templates/structures/partials/structures/active_tags.html,sha256=KhYA6LbAqg-iJJ2J4BGACXdbdiZFM4wAgDEq2RQEu0s,106
-structures/templates/structures/partials/structures/jump_gates_list.html,sha256=1hhx21fz1YAKTRK0E5FYP8uYTlXCFnm9FAdechiopx8,1470
-structures/templates/structures/partials/structures/poco_list.html,sha256=V5Z53LTvE0eHHWHKlwjGdtSwEkLSy0cIMw7ZE4KOdxc,1077
-structures/templates/structures/partials/structures/starbase_list.html,sha256=f-BhcqRiueLURcQoOevZHMYGj2Z6dvG36tourtv7ykE,1417
+structures/templates/structures/partials/structures/jump_gate_list.html,sha256=1hhx21fz1YAKTRK0E5FYP8uYTlXCFnm9FAdechiopx8,1470
+structures/templates/structures/partials/structures/orbital_list.html,sha256=uWV-61WUk1hyTCXgIkMuiAhof4VIP02bnH5N5nqaCCo,1070
+structures/templates/structures/partials/structures/starbase_list.html,sha256=Djl3nsTSn9TIZ6k4F0hiF-qDv_rLiVSIapnWUz0bvqU,1412
 structures/templates/structures/partials/structures/structure_list.html,sha256=2EHP1xJrmDNhwENhxGY3L6YbC53qFwhnDHcFzxkNXpI,1421
 structures/templates/structures/templatetags/detail_title.html,sha256=PWoYNZhTt1ngDEdz_B4TlyC7duO-8MxgznSUb27lUDA,117
 structures/templates/structures/templatetags/list_asset.html,sha256=6wWndrdBlWbOMIQlGaqeUtSfk-c6F3ZQMYErZJ4H7SM,375
@@ -160,7 +160,7 @@ structures/templates/structures/templatetags/list_title.html,sha256=C2NWwo27TGfG
 structures/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/templatetags/structures.py,sha256=vSt5AnfYuo11q1SxiskT4oshSMsZ9ZgM0nYpYiMl8bA,1637
 structures/tests/__init__.py,sha256=9MrJzKr8DdsQY3-79v188pTpwqT4TDQ46vKnBJAGqic,75
-structures/tests/test_admin.py,sha256=cb_AbOanp31k-oZhaUXCqnlkUu87EgNddq_VQKbB_Dk,26839
+structures/tests/test_admin.py,sha256=aDd88Ry0ahitpYyF_wa1jG_pWJ5m5w3jsat45sBhEmo,27493
 structures/tests/test_helpers.py,sha256=BQC-4H-9-v5qW4nugqy0bkxuGlA3UO2clYY2lI2LjoY,4893
 structures/tests/test_managers_1.py,sha256=4dnlK7Le04eJUPjJc9ex5BxZWIJGAyEvdKuuYXU2gqY,34846
 structures/tests/test_managers_2.py,sha256=FISr_NT1Qnu9j1JYYTceNsUk8k9rfCTKwjKi5WUVbPs,3025
@@ -185,7 +185,7 @@ structures/tests/models/test_notifications_2.py,sha256=wBoB6lHMK4yrd63DSkZ570yXW
 structures/tests/models/test_notifications_3.py,sha256=u11s0k9EmtFgL3kyb4zDyLVliQLOps701ZgEA2T2i0Y,7257
 structures/tests/models/test_notifications_discord.py,sha256=6maDXjl2C5yH2XRgsvMtb3P-tfOdZLQDaksffiqS8OM,6312
 structures/tests/models/test_owners_1.py,sha256=o8AJasQ0-Pdb0FRFZcmNcMGjaIk8fH3OZIZw4paJiDw,24433
-structures/tests/models/test_owners_2.py,sha256=gkTXpSibPWs1XfZtPvyeEvVebyYZcKERD9GQSYSClYk,21911
+structures/tests/models/test_owners_2.py,sha256=GZYdsFey6bQHuk9BiT1KFT_vW01mUHRtDxJRHPEmrC4,22539
 structures/tests/models/test_owners_3.py,sha256=cpDkfFkVvC1v4uuXha1vGUmWZ163huYTUDuZyed9Rdc,16947
 structures/tests/models/test_owners_4.py,sha256=_VP4QsPYGwBnn_bVN4aNX2ZVeJzMAzWObZrgCJkOPgY,19496
 structures/tests/models/test_owners_5.py,sha256=TIF_SqJqyGja8FBV2lQNAC4yff1usmJ4e0QW7e68zTg,36929
@@ -217,13 +217,13 @@ structures/views/statistics.py,sha256=7jj8b9ATsYwE7Cg6gMp-bYx29nV43GdWYun9WBggGk
 structures/views/status.py,sha256=gcahbk6dPIZDqkaNHDAsEHyDWLzicTK18Fom0A6xx3c,718
 structures/views/structures.py,sha256=Wb57jFfRa0Zxo6TxKmOCQ-jtopzPtHe0go6gnJn40CA,22584
 structures/webhooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-structures/webhooks/core.py,sha256=mP25MbQG8Yv2YayDFcR6x2V30eqXhR2q5u4SRefblf4,6573
+structures/webhooks/core.py,sha256=kvbMQ_kjJleQanlFFoiN52wIkBG_4u0ONfcHfCU5lgA,6604
 structures/webhooks/managers.py,sha256=L3G3AmsyDeif_lfpWshmAxQ61UGJ9w8i9lZaF2jbOtQ,1117
 structures/webhooks/models.py,sha256=kUkt9rnRQIJIrU9Bjcs34rvkb-TMbUubHdn-kny08kI,2067
 structures/webhooks/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/webhooks/tests/test_core.py,sha256=4NcEAQgK2KhQkFOxYh2ad0S-qUWh1DNGDmLo5Mo5opI,6762
 structures/webhooks/tests/test_utils.py,sha256=ekADFv0JOEtXeqdiejbeqrABO__Q1flJHzVieQ7L9e0,459
-aa_structures-2.14.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_structures-2.14.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-aa_structures-2.14.0.dist-info/METADATA,sha256=X7YMjOqlJc_CkmHeFWJiYgKb8QLDPdnzPibT_bh6ReM,5972
-aa_structures-2.14.0.dist-info/RECORD,,
+aa_structures-2.15.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-2.15.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+aa_structures-2.15.0.dist-info/METADATA,sha256=UZGw51TIsMgIdznKyyE9prBvlgDQQpJ3k3z4Url-DEE,5972
+aa_structures-2.15.0.dist-info/RECORD,,

structures/__init__.py

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

structures/admin.py

@@ -1,10 +1,13 @@
 """Admin site for Structures."""
 
+import functools
 import statistics
 from typing import Optional
 
+from django import forms
 from django.conf import settings
 from django.contrib import admin
+from django.contrib.admin.widgets import FilteredSelectMultiple
 from django.db import models
 from django.db.models import Prefetch
 from django.db.models.functions import Lower
@@ -1028,8 +1031,44 @@ class StructureAdmin(admin.ModelAdmin):
         )
 
 
+class WebhookAdminForm(forms.ModelForm):
+    owners = forms.ModelMultipleChoiceField(
+        queryset=Owner.objects.order_by(Lower("corporation__corporation_name")),
+        required=False,
+        widget=FilteredSelectMultiple(verbose_name=_("Users"), is_stacked=False),
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if self.instance and self.instance.pk:
+            self.fields["owners"].initial = self.instance.owners.all()
+
+    def save(self, commit=True):
+        webhook: Webhook = super().save(commit=False)
+
+        if commit:
+            webhook.save()
+
+        owners = self.cleaned_data["owners"]
+        if webhook.pk:
+            self._save_m2m_and_users(webhook, owners)
+        else:
+            self.save_m2m = functools.partial(
+                self._save_m2m_and_users, webhook=webhook, owners=owners
+            )
+
+        return webhook
+
+    def _save_m2m_and_users(self, webhook, owners):
+        """Save m2m relations incl. users."""
+        webhook.owners.set(owners)
+        self._save_m2m()
+
+
 @admin.register(Webhook)
 class WebhookAdmin(admin.ModelAdmin):
+    form = WebhookAdminForm
     list_display = (
         "name",
         "_ping_groups",
@@ -1057,6 +1096,7 @@ class WebhookAdmin(admin.ModelAdmin):
                     "name",
                     "url",
                     "notes",
+                    "owners",
                     "notification_types",
                     "ping_groups",
                     "is_active",

structures/models/owners.py

@@ -592,7 +592,7 @@ class Owner(models.Model):
         is_ok = True
         # fetch main list of structure for this corporation
         try:
-            structures = (
+            structures: List[dict] = (
                 esi.client.Corporation.get_corporations_corporation_id_structures(
                     corporation_id=self.corporation.corporation_id,
                     token=token.valid_access_token(),
@@ -620,9 +620,19 @@ class Owner(models.Model):
                         )
                     ).results()
                 except OSError as ex:
-                    self._report_esi_issue(
-                        f"fetch structure #{structure['structure_id']}", ex, token
-                    )
+                    if isinstance(ex, HTTPForbidden):
+                        logger.error(
+                            "Failed to fetch structure with ID #%d belonging to %s, "
+                            "because the character '%s' is missing "
+                            "docking rights for it.",
+                            structure["structure_id"],
+                            self,
+                            token.character_name,
+                        )
+                    else:
+                        self._report_esi_issue(
+                            f"fetch structure #{structure['structure_id']}", ex, token
+                        )
                     structure["name"] = "(no data)"
                     is_ok = False
                 else:

structures/templates/structures/partials/structures/{poco_list.html → orbital_list.html}

@@ -5,7 +5,7 @@
 <!-- structure list -->
 
 <h3>
-    {% translate 'Customs Offices' %}
+    {% translate 'Orbitals' %}
     {% include "structures/partials/structures/active_tags.html" %}
 </h3>
 

structures/templates/structures/partials/structures/starbase_list.html

@@ -5,7 +5,7 @@
 <!-- structure list -->
 
 <h3>
-    {% translate 'All Structures' %}
+    {% translate 'Starbases' %}
     {% include "structures/partials/structures/active_tags.html" %}
 </h3>
 

structures/templates/structures/structures.html

@@ -78,7 +78,7 @@
                 </div>
 
                 <div role="tabpanel" class="tab-pane" id="orbitals">
-                    {% include "structures/partials/structures/poco_list.html" %}
+                    {% include "structures/partials/structures/orbital_list.html" %}
                 </div>
 
                 <div role="tabpanel" class="tab-pane" id="starbases">
@@ -87,7 +87,7 @@
 
                 {% if show_jump_gates_tab %}
                     <div role="tabpanel" class="tab-pane" id="jump-gates">
-                        {% include "structures/partials/structures/jump_gates_list.html" %}
+                        {% include "structures/partials/structures/jump_gate_list.html" %}
                     </div>
                 {% endif %}
 

structures/tests/models/test_owners_2.py

@@ -376,6 +376,20 @@ class TestUpdateStructuresEsi(NoSocketsTestCase):
         structure = Structure.objects.get(id=1000000000002)
         self.assertEqual(structure.name, "(no data)")
 
+    def test_update_will_not_break_on_403_error_from_structure_info(self, mock_esi):
+        # given
+        new_endpoint = EsiEndpoint(
+            "Universe", "get_universe_structures_structure_id", http_error_code=403
+        )
+        mock_esi.client = self.esi_client_stub.replace_endpoints([new_endpoint])
+        owner = OwnerFactory(user=self.user, structures_last_update_at=None)
+        # when
+        owner.update_structures_esi()
+        # then
+        self.assertFalse(owner.is_structure_sync_fresh)
+        structure = Structure.objects.get(id=1000000000002)
+        self.assertEqual(structure.name, "(no data)")
+
     @patch(MODULE_PATH + ".Structure.objects.update_or_create_from_dict")
     def test_update_will_not_break_on_http_error_when_creating_structures(
         self, mock_create_structure, mock_esi

structures/tests/test_admin.py

@@ -719,3 +719,22 @@ class TestWebhookAdmin(TestCase):
         webhook.refresh_from_db()
         self.assertFalse(webhook.is_active)
         self.assertTrue(mock_message_user.called)
+
+    def test_can_assign_owner(self):
+        # given
+        owner = OwnerFactory()
+        webhook = WebhookFactory()
+        self.client.force_login(self.user)
+        data = {
+            "name": webhook.name,
+            "notification_types": NotificationType.webhook_defaults(),
+            "owners": [owner.pk],
+            "url": webhook.url,
+            "webhook_type": webhook.webhook_type,
+        }
+        r = self.client.post(
+            f"/admin/structures/webhook/{webhook.pk}/change/", data=data
+        )
+        self.assertEqual(r.status_code, 302)
+        webhook.refresh_from_db()
+        self.assertIn(owner, webhook.owners.all())

structures/webhooks/core.py

@@ -61,7 +61,7 @@ class DiscordWebhookMixin:
 
         return counter
 
-    # pylint: disable = too-many-arguments
+    # pylint: disable = too-many-positional-arguments, too-many-arguments
     def send_message(
         self,
         content: Optional[str] = None,