Changed path of source to regtech-mail-api/src/regtech_mail_api

cfpb · Mar 18, 2024 · 5779ca2 · 5779ca2
1 parent 633c439
commit 5779ca2
Show file tree

Hide file tree

Showing 10 changed files with 440 additions and 294 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ COPY poetry.lock pyproject.toml log-config.yml ./
 RUN poetry config virtualenvs.create false
 RUN poetry install
 
-COPY regtech_mail_api ./regtech_mail_api
+COPY src/ ./
 
 EXPOSE 8765
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,13 +5,13 @@ description = ""
 authors = ["CFPB's RegTech Team"]
 readme = "README.md"
 packages = [
-    { include = "regtech_mail_api" }
+    { include = "src/regtech_mail_api" }
 ]
 
 
 [tool.poetry.dependencies]
 python = "^3.12"
-fastapi = {extras = ["all"], version = "^0.104.1"}
+fastapi = {extras = ["all"], version = "^0.109.1"}
 uvicorn = "^0.27.0.post1"
 pyyaml = "^6.0.1"
 email-validator = "^2.1.0.post1"
@@ -35,7 +35,7 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.pytest.ini_options]
-pythonpath = ["regtech_mail_api"]
+pythonpath = ["src"]
 testpaths = ["tests"]
 env = [
   "KC_URL=http://localhost",

diff --git a/regtech_mail_api/__init__.py → src/regtech_mail_api/__init__.py b/regtech_mail_api/__init__.py → src/regtech_mail_api/__init__.py
diff --git a/regtech_mail_api/api.py → src/regtech_mail_api/api.py b/regtech_mail_api/api.py → src/regtech_mail_api/api.py
@@ -63,18 +63,17 @@ def read_root(request: Request):
 @requires("authenticated")
 async def send_email(request: Request):
     sender_addr = request.user.email
-    sender_name = request.user.name
+    sender_name = request.user.name if request.user.name else ""
     type = request.headers["case-type"]
-    subject = f"[DEV BETA] SBL User Request for {type}" + (
-        f" by {sender_name}" if sender_name else ""
-    )
+    subject = f"[DEV BETA] SBL User Request for {type}"
 
     sender = f"{sender_name} <{sender_addr}>" if sender_name else sender_addr
 
     form_data = await request.form()
 
     body_lines = [f"{k}: {v}" for k, v in form_data.items()]
-    email_body = f"Contact Email: {sender_addr}\n\n"
+    email_body = f"Contact Email: {sender_addr}\n"
+    email_body += f"Contact Name: {sender_name}\n\n"
     email_body += "\n".join(body_lines)
 
     email = Email(subject, email_body, settings.from_addr, sender, to={settings.to})

diff --git a/regtech_mail_api/mailer.py → src/regtech_mail_api/mailer.py b/regtech_mail_api/mailer.py → src/regtech_mail_api/mailer.py
diff --git a/regtech_mail_api/models.py → src/regtech_mail_api/models.py b/regtech_mail_api/models.py → src/regtech_mail_api/models.py
diff --git a/regtech_mail_api/settings.py → src/regtech_mail_api/settings.py b/regtech_mail_api/settings.py → src/regtech_mail_api/settings.py
diff --git a/tests/test_authentication.py b/tests/test_authentication.py
@@ -11,7 +11,7 @@
 
 @pytest.fixture
 def app_fixture(mocker: MockerFixture) -> FastAPI:
-    from api import app
+    from regtech_mail_api.api import app
 
     return app
 
@@ -74,7 +74,7 @@ def test_authed_endpoints(
             }
         }
 
-        mock = mocker.patch("api.send_email")
+        mock = mocker.patch("regtech_mail_api.api.send_email")
         mock.return_value = {"email": email_json}
         client = TestClient(app_fixture)
         res = client.get("/")

diff --git a/tests/test_send.py b/tests/test_send.py
@@ -11,7 +11,7 @@
 
 @pytest.fixture
 def app_fixture(mocker: MockerFixture) -> FastAPI:
-    from api import app
+    from regtech_mail_api.api import app
 
     return app
 
@@ -58,7 +58,7 @@ def test_send_no_profile(
         email_json = {
             "email": {
                 "subject": "[DEV BETA] SBL User Request for Institution Profile Change",
-                "body": "Contact Email: [email protected]\n\nlei: 1234567890ABCDEFGHIJ\ninstitution_name_1: Fintech 1\ntin_1: 12-3456789\nrssd_1: 1234567",
+                "body": "Contact Email: [email protected]\nContact Name: \n\nlei: 1234567890ABCDEFGHIJ\ninstitution_name_1: Fintech 1\ntin_1: 12-3456789\nrssd_1: 1234567",
                 "from_addr": "[email protected]",
                 "sender": "[email protected]",
                 "to": ["[email protected]"],
@@ -88,8 +88,8 @@ def test_send(
     ):
         email_json = {
             "email": {
-                "subject": "[DEV BETA] SBL User Request for Institution Profile Change by Test User",
-                "body": "Contact Email: [email protected]\n\nlei: 1234567890ABCDEFGHIJ\ninstitution_name_1: Fintech 1\ntin_1: 12-3456789\nrssd_1: 1234567",
+                "subject": "[DEV BETA] SBL User Request for Institution Profile Change",
+                "body": "Contact Email: [email protected]\nContact Name: Test User\n\nlei: 1234567890ABCDEFGHIJ\ninstitution_name_1: Fintech 1\ntin_1: 12-3456789\nrssd_1: 1234567",
                 "from_addr": "[email protected]",
                 "sender": "Test User <[email protected]>",
                 "to": ["[email protected]"],