From 6c9203711203b65ed96457978d24d5de32e82b7f Mon Sep 17 00:00:00 2001 From: DanJezeph15 Date: Tue, 22 Aug 2023 16:41:30 +0100 Subject: [PATCH 1/4] Add fake number for now to settings and change from name to it --- src/settings.py | 1 + src/worker/sms.py | 4 +++- tests/test_sms.py | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/settings.py b/src/settings.py index 85ed092b..c4d8cce7 100644 --- a/src/settings.py +++ b/src/settings.py @@ -42,6 +42,7 @@ class Settings(BaseSettings): # Have to use a US number as the originator to send to the US # https://support.messagebird.com/hc/en-us/articles/208747865-United-States us_send_number = '15744445663' + tutorcruncher_number = '123456789' # TODO idk what our number is or where to find it on messagebird :( @validator('pg_dsn') def heroku_ready_pg_dsn(cls, v): diff --git a/src/worker/sms.py b/src/worker/sms.py index 6ea0e5f6..36f7e293 100644 --- a/src/worker/sms.py +++ b/src/worker/sms.py @@ -64,7 +64,9 @@ def __init__(self, ctx: dict, group_id: int, company_id: int, recipient: SmsReci self.m: SmsSendModel = m self.tags = list(set(self.recipient.tags + self.m.tags + [str(self.m.uid)])) self.messagebird: MessageBird = ctx['messagebird'] - self.from_name = self.m.from_name if self.m.country_code != 'US' else self.settings.us_send_number + self.from_name = ( + self.settings.tutorcruncher_number if self.m.country_code != 'US' else self.settings.us_send_number + ) async def run(self): sms_data = await self._sms_prep() diff --git a/tests/test_sms.py b/tests/test_sms.py index af2d0f45..5e4590b7 100644 --- a/tests/test_sms.py +++ b/tests/test_sms.py @@ -5,6 +5,8 @@ from urllib.parse import urlencode from uuid import uuid4 +from src.main import settings + def test_send_message(cli, tmpdir, worker, loop): data = { @@ -26,7 +28,7 @@ def test_send_message(cli, tmpdir, worker, loop): "to: Number(number='+447891123856', country_code='44', " "number_formatted='+44 7891 123856', descr=None, is_mobile=True)" ) in msg_file - assert '\nfrom_name: foobar send\n' in msg_file + assert f'\nfrom_name: {settings.tutorcruncher_number}\n' in msg_file assert '\nmessage:\nthis is a message bar\n' in msg_file assert '\nlength: SmsLength(length=21, parts=1)\n' in msg_file @@ -323,7 +325,7 @@ def test_link_shortening(cli, tmpdir, sync_db: SyncDb, worker, loop): f = '69eb85e8-1504-40aa-94ff-75bb65fd8d75-447891123856.txt' assert str(tmpdir.listdir()[0]).endswith(f) msg_file = tmpdir.join(f).read() - assert '\nfrom_name: Morpheus\n' in msg_file + assert f'\nfrom_name: {settings.tutorcruncher_number}\n' in msg_file assert '\nmessage:\nthis is a message click.example.com/l' in msg_file token = re.search('message click.example.com/l(.+?)\n', msg_file).groups()[0] assert len(token) == 12 From 8ed73c471e3739c20d17f861d44fd31b1deb3334 Mon Sep 17 00:00:00 2001 From: DanJezeph15 Date: Tue, 22 Aug 2023 16:54:34 +0100 Subject: [PATCH 2/4] Add what I believe to be the real tutorcruncher number --- src/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.py b/src/settings.py index c4d8cce7..fa31fe64 100644 --- a/src/settings.py +++ b/src/settings.py @@ -42,7 +42,7 @@ class Settings(BaseSettings): # Have to use a US number as the originator to send to the US # https://support.messagebird.com/hc/en-us/articles/208747865-United-States us_send_number = '15744445663' - tutorcruncher_number = '123456789' # TODO idk what our number is or where to find it on messagebird :( + tutorcruncher_number = '12048170659' @validator('pg_dsn') def heroku_ready_pg_dsn(cls, v): From 19107ff51c1cda32711a39b95f9b13d1e42d59b0 Mon Sep 17 00:00:00 2001 From: DanJezeph15 Date: Tue, 22 Aug 2023 17:26:16 +0100 Subject: [PATCH 3/4] Added comment about the number being a placeholder --- src/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.py b/src/settings.py index fa31fe64..c82980f5 100644 --- a/src/settings.py +++ b/src/settings.py @@ -42,7 +42,7 @@ class Settings(BaseSettings): # Have to use a US number as the originator to send to the US # https://support.messagebird.com/hc/en-us/articles/208747865-United-States us_send_number = '15744445663' - tutorcruncher_number = '12048170659' + tutorcruncher_number = '12048170659' # TODO placeholder for now @validator('pg_dsn') def heroku_ready_pg_dsn(cls, v): From 194a50830da070b246d64b1b4df9af68eebd8254 Mon Sep 17 00:00:00 2001 From: DanJezeph15 Date: Tue, 29 Aug 2023 15:43:30 +0100 Subject: [PATCH 4/4] Change variable name --- src/settings.py | 2 +- src/worker/sms.py | 4 +--- tests/test_sms.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/settings.py b/src/settings.py index c82980f5..0364dfdc 100644 --- a/src/settings.py +++ b/src/settings.py @@ -42,7 +42,7 @@ class Settings(BaseSettings): # Have to use a US number as the originator to send to the US # https://support.messagebird.com/hc/en-us/articles/208747865-United-States us_send_number = '15744445663' - tutorcruncher_number = '12048170659' # TODO placeholder for now + gb_send_number = '12048170659' @validator('pg_dsn') def heroku_ready_pg_dsn(cls, v): diff --git a/src/worker/sms.py b/src/worker/sms.py index 36f7e293..d186d683 100644 --- a/src/worker/sms.py +++ b/src/worker/sms.py @@ -64,9 +64,7 @@ def __init__(self, ctx: dict, group_id: int, company_id: int, recipient: SmsReci self.m: SmsSendModel = m self.tags = list(set(self.recipient.tags + self.m.tags + [str(self.m.uid)])) self.messagebird: MessageBird = ctx['messagebird'] - self.from_name = ( - self.settings.tutorcruncher_number if self.m.country_code != 'US' else self.settings.us_send_number - ) + self.from_name = self.settings.gb_send_number if self.m.country_code != 'US' else self.settings.us_send_number async def run(self): sms_data = await self._sms_prep() diff --git a/tests/test_sms.py b/tests/test_sms.py index 5e4590b7..b8c0899c 100644 --- a/tests/test_sms.py +++ b/tests/test_sms.py @@ -28,7 +28,7 @@ def test_send_message(cli, tmpdir, worker, loop): "to: Number(number='+447891123856', country_code='44', " "number_formatted='+44 7891 123856', descr=None, is_mobile=True)" ) in msg_file - assert f'\nfrom_name: {settings.tutorcruncher_number}\n' in msg_file + assert f'\nfrom_name: {settings.gb_send_number}\n' in msg_file assert '\nmessage:\nthis is a message bar\n' in msg_file assert '\nlength: SmsLength(length=21, parts=1)\n' in msg_file @@ -325,7 +325,7 @@ def test_link_shortening(cli, tmpdir, sync_db: SyncDb, worker, loop): f = '69eb85e8-1504-40aa-94ff-75bb65fd8d75-447891123856.txt' assert str(tmpdir.listdir()[0]).endswith(f) msg_file = tmpdir.join(f).read() - assert f'\nfrom_name: {settings.tutorcruncher_number}\n' in msg_file + assert f'\nfrom_name: {settings.gb_send_number}\n' in msg_file assert '\nmessage:\nthis is a message click.example.com/l' in msg_file token = re.search('message click.example.com/l(.+?)\n', msg_file).groups()[0] assert len(token) == 12