Merge pull request #2015 from grafana/dev

dev to main

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.2.30 (2023-05-25)
+
+### Fixed
+
+- Fix Phone provider status callbacks [#2014](https://github.com/grafana/oncall/pull/2014)
+
 ## v1.2.29 (2023-05-25)
 
 ### Changed

engine/apps/phone_notifications/phone_backend.py

@@ -46,7 +46,7 @@ class PhoneBackend:
         renderer = AlertGroupPhoneCallRenderer(alert_group)
         message = renderer.render()
 
-        record = PhoneCallRecord.objects.create(
+        record = PhoneCallRecord(
             represents_alert_group=alert_group,
             receiver=user,
             notification_policy=notification_policy,

engine/apps/twilioapp/status_callback.py

@@ -33,8 +33,7 @@ def update_twilio_call_status(call_sid, call_status):
         # Will be removed soon.
         if twilio_phone_call:
             logger.info(
-                f"twilioapp.update_twilio_call_status: found legacy twilio_phone_call sid={call_sid}"
-                f" status={call_status}"
+                f"twilioapp.update_twilio_call_status: found twilio_phone_call sid={call_sid}" f" status={call_status}"
             )
             status = TwilioCallStatuses.DETERMINANT.get(call_status)
             twilio_phone_call.status = status
@@ -46,7 +45,7 @@ def update_twilio_call_status(call_sid, call_status):
 
         if phone_call_record and status:
             logger.info(
-                f"twilioapp.update_twilio_call_status: processing using phone_call_record id={phone_call_record.id} "
+                f"twilioapp.update_twilio_call_status: found phone_call_record_id={phone_call_record.id} "
                 f"sid={call_sid} status={call_status}"
             )
             log_record_type = None
@@ -72,6 +71,11 @@ def update_twilio_call_status(call_sid, call_status):
                     if phone_call_record.notification_policy
                     else None,
                 )
+                log_record.save()
+                logger.info(
+                    f"twilioapp.update_twilio_call_status: created log_record log_record_id={log_record.id} "
+                    f"type={log_record_type}"
+                )
                 user_notification_action_triggered_signal.send(sender=update_twilio_call_status, log_record=log_record)
 
 
@@ -121,7 +125,7 @@ def update_twilio_sms_status(message_sid, message_status):
 
         if sms_record and status:
             logger.info(
-                f"twilioapp.update_twilio_sms_status: processing using sms_record id={sms_record.id} "
+                f"twilioapp.update_twilio_sms_status: found sms_record_id={sms_record.id} "
                 f"sid={message_sid} status={message_status}"
             )
             log_record_type = None
@@ -144,6 +148,11 @@ def update_twilio_sms_status(message_sid, message_status):
                     if sms_record.notification_policy
                     else None,
                 )
+                log_record.save()
+                logger.info(
+                    f"twilioapp.update_twilio_sms_status: created log_record log_record_id={log_record.id} "
+                    f"type={log_record_type}"
+                )
                 user_notification_action_triggered_signal.send(sender=update_twilio_sms_status, log_record=log_record)