Fix types

Author: snigdhas

tests/sentry/issues/test_ingest_incident_integration.py

@@ -2,10 +2,11 @@
 
 from django.utils import timezone
 
+from sentry.event_manager import GroupInfo
 from sentry.incidents.grouptype import MetricIssue
 from sentry.issues.grouptype import FeedbackGroup
 from sentry.issues.ingest import save_issue_occurrence
-from sentry.issues.issue_occurrence import IssueOccurrenceData
+from sentry.issues.issue_occurrence import IssueOccurrence, IssueOccurrenceData
 from sentry.models.group import GroupStatus
 from sentry.models.groupopenperiod import GroupOpenPeriod
 from sentry.testutils.cases import TestCase
@@ -14,7 +15,7 @@
 
 
 class IncidentGroupOpenPeriodIntegrationTest(TestCase):
-    def setUp(self):
+    def setUp(self) -> None:
         super().setUp()
         self.organization = self.create_organization()
         self.project = self.create_project(organization=self.organization)
@@ -24,7 +25,9 @@ def setUp(self):
             name="Test Alert Rule",
         )
 
-    def save_issue_occurrence(self, group_type=MetricIssue):
+    def save_issue_occurrence(
+        self, group_type: int = MetricIssue.type_id
+    ) -> tuple[IssueOccurrence, GroupInfo]:
         event = self.store_event(
             data={"timestamp": timezone.now().isoformat()}, project_id=self.project.id
         )
@@ -41,7 +44,7 @@ def save_issue_occurrence(self, group_type=MetricIssue):
             "evidence_display": [
                 {"name": "Test Evidence", "value": "Test Value", "important": True}
             ],
-            "type": group_type.type_id,
+            "type": group_type,
             "detection_time": timezone.now().timestamp(),
             "level": "error",
             "culprit": "test-culprit",
@@ -51,11 +54,11 @@ def save_issue_occurrence(self, group_type=MetricIssue):
             occurrence, group_info = save_issue_occurrence(occurrence_data, event)
 
         assert group_info is not None
-        assert group_info.group.type == group_type.type_id
+        assert group_info.group.type == group_type
         return occurrence, group_info
 
     @with_feature("organizations:issue-open-periods")
