Jose2 - Account.jsx functional

Pipfile

@@ -8,18 +8,21 @@ verify_ssl = true
 [packages]
 flask = "*"
 flask-sqlalchemy = "*"
-flask-migrate = "*"
 flask-swagger = "*"
 psycopg2-binary = "*"
 python-dotenv = "*"
-flask-cors = "*"
 gunicorn = "*"
 cloudinary = "*"
 flask-admin = "*"
 typing-extensions = "*"
 flask-jwt-extended = "==4.6.0"
 wtforms = "==3.1.2"
 sqlalchemy = "*"
+flask-migrate = "*"
+pytz = "*"
+icalendar = "*"
+requests = "*"
+flask-cors = "*"
 
 [requires]
 python_version = "3.13"

migrations/versions/21f5540bab2c_.py

@@ -0,0 +1,73 @@
+"""empty message
+
+Revision ID: 21f5540bab2c
+Revises: 
+Create Date: 2025-09-20 16:17:04.733283
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '21f5540bab2c'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('users',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('email', sa.String(length=120), nullable=False),
+    sa.Column('password', sa.String(length=255), nullable=False),
+    sa.Column('is_active', sa.Boolean(), nullable=False),
+    sa.Column('security_question', sa.String(length=255), nullable=True),
+    sa.Column('jpeg', sa.LargeBinary(), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('email')
+    )
+    op.create_table('listings',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=False),
+    sa.Column('booking_id', sa.Integer(), nullable=True),
+    sa.Column('airbnb_address', sa.String(length=255), nullable=False),
+    sa.Column('airbnb_zipcode', sa.String(length=15), nullable=True),
+    sa.ForeignKeyConstraint(['booking_id'], ['bookings.id'], name='fk_listings_current_booking', use_alter=True),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('bookings',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('google_calendar_id', sa.String(length=255), nullable=True),
+    sa.Column('listing_id', sa.Integer(), nullable=False),
+    sa.Column('airbnb_guest_first_name', sa.String(length=120), nullable=True),
+    sa.Column('airbnb_guest_last_name', sa.String(length=120), nullable=True),
+    sa.Column('airbnb_checkin', sa.Date(), nullable=True),
+    sa.Column('airbnb_checkout', sa.Date(), nullable=True),
+    sa.Column('airbnb_guestpic_url', sa.String(length=500), nullable=True),
+    sa.Column('airbnb_guestpic', sa.LargeBinary(), nullable=True),
+    sa.Column('reservation_url', sa.String(length=500), nullable=True),
+    sa.Column('phone_last4', sa.String(length=4), nullable=True),
+    sa.Column('needs_manual_details', sa.Boolean(), nullable=False),
+    sa.CheckConstraint('(airbnb_checkin IS NULL OR airbnb_checkout IS NULL) OR (airbnb_checkout >= airbnb_checkin)', name='ck_booking_checkout_after_checkin'),
+    sa.ForeignKeyConstraint(['listing_id'], ['listings.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('listing_id', 'google_calendar_id', name='uq_booking_listing_googleid')
+    )
+    with op.batch_alter_table('bookings', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_bookings_google_calendar_id'), ['google_calendar_id'], unique=False)
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('bookings', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_bookings_google_calendar_id'))
+
+    op.drop_table('bookings')
+    op.drop_table('listings')
+    op.drop_table('users')
+    # ### end Alembic commands ###

migrations/versions/ef02e5ef8fa8_.py

@@ -0,0 +1,132 @@
+"""empty message
+
+Revision ID: ef02e5ef8fa8
+Revises: 21f5540bab2c
+Create Date: 2025-09-20 18:47:08.506715
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'ef02e5ef8fa8'
+down_revision = '21f5540bab2c'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('bookings', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('created_at', sa.DateTime(), nullable=False))
+        batch_op.add_column(sa.Column('updated_at', sa.DateTime(), nullable=False))
+        batch_op.alter_column('listing_id',
+               existing_type=sa.INTEGER(),
+               nullable=True)
+        batch_op.alter_column('airbnb_checkin',
+               existing_type=sa.DATE(),
+               type_=sa.DateTime(),
+               existing_nullable=True)
+        batch_op.alter_column('airbnb_checkout',
+               existing_type=sa.DATE(),
+               type_=sa.DateTime(),
+               existing_nullable=True)
+        batch_op.alter_column('reservation_url',
+               existing_type=sa.VARCHAR(length=500),
+               type_=sa.String(length=1024),
+               existing_nullable=True)
+        batch_op.alter_column('airbnb_guestpic_url',
+               existing_type=sa.VARCHAR(length=500),
+               type_=sa.String(length=1024),
+               existing_nullable=True)
+        batch_op.drop_constraint(batch_op.f('uq_booking_listing_googleid'), type_='unique')
+        batch_op.drop_constraint(batch_op.f('bookings_listing_id_fkey'), type_='foreignkey')
+        batch_op.drop_column('airbnb_guestpic')
+        batch_op.drop_column('phone_last4')
+
+    with op.batch_alter_table('listings', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('name', sa.String(length=255), nullable=True))
+        batch_op.add_column(sa.Column('street', sa.String(length=255), nullable=True))
+        batch_op.add_column(sa.Column('city', sa.String(length=120), nullable=True))
+        batch_op.add_column(sa.Column('state', sa.String(length=80), nullable=True))
+        batch_op.add_column(sa.Column('image_url', sa.String(length=1024), nullable=True))
+        batch_op.add_column(sa.Column('created_at', sa.DateTime(), nullable=False))
+        batch_op.add_column(sa.Column('updated_at', sa.DateTime(), nullable=False))
+        batch_op.drop_constraint(batch_op.f('listings_user_id_fkey'), type_='foreignkey')
+        batch_op.drop_column('booking_id')
+        batch_op.drop_column('user_id')
+        batch_op.drop_column('airbnb_address')
+        batch_op.drop_column('airbnb_zipcode')
+
+    with op.batch_alter_table('users', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('created_at', sa.DateTime(), nullable=False))
+        batch_op.add_column(sa.Column('updated_at', sa.DateTime(), nullable=False))
+        batch_op.alter_column('email',
+               existing_type=sa.VARCHAR(length=120),
+               type_=sa.String(length=255),
+               existing_nullable=False)
+        batch_op.drop_constraint(batch_op.f('users_email_key'), type_='unique')
+        batch_op.create_index(batch_op.f('ix_users_email'), ['email'], unique=True)
+        batch_op.drop_column('security_question')
+        batch_op.drop_column('jpeg')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('users', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('jpeg', postgresql.BYTEA(), autoincrement=False, nullable=True))
+        batch_op.add_column(sa.Column('security_question', sa.VARCHAR(length=255), autoincrement=False, nullable=True))
+        batch_op.drop_index(batch_op.f('ix_users_email'))
+        batch_op.create_unique_constraint(batch_op.f('users_email_key'), ['email'], postgresql_nulls_not_distinct=False)
+        batch_op.alter_column('email',
+               existing_type=sa.String(length=255),
+               type_=sa.VARCHAR(length=120),
+               existing_nullable=False)
+        batch_op.drop_column('updated_at')
+        batch_op.drop_column('created_at')
+
+    with op.batch_alter_table('listings', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('airbnb_zipcode', sa.VARCHAR(length=15), autoincrement=False, nullable=True))
+        batch_op.add_column(sa.Column('airbnb_address', sa.VARCHAR(length=255), autoincrement=False, nullable=False))
+        batch_op.add_column(sa.Column('user_id', sa.INTEGER(), autoincrement=False, nullable=False))
+        batch_op.add_column(sa.Column('booking_id', sa.INTEGER(), autoincrement=False, nullable=True))
+        batch_op.create_foreign_key(batch_op.f('listings_user_id_fkey'), 'users', ['user_id'], ['id'], ondelete='CASCADE')
+        batch_op.drop_column('updated_at')
+        batch_op.drop_column('created_at')
+        batch_op.drop_column('image_url')
+        batch_op.drop_column('state')
+        batch_op.drop_column('city')
+        batch_op.drop_column('street')
+        batch_op.drop_column('name')
+
+    with op.batch_alter_table('bookings', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('phone_last4', sa.VARCHAR(length=4), autoincrement=False, nullable=True))
+        batch_op.add_column(sa.Column('airbnb_guestpic', postgresql.BYTEA(), autoincrement=False, nullable=True))
+        batch_op.create_foreign_key(batch_op.f('bookings_listing_id_fkey'), 'listings', ['listing_id'], ['id'], ondelete='CASCADE')
+        batch_op.create_unique_constraint(batch_op.f('uq_booking_listing_googleid'), ['listing_id', 'google_calendar_id'], postgresql_nulls_not_distinct=False)
+        batch_op.alter_column('airbnb_guestpic_url',
+               existing_type=sa.String(length=1024),
+               type_=sa.VARCHAR(length=500),
+               existing_nullable=True)
+        batch_op.alter_column('reservation_url',
+               existing_type=sa.String(length=1024),
+               type_=sa.VARCHAR(length=500),
+               existing_nullable=True)
+        batch_op.alter_column('airbnb_checkout',
+               existing_type=sa.DateTime(),
+               type_=sa.DATE(),
+               existing_nullable=True)
+        batch_op.alter_column('airbnb_checkin',
+               existing_type=sa.DateTime(),
+               type_=sa.DATE(),
+               existing_nullable=True)
+        batch_op.alter_column('listing_id',
+               existing_type=sa.INTEGER(),
+               nullable=False)
+        batch_op.drop_column('updated_at')
+        batch_op.drop_column('created_at')
+
+    # ### end Alembic commands ###

