firefighter-incident 0.0.34__py3-none-any.whl → 0.0.36__py3-none-any.whl

firefighter/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.34'
-__version_tuple__ = version_tuple = (0, 0, 34)
+__version__ = version = '0.0.36'
+__version_tuple__ = version_tuple = (0, 0, 36)
 
 __commit_id__ = commit_id = None

firefighter/incidents/tasks/updateoncall.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Any
 
-from celery import Signature, shared_task
+from celery import shared_task
 from django.conf import settings
 
 from firefighter.slack.slack_templating import user_slack_handle_or_name
@@ -28,11 +28,11 @@ BASE_URL: str = settings.BASE_URL
 @shared_task(name="incidents.update_oncall")
 def update_oncall() -> None:
     """Fetch current on-calls and update the on-call Slack topic and Confluence page."""
-    chain: Signature[bool] = (
+    task_chain: Any = (
         fetch_oncalls.s()  # pyright: ignore[reportUnboundVariable]
         | update_oncall_views.s()
     )
-    chain()
+    task_chain()
 
 
 @shared_task(name="incidents.update_oncall_views")

firefighter/incidents/templates/pages/incident_detail.html

@@ -102,7 +102,7 @@
       <div class="lg:col-start-8 lg:col-span-5 space-y-6 ">
         {% component "card" card_title="External resources" id="incident-integrations" %}
           {% fill "card_content" %}
-            {% if not incident.conversation and not incident.postmortem_for and pagerduty_incident_set.count == 0 %}
+            {% if not incident.conversation and not has_confluence_pm and not has_jira_pm and not has_jira_ticket and pagerduty_incident_set.count == 0 %}
               <div class="px-4 py-5 sm:px-6 col-span-2">
                 <h4 class="text-center font-medium text-sm text-neutral-500 dark:text-neutral-100">
                   No external resources for this incident.
@@ -144,7 +144,7 @@
                     </div>
                   </li>
                 {% endif %}
-                {% if incident.postmortem_for %}
+                {% if has_confluence_app and incident.postmortem_for %}
                   <li class="py-4 flex items-center">
                     <div class="h-10 w-10 flex shrink-0">
                       <svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8 m-auto" viewBox="0 0 20 20" fill="currentColor">
@@ -157,6 +157,19 @@
                     </div>
                   </li>
                 {% endif %}
+                {% if has_jira_app and incident.jira_postmortem_for %}
+                  <li class="py-4 flex items-center">
+                    <div class="h-10 w-10 flex shrink-0">
+                      <svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8 m-auto" viewBox="0 0 20 20" fill="currentColor">
+                        <path fill-rule="evenodd" d="M4 4a2 2 0 012-2h4.586A2 2 0 0112 2.586L15.414 6A2 2 0 0116 7.414V16a2 2 0 01-2 2H6a2 2 0 01-2-2V4zm2 6a1 1 0 011-1h6a1 1 0 110 2H7a1 1 0 01-1-1zm1 3a1 1 0 100 2h6a1 1 0 100-2H7z" clip-rule="evenodd" />
+                      </svg>
+                    </div>
+                    <div class="ml-3">
+                      <p class="text-sm font-medium text-neutral-900 dark:text-neutral-100">Post-mortem</p>
+                      <p class="text-sm text-neutral-500 dark:text-neutral-300"> <a href="{{ incident.jira_postmortem_for.issue_url }}" target="_blank" rel="noopener noreferrer" class="underline" >{{ incident.jira_postmortem_for.jira_issue_key|truncatechars:70 }}</a></p>
+                    </div>
+                  </li>
+                {% endif %}
                 {% if incident.jira_ticket %}
                   <li class="py-4 flex items-center">
                     <div class="h-10 w-10 flex shrink-0">

firefighter/incidents/views/views.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import logging
 import re
+from contextlib import suppress
 from typing import TYPE_CHECKING, Any, cast
 
 from django.conf import settings
@@ -194,8 +195,35 @@ class IncidentDetailView(CustomDetailView[Incident]):
 
         incident: Incident = context["incident"]
 
+        # Check if external resources exist
+        has_confluence_app = "firefighter.confluence" in settings.INSTALLED_APPS
+        has_jira_app = "firefighter.jira_app" in settings.INSTALLED_APPS
+
+        # Safely check for post-mortem existence
+        # We suppress exceptions because accessing OneToOne relations can fail
+        # in various ways if the related app is not installed or tables don't exist
+        has_confluence_pm = False
+        if has_confluence_app:
+            with suppress(AttributeError, ImportError, LookupError):
+                has_confluence_pm = bool(incident.postmortem_for)
+
+        has_jira_pm = False
+        if has_jira_app:
+            with suppress(AttributeError, ImportError, LookupError):
+                has_jira_pm = bool(incident.jira_postmortem_for)
+
+        has_jira_ticket = False
+        if has_jira_app:
+            with suppress(AttributeError, ImportError, LookupError):
+                has_jira_ticket = bool(incident.jira_ticket)
+
         additional_context = {
             "page_title": f"Incident #{incident.id}",
+            "has_confluence_app": has_confluence_app,
+            "has_jira_app": has_jira_app,
+            "has_confluence_pm": has_confluence_pm,
+            "has_jira_pm": has_jira_pm,
+            "has_jira_ticket": has_jira_ticket,
         }
 
         return {**context, **additional_context}

{firefighter_incident-0.0.34.dist-info → firefighter_incident-0.0.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: firefighter-incident
-Version: 0.0.34
+Version: 0.0.36
 Summary: Incident Management tool made for Slack using Django
 Project-URL: Repository, https://github.com/ManoManoTech/firefighter-incident
 Project-URL: Documentation, https://manomanotech.github.io/firefighter-incident/latest/

{firefighter_incident-0.0.34.dist-info → firefighter_incident-0.0.36.dist-info}/RECORD

@@ -6,7 +6,7 @@ gunicorn.conf.py,sha256=vHsTGjaKOr8FDMp6fTKYTX4AtokmPgYvvt5Mr0Q6APc,273
 main.py,sha256=Brj7IANCvq7zHGT7mm_VDO1_vV7OFwt6Zpt4gUwP4pM,1532
 manage.py,sha256=5ivHGD13C6nJ8QvltKsJ9T9akA5he8da70HLWaEP3k8,689
 firefighter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-firefighter/_version.py,sha256=lALZlyVk-nrQoV2VLZzOsgzhfEll5JRUW4TJRJXnR_o,706
+firefighter/_version.py,sha256=0ktbVh2xRI7xnrojV_sDPVhrN753EK8vWN68JQalwWk,706
 firefighter/api/__init__.py,sha256=JQW0Bv6xwGqy7ioxx3h6UGMzkkJ4DntDpbvV1Ncgi8k,136
 firefighter/api/admin.py,sha256=Q6f37xwf-i0xypFx6zU7r6bYxsSvLm66naZSHUK13JM,4621
 firefighter/api/apps.py,sha256=P5uU1_gMrDfzurdMbfqw1Bnb2uNKKcMq17WBPg2sLhc,204
@@ -219,7 +219,7 @@ firefighter/incidents/static/img/favicon/site.webmanifest,sha256=NJW-gRQeeWpPkSi
 firefighter/incidents/static/js/main.js,sha256=T7FTIT_JMAMIPJmAvAQSjmxvzpUgkiCjzRqHEKBEl1M,558
 firefighter/incidents/static/js/main.min.js,sha256=BfqPI2rnZBm7Gk82rXZRf_A-Ihv76aAtQi8eA-rW8kA,235569
 firefighter/incidents/tasks/__init__.py,sha256=VVOIAmKi-im5UnQwZokuQmm3FcqRbBwJsxGV3cH2SO0,89
-firefighter/incidents/tasks/updateoncall.py,sha256=dLfhajkEjlniAz3NGZ0YCXIe2GmYPBkXfvoK1MwVZGc,4028
+firefighter/incidents/tasks/updateoncall.py,sha256=9p0neb0mOm165UAA6JAr7kXrkX4gh2ZIjvdV6l3TuVc,4015
 firefighter/incidents/templates/incidents/filter.html,sha256=ZZu7FIclnwhtOCYAm_DBUgZ-cdxwFQPUXW8lATBF1mM,4401
 firefighter/incidents/templates/incidents/table.html,sha256=cNy6gLIE4IW3czOPQzKwtQrc5rbjo9XP7IyA7uUQc0g,2360
 firefighter/incidents/templates/incidents/errors/base.html,sha256=BAu35yyBSO-r6GXP0AyH6hbNOpwXsbkSCRr2AnWYzKQ,942
@@ -251,7 +251,7 @@ firefighter/incidents/templates/pages/docs_metrics.html,sha256=q10CCPwjujuj9_h7M
 firefighter/incidents/templates/pages/incident_category_detail.html,sha256=65vhQ3l3cWlLUYilfKHPuMn7lEfRJFjokiOeYUpeTTY,5425
 firefighter/incidents/templates/pages/incident_category_list.html,sha256=gXLPk9N7R585xqmA6JpL06J7hsxAXQvnsShesK2HR9o,1731
 firefighter/incidents/templates/pages/incident_create.html,sha256=syDS8EqmdcCf6z2dJox5gSPTOsyNdq0jFiDdzVc_vmU,2280
-firefighter/incidents/templates/pages/incident_detail.html,sha256=HhwpMg1nAaUqbYDi2RrgK5IkPhiKzHKcoSmk98O-rng,15058
+firefighter/incidents/templates/pages/incident_detail.html,sha256=7KbrQMymcPUw0qbF4m08V9afsxrWxml6iGzdk-q5qPk,16238
 firefighter/incidents/templates/pages/incident_list.html,sha256=IWTZyuIeG1RVCZGNLQ_N3Jg7a_Ush6YbQXWUy0xVuV8,2339
 firefighter/incidents/templates/pages/incident_role_types_detail.html,sha256=LVoFbW9rrP4Yln_Ld-Jwe1JvhhvgwpxZgpdNzbrLWsA,4099
 firefighter/incidents/templates/pages/incident_role_types_list.html,sha256=SRBhDIfne-bX4C-EhYqyCktIksR4Rd5GPMkYfE6El1o,1556
@@ -264,7 +264,7 @@ firefighter/incidents/views/date_filter.py,sha256=fUhTjkBulMokI5tAHuqNDVv1dyspjm
 firefighter/incidents/views/date_utils.py,sha256=Q2i-84hXm1vuXy7-1x1SSteWXzXUzh4b0a79nmTEfWA,5733
 firefighter/incidents/views/errors.py,sha256=yDuH0YOdGf-voVNEC51yR9Ie3OU-az7g2EqWs_uV1Kk,7855
 firefighter/incidents/views/reports.py,sha256=1Iegx04w-oHw4cj7u9w2_s7T_e9FH5I6RRPTwDZwZhg,20973
-firefighter/incidents/views/views.py,sha256=4AR3i9SiC9AnrzZCRIhx147rus4_dXS0IRWsQ8ilkjg,11031
+firefighter/incidents/views/views.py,sha256=ynMYwEi4vKHpYwrH6kEAiWKY91NVF8QSZfKy5thQuXg,12287
 firefighter/incidents/views/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/incidents/views/components/details.py,sha256=gFEezmL1TcVYnM_ryLNNMaynuIdjYV31Qzx_GfzrQiA,1040
 firefighter/incidents/views/components/list.py,sha256=u8HfXetmdL59h_4AZIhiHmKcmrPRZXgekPfnucB4Rek,2207
@@ -482,6 +482,7 @@ firefighter_tests/test_incidents/test_models/test_incident_category.py,sha256=aR
 firefighter_tests/test_incidents/test_models/test_incident_model.py,sha256=AWyWfQYcHNP9GPizIo0wRxNGTJTEJnAwNSd4UmRq-dk,8626
 firefighter_tests/test_incidents/test_models/test_migrations/test_incident_migrations.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter_tests/test_incidents/test_utils/test_date_utils.py,sha256=ogP7qOEwItL4YGI5gbQPVssOS9ilwiuZC8OrT2qngBY,6568
+firefighter_tests/test_incidents/test_views/test_incident_detail_jira_postmortem.py,sha256=WM1nr3XLGMqOEyr4e6XsWcU01aH4spiGnXd9YsVoVZY,1925
 firefighter_tests/test_incidents/test_views/test_incident_detail_view.py,sha256=lkCIRfz99Ea0o0Id08LFWrjXLDmHv6XvezaSsjg-eYQ,871
 firefighter_tests/test_incidents/test_views/test_index_view.py,sha256=InpxbaWOFwRn4YWeIKZhj17vMymrQQf2p2LFhe2Bcdw,816
 firefighter_tests/test_jira_app/__init__.py,sha256=JxZ3v-0kiHOoO-N3kR8NHTmD8tEvuEYKW1GX_S1ZLMY,33
@@ -528,8 +529,8 @@ firefighter_tests/test_slack/views/modals/test_send_sos.py,sha256=_rE6jD-gOzcGyh
 firefighter_tests/test_slack/views/modals/test_status.py,sha256=oQzPfwdg2tkbo9nfkO1GfS3WydxqSC6vy1AZjZDKT30,2226
 firefighter_tests/test_slack/views/modals/test_update_status.py,sha256=vbHGx6dkM_0swE1vJ0HrkhI1oJzD_WHZuIQ-_arAxXo,55686
 firefighter_tests/test_slack/views/modals/test_utils.py,sha256=DJd2n9q6fFu8UuCRdiq9U_Cn19MdnC5c-ydLLrk6rkc,5218
-firefighter_incident-0.0.34.dist-info/METADATA,sha256=Ap1ovJI4n2CB3VlE_e-GPUyxmDm5PWrACG8e2a5kOFg,5570
-firefighter_incident-0.0.34.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-firefighter_incident-0.0.34.dist-info/entry_points.txt,sha256=c13meJbv7YNmYz7MipMOQwzQ5IeFOPXUBYAJ44XMQsM,61
-firefighter_incident-0.0.34.dist-info/licenses/LICENSE,sha256=krRiGp-a9-1nH1bWpBEdxyTKLhjLmn6DMVVoIb0zF90,1087
-firefighter_incident-0.0.34.dist-info/RECORD,,
+firefighter_incident-0.0.36.dist-info/METADATA,sha256=lTBD-i5dhhYhEu9Jy1GK31W1V_HbnE1bHiNP0fItrjM,5570
+firefighter_incident-0.0.36.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+firefighter_incident-0.0.36.dist-info/entry_points.txt,sha256=c13meJbv7YNmYz7MipMOQwzQ5IeFOPXUBYAJ44XMQsM,61
+firefighter_incident-0.0.36.dist-info/licenses/LICENSE,sha256=krRiGp-a9-1nH1bWpBEdxyTKLhjLmn6DMVVoIb0zF90,1087
+firefighter_incident-0.0.36.dist-info/RECORD,,

firefighter_tests/test_incidents/test_views/test_incident_detail_jira_postmortem.py

@@ -0,0 +1,63 @@
+"""Test incident detail view displays Jira post-mortem links."""
+
+from __future__ import annotations
+
+import pytest
+from django.apps import apps
+from django.test import Client
+from django.urls import reverse
+
+from firefighter.incidents.models import Incident
+from firefighter.incidents.models.user import User
+
+pytestmark = pytest.mark.skipif(
+    not apps.is_installed("firefighter.jira_app"),
+    reason="Jira app not installed",
+)
+
+
+@pytest.mark.django_db
+def test_incident_detail_view_with_jira_postmortem(
+    client: Client, incident_saved: Incident, admin_user: User
+) -> None:
+    """Test that Jira post-mortem link is displayed when it exists."""
+    from firefighter.jira_app.models import JiraPostMortem
+
+    # Create a Jira post-mortem for the incident
+    JiraPostMortem.objects.create(
+        incident=incident_saved,
+        jira_issue_key="INCIDENT-123",
+        jira_issue_id="10001",
+        created_by=admin_user,
+    )
+
+    client.force_login(admin_user)
+    response = client.get(
+        reverse("incidents:incident-detail", args=[incident_saved.id])
+    )
+
+    assert response.status_code == 200
+    response_content = str(response.content)
+
+    # Check that the post-mortem section is present
+    assert "Post-mortem" in response_content
+
+    # Check that the Jira issue key is displayed
+    assert "INCIDENT-123" in response_content
+
+    # Check that the URL is correctly formed
+    assert "browse/INCIDENT-123" in response_content
+
+
+@pytest.mark.django_db
+def test_incident_detail_view_without_jira_postmortem(
+    client: Client, incident_saved: Incident, admin_user: User
+) -> None:
+    """Test that incident detail view works without Jira post-mortem."""
+    client.force_login(admin_user)
+    response = client.get(
+        reverse("incidents:incident-detail", args=[incident_saved.id])
+    )
+
+    assert response.status_code == 200
+    # Page should load successfully even without post-mortem