pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] sms: update and fix returned IAP state about badly formatted numbers

Browse Source 
PURPOSE

Followup of merge 4287481 .

SPECIFICATIONS

wrong_format_number is actually now called wrong_number_format. This commit
propagates this renaming through SMS code and tests.

LINKS

Task 1922187

closes odoo/odoo#35025

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
This commit is contained in:
Remi Rahir
2019-07-23 08:29:15 +00:00
committed by Thibault Delavallée
parent 17679bd44c
commit 4968eb7c83
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sms/models/sms_api.py
+1 -1
View File
@@ -46,7 +46,7 @@ class SmsApi(models.AbstractModel):
:return: return of /iap/sms/1/send controller which is a list of dict [{
'res_id': integer: ID of sms.sms,
'state': string: 'insufficient_credit' or 'wrong_format_number' or 'success',
'state': string: 'insufficient_credit' or 'wrong_number_format' or 'success',
'credit': integer: number of credits spent to send this SMS,
}]
addons/sms/models/sms_sms.py
+1 -1
View File
@@ -100,7 +100,7 @@ class SmsSms(models.Model):
def _postprocess_sent_sms(self, iap_results, failure_reason=None, delete_all=False):
sms_to_notif_status = {
'success': False, 'insufficient_credit': 'sms_credit',
'wrong_format_number': 'sms_number_format', 'server_error': 'sms_server'}
'wrong_number_format': 'sms_number_format', 'server_error': 'sms_server'}
if delete_all:
todelete_sms_ids = [item['res_id'] for item in iap_results]
else:
addons/sms/tests/common.py
+2 -2
View File
@@ -35,8 +35,8 @@ class MockSMS(common.BaseCase):
error = sim_error or (nbr_t_error and nbr_t_error.get(to_send['number']))
if error and error == 'credit':
res.update(credit=0, state='insufficient_credit')
elif error and error == 'wrong_format_number':
res.update(state='wrong_format_number')
elif error and error == 'wrong_number_format':
res.update(state='wrong_number_format')
elif error and error == 'jsonrpc_exception':
raise exceptions.AccessError(
'The url that this service requested returned an error. Please contact the author of the app. The url it tried to contact was ' + local_endpoint
addons/test_mail_full/tests/test_sms_post.py
+3 -3
View File
@@ -41,7 +41,7 @@ class TestSMSPost(test_mail_full_common.BaseFunctionalTest, sms_common.MockSMS,
self.assertSMSNotification([{'partner': self.partner_1}], 'Mega SMS\nTop moumoutte', messages)
def test_message_sms_internals_check_existing(self):
with self.sudo('employee'), self.mockSMSGateway(sim_error='wrong_format_number'):
with self.sudo('employee'), self.mockSMSGateway(sim_error='wrong_number_format'):
test_record = self.env['mail.test.sms'].browse(self.test_record.id)
messages = test_record._message_sms(self._test_body, partner_ids=self.partner_1.ids)
@@ -326,7 +326,7 @@ class TestSMSPostException(test_mail_full_common.BaseFunctionalTest, sms_common.
], self._test_body, messages)
def test_message_sms_crash_wrong_number(self):
with self.sudo('employee'), self.mockSMSGateway(sim_error='wrong_format_number'):
with self.sudo('employee'), self.mockSMSGateway(sim_error='wrong_number_format'):
test_record = self.env['mail.test.sms'].browse(self.test_record.id)
messages = test_record._message_sms(self._test_body, partner_ids=(self.partner_1 | self.partner_2).ids)
@@ -336,7 +336,7 @@ class TestSMSPostException(test_mail_full_common.BaseFunctionalTest, sms_common.
], self._test_body, messages)
def test_message_sms_crash_wrong_number_single(self):
with self.sudo('employee'), self.mockSMSGateway(nbr_t_error={phone_validation.phone_get_sanitized_record_number(self.partner_2): 'wrong_format_number'}):
with self.sudo('employee'), self.mockSMSGateway(nbr_t_error={phone_validation.phone_get_sanitized_record_number(self.partner_2): 'wrong_number_format'}):
test_record = self.env['mail.test.sms'].browse(self.test_record.id)
messages = test_record._message_sms(self._test_body, partner_ids=(self.partner_1 | self.partner_2 | self.partner_3).ids)