src/api/models.py

@@ -1,19 +1,119 @@
+from __future__ import annotations
+
+from datetime import datetime
 from flask_sqlalchemy import SQLAlchemy
-from sqlalchemy import String, Boolean
-from sqlalchemy.orm import Mapped, mapped_column
 
 db = SQLAlchemy()
 
+
+# ---- User -------------------------------------------------------------------
+# Minimal User model so api/admin.py can `from .models import db, User`
 class User(db.Model):
-    id: Mapped[int] = mapped_column(primary_key=True)
-    email: Mapped[str] = mapped_column(String(120), unique=True, nullable=False)
-    password: Mapped[str] = mapped_column(nullable=False)
-    is_active: Mapped[bool] = mapped_column(Boolean(), nullable=False)
+    __tablename__ = "users"
+
+    id = db.Column(db.Integer, primary_key=True)
+    email = db.Column(db.String(255), unique=True, nullable=False, index=True)
+    # store hashed password
+    password = db.Column(db.String(255), nullable=False)
+    is_active = db.Column(db.Boolean, nullable=False, default=True)
+
+    created_at = db.Column(db.DateTime, nullable=False,
+                           default=datetime.utcnow)
+    updated_at = db.Column(
+        db.DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow
+    )
 
+    def __repr__(self) -> str:  # pragma: no cover
+        return f"<User {self.id} {self.email}>"
 
