diff --git a/alembic/versions/20250415_130711_8ac3f0b1_update_contactform.py b/alembic/versions/20250415_130711_8ac3f0b1_update_contactform.py new file mode 100644 index 0000000..f4687b4 --- /dev/null +++ b/alembic/versions/20250415_130711_8ac3f0b1_update_contactform.py @@ -0,0 +1,33 @@ +"""create table for contact_forms + +Revision ID: 9d7c2ab1e8e4 +Revises: 0001 +Create Date: 2023-05-23 16:06:31.869970 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.sql import func + + +# revision identifiers, used by Alembic. +revision = '9d7c2ab1e8e4' +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=None), + 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(), nullable=False, server_default=func.now()), + sa.Column('updated_at', sa.DateTime(), nullable=False, server_default=func.now(), onupdate=func.now()) + ) + + +def downgrade(): + op.drop_table('contact_forms') \ No newline at end of file diff --git a/endpoints/contact.post.py b/endpoints/contact.post.py index e69de29..ecd9c60 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 import ContactFormCreate, ContactFormSchema +from helpers.contact_form_helpers import validate_contact_form_data, create_contact_form +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=ContactFormSchema) +async def create_contact( + contact_data: ContactFormCreate, + db: Session = Depends(get_db) +): + if not validate_contact_form_data(contact_data): + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invalid contact form data") + + new_contact = create_contact_form(db=db, contact_form_data=contact_data) + return new_contact \ 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..b05cee8 --- /dev/null +++ b/helpers/contact_form_helpers.py @@ -0,0 +1,51 @@ +import re +from pydantic import ValidationError +from sqlalchemy.orm import Session +from models.contact_form import ContactForm +from schemas.contact_form import ContactFormCreate + +def validate_contact_form_data(data: ContactFormCreate) -> bool: + """ + Validates the contact form data. + + Args: + data (ContactFormCreate): The contact form data to validate. + + Returns: + bool: True if the data is valid, False otherwise. + """ + try: + data.name + data.email + data.message + except ValidationError: + return False + + if not data.name or not data.email or not data.message: + return False + + email_regex = r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b' + if not re.match(email_regex, data.email): + return False + + return True + +def create_contact_form(db: Session, contact_form_data: ContactFormCreate) -> ContactForm: + """ + Creates a new contact form 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. + """ + if not validate_contact_form_data(contact_form_data): + raise ValueError("Invalid contact form data") + + db_contact_form = ContactForm(**contact_form_data.dict()) + db.add(db_contact_form) + db.commit() + db.refresh(db_contact_form) + return db_contact_form \ No newline at end of file diff --git a/models/contact_form.py b/models/contact_form.py new file mode 100644 index 0000000..fc829b0 --- /dev/null +++ b/models/contact_form.py @@ -0,0 +1,24 @@ +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( + "created_at", + nullable=False, + server_default=func.now() + ) + updated_at = Column( + "updated_at", + nullable=False, + server_default=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..31f30b3 --- /dev/null +++ b/schemas/contact_form.py @@ -0,0 +1,25 @@ +from pydantic import BaseModel, Field, EmailStr +from typing import Optional +from datetime import datetime +from uuid import UUID + +class ContactFormBase(BaseModel): + name: str = Field(..., description="Contact's name") + email: EmailStr = Field(..., description="Contact's email address") + message: str = Field(..., description="Contact's message") + +class ContactFormCreate(ContactFormBase): + pass + +class ContactFormUpdate(ContactFormBase): + name: Optional[str] = Field(None, description="Contact's name") + email: Optional[EmailStr] = Field(None, description="Contact's email address") + message: Optional[str] = Field(None, description="Contact's message") + +class ContactFormSchema(ContactFormBase): + id: UUID + created_at: datetime + updated_at: datetime + + class Config: + orm_mode = True \ No newline at end of file