Fixin' bugs.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-02-08 13:14:19 -05:00
parent f43ad68329
commit b5c2a8e240
3 changed files with 10 additions and 7 deletions

View File

@@ -1,6 +1,7 @@
from strenum import StrEnum # In 3.11 this is in the enum library. We will not need
# this external library any more.
from strenum import StrEnum # type: ignore [import-not-found]
# In 3.11 this is in the enum library. We will not need this external library any more.
# The line will simply change from importing from strenum to importing from enum.
# And the strenum library can then be removed from poetry.
class TemplateType(StrEnum):

View File

@@ -1164,8 +1164,10 @@ class TemplateBase(db.Model):
def _as_utils_template(self):
if self.template_type == TemplateType.EMAIL:
return PlainTextEmailTemplate(self.__dict__)
if self.template_type == TemplateType.SMS:
elif self.template_type == TemplateType.SMS:
return SMSMessageTemplate(self.__dict__)
else:
raise ValueError(f"{self.template_type} is an invalid template type.")
def _as_utils_template_with_personalisation(self, values):
template = self._as_utils_template()

View File

@@ -16,7 +16,7 @@ def test_get_all_templates_returns_200(client, sample_service):
subject=f"subject_{name}" if tmp_type == TemplateType.EMAIL else "",
template_name=name,
)
for name, tmp_type in product(("A", "B", "C"), TemplateType)
for name, tmp_type in (("A", TemplateType.SMS), ("B", TemplateType.EMAIL))
]
auth_header = create_service_authorization_header(service_id=sample_service.id)
@@ -41,7 +41,7 @@ def test_get_all_templates_returns_200(client, sample_service):
assert template["subject"] == templates[index].subject
@pytest.mark.parametrize("tmp_type", TemplateType)
@pytest.mark.parametrize("tmp_type", (TemplateType.SMS, TemplateType.EMAIL))
def test_get_all_templates_for_valid_type_returns_200(client, sample_service, tmp_type):
templates = [
create_template(
@@ -75,7 +75,7 @@ def test_get_all_templates_for_valid_type_returns_200(client, sample_service, tm
assert template["subject"] == templates[index].subject
@pytest.mark.parametrize("tmp_type", TemplateType)
@pytest.mark.parametrize("tmp_type", (TemplateType.SMS, TemplateType.EMAIL))
def test_get_correct_num_templates_for_valid_type_returns_200(
client, sample_service, tmp_type
):