firefighter-incident 0.0.35__tar.gz → 0.0.36__tar.gz

{firefighter_incident-0.0.35 → firefighter_incident-0.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: firefighter-incident
-Version: 0.0.35
+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.35 → firefighter_incident-0.0.36}/firefighter/_version.py

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

{firefighter_incident-0.0.35 → firefighter_incident-0.0.36}/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_incident-0.0.35 → firefighter_incident-0.0.36}/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.36/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