Skip to content

Commit de1c620

Browse files
committed
Changed requested changes
Fixed the route of the email send. changed testing assertion renamed files and function..
1 parent ff84deb commit de1c620

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

app/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from app.database.database import engine
66
from app.dependencies import (
77
MEDIA_PATH, STATIC_PATH, templates)
8-
from app.routers import agenda, event, profile, email_send
8+
from app.routers import agenda, event, profile, email
99

1010

1111
models.Base.metadata.create_all(bind=engine)
@@ -17,7 +17,7 @@
1717
app.include_router(profile.router)
1818
app.include_router(event.router)
1919
app.include_router(agenda.router)
20-
app.include_router(email_send.router)
20+
app.include_router(email.router)
2121

2222

2323
@app.get("/")

app/routers/email_send.py renamed to app/routers/email.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
from app.database.database import get_db
2-
from app.internal.email import send
2+
from app.internal.email import send as internal_send
33
from fastapi import APIRouter, BackgroundTasks, Depends, Form, HTTPException
44
from sqlalchemy.orm.session import Session
55
from starlette.responses import RedirectResponse
66

77
router = APIRouter(
8-
prefix="/email_send",
8+
prefix="/email",
99
tags=["email"],
1010
responses={404: {"description": "Not found"}},
1111
)
1212

1313

14-
@router.post("/")
15-
async def send_email(
14+
@router.post("/send")
15+
async def send(
1616
db: Session = Depends(get_db),
1717
send_to: str = "/",
1818
title: str = Form(...),
1919
event_used: str = Form(...),
2020
user_to_send: str = Form(...),
2121
background_tasks: BackgroundTasks = BackgroundTasks
2222
) -> RedirectResponse:
23-
if not send(
23+
if not internal_send(
2424
title=title, event_used=event_used,
2525
user_to_send=user_to_send,
2626
background_tasks=background_tasks, session=db):

app/templates/demo/home_email.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ <h1>{{message}}</h1>
77
</div>
88

99
<div>
10-
<form action="/email_send/" method="post">
10+
<form action="/email/send" method="post">
1111
<!-- Example of how to use sending email
1212
This is a testing using ids of evenets and users yet with
1313
simple manipulation you could send it how ever you want -->

tests/test_email.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ def test_email_send(client, user, event, smtpd):
1212
mail.config.MAIL_TLS = False
1313
with mail.record_messages() as outbox:
1414
response = client.post(
15-
"/email_send/", data={
15+
"/email/send", data={
1616
"event_used": event.id, "user_to_send": user.id,
1717
"title": "Testing",
1818
"background_tasks": BackgroundTasks})
1919
assert len(outbox) == 1
20-
assert response.status_code == 303
20+
assert response.ok
2121

2222

2323
def test_failed_email_send(client, user, event, smtpd):
@@ -26,9 +26,9 @@ def test_failed_email_send(client, user, event, smtpd):
2626
mail.config.MAIL_PORT = smtpd.port
2727
with mail.record_messages() as outbox:
2828
response = client.post(
29-
"/email_send/", data={
29+
"/email/send", data={
3030
"event_used": event.id + 1, "user_to_send": user.id,
3131
"title": "Testing",
3232
"background_tasks": BackgroundTasks})
3333
assert len(outbox) == 0
34-
assert response.status_code == 404
34+
assert not response.ok

0 commit comments

Comments
 (0)