aa-structures 2.9.0__tar.gz → 2.10.0__tar.gz

{aa_structures-2.9.0 → aa_structures-2.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-structures
-Version: 2.9.0
+Version: 2.10.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.9.0 → aa_structures-2.10.0}/structures/__init__.py

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

{aa_structures-2.9.0 → aa_structures-2.10.0}/structures/auth_hooks.py

@@ -32,4 +32,9 @@ def register_menu():
 
 @hooks.register("url_hook")
 def register_urls():
-    return UrlHook(urls, "structures", r"^structures/")
+    return UrlHook(
+        urls,
+        "structures",
+        r"^structures/",
+        excluded_views=["structures.views.status.service_status"],
+    )

{aa_structures-2.9.0 → aa_structures-2.10.0}/structures/models/owners.py

@@ -235,7 +235,9 @@ class Owner(models.Model):
                 is_alliance_main=False
             )
             if "update_fields" in kwargs:
-                kwargs["update_fields"].append("is_alliance_main")
+                u = set(kwargs["update_fields"])
+                u.add("is_alliance_main")
+                kwargs["update_fields"] = u
         super().save(*args, **kwargs)
 
     @property

{aa_structures-2.9.0 → aa_structures-2.10.0}/structures/tests/integration/test_tasks.py

@@ -16,8 +16,7 @@ from app_utils.esi_testing import EsiClientStub, EsiEndpoint
 from structures import tasks
 from structures.core.notification_types import NotificationType
 from structures.models import Structure
