aa-structures 2.3.1b1__tar.gz → 2.4.1__tar.gz

{aa_structures-2.3.1b1 → aa_structures-2.4.1}/PKG-INFO

@@ -1,15 +1,10 @@
 Metadata-Version: 2.1
 Name: aa-structures
-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/
-Project-URL: Source, https://gitlab.com/ErikKalkoken/aa-structures
-Project-URL: Changelog, https://gitlab.com/ErikKalkoken/aa-structures/-/blob/master/CHANGELOG.md
-Project-URL: Tracker, https://gitlab.com/ErikKalkoken/aa-structures/-/issues
+Version: 2.4.1
+Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
-License-Expression: MIT
-License-File: LICENSE
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.0
@@ -20,18 +15,22 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Requires-Python: >=3.8
-Requires-Dist: allianceauth-app-utils>=1.14.2
+Requires-Dist: allianceauth-app-utils>=1.18.1
 Requires-Dist: allianceauth>=3.0.0
 Requires-Dist: dhooks-lite>=0.6.1
-Requires-Dist: django-eveuniverse>=0.17
+Requires-Dist: django-eveuniverse>=1.0
 Requires-Dist: django-multiselectfield
 Requires-Dist: django-navhelper
 Requires-Dist: pytz!=2022.2
-Requires-Dist: redis-simple-mq>=0.4
-Description-Content-Type: text/markdown
+Requires-Dist: redis-simple-mq>=0.5
+Project-URL: Changelog, https://gitlab.com/ErikKalkoken/aa-structures/-/blob/master/CHANGELOG.md
+Project-URL: Documentation, https://aa-structures.readthedocs.io/en/latest/
+Project-URL: Homepage, https://gitlab.com/ErikKalkoken/aa-structures
+Project-URL: Source, https://gitlab.com/ErikKalkoken/aa-structures
+Project-URL: Tracker, https://gitlab.com/ErikKalkoken/aa-structures/-/issues
 
 # Structures
 
