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

structures/tests/testdata/factories.py

@@ -476,6 +476,27 @@ class PocoDetailsFactory(
     standing_level = PocoDetails.StandingLevel.BAD
 
 
+class SkyhookFactory(StructureFactory):
+    class Params:
+        eve_planet_name = "Amamake V"
+
+    has_fitting = None
+    has_core = None
+    state = Structure.State.NA
+
+    @factory.lazy_attribute
+    def eve_planet(self):
+        return EvePlanet.objects.get(name=self.eve_planet_name)
+
+    @factory.lazy_attribute
+    def eve_solar_system(self):
+        return self.eve_planet.eve_solar_system
+
+    @factory.lazy_attribute
+    def eve_type(self):
+        return EveType.objects.get(id=EveTypeId.ORBITAL_SKYHOOK)
+
+
 class JumpGateFactory(StructureFactory):
     @factory.lazy_attribute
     def eve_type(self):

structures/tests/testdata/generate_notifications.py

@@ -3,177 +3,162 @@
 this scripts create a test owner and adds test notifications to it
 """
 
-import inspect
+import datetime as dt
 import json
-import os
-import sys
-from datetime import timedelta
-
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-myauth_dir = (
-    os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(currentdir))))
-    + "/myauth"
-)
-sys.path.insert(0, myauth_dir)
-
-
-import django
-from django.apps import apps
-from django.db import transaction
-from django.utils.timezone import now
-
-# init and setup django project
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "myauth.settings.local")
-django.setup()
-
-if not apps.is_installed("structures"):
-    raise RuntimeError("The app structures is not installed")
-
-from esi.clients import esi_client_factory
-from eveuniverse.models import EveEntity
-
-from allianceauth.eveonline.models import EveCorporationInfo
-
-from structures.models import Notification, Owner, Structure, Webhook
-
-# corporation / structure the notifications will be added to
-CORPORATION_ID = 98587692  # RABIS
-
-print(
-    "load_test_notifications - "
-    "script loads test notification into the local database "
-)
-
-print("Connecting to ESI ...")
-client = esi_client_factory()
-
-print("Creating base data ...")
-try:
-    corporation = EveCorporationInfo.objects.get(corporation_id=CORPORATION_ID)
-except EveCorporationInfo.DoesNotExist:
-    corporation = EveCorporationInfo.objects.create_corporation(CORPORATION_ID)
-
-owner, created = Owner.objects.get_or_create(
-    corporation=corporation, defaults={"is_active": False}
-)
-if created and not owner.webhooks.exists():
-    webhook = Webhook.objects.filter(is_active=True, is_default=True).first()
-    if webhook:
-        owner.webhooks.add(webhook)
-
-structure = {
-    "fuel_expires": None,
-    "name": "Test Structure Alpha",
-    "next_reinforce_apply": None,
-    "next_reinforce_hour": None,
-    "position": {"x": 55028384780.0, "y": 7310316270.0, "z": -163686684205.0},
-    "profile_id": 101853,
-    "reinforce_hour": 18,
-    "services": [
-        {
-            "name": "Clone Bay",
-            "name_de": "Clone Bay_de",
-            "name_ko": "Clone Bay_ko",
-            "state": "online",
-        },
-        {
-            "name": "Market Hub",
-            "name_de": "Market Hub_de",
-            "name_ko": "Market Hub_ko",
-            "state": "offline",
-        },
-    ],
-    "state": "shield_vulnerable",
-    "state_timer_end": None,
-    "state_timer_start": None,
-    "structure_id": 1999999999999,
-    "system_id": 30002537,
-    "type_id": 35832,
-    "unanchors_at": None,
-}
-structure, _ = Structure.objects.update_or_create_from_dict(structure, owner)
-
-with open(file=currentdir + "/entities.json", mode="r", encoding="utf-8") as fp:
-    data = json.load(fp)
-
-notifications = data["Notification"]
-for notification in notifications:
-    if notification["sender_id"] == 2901:
-        notification["sender_id"] = 1000137  # DED
-    if notification["sender_id"] == 2902:
-        notification["sender_id"] = 1000125  # Concord
-    elif notification["sender_id"] == 1011:
-        notification["sender_id"] = 3004029
-    elif notification["sender_id"] == 2022:
-        notification["sender_id"] = 1000127  # Guristas
-    elif notification["sender_id"] == 3001:
-        notification["sender_id"] = 99010298
-    notification["text"] = notification["text"].replace(
-        "1000000000001", str(structure.id)
-    )
-    notification["text"] = notification["text"].replace(
-        "35835", str(structure.eve_type_id)
-    )
-    notification["text"] = notification["text"].replace(
-        "35835", str(structure.eve_type_id)
+from pathlib import Path
+
+from app_utils.scripts import start_django
+
+start_django()
+
+
+def main():
+
+    from django.utils.timezone import now
+    from esi.clients import esi_client_factory
+    from eveuniverse.models import EveEntity
+
+    from allianceauth.eveonline.models import EveCorporationInfo
+
+    from structures.core.notification_types import NotificationType
+    from structures.models import Notification, Owner, Structure, Webhook
+
+    # corporation / structure the notifications will be added to
+    CORPORATION_ID = 1000127  # Guristas
+
+    print(
+        "load_test_notifications - "
+        "script loads test notification into the local database "
     )
-    notification["text"] = notification["text"].replace(
-        "30002537", str(structure.eve_solar_system_id)
+
+    print("Connecting to ESI ...")
+    client = esi_client_factory()
+
+    print("Creating base data ...")
+    try:
+        corporation = EveCorporationInfo.objects.get(corporation_id=CORPORATION_ID)
+    except EveCorporationInfo.DoesNotExist:
+        corporation = EveCorporationInfo.objects.create_corporation(CORPORATION_ID)
+
+    owner, created = Owner.objects.get_or_create(
+        corporation=corporation, defaults={"is_active": False}
     )
-    notification["text"] = notification["text"].replace("1001", "3004037")
-    notification["text"] = notification["text"].replace("1002", "3019491")
-    notification["text"] = notification["text"].replace("1011", "3004029")
-    notification["text"] = notification["text"].replace("2001", "98394960")
-    notification["text"] = notification["text"].replace(
-        "2002", "1000134"
-    )  # Blood Raiders
-    notification["text"] = notification["text"].replace("3001", "99005502")
-    notification["text"] = notification["text"].replace("3002", "99009333")
-    notification["text"] = notification["text"].replace("3011", "1354830081")
-
-with transaction.atomic():
-    timestamp_start = now() - timedelta(hours=2)
-    for notification in notifications:
-        if notification["sender_type"] != "other":
-            continue
-
-        sender, _ = EveEntity.objects.get_or_create_esi(id=notification["sender_id"])
-        text = notification["text"] if "text" in notification else None
-        is_read = notification["is_read"] if "is_read" in notification else None
-        timestamp_start = timestamp_start + timedelta(minutes=5)
-        obj = Notification.objects.update_or_create(
-            notification_id=notification["notification_id"],
+    if created and not owner.webhooks.exists():
+        webhook = Webhook.objects.filter(is_active=True, is_default=True).first()
+        if webhook:
+            owner.webhooks.add(webhook)
+
+    structure = {
+        "fuel_expires": None,
+        "name": "Test Structure Alpha",
+        "next_reinforce_apply": None,
+        "next_reinforce_hour": None,
+        "position": {"x": 55028384780.0, "y": 7310316270.0, "z": -163686684205.0},
+        "profile_id": 101853,
+        "reinforce_hour": 18,
+        "services": [
+            {
+                "name": "Clone Bay",
+                "name_de": "Clone Bay_de",
+                "name_ko": "Clone Bay_ko",
+                "state": "online",
+            },
+            {
+                "name": "Market Hub",
+                "name_de": "Market Hub_de",
+                "name_ko": "Market Hub_ko",
+                "state": "offline",
+            },
+        ],
+        "state": "shield_vulnerable",
+        "state_timer_end": None,
+        "state_timer_start": None,
+        "structure_id": 1999999999999,
+        "system_id": 30002537,
+        "type_id": 35832,
+        "unanchors_at": None,
+    }
+    structure, _ = Structure.objects.update_or_create_from_dict(structure, owner)
+
+    p = Path(__file__).parent / "/entities.json"
+    with p.open(mode="r", encoding="utf-8") as fp:
+        data = json.load(fp)
+
+    notifications = data["Notification"]
+    for n in notifications:
+        if n["sender_id"] == 2901:
+            n["sender_id"] = 1000137  # DED
+        if n["sender_id"] == 2902:
+            n["sender_id"] = 1000125  # Concord
+        elif n["sender_id"] == 1011:
+            n["sender_id"] = 3004029
+        elif n["sender_id"] == 2022:
+            n["sender_id"] = 1000127  # Guristas
+        elif n["sender_id"] == 3001:
+            n["sender_id"] = 99010298
+        n["text"] = n["text"].replace("1000000000001", str(structure.id))
+        n["text"] = n["text"].replace("35835", str(structure.eve_type_id))
+        n["text"] = n["text"].replace("35835", str(structure.eve_type_id))
+        n["text"] = n["text"].replace("30002537", str(structure.eve_solar_system_id))
+        n["text"] = n["text"].replace("1001", "3004037")
+        n["text"] = n["text"].replace("1002", "3019491")
+        n["text"] = n["text"].replace("1011", "3004029")
+        n["text"] = n["text"].replace("2001", "98394960")
+        n["text"] = n["text"].replace("2002", "1000134")  # Blood Raiders
+        n["text"] = n["text"].replace("3001", "99005502")
+        n["text"] = n["text"].replace("3002", "99009333")
+        n["text"] = n["text"].replace("3011", "1354830081")
+
+    timestamp_start = now() - dt.timedelta(hours=2)
+
+    for n in notifications:
+        notif_type = n["type"]
+        if notif_type not in NotificationType.values:
+            print(f"Skipping unsupported: {notif_id} {notif_type}")
+
+        notif_id = n["notification_id"]
+        sender, _ = EveEntity.objects.get_or_create_esi(id=n["sender_id"])
+        text = n["text"] if "text" in n else None
+        is_read = n["is_read"] if "is_read" in n else None
+        timestamp_start = timestamp_start + dt.timedelta(minutes=5)
+        obj, created = Notification.objects.update_or_create(
+            notification_id=notif_id,
             owner=owner,
             defaults={
                 "sender": sender,
                 "timestamp": timestamp_start,
-                "notif_type": notification["type"],
+                "notif_type": notif_type,
                 "text": text,
                 "is_read": is_read,
                 "last_updated": now(),
                 "is_sent": False,
             },
         )
+        if created:
+            print(f"Created: {notif_id} {notif_type}")
 
-print("DONE")
+    print("DONE")
 
+    """
+    for notification in notifications:
+        dt = datetime.datetime.utcfromtimestamp(notification['timestamp'])
+        dt = pytz.utc.localize(dt)
+        notification['timestamp'] = dt.isoformat()
+
+    with open(
+        file=currentdir + '/td_notifications_2.json',
+        mode='w',
+        encoding='utf-8'
+    ) as f:
+        json.dump(
+            notifications,
+            f,
+            sort_keys=True,
+            indent=4
+        )
 
-"""
-for notification in notifications:
-    dt = datetime.datetime.utcfromtimestamp(notification['timestamp'])
-    dt = pytz.utc.localize(dt)
-    notification['timestamp'] = dt.isoformat()
-
-with open(
-    file=currentdir + '/td_notifications_2.json',
-    mode='w',
-    encoding='utf-8'
-) as f:
-    json.dump(
-        notifications,
-        f,
-        sort_keys=True,
-        indent=4
-    )
+    """
 
-"""
+
+if __name__ == "__main__":
+    main()

structures/tests/testdata/helpers.py

@@ -4,6 +4,7 @@ import datetime as dt
 import json
 import logging
 import unicodedata
+from collections import namedtuple
 from pathlib import Path
 from random import randrange
 
@@ -192,3 +193,8 @@ def datetime_to_ldap(my_dt: dt.datetime) -> int:
         ((my_dt - dt.datetime(1970, 1, 1, tzinfo=pytz.utc)).total_seconds())
         + 11644473600
     ) * 10000000
+
+
+NearestCelestial = namedtuple(
+    "NearestCelestial", ["eve_type", "eve_object", "distance"]
+)

structures/tests/views/test_structures.py

@@ -19,6 +19,7 @@ from structures.tests.testdata.factories import (
     JumpGateFactory,
     OwnerFactory,
     PocoFactory,
+    SkyhookFactory,
     StarbaseFactory,
     StructureFactory,
     StructureTagFactory,
@@ -148,6 +149,7 @@ class TestStructureListDataFilterVariant(TestCase):
         owner = OwnerFactory(user=cls.user)
         cls.structure = StructureFactory(owner=owner)
         cls.poco = PocoFactory(owner=owner)
+        cls.skyhook = SkyhookFactory(owner=owner)
         cls.starbase = StarbaseFactory(owner=owner)
         cls.jump_gate = JumpGateFactory(owner=owner)
 
@@ -163,17 +165,17 @@ class TestStructureListDataFilterVariant(TestCase):
         structure_ids = set(data.keys())
         self.assertSetEqual(structure_ids, {self.structure.id, self.jump_gate.id})
 
-    def test_should_return_pocos_only(self):
+    def test_should_return_orbitals_only(self):
         # given
         request = self.factory.get("/")
         request.user = self.user
         # when
-        response = structures.structure_list_data(request, "pocos")
+        response = structures.structure_list_data(request, "orbitals")
         # then
         self.assertEqual(response.status_code, 200)
         data = json_response_to_dict(response)
         structure_ids = set(data.keys())
-        self.assertSetEqual(structure_ids, {self.poco.id})
+        self.assertSetEqual(structure_ids, {self.poco.id, self.skyhook.id})
 
     def test_should_return_starbases_only(self):
         # given
@@ -211,7 +213,13 @@ class TestStructureListDataFilterVariant(TestCase):
         structure_ids = set(data.keys())
         self.assertSetEqual(
             structure_ids,
-            {self.structure.id, self.poco.id, self.starbase.id, self.jump_gate.id},
+            {
+                self.structure.id,
+                self.poco.id,
+                self.starbase.id,
+                self.jump_gate.id,
+                self.skyhook.id,
+            },
         )
 
     def test_should_raise_error_when_invalid_variant_requested(self):

structures/views/structures.py

@@ -58,7 +58,7 @@ class StructureSelection(str, Enum):
     """A pre-defined selection to filter structures data."""
 
     STRUCTURES = "structures"
-    POCOS = "pocos"
+    ORBITALS = "orbitals"
     STARBASES = "starbases"
     JUMP_GATES = "jump_gates"
     ALL = "all"
@@ -118,8 +118,8 @@ def structure_list(request: HttpRequest):
     structures_count = _structures_query(
         request.user, StructureSelection.STRUCTURES, tags
     ).count()
-    pocos_count = _structures_query(
-        request.user, StructureSelection.POCOS, tags
+    orbitals_count = _structures_query(
+        request.user, StructureSelection.ORBITALS, tags
     ).count()
     starbases_count = _structures_query(
         request.user, StructureSelection.STARBASES, tags
@@ -136,7 +136,7 @@ def structure_list(request: HttpRequest):
         "tags_exist": StructureTag.objects.exists(),
         "show_jump_gates_tab": STRUCTURES_SHOW_JUMP_GATES,
         "structures_count": structures_count,
-        "pocos_count": pocos_count,
+        "orbitals_count": orbitals_count,
         "starbases_count": starbases_count,
         "jump_gates_count": jump_gates_count,
         "data_export": data_export,
@@ -146,7 +146,7 @@ def structure_list(request: HttpRequest):
 
 def _construct_data_export(request, tags):
     structures_ajax_url = _construct_ajax_url(StructureSelection.STRUCTURES, tags)
-    pocos_ajax_url = _construct_ajax_url(StructureSelection.POCOS, tags)
+    pocos_ajax_url = _construct_ajax_url(StructureSelection.ORBITALS, tags)
     starbases_ajax_url = _construct_ajax_url(StructureSelection.STARBASES, tags)
     jump_gates_ajax_url = _construct_ajax_url(StructureSelection.JUMP_GATES, tags)
 
@@ -213,7 +213,7 @@ def _structures_query(
             eve_type__eve_group__eve_category_id=EveCategoryId.STRUCTURE
         )
 
-    elif selection == StructureSelection.POCOS:
+    elif selection == StructureSelection.ORBITALS:
         structures_qs = structures_qs.filter(
             eve_type__eve_group__eve_category_id=EveCategoryId.ORBITAL
         ).annotate_has_poco_details()