-    def serialize(self):
+    def serialize(self) -> dict:
         return {
             "id": self.id,
             "email": self.email,
-            # do not serialize the password, its a security breach
-        }
+            "is_active": self.is_active,
+        }
+
+
+# ---- Listing ----------------------------------------------------------------
+# Lightweight Listing model; safe to have even if you’re not using it yet.
+class Listing(db.Model):
+    __tablename__ = "listings"
+
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(255), nullable=True)
+    street = db.Column(db.String(255), nullable=True)
+    city = db.Column(db.String(120), nullable=True)
+    state = db.Column(db.String(80), nullable=True)
+    image_url = db.Column(db.String(1024), nullable=True)
+
+    created_at = db.Column(db.DateTime, nullable=False,
+                           default=datetime.utcnow)
+    updated_at = db.Column(
+        db.DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return f"<Listing {self.id} {self.name or ''}>"
+
+    def serialize(self) -> dict:
+        return {
+            "id": self.id,
+            "name": self.name,
+            "street": self.street,
+            "city": self.city,
+            "state": self.state,
+            "image_url": self.image_url,
+        }
+
+
+# ---- Booking ----------------------------------------------------------------
+# No phone/last4 anywhere. Dates & optional guest picture supported.
+class Booking(db.Model):
+    __tablename__ = "bookings"
+
+    id = db.Column(db.Integer, primary_key=True)
+
+    # Google event UID
+    google_calendar_id = db.Column(db.String(255), index=True, nullable=True)
+
+    # Optional association to a listing (kept simple: no FK constraint required)
+    listing_id = db.Column(db.Integer, nullable=True)
+
+    # Optional guest names (manual)
+    airbnb_guest_first_name = db.Column(db.String(120), nullable=True)
+    airbnb_guest_last_name = db.Column(db.String(120), nullable=True)
+
+    # Reservation dates
+    airbnb_checkin = db.Column(db.DateTime, nullable=True)
+    airbnb_checkout = db.Column(db.DateTime, nullable=True)
+
+    # Reservation link (e.g., from calendar description)
+    reservation_url = db.Column(db.String(1024), nullable=True)
+
+    # Optional image per booking (if you save one later)
+    airbnb_guestpic_url = db.Column(db.String(1024), nullable=True)
+
+    # Bookkeeping
+    needs_manual_details = db.Column(db.Boolean, nullable=False, default=True)
+    created_at = db.Column(db.DateTime, nullable=False,
+                           default=datetime.utcnow)
+    updated_at = db.Column(
+        db.DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return f"<Booking {self.id} {self.google_calendar_id or ''}>"
+
+    def serialize(self) -> dict:
+        return {
+            "id": self.id,
+            "google_calendar_id": self.google_calendar_id,
+            "listing_id": self.listing_id,
+            "airbnb_guest_first_name": self.airbnb_guest_first_name,
+            "airbnb_guest_last_name": self.airbnb_guest_last_name,
+            "airbnb_checkin": self.airbnb_checkin.isoformat() if self.airbnb_checkin else None,
+            "airbnb_checkout": self.airbnb_checkout.isoformat() if self.airbnb_checkout else None,
+            "reservation_url": self.reservation_url,
+            "airbnb_guestpic_url": self.airbnb_guestpic_url,
+            "needs_manual_details": self.needs_manual_details,
+        }