@@ -108,3 +107,4 @@ The tax rate and access configuration of customs offices is visible too:
 This is an example for a notification posted on Discord:
 
 ![Notification example](https://i.imgur.com/oqBqeFy.png)
+

{aa_structures-2.3.1b1 → aa_structures-2.4.1}/pyproject.toml

@@ -1,13 +1,12 @@
 [build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+requires = ["flit_core >=3.2,<4"]
+build-backend = "flit_core.buildapi"
 
 [project]
 name = "aa-structures"
-dynamic = ["version"]
-description = "App for managing Eve Online structures with Alliance Auth"
+dynamic = ["version", "description"]
 readme = "README.md"
-license = "MIT"
+license = {file = "LICENSE"}
 requires-python = ">=3.8"
 authors = [
     { name = "Erik Kalkoken", email = "kalkoken87@gmail.com" },
@@ -23,18 +22,19 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
 dependencies = [
-    "allianceauth-app-utils>=1.14.2",
+    "allianceauth-app-utils>=1.18.1",
     "allianceauth>=3.0.0",
     "dhooks-lite>=0.6.1",
-    "django-eveuniverse>=0.17",
+    "django-eveuniverse>=1.0",
     "django-multiselectfield",
     "django-navhelper",
     "pytz!=2022.2",
-    "redis-simple-mq>=0.4",
+    "redis-simple-mq>=0.5",
 ]
 
 [project.urls]
@@ -44,13 +44,8 @@ Source = "https://gitlab.com/ErikKalkoken/aa-structures"
 Changelog = "https://gitlab.com/ErikKalkoken/aa-structures/-/blob/master/CHANGELOG.md"
 Tracker = "https://gitlab.com/ErikKalkoken/aa-structures/-/issues"
 
-[tool.hatch.version]
-path = "structures/__init__.py"
-
-[tool.hatch.build]
-include = [
-    "/structures",
-]
+[tool.flit.module]
+name = "structures"
 
 [tool.isort]
 profile = "black"

aa_structures-2.4.1/structures/__init__.py

@@ -0,0 +1,6 @@
+"""App for managing Eve Online structures with Alliance Auth."""
+
+default_app_config = "structures.apps.StructuresConfig"
+
+__version__ = "2.4.1"
+__title__ = "Structures"

{aa_structures-2.3.1b1 → aa_structures-2.4.1}/structures/managers.py

@@ -345,7 +345,7 @@ class StructureManagerBase(models.Manager):
         obj, created = self.update_or_create_from_dict(structure=structure, owner=owner)
         return obj, created
 
-    def update_or_create_from_dict(self, structure: dict, owner: object) -> tuple:
+    def update_or_create_from_dict(self, structure: dict, owner) -> tuple:
         """update or create structure from given dict"""
 
         from .models import StructureService
@@ -354,88 +354,69 @@ class StructureManagerBase(models.Manager):
         eve_solar_system, _ = EveSolarSystem.objects.get_or_create_esi(
             id=structure["system_id"]
         )
-        fuel_expires_at = (
-            structure["fuel_expires"] if "fuel_expires" in structure else None
-        )
-        next_reinforce_hour = (
-            structure["next_reinforce_hour"]
-            if "next_reinforce_hour" in structure
-            else None
-        )
-        next_reinforce_apply = (
-            structure["next_reinforce_apply"]
-            if "next_reinforce_apply" in structure
-            else None
-        )
-        reinforce_hour = (
-            structure["reinforce_hour"] if "reinforce_hour" in structure else None
-        )
-        state = (
-            self.model.State.from_esi_name(structure["state"])
-            if "state" in structure
-            else self.model.State.UNKNOWN
-        )
-        state_timer_start = (
-            structure["state_timer_start"] if "state_timer_start" in structure else None
-        )
-        state_timer_end = (
-            structure["state_timer_end"] if "state_timer_end" in structure else None
-        )
-        unanchors_at = (
-            structure["unanchors_at"] if "unanchors_at" in structure else None
-        )
-        position_x = structure["position"]["x"] if "position" in structure else None
-        position_y = structure["position"]["y"] if "position" in structure else None
-        position_z = structure["position"]["z"] if "position" in structure else None
-        if "planet_id" in structure:
-            eve_planet, _ = EvePlanet.objects.get_or_create_esi(
-                id=structure["planet_id"]
-            )
+        if position := structure.get("position"):
+            position_x = position.get("x")
+            position_y = position.get("y")
+            position_z = position.get("z")
+        else:
+            position_x = position_y = position_z = None
+        if planet_id := structure.get("planet_id"):
+            eve_planet, _ = EvePlanet.objects.get_or_create_esi(id=planet_id)
         else:
             eve_planet = None
-        if "moon_id" in structure:
-            eve_moon, _ = EveMoon.objects.get_or_create_esi(id=structure["moon_id"])
+        if moon_id := structure.get("moon_id"):
+            eve_moon, _ = EveMoon.objects.get_or_create_esi(id=moon_id)
         else:
             eve_moon = None
+
+        structure_id = structure["structure_id"]
         try:
-            old_obj = self.get(id=structure["structure_id"])
+            old_obj = self.get(id=structure_id)
         except self.model.DoesNotExist:
             old_obj = None
+
         obj, created = self.update_or_create(
-            id=structure["structure_id"],
+            id=structure_id,
             defaults={
                 "owner": owner,
                 "eve_type": eve_type,
-                "name": structure["name"],
+                "name": structure.get("name", ""),
                 "eve_solar_system": eve_solar_system,
                 "eve_planet": eve_planet,
                 "eve_moon": eve_moon,
                 "position_x": position_x,
                 "position_y": position_y,
                 "position_z": position_z,
-                "fuel_expires_at": fuel_expires_at,
-                "next_reinforce_hour": next_reinforce_hour,
-                "next_reinforce_apply": next_reinforce_apply,
-                "reinforce_hour": reinforce_hour,
-                "state": state,
-                "state_timer_start": state_timer_start,
-                "state_timer_end": state_timer_end,
-                "unanchors_at": unanchors_at,
+                "fuel_expires_at": structure.get("fuel_expires"),
+                "next_reinforce_hour": structure.get("next_reinforce_hour"),
+                "next_reinforce_apply": structure.get("next_reinforce_apply"),
+                "reinforce_hour": structure.get("reinforce_hour"),
+                "state": self.model.State.from_esi_name(structure.get("state", "")),
+                "state_timer_start": structure.get("state_timer_start"),
+                "state_timer_end": structure.get("state_timer_end"),
+                "unanchors_at": structure.get("unanchors_at"),
                 "last_updated_at": now(),
             },
         )
+
         if old_obj:
             obj.handle_fuel_notifications(old_obj)
+
         # Make sure we have dogmas loaded for this type for fittings
         EveType.objects.get_or_create_esi(
             id=structure["type_id"], enabled_sections=[EveType.Section.DOGMAS]
         )
+
         # save related structure services
         StructureService.objects.filter(structure=obj).delete()
         if "services" in structure and structure["services"]:
             for service in structure["services"]:
-                state = StructureService.State.from_esi_name(service["state"])
-                args = {"structure": obj, "name": service["name"], "state": state}
+                service_state = StructureService.State.from_esi_name(service["state"])
+                args = {
+                    "structure": obj,
+                    "name": service["name"],
+                    "state": service_state,
+                }
                 StructureService.objects.create(**args)
 
         if obj.services.filter(state=StructureService.State.ONLINE).exists():

{aa_structures-2.3.1b1 → aa_structures-2.4.1}/structures/providers.py

@@ -1,5 +1,4 @@
 import logging
-from pathlib import Path
 
 from esi.clients import EsiClientProvider
 
@@ -8,7 +7,4 @@ from app_utils.logging import LoggerAddTag
 from . import __title__, __version__
 
 logger = LoggerAddTag(logging.getLogger(__name__), __title__)
-swagger_path = Path(__file__).parent / "swagger.json"
-esi = EsiClientProvider(
-    app_info_text=f"aa-structures v{__version__}", spec_file=swagger_path
-)
+esi = EsiClientProvider(app_info_text=f"aa-structures v{__version__}")

{aa_structures-2.3.1b1 → aa_structures-2.4.1}/structures/tests/test_managers_1.py

@@ -8,7 +8,7 @@ from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo
 from app_utils.esi_testing import EsiClientStub, EsiEndpoint
 from app_utils.testing import NoSocketsTestCase, create_user_from_evecharacter
 
-from ..models import (
+from structures.models import (
     EveSovereigntyMap,
     NotificationType,
     Owner,
@@ -17,11 +17,13 @@ from ..models import (
     StructureTag,
     Webhook,
 )
+
 from .testdata.factories import (
     create_eve_sovereignty_map,
     create_owner_from_user,
     create_upwell_structure,
 )
+from .testdata.factories_2 import OwnerFactory
 from .testdata.helpers import create_structures, load_entities
 from .testdata.load_eveuniverse import load_eveuniverse
 
@@ -503,6 +505,32 @@ class TestStructureManagerCreateFromDict(NoSocketsTestCase):
         self.assertFalse(created)
         self.assertIsNone(structure.last_online_at)
 
+    def test_can_create_starbase_without_moon(self):
+        owner = OwnerFactory()
+        structure = {
+            "structure_id": 1300000000099,
+            "name": "Hidden place",
+            "system_id": 30002537,
+            "type_id": 16213,
+            "moon_id": None,
+            "position": {"x": 55028384780.0, "y": 7310316270.0, "z": -163686684205.0},
+        }
+        structure, created = Structure.objects.update_or_create_from_dict(
+            structure, owner
+        )
+
+        # check structure
+        structure: Structure
+        self.assertTrue(created)
+        self.assertEqual(structure.id, 1300000000099)
+        self.assertEqual(structure.eve_type_id, 16213)
+        self.assertEqual(structure.eve_solar_system_id, 30002537)
+        self.assertEqual(structure.owner, owner)
+        self.assertEqual(structure.position_x, 55028384780.0)
+        self.assertEqual(structure.position_y, 7310316270.0)
+        self.assertEqual(structure.position_z, -163686684205.0)
+        self.assertEqual(structure.state, Structure.State.UNKNOWN)
+
 
 class TestStructureTagManager(NoSocketsTestCase):
     @classmethod

aa_structures-2.3.1b1/.gitignore

@@ -1,23 +0,0 @@
-*.log
-*.tmp
-*.bak
-*.old
-__pycache__
-.vscode/
-dist/
-build/
-*.egg-info/
-update_coverage.sh
-coverage.xml
-.coverage
-.tox/
-announce_release.py
-htmlcov/
-structures_notifications_archive/
-starbases_raw*.json
-customs_offices_raw*.json
-notifications_raw*.json
-structures_raw*.json
-starbases_raw*.json
-.mypy_cache
-_build/

aa_structures-2.3.1b1/structures/__init__.py

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