aa-structures 2.9.1__py3-none-any.whl → 2.10.0__py3-none-any.whl

{aa_structures-2.9.1.dist-info → aa_structures-2.10.0.dist-info}/METADATA

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

@@ -1,15 +1,15 @@
-structures/__init__.py,sha256=JDqVcTEi8eCaAdMSvOph_y7iv7PQbntaqVFeo0pFNS0,203
+structures/__init__.py,sha256=uMpmaP4VBhwkpAgLo3BXo4Hx7Rw_4RLMyB7jScq_qO8,204
 structures/admin.py,sha256=cn6AtcSDI6bJROhBnvE2iQwOkm1t3NVabrpTVphxbTk,38662
 structures/app_settings.py,sha256=7BFWl1Q4tqTuj3CV6BmEctIFKJx9QIUfm2tjKzme2jM,6526
 structures/apps.py,sha256=MNZH9l3qWCwuS7OGiKGkBVrDzKoOFlqwDdEgyEFzxVA,195
-structures/auth_hooks.py,sha256=JI9dCNpYdRAPmD2fbiFqhc3ODxqvvyrgQQSmDyrZ3Fk,915
+structures/auth_hooks.py,sha256=nRbrixFkAE5gphDokB1E8xhH8FY2VtXVwu0XMmSGBAw,1013
 structures/constants.py,sha256=R7sC5esaWJayJpTDbug7dTKxkkXDKXQ-U6M9Qb0GH5s,967
 structures/forms.py,sha256=kXs-SGIIj-D9xtFCILKe_PMRU4eHl3-HLNWRhaZKmnQ,391
 structures/helpers.py,sha256=_dw7j7yobpcV70VwWxoQiptk69b3ksvaDlRQKHg8Kmg,2344
 structures/managers.py,sha256=Th_nPY8GNcdBPqqfqjtTriYdsZWFAWknbNqI8QG17vo,19225
 structures/providers.py,sha256=9QYHd8X5HwBhrbgbX3LUrXXV1KGM3hFhcxK6qIJjJtg,317
 structures/tasks.py,sha256=INZ3soMYHYfxrQsyTO-ozoxbVX6lpMnF3AUo8ybWIoA,9083
-structures/urls.py,sha256=rBOv84nMX6WcZEnTZxASrSUhGaqubs4eRLyibDovrUs,1396
+structures/urls.py,sha256=An5v27AD_NXMNL66cMVtQNci1C_Aqry32rrvDkMpgYo,1467
 structures/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/core/notification_timers.py,sha256=G-QwpqP9HFv_Y7KsID9bLF-GluEJ1-duSJQN-zqJtM0,14977
 structures/core/notification_types.py,sha256=0SExh-VuImRz05jatnCu9lAfIFORUZ-kon9rjF4SXfI,12279
@@ -172,8 +172,8 @@ structures/tests/core/notification_embeds/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 structures/tests/core/notification_embeds/test_helpers.py,sha256=HG20TC8Bz7NqpaQWo6uvrsxfNIwTL2Zi_NRkh3UyN2Y,1776
 structures/tests/core/notification_embeds/test_main.py,sha256=vTDByjxxVCA6KMcr5XH4f4QsMgcDI_YDd-fjZfHztng,13808
 structures/tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-structures/tests/integration/test_tasks.py,sha256=nb2HjS31ArQfoD2FIjQN-QHGGR4Xcqs9J1ICshmJVDA,23588
-structures/tests/integration/test_views.py,sha256=iA3chzZXhrnZzyBGmpRm-rQsKa6ru7y34fdB7CBtKDw,4331
+structures/tests/integration/test_tasks.py,sha256=s6hL5UBotDmhLq7NUiOad72W-S_18u_yAHiLWVryVi8,23617
+structures/tests/integration/test_views.py,sha256=SkbIposTUjo0nujHL4WEaZO7nY1Bfuvm805H39XUv-g,4361
 structures/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/models/test_eveuniverse.py,sha256=bQ1upOLfoivfaa9KCrzjWvSH_EvL2STuvfFfZ9saIMY,1623
 structures/tests/models/test_notifications_1.py,sha256=xVX4an54sZM8WLUdsAGUG2Nb4Rl7W5FBzhI0hBhJo5g,30300
@@ -201,14 +201,16 @@ structures/tests/testdata/tasks_loadtest.py,sha256=Hn0UVeaMfdi5S4W12lsb6g_xwjQcN
 structures/tests/testdata/test_generate_structures.py,sha256=vpReGRROduZsGB99Dq7yPKNKSkSLFdLM_esdf5TTnnI,414
 structures/tests/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/views/test_public.py,sha256=FTaT3VUOnoT4t9rCCTCGyDrberpa8CRJHsXuqAw2PQE,1372
+structures/tests/views/test_service_status.py,sha256=mWkP13HnKRa3ltsZ2FKJuZRJjvYic9wjgQ1J3qA8n-k,4197
 structures/tests/views/test_statistics.py,sha256=MHt31AIX9_jt8-yP8XsbsiRRUKEtY8mQJbk11saFYZc,2626
-structures/tests/views/test_structures.py,sha256=foTvuaI8x36wwTLiwsfAE1ofVPTJVrnXuBT39sWLBOs,29004
+structures/tests/views/test_structures.py,sha256=dspLWOORWZyhgZRD8OtqZtG2kL4kN7JEFTI1v4l7I9U,25971
 structures/tests/views/utils.py,sha256=0ALPjL8d0vcIWa_Pl4_gDl1qtBp71oDqyZLJyvDj-Uc,247
 structures/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/views/common.py,sha256=Z_hcpEpkGrhwFdMAAMON_DqsfQ_lMyRwOMl5ROo_aSk,818
 structures/views/public.py,sha256=-Tel-poYKZTy8eQllhsWUxVf7HYBuCfeL9JWlbKhs7s,3035
 structures/views/statistics.py,sha256=7jj8b9ATsYwE7Cg6gMp-bYx29nV43GdWYun9WBggGkM,4709
-structures/views/structures.py,sha256=XtQxYySOPqO9klPgF1o57pCejuo22EdU00h5LAdEVME,23167
+structures/views/status.py,sha256=gcahbk6dPIZDqkaNHDAsEHyDWLzicTK18Fom0A6xx3c,718
+structures/views/structures.py,sha256=hw4Rjr6O_fK7dvdgtZGP9r3DExkfEwCPixeoEBK5KNU,22548
 structures/webhooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/webhooks/core.py,sha256=mP25MbQG8Yv2YayDFcR6x2V30eqXhR2q5u4SRefblf4,6573
 structures/webhooks/managers.py,sha256=L3G3AmsyDeif_lfpWshmAxQ61UGJ9w8i9lZaF2jbOtQ,1117
@@ -216,7 +218,7 @@ structures/webhooks/models.py,sha256=kUkt9rnRQIJIrU9Bjcs34rvkb-TMbUubHdn-kny08kI
 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.9.1.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_structures-2.9.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-aa_structures-2.9.1.dist-info/METADATA,sha256=yvzawtDxsWgorHAKcQRjx1WJFOc8GbVlvPQcYcL8q50,5971
-aa_structures-2.9.1.dist-info/RECORD,,
+aa_structures-2.10.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-2.10.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+aa_structures-2.10.0.dist-info/METADATA,sha256=fc6JHf4tNiaFaCZmiZZRD71A0Q2BMEjAjuIQNHmwicI,5972
+aa_structures-2.10.0.dist-info/RECORD,,

structures/__init__.py

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

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"],
+    )

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

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"

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

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

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,

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

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