-
-from ..testdata.factories import (
+from structures.tests.testdata.factories import (
     EveEntityAllianceFactory,
     EveEntityCorporationFactory,
     NotificationFactory,
@@ -28,7 +27,7 @@ from ..testdata.factories import (
     WebhookFactory,
     datetime_to_esi,
 )
-from ..testdata.load_eveuniverse import load_eveuniverse
+from structures.tests.testdata.load_eveuniverse import load_eveuniverse
 
 if "structuretimers" in app_labels():
     from structuretimers.models import Timer as StructureTimer

{aa_structures-2.9.0 → aa_structures-2.10.0}/structures/tests/integration/test_views.py

@@ -5,7 +5,7 @@ from django.urls import reverse
 
 from app_utils.testing import add_character_to_user
 
-from ..testdata.factories import (
+from structures.tests.testdata.factories import (
     EveCharacterFactory,
     JumpGateFactory,
     OwnerFactory,
@@ -15,7 +15,7 @@ from ..testdata.factories import (
     UserMainBasicFactory,
     UserMainDefaultFactory,
 )
-from ..testdata.load_eveuniverse import load_eveuniverse
+from structures.tests.testdata.load_eveuniverse import load_eveuniverse
 
 STRUCTURES_PATH = "structures.views.structures"
 PUBLIC_PATH = "structures.views.public"

{aa_structures-2.9.0 → aa_structures-2.10.0}/structures/tests/models/test_owners_1.py

@@ -190,6 +190,26 @@ class TestOwner(NoSocketsTestCase):
         self.owner.refresh_from_db()
         self.assertFalse(self.owner.is_alliance_main)
 
+    def test_should_ensure_is_alliance_main_is_set_for_update_fields_1(self):
+        # given
+        corporation = EveCorporationInfoFactory(alliance=self.alliance)
+        owner = OwnerFactory(corporation=corporation, is_alliance_main=True)
+        # when
+        owner.save(update_fields={"is_active"})
+        # then
+        owner.refresh_from_db()
+        self.assertTrue(owner.is_alliance_main)
+
+    def test_should_ensure_is_alliance_main_is_set_for_update_fields_2(self):
+        # given
+        corporation = EveCorporationInfoFactory(alliance=self.alliance)
+        owner = OwnerFactory(corporation=corporation, is_alliance_main=True)
+        # when
+        owner.save(update_fields=["is_active"])
+        # then
+        owner.refresh_from_db()
+        self.assertTrue(owner.is_alliance_main)
+
     def test_should_allow_mains_from_other_alliances(self):
         # given
         self.owner.is_alliance_main = True

aa_structures-2.10.0/structures/tests/views/test_service_status.py

@@ -0,0 +1,113 @@
+import datetime as dt
+from unittest.mock import patch
+
+from django.test import TestCase
+from django.urls import reverse
+from django.utils.timezone import now
+
+from app_utils.testing import response_text
+
+from structures.tests.testdata.factories import OwnerFactory
+from structures.views import status
+
+OWNERS_PATH = "structures.models.owners"
+
+
+@patch(OWNERS_PATH + ".STRUCTURES_STRUCTURE_SYNC_GRACE_MINUTES", 30)
+@patch(OWNERS_PATH + ".STRUCTURES_NOTIFICATION_SYNC_GRACE_MINUTES", 30)
+class TestServiceStatus(TestCase):
+    def test_should_report_ok(self):
+        # given
+        OwnerFactory(
+            structures_last_update_at=now(),
+            notifications_last_update_at=now(),
+            forwarding_last_update_at=now(),
+            assets_last_update_at=now(),
+        )
+        request = self.client.get(reverse("structures:service_status"))
+        # when
+        response = status.service_status(request)
+        # then
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response_text(response), "service is up")
+
+    def test_should_report_ok_when_downed_owner_is_inactive(self):
+        # given
+        OwnerFactory(
+            structures_last_update_at=now(),
+            notifications_last_update_at=now(),
+            forwarding_last_update_at=now(),
+            assets_last_update_at=now(),
+        )
+        OwnerFactory(
+            structures_last_update_at=now() - dt.timedelta(minutes=31),
+            notifications_last_update_at=now(),
+            forwarding_last_update_at=now(),
+            assets_last_update_at=now(),
+            is_active=False,
+        )
+        request = self.client.get(reverse("structures:service_status"))
+        # when
+        response = status.service_status(request)
+        # then
+        self.assertEqual(response.status_code, 200)
+
+    def test_should_report_fail_when_issue_with_structures(self):
+        # given
+        OwnerFactory(
+            structures_last_update_at=now() - dt.timedelta(minutes=31),
+            notifications_last_update_at=now(),
+            forwarding_last_update_at=now(),
+            assets_last_update_at=now(),
+        )
+        request = self.client.get(reverse("structures:service_status"))
+        # when
+        response = status.service_status(request)
+        # then
+        self.assertEqual(response.status_code, 500)
+        self.assertEqual(response_text(response), "service is down")
+
+    def test_should_report_fail_when_issue_with_notifications(self):
+        # given
+        OwnerFactory(
+            structures_last_update_at=now(),
+            notifications_last_update_at=now() - dt.timedelta(minutes=31),
+            forwarding_last_update_at=now(),
+            assets_last_update_at=now(),
+        )
+        request = self.client.get(reverse("structures:service_status"))
+        # when
+        response = status.service_status(request)
+        # then
+        self.assertEqual(response.status_code, 500)
+        self.assertEqual(response_text(response), "service is down")
+
+    def test_should_report_fail_when_issue_with_forwarding(self):
+        # given
+        OwnerFactory(
+            structures_last_update_at=now(),
+            notifications_last_update_at=now(),
+            forwarding_last_update_at=now() - dt.timedelta(minutes=31),
+            assets_last_update_at=now(),
+        )
+        request = self.client.get(reverse("structures:service_status"))
+        # when
+        response = status.service_status(request)
+        # then
+        self.assertEqual(response.status_code, 500)
+        self.assertEqual(response_text(response), "service is down")
+
+    def test_should_report_fail_when_issue_with_assets(self):
+        # given
+        OwnerFactory(
+            structures_last_update_at=now(),
+            notifications_last_update_at=now(),
+            forwarding_last_update_at=now(),
+            assets_last_update_at=now() - dt.timedelta(minutes=31),
+        )
+        request = self.client.get(reverse("structures:service_status"))
+        # when
+        response = status.service_status(request)
+        # then
+        self.assertEqual(response.status_code, 500)
+        self.assertEqual(response_text(response), "service is down")

{aa_structures-2.9.0 → aa_structures-2.10.0}/structures/tests/views/test_structures.py

@@ -11,6 +11,7 @@ from django.utils.timezone import now
 from app_utils.testdata_factories import UserMainFactory
 from app_utils.testing import json_response_to_python
 
+import structures.views.status
 from structures.models import Owner, Structure
 from structures.views import structures
 
@@ -656,88 +657,6 @@ class TestAddStructureOwner(TestCase):
         self.assertTrue(owner.is_active)
 
 
-class TestStatus(TestCase):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.factory = RequestFactory()
-        # Owner.objects.filter(is_included_in_service_status=True)
-
-    def test_view_service_status_ok(self):
-        # given
-        OwnerFactory(
-            structures_last_update_at=now(),
-            notifications_last_update_at=now(),
-            forwarding_last_update_at=now(),
-            assets_last_update_at=now(),
-        )
-        request = self.factory.get(reverse("structures:service_status"))
-        # when
-        response = structures.service_status(request)
-        # then
-        self.assertEqual(response.status_code, 200)
-
-    @patch(OWNERS_PATH + ".STRUCTURES_STRUCTURE_SYNC_GRACE_MINUTES", 30)
-    def test_view_service_status_fail_structures(self):
-        # given
-        OwnerFactory(
-            structures_last_update_at=now() - dt.timedelta(minutes=31),
-            notifications_last_update_at=now(),
-            forwarding_last_update_at=now(),
-            assets_last_update_at=now(),
-        )
-        request = self.factory.get(reverse("structures:service_status"))
-        # when
-        response = structures.service_status(request)
-        # then
-        self.assertEqual(response.status_code, 500)
-
-    @patch(OWNERS_PATH + ".STRUCTURES_NOTIFICATION_SYNC_GRACE_MINUTES", 30)
-    def test_view_service_status_fail_notifications(self):
-        # given
-        OwnerFactory(
-            structures_last_update_at=now(),
-            notifications_last_update_at=now() - dt.timedelta(minutes=31),
-            forwarding_last_update_at=now(),
-            assets_last_update_at=now(),
-        )
-        request = self.factory.get(reverse("structures:service_status"))
-        # when
-        response = structures.service_status(request)
-        # then
-        self.assertEqual(response.status_code, 500)
-
-    @patch(OWNERS_PATH + ".STRUCTURES_NOTIFICATION_SYNC_GRACE_MINUTES", 30)
-    def test_view_service_status_fail_forwarding(self):
-        # given
-        OwnerFactory(
-            structures_last_update_at=now(),
-            notifications_last_update_at=now(),
-            forwarding_last_update_at=now() - dt.timedelta(minutes=31),
-            assets_last_update_at=now(),
-        )
-        request = self.factory.get(reverse("structures:service_status"))
-        # when
-        response = structures.service_status(request)
-        # then
-        self.assertEqual(response.status_code, 500)
-
-    @patch(OWNERS_PATH + ".STRUCTURES_STRUCTURE_SYNC_GRACE_MINUTES", 30)
-    def test_view_service_status_fail_assets(self):
-        # given
-        OwnerFactory(
-            structures_last_update_at=now(),
-            notifications_last_update_at=now(),
-            forwarding_last_update_at=now(),
-            assets_last_update_at=now() - dt.timedelta(minutes=31),
-        )
-        request = self.factory.get(reverse("structures:service_status"))
-        # when
-        response = structures.service_status(request)
-        # then
-        self.assertEqual(response.status_code, 500)
-
-
 class TestStructureFittingModal(TestCase):
     @classmethod
     def setUpClass(cls):

{aa_structures-2.9.0 → aa_structures-2.10.0}/structures/urls.py

@@ -1,8 +1,9 @@
 """Tasks for Structures."""
 
 from django.urls import path
+from django.views.decorators.cache import never_cache
 
-from .views import public, statistics, structures
+from .views import public, statistics, status, structures
 
 app_name = "structures"
 
@@ -19,7 +20,7 @@ urlpatterns = [
         structures.add_structure_owner,
         name="add_structure_owner",
     ),
-    path("service_status", structures.service_status, name="service_status"),
+    path("service_status", never_cache(status.service_status), name="service_status"),
     path(
         "<int:structure_id>/structure_details",
         structures.structure_details,

aa_structures-2.10.0/structures/views/status.py

@@ -0,0 +1,22 @@
+"""Status views."""
+
+from django.http import HttpRequest, HttpResponse, HttpResponseServerError
+
+from structures.models import Owner
+
+
+def service_status(request: HttpRequest):
+    """Public view to 3rd party monitoring.
+
+    This is view allows running a 3rd party monitoring on the status
+    of this services. Service will be reported as down if any of the
+    configured structure or notifications syncs fails or is delayed
+    """
+    active_owners = Owner.objects.filter(
+        is_included_in_service_status=True, is_active=True
+    )
+    for owner in active_owners:
+        if not owner.are_all_syncs_ok:
+            return HttpResponseServerError("service is down")
+
+    return HttpResponse("service is up")

{aa_structures-2.9.0 → aa_structures-2.10.0}/structures/views/structures.py

@@ -10,7 +10,7 @@ from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.models import User
 from django.db.models import Prefetch
-from django.http import HttpRequest, HttpResponse, HttpResponseServerError, JsonResponse
+from django.http import HttpRequest, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.templatetags.static import static
 from django.urls import reverse
@@ -651,19 +651,3 @@ def add_structure_owner(request: HttpRequest, token: Token):
                     title=_("%s: Character added to: %s") % (__title__, owner),
                 )
     return redirect("structures:index")
-
-
-def service_status(request: HttpRequest):
-    """Public view to 3rd party monitoring.
-
-    This is view allows running a 3rd party monitoring on the status
-    of this services. Service will be reported as down if any of the
-    configured structure or notifications syncs fails or is delayed
-    """
-    status_ok = True
-    for owner in Owner.objects.filter(is_included_in_service_status=True):
-        status_ok = status_ok and owner.are_all_syncs_ok
-
-    if status_ok:
-        return HttpResponse(_("service is up"))
-    return HttpResponseServerError(_("service is down"))