diff --git a/alembic/versions/20250415_172723_b258a68d_update_contactform.py b/alembic/versions/20250415_172723_b258a68d_update_contactform.py new file mode 100644 index 0000000..00ba979 --- /dev/null +++ b/alembic/versions/20250415_172723_b258a68d_update_contactform.py @@ -0,0 +1,28 @@ +"""create table for contact_forms +Revision ID: 5e7fa046f1ea +Revises: 0001 +Create Date: 2023-05-23 10:31:18.938612 +""" +from alembic import op +import sqlalchemy as sa +import uuid + +# revision identifiers, used by Alembic. +revision = '5e7fa046f1ea' +down_revision = '0001' +branch_labels = None +depends_on = None + +def upgrade(): + op.create_table( + 'contact_forms', + 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.DateTime(timezone=True), server_default=sa.func.now()), + sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.func.now(), onupdate=sa.func.now()) + ) + +def downgrade(): + op.drop_table('contact_forms') \ No newline at end of file diff --git a/endpoints/Contact-form.post.py b/endpoints/Contact-form.post.py index e69de29..816adc6 100644 --- a/endpoints/Contact-form.post.py +++ b/endpoints/Contact-form.post.py @@ -0,0 +1,20 @@ +from fastapi import APIRouter, HTTPException, status +from schemas.contact_form import ContactFormCreate +from helpers.contact_form_helpers import create_contact_form, validate_contact_form_data +from sqlalchemy.orm import Session +from fastapi import Depends +from core.database import get_db + +router = APIRouter() + +@router.post("/contact-form", status_code=status.HTTP_201_CREATED, response_model=ContactFormCreate) +async def create_contact_form_submission( + contact_form_data: ContactFormCreate, + db: Session = Depends(get_db) +): + errors = validate_contact_form_data(contact_form_data.dict()) + if errors: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=errors) + + new_contact_form = create_contact_form(db=db, contact_form_data=contact_form_data) + return new_contact_form \ No newline at end of file diff --git a/helpers/contact_form_helpers.py b/helpers/contact_form_helpers.py new file mode 100644 index 0000000..9ecf319 --- /dev/null +++ b/helpers/contact_form_helpers.py @@ -0,0 +1,60 @@ +from typing import Dict, Any +import re +from sqlalchemy.orm import Session +from models.contact_form import ContactForm +from schemas.contact_form import ContactFormCreate + +def create_contact_form(db: Session, contact_form_data: ContactFormCreate) -> ContactForm: + """ + Creates a new contact form submission in the database. + + Args: + db (Session): The database session. + contact_form_data (ContactFormCreate): The data for the contact form to create. + + Returns: + ContactForm: The newly created contact form object. + """ + db_contact_form = ContactForm(**contact_form_data.dict()) + db.add(db_contact_form) + db.commit() + db.refresh(db_contact_form) + return db_contact_form + +def validate_contact_form_data(contact_form_data: Dict[str, Any]) -> Dict[str, str]: + """ + Validates the input data for a contact form submission. + + Args: + contact_form_data (Dict[str, Any]): The input data to validate. + + Returns: + Dict[str, str]: A dictionary containing error messages for any invalid fields. + """ + errors = {} + + # Check if all required fields are present + required_fields = ["name", "email", "message"] + for field in required_fields: + if field not in contact_form_data or not contact_form_data[field]: + errors[field] = f"{field.capitalize()} is required." + + # Check if email is in valid format + email = contact_form_data.get("email") + if email and not is_valid_email(email): + errors["email"] = "Invalid email format." + + return errors + +def is_valid_email(email: str) -> bool: + """ + Checks if a given email address is in a valid format. + + 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)) \ No newline at end of file diff --git a/models/contact_form.py b/models/contact_form.py new file mode 100644 index 0000000..b2dab6a --- /dev/null +++ b/models/contact_form.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 ContactForm(Base): + __tablename__ = "contact_forms" + + 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(func.now()) + updated_at = Column(func.now(), onupdate=func.now()) \ No newline at end of file diff --git a/schemas/contact_form.py b/schemas/contact_form.py new file mode 100644 index 0000000..870a8a8 --- /dev/null +++ b/schemas/contact_form.py @@ -0,0 +1,25 @@ +from pydantic import BaseModel, Field, EmailStr +from typing import Optional +from uuid import UUID +from datetime import datetime + +class ContactFormBase(BaseModel): + name: str = Field(..., description="Contact form submitter's name") + email: EmailStr = Field(..., description="Contact form submitter's email address") + message: str = Field(..., description="Contact form message") + +class ContactFormCreate(ContactFormBase): + pass + +class ContactFormUpdate(ContactFormBase): + name: Optional[str] = Field(None, description="Contact form submitter's name") + email: Optional[EmailStr] = Field(None, description="Contact form submitter's email address") + message: Optional[str] = Field(None, description="Contact form message") + +class ContactFormSchema(ContactFormBase): + id: UUID + created_at: datetime + updated_at: datetime + + class Config: + orm_mode = True \ No newline at end of file