aa-structures 2.14.1__py3-none-any.whl → 2.16.0__py3-none-any.whl

{aa_structures-2.14.1.dist-info → aa_structures-2.16.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-structures
-Version: 2.14.1
+Version: 2.16.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.1.dist-info → aa_structures-2.16.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-structures/__init__.py,sha256=AKjtjd55mt0eK2ld7jC0D_ZbzHd-XxjqCBgxuBaz_vQ,204
-structures/admin.py,sha256=cA04JFghU-zIGC168fhZ5Hj_FYAQxlF6TFVDb8sgO4A,40066
+structures/__init__.py,sha256=Z3bIPmcm4sX1w_r8VxYDVpCP0rbtGGuzUzh7wP8la5c,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
-structures/constants.py,sha256=12iIVgFWSNaH1iYBByrsv3OQKCnNxluuckOdrfgzWzA,995
+structures/constants.py,sha256=k5rfD29ZjR7ToRmJw4WnLVd4LmoZvDw4OK5IoiiyJ6w,1063
 structures/forms.py,sha256=kXs-SGIIj-D9xtFCILKe_PMRU4eHl3-HLNWRhaZKmnQ,391
 structures/helpers.py,sha256=_dw7j7yobpcV70VwWxoQiptk69b3ksvaDlRQKHg8Kmg,2344
-structures/managers.py,sha256=6zGvmiP1_TZ1uZlPTxNFYgJ77JIjY3uw2PmYeyrJ10E,20063
+structures/managers.py,sha256=_XZhsWb4is7LpQTUmGZwxQeJzyZnsB3n21EETgEIlzU,20062
 structures/providers.py,sha256=9QYHd8X5HwBhrbgbX3LUrXXV1KGM3hFhcxK6qIJjJtg,317
 structures/tasks.py,sha256=INZ3soMYHYfxrQsyTO-ozoxbVX6lpMnF3AUo8ybWIoA,9083
 structures/urls.py,sha256=An5v27AD_NXMNL66cMVtQNci1C_Aqry32rrvDkMpgYo,1467
@@ -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=7CKpwHlw4Nz8lTJUgQZxI-GHon5FrlMEILxe7q7Vfgg,58391
+structures/models/owners.py,sha256=Oxs9LDtoKRvpqGtvZehNDyBPKgW_UIrUntZPe6LVPzY,59611
 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
@@ -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,17 +185,18 @@ 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=GZYdsFey6bQHuk9BiT1KFT_vW01mUHRtDxJRHPEmrC4,22539
+structures/tests/models/test_owners_2.py,sha256=RSaeLz6S6ncoikWwDjNh6YZftpBN8TGdzAl8E2tgkqA,24527
 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
 structures/tests/models/test_owners_6.py,sha256=R9UE2QGwiGTWLHzzOZwGQPWJrAPwIIl7UwrHH-ki4Ak,940
 structures/tests/models/test_structures.py,sha256=iCCa0yYyPHieNfj8TQbdoIv141oLc6hlICZ6AsTnHAw,41849
 structures/tests/testdata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-structures/tests/testdata/create_eveuniverse.py,sha256=6CYgXtJaEwxWvQFyH-P0SKsRqeMuSyJ92ZJiXe_-nuY,2256
+structures/tests/testdata/constants.py,sha256=iab-9cHjAO4RBM88UeWbBypRm9qoZcViwZ8BPY17p1Q,441
+structures/tests/testdata/create_eveuniverse.py,sha256=a5DHYAxxsytOeevAL53RDoeDWObKwViqfpXRlmZeOHY,2157
 structures/tests/testdata/entities.json,sha256=vmb0uhwTpD0gycGAakgYidr3qSbnHiMubAd4u7T2l70,36053
 structures/tests/testdata/esi_data.json,sha256=DX47oSlRZIPxlPueMfiNElbZbAip2cp3LAUmv8GAPJ0,13864
-structures/tests/testdata/eveuniverse.json,sha256=3fhD72lUNLj96wO4ASbpNcdH_8VbqcXUvKUXR6j0768,1028885
+structures/tests/testdata/eveuniverse.json,sha256=7RA5qeaPYx78Mk5_zixL2XYd-Oa4omhUihjgAbgNLyc,1616628
 structures/tests/testdata/factories.py,sha256=UF7Zao2-DjVFLZLEBWaJv4Pg1uw5D6p0TO8ZKuoAI_8,25293
 structures/tests/testdata/generate_notifications.py,sha256=lhcnbsnE4O6g0OFUAYO2sCfu8vmwBcFtxn-TuTLtFnM,5417
 structures/tests/testdata/generate_notifications_2.py,sha256=mdoGXd9vgy_opmrwTr9MfGe-QieHV4BHtRA7VFzxFKM,1413
@@ -217,13 +218,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.1.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_structures-2.14.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-aa_structures-2.14.1.dist-info/METADATA,sha256=9vdeZ6CyZ-97fnE0YXmYsN_w_T8TUBRfj840AVZgN0w,5972
-aa_structures-2.14.1.dist-info/RECORD,,
+aa_structures-2.16.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-2.16.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+aa_structures-2.16.0.dist-info/METADATA,sha256=1Aqt2HSauvphDqPjDpuv3s2Pkht-0ezvNuQWA7Op4hI,5972
+aa_structures-2.16.0.dist-info/RECORD,,

structures/__init__.py

@@ -3,5 +3,5 @@
 # pylint: disable = invalid-name
 default_app_config = "structures.apps.StructuresConfig"
 
-__version__ = "2.14.1"
+__version__ = "2.16.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/constants.py

@@ -16,6 +16,7 @@ class EveCategoryId(IntEnum):
     ORBITAL = 46
     STARBASE = 23
     STRUCTURE = 65
+    STRUCTURE_MODULE = 66
 
 
 class EveGroupId(IntEnum):
@@ -26,11 +27,13 @@ class EveGroupId(IntEnum):
     ENGINEERING_COMPLEX = 1404
     FUEL_BLOCK = 1136
     ICE_PRODUCT = 423
-    REFINERY = 1406
+    MOON = 8
     PLANET = 7
+    QUANTUM_CORES = 4086
+    REFINERY = 1406
     STRUCTURE_CITADEL_SERVICE_MODULE = 1321
     UNCOMMON_MOON_ASTEROIDS = 1921
-    QUANTUM_CORES = 4086
+    UPWELL_MOON_DRILL = 4744
 
 
 class EveTypeId(IntEnum):
@@ -42,8 +45,8 @@ class EveTypeId(IntEnum):
     IHUB = 32458
     JUMP_GATE = 35841
     LIQUID_OZONE = 16273
-    ORBITAL_SKYHOOK = 81080
     NITROGEN_FUEL_BLOCK = 4051
+    ORBITAL_SKYHOOK = 81080
     STRONTIUM = 16275
     TCU = 32226
 

structures/managers.py

@@ -392,7 +392,7 @@ class StructureManagerBase(models.Manager):
     def update_or_create_from_dict(
         self, structure: dict, owner: Owner
     ) -> Tuple[Any, bool]:
-        """update or create structure from given dict"""
+        """Update or create a structure from a dict."""
 
         eve_type: EveType = EveType.objects.get_or_create_esi(id=structure["type_id"])[
             0

structures/models/owners.py

@@ -585,14 +585,10 @@ class Owner(models.Model):
         return positions
 
     def _fetch_upwell_structures(self, token: Token) -> bool:
-        """Fetch Upwell structures from ESI for self.
-
-        Return True if successful, else False.
-        """
-        is_ok = True
+        """Fetches Upwell structures from ESI an reports whether it was successful."""
         # fetch main list of structure for this corporation
         try:
-            structures: List[dict] = (
+            structures = (
                 esi.client.Corporation.get_corporations_corporation_id_structures(
                     corporation_id=self.corporation.corporation_id,
                     token=token.valid_access_token(),
@@ -604,58 +600,12 @@ class Owner(models.Model):
 
         # fetch additional information for structures
         if not structures:
+            is_ok = True
             logger.info("%s: No Upwell structures retrieved from ESI", self)
         else:
-            logger.info(
-                "%s: Fetching additional infos for %d Upwell structures from ESI",
-                self,
-                len(structures),
-            )
-            for structure in structures:
-                try:
-                    structure_info = (
-                        esi.client.Universe.get_universe_structures_structure_id(
-                            structure_id=structure["structure_id"],
-                            token=token.valid_access_token(),
-                        )
-                    ).results()
-                except OSError as ex:
-                    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:
-                    structure["name"] = Structure.extract_name_from_esi_response(
-                        structure_info["name"]
-                    )
-                    structure["position"] = structure_info["position"]
-
-            logger.info(
-                "%s: Storing updates for %d upwell structures",
-                self,
-                len(structures),
-            )
-            for structure in structures:
-                try:
-                    Structure.objects.update_or_create_from_dict(structure, self)
-                except OSError:
-                    logger.warning(
-                        "%s: Failed to store update for structure with ID %s",
-                        self,
-                        structure["structure_id"],
-                    )
-                    is_ok = False
+            is_ok = self._fetch_universe_infos_for_structures(token, structures)
+            is_ok &= self._store_structure_updates(structures)
+            self._resolve_metenox_moons()
 
         if STRUCTURES_DEVELOPER_MODE:
             self._store_raw_data("structures", structures)
@@ -666,6 +616,95 @@ class Owner(models.Model):
         )
         return is_ok
 
+    def _fetch_universe_infos_for_structures(
+        self, token, structures: List[dict]
+    ) -> bool:
+        count = 0
+        for s in structures:
+            try:
+                structure_info = (
+                    esi.client.Universe.get_universe_structures_structure_id(
+                        structure_id=s["structure_id"],
+                        token=token.valid_access_token(),
+                    )
+                ).results()
+            except OSError as ex:
+                if isinstance(ex, HTTPForbidden):
+                    logger.error(
+                        "Failed to fetch structure with ID #%d belonging to %s, "
+                        "because the character '%s' is missing docking rights.",
+                        s["structure_id"],
+                        self,
+                        token.character_name,
+                    )
+                else:
+                    self._report_esi_issue(
+                        f"fetch structure #{s['structure_id']}", ex, token
+                    )
+                s["name"] = "(no data)"
+            else:
+                count += 1
+                s["name"] = Structure.extract_name_from_esi_response(
+                    structure_info["name"]
+                )
+                s["position"] = structure_info["position"]
+
+        logger.info(
+            "%s: Fetched universe infos for %d / %d Upwell structures from ESI",
+            self,
+            count,
+            len(structures),
+        )
+        return count == len(structures)
+
+    def _store_structure_updates(self, structures: List[dict]) -> bool:
+        count = 0
+        for s in structures:
+            try:
+                Structure.objects.update_or_create_from_dict(s, self)
+            except OSError:
+                logger.warning(
+                    "%s: Failed to store update for structure with ID %s",
+                    self,
+                    s["structure_id"],
+                )
+            else:
+                count += 1
+        logger.info(
+            "%s: Stored updates for %d/%d upwell structures",
+            self,
+            count,
+            len(structures),
+        )
+        return count == len(structures)
+
+    def _resolve_metenox_moons(self):
+        """Add moons to all unresolved metenox structures."""
+        s: Structure
+        for s in self.structures.filter(
+            eve_type__eve_group=EveGroupId.UPWELL_MOON_DRILL,
+            eve_moon__isnull=True,
+            position_x__isnull=False,
+            position_y__isnull=False,
+            position_z__isnull=False,
+        ):
+            try:
+                celestial = s.eve_solar_system.nearest_celestial(
+                    x=s.position_x,
+                    y=s.position_y,
+                    z=s.position_z,
+                    group_id=EveGroupId.MOON,
+                )
+            except OSError:
+                continue
+
+            if not celestial or not isinstance(celestial.eve_object, EveMoon):
+                continue
+
+            s.eve_moon = celestial.eve_object
+            s.save()
+            logger.info("%s: Resolved moon for Metenox: %d", self, s.name)
+
     def _fetch_custom_offices(self, token: Token) -> bool:
         """Fetch custom offices from ESI for this owner.
 
@@ -1375,6 +1414,7 @@ class Owner(models.Model):
             s.eve_planet = celestial.eve_object
             s.name = celestial.eve_type.name
             s.save()
+            logger.info("%s: Resolved moon for Skyhook at: %s", self, s.eve_planet.name)
 
     @staticmethod
     def get_esi_scopes() -> List[str]:

structures/tests/models/test_owners_2.py

@@ -2,6 +2,7 @@ import datetime as dt
 from unittest.mock import patch
 
 from django.utils.timezone import now, utc
+from eveuniverse.models import EveMoon
 
 from app_utils.esi_testing import EsiClientStub, EsiEndpoint
 from app_utils.testing import NoSocketsTestCase
@@ -10,6 +11,7 @@ from structures.constants import EveCorporationId
 from structures.core.notification_types import NotificationType
 from structures.models import Structure, StructureService
 from structures.tests import to_json
+from structures.tests.testdata.constants import EveMoonId, EveSolarSystemId, EveTypeId
 from structures.tests.testdata.factories import (
     EveEntityCorporationFactory,
     FuelAlertConfigFactory,
@@ -20,6 +22,7 @@ from structures.tests.testdata.factories import (
     UserMainDefaultOwnerFactory,
     WebhookFactory,
 )
+from structures.tests.testdata.helpers import NearestCelestial
 from structures.tests.testdata.load_eveuniverse import load_eveuniverse
 
 MODULE_PATH = "structures.models.owners"
@@ -40,54 +43,6 @@ class TestUpdateStructuresEsi(NoSocketsTestCase):
             id=EveCorporationId.DED, name="DED"
         )  # for notifications
         cls.endpoints = [
-            EsiEndpoint(
-                "Assets",
-                "get_corporations_corporation_id_assets",
-                "corporation_id",
-                needs_token=True,
-                data={
-                    str(cls.corporation_id): [
-                        {
-                            "is_singleton": False,
-                            "item_id": 1300000001001,
-                            "location_flag": "QuantumCoreRoom",
-                            "location_id": 1000000000001,
-                            "location_type": "item",
-                            "quantity": 1,
-                            "type_id": 56201,  # Astrahus Upwell Quantum Core
-                        },
-                        {
-                            "is_singleton": True,
-                            "item_id": 1300000001002,
-                            "location_flag": "ServiceSlot0",
-                            "location_id": 1000000000001,
-                            "location_type": "item",
-                            "quantity": 1,
-                            "type_id": 35894,  # Standup Cloning Center I
-                        },
-                        {
-                            "is_singleton": True,
-                            "item_id": 1300000002001,
-                            "location_flag": "ServiceSlot0",
-                            "location_id": 1000000000002,
-                            "location_type": "item",
-                            "quantity": 1,
-                            "type_id": 35894,  # Standup Cloning Center I
-                        },
-                    ],
-                    "2102": [
-                        {
-                            "is_singleton": False,
-                            "item_id": 1300000003001,
-                            "location_flag": "StructureFuel",
-                            "location_id": 1000000000004,
-                            "location_type": "item",
-                            "quantity": 5000,
-                            "type_id": 16273,  # Liquid Ozone
-                        }
-                    ],
-                },
-            ),
             EsiEndpoint(
                 "Corporation",
                 "get_corporations_corporation_id_structures",
@@ -110,8 +65,8 @@ class TestUpdateStructuresEsi(NoSocketsTestCase):
                             "state_timer_end": None,
                             "state_timer_start": None,
                             "structure_id": 1000000000002,
-                            "system_id": 30002537,
-                            "type_id": 35835,  # Athanor
+                            "system_id": EveSolarSystemId.AMAMAKE,
+                            "type_id": EveTypeId.ATHANOR,
                             "unanchors_at": None,
                         },
                         {
@@ -131,8 +86,8 @@ class TestUpdateStructuresEsi(NoSocketsTestCase):
                                 2020, 4, 5, 6, 30, tzinfo=utc
                             ),
                             "structure_id": 1000000000001,
-                            "system_id": 30002537,
-                            "type_id": 35832,  # Astrahus
+                            "system_id": EveSolarSystemId.AMAMAKE,
+                            "type_id": EveTypeId.ASTRAHUS,
                             "unanchors_at": dt.datetime(2020, 5, 5, 6, 30, tzinfo=utc),
                         },
                         {
@@ -148,7 +103,7 @@ class TestUpdateStructuresEsi(NoSocketsTestCase):
                             "state_timer_start": None,
                             "structure_id": 1000000000003,
                             "system_id": 30000476,
-                            "type_id": 35832,  # Astrahus
+                            "type_id": EveTypeId.ASTRAHUS,
                             "unanchors_at": None,
                         },
                     ],
@@ -168,8 +123,8 @@ class TestUpdateStructuresEsi(NoSocketsTestCase):
                             "y": 7310316270.0,
                             "z": -163686684205.0,
                         },
-                        "solar_system_id": 30002537,
-                        "type_id": 35832,  # Astrahus
+                        "solar_system_id": EveSolarSystemId.AMAMAKE,
+                        "type_id": EveTypeId.ASTRAHUS,
                     },
                     "1000000000002": {
                         "corporation_id": cls.corporation_id,
@@ -179,8 +134,8 @@ class TestUpdateStructuresEsi(NoSocketsTestCase):
                             "y": -130157937025.56424,
                             "z": -442026427345.6355,
                         },
-                        "solar_system_id": 30002537,
-                        "type_id": 35835,  # Athanor
+                        "solar_system_id": EveSolarSystemId.AMAMAKE,
+                        "type_id": EveTypeId.ATHANOR,
                     },
                     "1000000000003": {
                         "corporation_id": cls.corporation_id,
@@ -191,7 +146,7 @@ class TestUpdateStructuresEsi(NoSocketsTestCase):
                             "z": -442026427345.6355,
                         },
                         "solar_system_id": 30000476,
-                        "type_id": 35832,  # Astrahus
+                        "type_id": EveTypeId.ASTRAHUS,
                     },
                 },
             ),
@@ -221,7 +176,7 @@ class TestUpdateStructuresEsi(NoSocketsTestCase):
         self.assertEqual(structure.position_x, 55028384780.0)
         self.assertEqual(structure.position_y, 7310316270.0)
         self.assertEqual(structure.position_z, -163686684205.0)
-        self.assertEqual(structure.eve_solar_system_id, 30002537)
+        self.assertEqual(structure.eve_solar_system_id, EveSolarSystemId.AMAMAKE)
         self.assertEqual(structure.eve_type_id, 35832)
         self.assertEqual(
             int(structure.owner.corporation.corporation_id), self.corporation_id
@@ -550,3 +505,92 @@ class TestUpdateStructuresEsi(NoSocketsTestCase):
             owner.update_structures_esi()
         # then
         self.assertEqual(structure.structure_fuel_alerts.count(), 0)
+
+
+@patch(MODULE_PATH + ".STRUCTURES_FEATURE_STARBASES", False)
+@patch(MODULE_PATH + ".STRUCTURES_FEATURE_CUSTOMS_OFFICES", False)
+@patch(MODULE_PATH + ".esi")
+class TestUpdateSpecificUpwellStructuresEsi(NoSocketsTestCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        load_eveuniverse()
+        cls.user = UserMainDefaultOwnerFactory()
+        cls.owner = OwnerFactory(user=cls.user, structures_last_update_at=None)
+        cls.corporation_id = cls.owner.corporation.corporation_id
+        EveEntityCorporationFactory(
+            id=EveCorporationId.DED, name="DED"
+        )  # for notifications
+
+    def test_can_update_metenox(self, mock_esi):
+        structure_id = 1000000000111
+        type_id = EveTypeId.METENOX
+        solar_system_id = EveSolarSystemId.AMAMAKE
+        endpoints = [
+            EsiEndpoint(
+                "Corporation",
+                "get_corporations_corporation_id_structures",
+                "corporation_id",
+                needs_token=True,
+                data={
+                    str(self.corporation_id): [
+                        {
+                            "corporation_id": self.corporation_id,
+                            "fuel_expires": dt.datetime(2020, 3, 5, 5, tzinfo=utc),
+                            "next_reinforce_apply": None,
+                            "next_reinforce_hour": None,
+                            "profile_id": 101853,
+                            "reinforce_hour": 18,
+                            "services": [
+                                {"name": "Moon Drill", "state": "online"},
+                            ],
+                            "state": "shield_vulnerable",
+                            "state_timer_end": dt.datetime(2020, 4, 5, 7, tzinfo=utc),
+                            "state_timer_start": dt.datetime(
+                                2020, 4, 5, 6, 30, tzinfo=utc
+                            ),
+                            "structure_id": structure_id,
+                            "system_id": solar_system_id,
+                            "type_id": type_id,
+                            "unanchors_at": dt.datetime(2020, 5, 5, 6, 30, tzinfo=utc),
+                        },
+                    ],
+                },
+            ),
+            EsiEndpoint(
+                "Universe",
+                "get_universe_structures_structure_id",
+                "structure_id",
+                needs_token=True,
+                data={
+                    str(structure_id): {
+                        "corporation_id": self.corporation_id,
+                        "name": "Amamake - Mining",
+                        "position": {
+                            "x": 55028384780.0,
+                            "y": 7310316270.0,
+                            "z": -163686684205.0,
+                        },
+                        "solar_system_id": solar_system_id,
+                        "type_id": type_id,
+                    },
+                },
+            ),
+        ]
+        # given
+        mock_esi.client = EsiClientStub.create_from_endpoints(endpoints)
+        owner = OwnerFactory(user=self.user, structures_last_update_at=None)
+        moon = EveMoon.objects.get(id=EveMoonId.AMAMAKE_P2_M1)
+        # when
+        with patch(MODULE_PATH + ".EveSolarSystem.nearest_celestial") as m:
+            m.return_value = NearestCelestial(None, moon, 100)
+            owner.update_structures_esi()
+        # then
+        owner.refresh_from_db()
+        self.assertTrue(owner.is_structure_sync_fresh)
+        s = Structure.objects.get(id=structure_id)
+        self.assertEqual(s.name, "Mining")
+        self.assertEqual(s.eve_solar_system.id, EveSolarSystemId.AMAMAKE)
+        services = set(s.services.values_list("name", flat=True))
+        self.assertSetEqual({"Moon Drill"}, services)
+        self.assertEqual(s.eve_moon, moon)

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())