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

structures/tests/views/test_structures.py

@@ -8,13 +8,13 @@ from django.urls import reverse
 from django.utils.dateparse import parse_datetime
 from django.utils.timezone import now
 
+from allianceauth.eveonline.models import EveCharacter
 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
-
-from ..testdata.factories import (
+from structures.tests.testdata.factories import (
     EveCharacterFactory,
     JumpGateFactory,
     OwnerFactory,
@@ -26,7 +26,9 @@ from ..testdata.factories import (
     UserMainDefaultOwnerFactory,
     WebhookFactory,
 )
-from ..testdata.load_eveuniverse import load_eveuniverse
+from structures.tests.testdata.load_eveuniverse import load_eveuniverse
+from structures.views import structures
+
 from .utils import json_response_to_dict
 
 VIEWS_PATH = "structures.views.structures"
@@ -526,7 +528,7 @@ class TestAddStructureOwner(TestCase):
         cls.factory = RequestFactory()
         load_eveuniverse()
         cls.user = UserMainDefaultOwnerFactory()
-        cls.character = cls.user.profile.main_character
+        cls.character: EveCharacter = cls.user.profile.main_character
         cls.character_ownership = cls.character.character_ownership
 
     def _add_structure_owner_view(self, token=None, user=None):
@@ -655,87 +657,57 @@ 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):
+    @patch(VIEWS_PATH + ".STRUCTURES_ADMIN_NOTIFICATIONS_ENABLED", False)
+    @patch(VIEWS_PATH + ".tasks.update_all_for_owner")
+    @patch(VIEWS_PATH + ".notify_admins")
+    @patch(VIEWS_PATH + ".messages")
+    def test_can_readd_same_character(
+        self, mock_messages, mock_notify_admins, mock_update_all_for_owner
+    ):
         # 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"))
+        owner = OwnerFactory(characters=[self.character])
+        owner_character = owner.characters.first()
         # when
-        response = structures.service_status(request)
+        response = self._add_structure_owner_view(user=self.user)
         # 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(),
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, reverse("structures:index"))
+        owner.refresh_from_db()
+        character_ownerships = set(
+            owner.characters.values_list("character_ownership", flat=True)
         )
-        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(),
+        self.assertSetEqual(
+            {self.character_ownership.pk, owner_character.character_ownership.pk},
+            character_ownerships,
         )
-        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)
+    # @patch(VIEWS_PATH + ".STRUCTURES_ADMIN_NOTIFICATIONS_ENABLED", False)
+    # @patch(VIEWS_PATH + ".tasks.update_all_for_owner")
+    # @patch(VIEWS_PATH + ".notify_admins")
+    # @patch(VIEWS_PATH + ".messages")
+    # def test_should_reenable_character_when_re_adding(
+    #     self, mock_messages, mock_notify_admins, mock_update_all_for_owner
+    # ):
+    #     # given
+    #     owner = OwnerFactory(characters=[self.character])
+    #     owner_character: OwnerCharacter = owner.characters.first()
+    #     owner_character.is_enabled = False
+    #     owner_character.save()
+    #     # when
+    #     response = self._add_structure_owner_view(user=self.user)
+    #     # then
+    #     self.assertEqual(response.status_code, 302)
+    #     self.assertEqual(response.url, reverse("structures:index"))
+    #     owner.refresh_from_db()
+    #     character_ownerships = set(
+    #         owner.characters.values_list("character_ownership", flat=True)
+    #     )
+    #     self.assertSetEqual(
+    #         {self.character_ownership.pk, owner_character.character_ownership.pk},
+    #         character_ownerships,
+    #     )
+    #     owner_character.refresh_from_db()
+    #     self.assertTrue(owner_character.is_enabled)
 
 
 class TestStructureFittingModal(TestCase):

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
@@ -630,7 +630,7 @@ def add_structure_owner(request: HttpRequest, token: Token):
                 % {
                     "corporation": owner,
                     "character": token_char,
-                    "characters_count": owner.characters_count(),
+                    "characters_count": owner.valid_characters_count(),
                 }
             ),
         )
@@ -646,24 +646,8 @@ def add_structure_owner(request: HttpRequest, token: Token):
                         "character": token_char,
                         "corporation": owner,
                         "user": request.user.username,
-                        "characters_count": owner.characters_count(),
+                        "characters_count": owner.valid_characters_count(),
                     },
                     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"))