From 7db88a45db1a09feb1feb7dc5d5f761e0806cfab Mon Sep 17 00:00:00 2001 From: Sam Der Date: Wed, 13 Dec 2023 20:07:34 -0800 Subject: [PATCH] fix: move PersonalizationData to sendgrid_handler --- apps/api/src/services/sendgrid_handler.py | 11 +++++++++-- apps/api/src/utils/PersonalizationData.py | 9 --------- apps/api/src/utils/email_handler.py | 2 +- apps/api/tests/test_sendgrid_handler.py | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 apps/api/src/utils/PersonalizationData.py diff --git a/apps/api/src/services/sendgrid_handler.py b/apps/api/src/services/sendgrid_handler.py index 2c151c64..13193dd4 100644 --- a/apps/api/src/services/sendgrid_handler.py +++ b/apps/api/src/services/sendgrid_handler.py @@ -2,18 +2,25 @@ # https://github.com/sendgrid/sendgrid-python import os from logging import getLogger -from typing import Iterable, Tuple, Union +from typing import Iterable, Tuple, TypedDict, Union +from typing_extensions import NotRequired import aiosendgrid from httpx import HTTPStatusError from sendgrid.helpers.mail import Email, Mail, Personalization -from utils.PersonalizationData import PersonalizationData log = getLogger(__name__) SENDGRID_API_KEY = os.getenv("SENDGRID_API_KEY") +class PersonalizationData(TypedDict): + email: str + first_name: NotRequired[str] + last_name: NotRequired[str] + passphrase: NotRequired[str] + + async def send_email( template_id: str, sender_email: Tuple[str, str], diff --git a/apps/api/src/utils/PersonalizationData.py b/apps/api/src/utils/PersonalizationData.py deleted file mode 100644 index 9c729da5..00000000 --- a/apps/api/src/utils/PersonalizationData.py +++ /dev/null @@ -1,9 +0,0 @@ -from typing import TypedDict -from typing_extensions import NotRequired - - -class PersonalizationData(TypedDict): - email: str - first_name: NotRequired[str] - last_name: NotRequired[str] - passphrase: NotRequired[str] diff --git a/apps/api/src/utils/email_handler.py b/apps/api/src/utils/email_handler.py index d4a59555..8eb36d87 100644 --- a/apps/api/src/utils/email_handler.py +++ b/apps/api/src/utils/email_handler.py @@ -4,7 +4,7 @@ from pydantic import EmailStr from services import sendgrid_handler -from utils.PersonalizationData import PersonalizationData +from services.sendgrid_handler import PersonalizationData IH_SENDER = ("apply@irvinehacks.com", "IrvineHacks 2024 Applications") diff --git a/apps/api/tests/test_sendgrid_handler.py b/apps/api/tests/test_sendgrid_handler.py index 39236380..fd77bd32 100644 --- a/apps/api/tests/test_sendgrid_handler.py +++ b/apps/api/tests/test_sendgrid_handler.py @@ -5,7 +5,7 @@ from httpx import HTTPStatusError, Request, Response from services import sendgrid_handler -from utils.PersonalizationData import PersonalizationData +from services.sendgrid_handler import PersonalizationData SAMPLE_SENDER = ("noreply@irvinehacks.com", "No Reply IrvineHacks") SAMPLE_RECIPIENTS: list[PersonalizationData] = [