website/templatetags/custom_tags.py (1)

207-210: Enhance docstring with parameter and return details

Improve the function documentation by adding parameter and return value details.

 @register.filter
 def format_security_timedelta(td):
-    """Convert a timedelta object into a human-readable string."""
+    """Convert a timedelta object into a human-readable string.
+    
+    Args:
+        td (timedelta): The timedelta object to format
+    
+    Returns:
+        str: A formatted string like "X days, Y hours, Z minutes" or "N/A" if td is None
+    """
     if not td:
         return "N/A"

website/templates/organization/organization_analytics.html (1)

282-329: Add error handling for potentially missing data

The security incidents summary section should handle the case where security_incidents_summary might be None or any of its properties might be missing.

Add checks before accessing potentially missing properties:

 <div id="security-incidents" class="w-full px-8 mt-8">
     <div class="bg-white rounded-xl p-6 shadow-sm">
         <h2 class="text-2xl font-bold text-gray-900 mb-6">Security Incidents Summary</h2>
+        {% if security_incidents_summary %}
         <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
             <!-- Recent Incidents -->
             <div class="bg-gray-50 p-4 rounded-lg">
                 <h3 class="text-lg font-semibold text-gray-800 mb-2">Recent Incidents (30 days)</h3>
                 <p class="text-3xl font-bold text-red-600">{{ security_incidents_summary.recent_incidents }}</p>
             </div>
             <!-- Other sections... -->
         </div>
+        {% else %}
+        <div class="bg-gray-50 p-4 rounded-lg">
+            <p class="text-gray-600">No security incidents data available</p>
+        </div>
+        {% endif %}
     </div>
 </div>

website/views/company.py (1)

214-216: Potential database compatibility issue with timedelta calculation

Using database-level subtraction with F("closed_date") - F("created") might work for PostgreSQL, but could cause issues with other database backends. Consider performing this calculation in Python after fetching the data.

     # Calculate average resolution time
     resolved_issues = security_issues.filter(status="resolved")
     resolved_issues = resolved_issues.filter(closed_date__isnull=False)
-    avg_resolution_time = resolved_issues.aggregate(avg_time=Avg(F("closed_date") - F("created")))["avg_time"]
+    # Fetch the issues and calculate average timedelta in Python
+    resolved_issues_list = resolved_issues.values('closed_date', 'created')
+    if resolved_issues_list:
+        total_timedelta = timedelta()
+        count = 0
+        for issue in resolved_issues_list:
+            if issue['closed_date'] and issue['created']:
+                total_timedelta += issue['closed_date'] - issue['created']
+                count += 1
+        avg_resolution_time = total_timedelta / count if count > 0 else None
+    else:
+        avg_resolution_time = None

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

website/views/company.py (1)

195-227: Nicely structured security incidents summary method with good error handling.

The method effectively:

• Filters security-related issues (label=4)
• Gracefully handles the possible absence of the severity field
• Calculates recent incidents (last 30 days)
• Computes average resolution time
• Identifies top affected domains

However, there's potential for a None value in the average resolution time calculation if no issues are resolved.

Consider adding a fallback for the average resolution time when no issues are resolved:

    avg_resolution_time = resolved_issues.aggregate(avg_time=Avg(F("closed_date") - F("created")))["avg_time"]
+    # Provide default value when no resolved issues exist
+    if avg_resolution_time is None:
+        avg_resolution_time = timedelta(0)

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

website/templatetags/custom_tags.py (1)

208-217: The timedelta formatter looks good, with a minor readability enhancement suggestion.

The implementation correctly calculates days, hours, and minutes from a timedelta object, properly extracting each time component. I see that the previous review comment about correctly handling days extraction has been addressed.

Consider handling pluralization for a more natural reading experience:

 @register.filter
 def format_security_timedelta(td):
     """Convert a timedelta object into a human-readable string."""
     if not td:
         return "N/A"
     total_seconds = int(td.total_seconds())
     days = total_seconds // (24 * 3600)  # Calculate days first
     hours = (total_seconds % (24 * 3600)) // 3600  # Get remaining hours after days
     minutes = (total_seconds % 3600) // 60  # Get remaining minutes
-    return f"{days} days, {hours} hours, {minutes} minutes"
+    day_label = "day" if days == 1 else "days"
+    hour_label = "hour" if hours == 1 else "hours"
+    minute_label = "minute" if minutes == 1 else "minutes"
+    return f"{days} {day_label}, {hours} {hour_label}, {minutes} {minute_label}"

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

website/templatetags/custom_tags.py (1)

208-217: Clean implementation of the time formatter filter!

The implementation correctly calculates days, hours, and minutes from a timedelta object, addressing the previous feedback about hours calculation. This will provide a consistent and readable time format for security incidents in the dashboard.

Here are a few minor suggestions to make the function even more robust:

1. Consider handling negative timedeltas (perhaps with an absolute value conversion)
2. The function could be enhanced to display only non-zero components (e.g., "2 hours, 30 minutes" instead of "0 days, 2 hours, 30 minutes")
3. Expand the docstring to include parameter and return value descriptions

 @register.filter
 def format_security_timedelta(td):
-    """Convert a timedelta object into a human-readable string."""
+    """
+    Convert a timedelta object into a human-readable string.
+    
+    Args:
+        td (timedelta): The timedelta object to format
+        
+    Returns:
+        str: A human-readable string representation (e.g., "2 days, 5 hours, 30 minutes")
+              or "N/A" if the input is None/empty
+    """
     if not td:
         return "N/A"
-    total_seconds = int(td.total_seconds())
+    # Handle negative timedeltas by taking absolute value
+    total_seconds = int(abs(td.total_seconds()))
     days = total_seconds // (24 * 3600)  # Calculate days first
     hours = (total_seconds % (24 * 3600)) // 3600  # Get remaining hours after days
     minutes = (total_seconds % 3600) // 60  # Get remaining minutes
-    return f"{days} days, {hours} hours, {minutes} minutes"
+    # Build parts of the string, including only non-zero components
+    parts = []
+    if days > 0:
+        parts.append(f"{days} days")
+    if hours > 0 or days > 0:
+        parts.append(f"{hours} hours")
+    if minutes > 0 or hours > 0 or days > 0:
+        parts.append(f"{minutes} minutes")
+    if not parts:
+        return "0 minutes"  # Handle case where all values are zero
+    return ", ".join(parts)

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro