aa-structures 2.14.0__tar.gz → 2.15.0__tar.gz

{aa_structures-2.14.0 → aa_structures-2.15.0}/PKG-INFO

@@ -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 → aa_structures-2.15.0}/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"

{aa_structures-2.14.0 → aa_structures-2.15.0}/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",

{aa_structures-2.14.0 → aa_structures-2.15.0}/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:

aa_structures-2.14.0/structures/templates/structures/partials/structures/poco_list.html → aa_structures-2.15.0/structures/templates/structures/partials/structures/orbital_list.html

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

{aa_structures-2.14.0 → aa_structures-2.15.0}/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>
 

{aa_structures-2.14.0 → aa_structures-2.15.0}/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 %}
 

{aa_structures-2.14.0 → aa_structures-2.15.0}/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

{aa_structures-2.14.0 → aa_structures-2.15.0}/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())

{aa_structures-2.14.0 → aa_structures-2.15.0}/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,