diff --git a/alembic/versions/20250426_121147_da60f8c3_update_contact_form_submission.py b/alembic/versions/20250426_121147_da60f8c3_update_contact_form_submission.py new file mode 100644 index 0000000..13fc834 --- /dev/null +++ b/alembic/versions/20250426_121147_da60f8c3_update_contact_form_submission.py @@ -0,0 +1,33 @@ +"""create table for contact_form_submissions + +Revision ID: 6f9d7c9a3b6e +Revises: 0001 +Create Date: 2023-05-18 12:34:56 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.sql import func +import uuid + +# revision identifiers, used by Alembic. +revision = '6f9d7c9a3b6e' +down_revision = '0001' +branch_labels = None +depends_on = None + + +def upgrade(): + op.create_table( + 'contact_form_submissions', + sa.Column('id', sa.String(36), primary_key=True, default=lambda: str(uuid.uuid4())), + sa.Column('name', sa.String(), nullable=False), + sa.Column('email', sa.String(), nullable=False), + sa.Column('message', sa.Text(), nullable=False), + sa.Column('created_at', sa.Text(), server_default=func.now()), + sa.Column('updated_at', sa.Text(), server_default=func.now(), onupdate=func.now()) + ) + + +def downgrade(): + op.drop_table('contact_form_submissions') \ No newline at end of file diff --git a/endpoints/contact.post.py b/endpoints/contact.post.py index e69de29..2a7daa4 100644 --- a/endpoints/contact.post.py +++ b/endpoints/contact.post.py @@ -0,0 +1,19 @@ +from fastapi import APIRouter, HTTPException, status +from schemas.contact_form_submission import ContactFormSubmissionCreate, ContactFormSubmissionSchema +from helpers.contact_form_submission_helpers import create_contact_form_submission, validate_email +from sqlalchemy.orm import Session +from fastapi import Depends +from core.database import get_db + +router = APIRouter() + +@router.post("/contact", status_code=status.HTTP_201_CREATED, response_model=ContactFormSubmissionSchema) +async def create_contact_form( + submission_data: ContactFormSubmissionCreate, + db: Session = Depends(get_db) +): + if not validate_email(submission_data.email): + raise HTTPException(status_code=400, detail="Invalid email format") + + new_submission = create_contact_form_submission(db=db, submission_data=submission_data) + return new_submission \ No newline at end of file diff --git a/helpers/contact_form_submission_helpers.py b/helpers/contact_form_submission_helpers.py new file mode 100644 index 0000000..3005b2f --- /dev/null +++ b/helpers/contact_form_submission_helpers.py @@ -0,0 +1,50 @@ +import re +from sqlalchemy.orm import Session +from models.contact_form_submission import ContactFormSubmission +from schemas.contact_form_submission import ContactFormSubmissionCreate +from fastapi import HTTPException + +def validate_email(email: str) -> bool: + """ + Validates an email address using a regular expression. + + Args: + email (str): The email address to validate. + + Returns: + bool: True if the email is valid, False otherwise. + """ + email_regex = r'^[\w\.-]+@[\w\.-]+\.\w+$' + return bool(re.match(email_regex, email)) + +def create_contact_form_submission(db: Session, submission_data: ContactFormSubmissionCreate) -> ContactFormSubmission: + """ + Creates a new contact form submission in the database. + + Args: + db (Session): The database session. + submission_data (ContactFormSubmissionCreate): The data for the submission to create. + + Returns: + ContactFormSubmission: The newly created contact form submission object. + + Raises: + HTTPException: If any required field is missing or the email is invalid. + """ + # Validate required fields + if not submission_data.name: + raise HTTPException(status_code=400, detail="Name is required") + if not submission_data.email: + raise HTTPException(status_code=400, detail="Email is required") + if not submission_data.message: + raise HTTPException(status_code=400, detail="Message is required") + + # Validate email format + if not validate_email(submission_data.email): + raise HTTPException(status_code=400, detail="Invalid email format") + + db_submission = ContactFormSubmission(**submission_data.dict()) + db.add(db_submission) + db.commit() + db.refresh(db_submission) + return db_submission \ No newline at end of file diff --git a/models/contact_form_submission.py b/models/contact_form_submission.py new file mode 100644 index 0000000..72a720e --- /dev/null +++ b/models/contact_form_submission.py @@ -0,0 +1,15 @@ +from sqlalchemy import Column, String, Text +from sqlalchemy.dialects.postgresql import UUID +from sqlalchemy.sql import func +from core.database import Base +import uuid + +class ContactFormSubmission(Base): + __tablename__ = "contact_form_submissions" + + id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4) + name = Column(String, nullable=False) + email = Column(String, nullable=False) + message = Column(Text, nullable=False) + created_at = Column(Text, default=func.now()) + updated_at = Column(Text, default=func.now(), onupdate=func.now()) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 596e6f3..db12c92 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,6 @@ sqlalchemy>=1.4.0 python-dotenv>=0.19.0 bcrypt>=3.2.0 alembic>=1.13.1 +jose +passlib +pydantic diff --git a/schemas/contact_form_submission.py b/schemas/contact_form_submission.py new file mode 100644 index 0000000..61ada75 --- /dev/null +++ b/schemas/contact_form_submission.py @@ -0,0 +1,25 @@ +from pydantic import BaseModel, EmailStr, Field +from typing import Optional +from datetime import datetime +import uuid + +class ContactFormSubmissionBase(BaseModel): + name: str = Field(..., description="Name of the submitter") + email: EmailStr = Field(..., description="Email of the submitter") + message: str = Field(..., description="Message from the submitter") + +class ContactFormSubmissionCreate(ContactFormSubmissionBase): + pass + +class ContactFormSubmissionUpdate(ContactFormSubmissionBase): + name: Optional[str] = Field(None, description="Name of the submitter") + email: Optional[EmailStr] = Field(None, description="Email of the submitter") + message: Optional[str] = Field(None, description="Message from the submitter") + +class ContactFormSubmissionSchema(ContactFormSubmissionBase): + id: uuid.UUID + created_at: datetime + updated_at: datetime + + class Config: + orm_mode = True \ No newline at end of file