From e01ef60ed2674ad3ada15231d4571621ab76d58c Mon Sep 17 00:00:00 2001
From: RulaKhaled <rola.abuhasna@sentry.io>
Date: Thu, 17 Apr 2025 20:03:41 +0200
Subject: [PATCH 1/2] fix: Fix Django vuln

---
 pyproject.toml | 2 +-
 uv.lock        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 27cd56fc05..1e154cb578 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,7 +19,7 @@ dependencies = [
     "django-model-utils==4.5.1",
     "django-postgres-extra>=2.0.8",
     "django-prometheus==2.3.1",
-    "django>=4.2.16",
+    "django>=4.2.17",
     "djangorestframework==3.15.2",
     "drf-spectacular==0.26.2",
     "drf-spectacular-sidecar==2023.3.1",
diff --git a/uv.lock b/uv.lock
index 970286595f..b6ae2f32da 100644
--- a/uv.lock
+++ b/uv.lock
@@ -359,7 +359,7 @@ requires-dist = [
     { name = "celery", specifier = ">=5.3.6" },
     { name = "cerberus", specifier = "==1.3.5" },
     { name = "certifi", specifier = ">=2024.7.4" },
-    { name = "django", specifier = ">=4.2.16" },
+    { name = "django", specifier = ">=4.2.17" },
     { name = "django-autocomplete-light", specifier = "==3.11.0" },
     { name = "django-better-admin-arrayfield", specifier = "==1.4.2" },
     { name = "django-cors-headers", specifier = "==3.7.0" },
@@ -503,16 +503,16 @@ wheels = [
 
 [[package]]
 name = "django"
-version = "4.2.16"
+version = "4.2.20"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "asgiref" },
     { name = "sqlparse" },
     { name = "tzdata", marker = "sys_platform == 'win32'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/65/d8/a607ee443b54a4db4ad28902328b906ae6218aa556fb9b3ac45c0bcb313d/Django-4.2.16.tar.gz", hash = "sha256:6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad", size = 10436023 }
+sdist = { url = "https://files.pythonhosted.org/packages/0a/dd/33d2a11713f6b78493273a32d99bb449f2d93663ed4ec15a8b890d44ba04/Django-4.2.20.tar.gz", hash = "sha256:92bac5b4432a64532abb73b2ac27203f485e40225d2640a7fbef2b62b876e789", size = 10432686 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/94/2c/6b6c7e493d5ea789416918658ebfa16be7a64c77610307497ed09a93c8c4/Django-4.2.16-py3-none-any.whl", hash = "sha256:1ddc333a16fc139fd253035a1606bb24261951bbc3a6ca256717fa06cc41a898", size = 7992936 },
+    { url = "https://files.pythonhosted.org/packages/b3/5d/7571ba1c288ead056dda7adad46b25cbf64790576f095565282e996138b1/Django-4.2.20-py3-none-any.whl", hash = "sha256:213381b6e4405f5c8703fffc29cd719efdf189dec60c67c04f76272b3dc845b9", size = 7993584 },
 ]
 
 [[package]]

From 68fd0d03372656b10a6326c7dde90323260563ca Mon Sep 17 00:00:00 2001
From: RulaKhaled <rola.abuhasna@sentry.io>
Date: Thu, 24 Apr 2025 00:25:54 +0200
Subject: [PATCH 2/2] fix: Second attempt to resolve segments results err

---
 services/comparison.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/comparison.py b/services/comparison.py
index db1e02229f..9c531fb3a0 100644
--- a/services/comparison.py
+++ b/services/comparison.py
@@ -397,6 +397,8 @@ class Segment:
     @classmethod
     def segments(cls, file_comparison):
         lines = file_comparison.lines
+        if lines is None:
+            return []
 
         # line numbers of interest (i.e. coverage changed or code changed)
         line_numbers = []