From 2601d52c29c9a125c77d6b8eae3492f4a89f0c4c Mon Sep 17 00:00:00 2001 From: Innokentii Konstantinov Date: Thu, 25 May 2023 13:53:58 +0800 Subject: [PATCH 1/2] Fix status callbacks (#2014) --- .../apps/phone_notifications/phone_backend.py | 2 +- engine/apps/twilioapp/status_callback.py | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/engine/apps/phone_notifications/phone_backend.py b/engine/apps/phone_notifications/phone_backend.py index db070e61..0ac77228 100644 --- a/engine/apps/phone_notifications/phone_backend.py +++ b/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, diff --git a/engine/apps/twilioapp/status_callback.py b/engine/apps/twilioapp/status_callback.py index 634a203a..8b6ab3b6 100644 --- a/engine/apps/twilioapp/status_callback.py +++ b/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) From 1d2ff1e3438ccc7dfdc7d85abd02029aeaf01d6d Mon Sep 17 00:00:00 2001 From: Innokentii Konstantinov Date: Thu, 25 May 2023 14:30:49 +0800 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80d7676e..e2f46299 100644 --- a/CHANGELOG.md +++ b/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