-    def test_save_issue_occurrence_creates_relationship_when_incident_exists(self):
+    def test_save_issue_occurrence_creates_relationship_when_incident_exists(self) -> None:
         """Test that save_issue_occurrence creates the relationship when incident exists"""
         incident = self.create_incident(
             organization=self.organization,
@@ -74,7 +77,7 @@ def test_save_issue_occurrence_creates_relationship_when_incident_exists(self):
         assert item.incident_identifier == incident.identifier
 
     @with_feature("organizations:issue-open-periods")
-    def test_save_issue_occurrence_creates_placeholder_when_incident_doesnt_exist(self):
+    def test_save_issue_occurrence_creates_placeholder_when_incident_doesnt_exist(self) -> None:
         """Test that save_issue_occurrence creates placeholder when incident doesn't exist"""
         _, group_info = self.save_issue_occurrence()
         group = group_info.group
@@ -86,7 +89,7 @@ def test_save_issue_occurrence_creates_placeholder_when_incident_doesnt_exist(se
         assert not IncidentGroupOpenPeriod.objects.filter(group_open_period=open_period).exists()
 
     @with_feature("organizations:issue-open-periods")
-    def test_save_issue_occurrence_creates_relationship_for_existing_group(self):
+    def test_save_issue_occurrence_creates_relationship_for_existing_group(self) -> None:
         """Test that save_issue_occurrence creates relationship for existing groups"""
         incident = self.create_incident(
             organization=self.organization,
@@ -114,9 +117,9 @@ def test_save_issue_occurrence_creates_relationship_for_existing_group(self):
         assert item.incident_identifier == incident.identifier
 
     @with_feature("organizations:issue-open-periods")
-    def test_save_issue_occurrence_no_relationship_for_non_metric_issues(self):
+    def test_save_issue_occurrence_no_relationship_for_non_metric_issues(self) -> None:
         # Test that save_issue_occurrence doesn't create relationships for non-metric issues
-        _, group_info = self.save_issue_occurrence(group_type=FeedbackGroup)
+        _, group_info = self.save_issue_occurrence(group_type=FeedbackGroup.type_id)
 
         group = group_info.group
         assert group is not None

tests/sentry/workflow_engine/models/test_incident_groupopenperiod.py

@@ -1,3 +1,4 @@
+from typing import Any
 from unittest.mock import patch
 
 from django.utils import timezone
@@ -12,7 +13,7 @@
 
 
 class IncidentGroupOpenPeriodTest(TestCase):
-    def setUp(self):
+    def setUp(self) -> None:
         super().setUp()
         self.organization = self.create_organization()
         self.project = self.create_project(organization=self.organization)
@@ -25,7 +26,7 @@ def setUp(self):
         self.group.type = MetricIssue.type_id
         self.group.save()
 
-    def save_issue_occurrence(self, group_type=MetricIssue, include_alert_id=True):
+    def save_issue_occurrence(self, include_alert_id: bool = True) -> tuple[Any, GroupOpenPeriod]:
         event = self.store_event(
             data={"timestamp": timezone.now().isoformat()}, project_id=self.project.id
         )
@@ -42,7 +43,7 @@ def save_issue_occurrence(self, group_type=MetricIssue, include_alert_id=True):
             "evidence_display": [
                 {"name": "Test Evidence", "value": "Test Value", "important": True}
             ],
-            "type": group_type.type_id,
+            "type": MetricIssue.type_id,
             "detection_time": timezone.now().timestamp(),
             "level": "error",
             "culprit": "test-culprit",
@@ -52,15 +53,15 @@ def save_issue_occurrence(self, group_type=MetricIssue, include_alert_id=True):
             occurrence, group_info = save_issue_occurrence(occurrence_data, event)
 
         assert group_info is not None
-        assert group_info.group.type == group_type.type_id
+        assert group_info.group.type == MetricIssue.type_id
 
         open_period = GroupOpenPeriod.objects.get(group=group_info.group)
         assert open_period is not None
         assert open_period.date_ended is None
         return occurrence, open_period
 
     @with_feature("organizations:issue-open-periods")
-    def test_create_from_occurrence_with_existing_incident(self):
+    def test_create_from_occurrence_with_existing_incident(self) -> None:
         """Test creating relationship when incident exists"""
         occurrence, open_period = self.save_issue_occurrence()
 
@@ -79,7 +80,7 @@ def test_create_from_occurrence_with_existing_incident(self):
         assert result.group_open_period == open_period
 
     @with_feature("organizations:issue-open-periods")
-    def test_create_from_occurrence_without_incident(self):
+    def test_create_from_occurrence_without_incident(self) -> None:
         """Test creating placeholder when incident doesn't exist"""
         occurrence, open_period = self.save_issue_occurrence()
 
@@ -90,7 +91,7 @@ def test_create_from_occurrence_without_incident(self):
         assert open_period.data["pending_incident_alert_id"] == self.alert_rule.id
 
     @with_feature("organizations:issue-open-periods")
-    def test_create_from_occurrence_no_alert_id(self):
+    def test_create_from_occurrence_no_alert_id(self) -> None:
         """Test handling when no alert_id in evidence_data"""
         with patch("sentry.issues.ingest.eventstream") as _:
             occurrence, group_info = self.save_issue_occurrence(include_alert_id=False)
@@ -105,7 +106,7 @@ def test_create_from_occurrence_no_alert_id(self):
         assert result is None
 
     @with_feature("organizations:issue-open-periods")
-    def test_create_relationship_new(self):
+    def test_create_relationship_new(self) -> None:
         """Test creating a new relationship"""
         occurrence, open_period = self.save_issue_occurrence()
 
@@ -124,7 +125,7 @@ def test_create_relationship_new(self):
         assert result.group_open_period == open_period
 
     @with_feature("organizations:issue-open-periods")
-    def test_create_relationship_existing(self):
+    def test_create_relationship_existing(self) -> None:
         """Test updating an existing relationship"""
         occurrence, open_period = self.save_issue_occurrence()
 
@@ -155,7 +156,7 @@ def test_create_relationship_existing(self):
         assert result.group_open_period == open_period
 
     @with_feature("organizations:issue-open-periods")
-    def test_create_placeholder_relationship(self):
+    def test_create_placeholder_relationship(self) -> None:
         """Test creating a placeholder relationship"""
         occurrence, open_period = self.save_issue_occurrence()
 
@@ -168,7 +169,7 @@ def test_create_placeholder_relationship(self):
         assert open_period.data["pending_incident_alert_id"] == self.alert_rule.id
 
     @with_feature("organizations:issue-open-periods")
-    def test_create_pending_relationships_for_incident(self):
+    def test_create_pending_relationships_for_incident(self) -> None:
         """Test creating relationships for pending open periods"""
         occurrence, open_period = self.save_issue_occurrence()
 
@@ -195,7 +196,7 @@ def test_create_pending_relationships_for_incident(self):
         assert "pending_incident_alert_id" not in open_period.data
 
     @with_feature("organizations:issue-open-periods")
-    def test_create_pending_relationships_for_incident_no_pending(self):
+    def test_create_pending_relationships_for_incident_no_pending(self) -> None:
         """Test creating relationships when no pending relationships exist"""
         incident = self.create_incident(
             organization=self.organization,