ref(uptime): Consistently name ProjectUptimeSubscription -> uptime_monitor (#97766)

Author: evanpurkhiser

src/sentry/uptime/endpoints/bases.py

@@ -21,7 +21,7 @@ def convert_args(
         project = kwargs["project"]
 
         try:
-            kwargs["uptime_subscription"] = ProjectUptimeSubscription.objects.get(
+            kwargs["uptime_monitor"] = ProjectUptimeSubscription.objects.get(
                 project=project, id=uptime_project_subscription_id
             )
         except ProjectUptimeSubscription.DoesNotExist:

src/sentry/uptime/endpoints/project_uptime_alert_checks_index.py

@@ -54,10 +54,10 @@ def get(
         self,
         request: Request,
         project: Project,
-        uptime_subscription: ProjectUptimeSubscription,
+        uptime_monitor: ProjectUptimeSubscription,
     ) -> Response:
 
-        if uptime_subscription.uptime_subscription.subscription_id is None:
+        if uptime_monitor.uptime_subscription.subscription_id is None:
             return Response([])
 
         start, end = get_date_range_from_params(request.GET)
@@ -71,7 +71,7 @@ def data_fn(offset: int, limit: int) -> Any:
                 ):
                     return self._make_eap_request(
                         project,
-                        uptime_subscription,
+                        uptime_monitor,
                         offset,
                         limit,
                         start,
@@ -83,7 +83,7 @@ def data_fn(offset: int, limit: int) -> Any:
                 else:
                     return self._make_eap_request(
                         project,
-                        uptime_subscription,
+                        uptime_monitor,
                         offset,
                         limit,
                         start,
@@ -107,7 +107,7 @@ def data_fn(offset: int, limit: int) -> Any:
     def _make_eap_request(
         self,
         project: Project,
-        uptime_subscription: ProjectUptimeSubscription,
+        uptime_monitor: ProjectUptimeSubscription,
         offset: int,
         limit: int,
         start: datetime,
@@ -129,11 +129,9 @@ def _make_eap_request(
         end_timestamp.FromDatetime(end)
 
         if trace_item_type == TraceItemType.TRACE_ITEM_TYPE_UPTIME_CHECK:
-            subscription_id = str(
-                uuid.UUID(uptime_subscription.uptime_subscription.subscription_id)
-            )
+            subscription_id = str(uuid.UUID(uptime_monitor.uptime_subscription.subscription_id))
         else:
-            subscription_id = uuid.UUID(uptime_subscription.uptime_subscription.subscription_id).hex
+            subscription_id = uuid.UUID(uptime_monitor.uptime_subscription.subscription_id).hex
 
         subscription_filter = TraceItemFilter(
             comparison_filter=ComparisonFilter(
@@ -202,12 +200,12 @@ def _make_eap_request(
         )
 
         rpc_response = snuba_rpc.table_rpc([rpc_request])[0]
-        return self._serialize_response(rpc_response, uptime_subscription, trace_item_type)
+        return self._serialize_response(rpc_response, uptime_monitor, trace_item_type)
 
     def _serialize_response(
         self,
         rpc_response: TraceItemTableResponse,
-        uptime_subscription: ProjectUptimeSubscription,
+        uptime_monitor: ProjectUptimeSubscription,
         trace_item_type: TraceItemType.ValueType,
     ) -> list[EapCheckEntrySerializerResponse]:
         """
@@ -220,7 +218,7 @@ def _serialize_response(
         column_names = [cv.attribute_name for cv in column_values]
         entries: list[EapCheckEntry] = [
             self._transform_row(
-                row_idx, column_values, column_names, uptime_subscription, trace_item_type
+                row_idx, column_values, column_names, uptime_monitor, trace_item_type
             )
             for row_idx in range(len(column_values[0].results))
         ]
@@ -232,7 +230,7 @@ def _transform_row(
         row_idx: int,
         column_values: Any,
         column_names: list[str],
-        uptime_subscription: ProjectUptimeSubscription,
+        uptime_monitor: ProjectUptimeSubscription,
         trace_item_type: TraceItemType.ValueType,
     ) -> EapCheckEntry:
         row_dict: dict[str, AttributeValue] = {
@@ -259,7 +257,7 @@ def _transform_row(
 
         return EapCheckEntry(
             uptime_check_id=uptime_check_id,
-            uptime_monitor_id=uptime_subscription.id,
+            uptime_monitor_id=uptime_monitor.id,
             timestamp=datetime.fromtimestamp(
                 row_dict[
                     (

src/sentry/uptime/endpoints/project_uptime_alert_details.py

@@ -22,7 +22,7 @@
     ProjectUptimeSubscriptionSerializerResponse,
 )
 from sentry.uptime.endpoints.validators import UptimeMonitorValidator
-from sentry.uptime.models import ProjectUptimeSubscription, UptimeSubscription, get_detector
+from sentry.uptime.models import ProjectUptimeSubscription, get_detector
 from sentry.uptime.subscriptions.subscriptions import delete_uptime_detector
 from sentry.utils.audit import create_audit_entry
 
@@ -56,10 +56,10 @@ def get(
         self,
         request: Request,
         project: Project,
-        uptime_subscription: UptimeSubscription,
+        uptime_monitor: ProjectUptimeSubscription,
     ) -> Response:
         serialized_uptime_alert: ProjectUptimeSubscriptionSerializerResponse = serialize(
-            uptime_subscription,
+            uptime_monitor,
             request.user,
         )
         return self.respond(serialized_uptime_alert)
@@ -81,15 +81,15 @@ def get(
         },
     )
     def put(
-        self, request: Request, project: Project, uptime_subscription: ProjectUptimeSubscription
+        self, request: Request, project: Project, uptime_monitor: ProjectUptimeSubscription
     ) -> Response:
         """
         Update an uptime monitor.
         """
         validator = UptimeMonitorValidator(
             data=request.data,
             partial=True,
-            instance=uptime_subscription,
+            instance=uptime_monitor,
             context={
                 "organization": project.organization,
                 "project": project,
@@ -117,19 +117,18 @@ def put(
         },
     )
     def delete(
-        self, request: Request, project: Project, uptime_subscription: ProjectUptimeSubscription
+        self, request: Request, project: Project, uptime_monitor: ProjectUptimeSubscription
     ) -> Response:
         """
         Delete an uptime monitor.
         """
-        detector = get_detector(uptime_subscription.uptime_subscription)
-        uptime_subscription_id = uptime_subscription.id
-        audit_log_data = uptime_subscription.get_audit_log_data()
+        detector = get_detector(uptime_monitor.uptime_subscription)
+        audit_log_data = uptime_monitor.get_audit_log_data()
         delete_uptime_detector(detector)
         create_audit_entry(
             request=request,
             organization=project.organization,
-            target_object=uptime_subscription_id,
+            target_object=uptime_monitor.id,
             event=audit_log.get_event_id("UPTIME_MONITOR_REMOVE"),
             data=audit_log_data,
         )