forked from cartsnitch/cartsnitch
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fa4d0f5003 | |||
| f784f1952e | |||
| 2e8ec75831 | |||
| 1af2b623ed | |||
| 038440a319 | |||
| 9ba892c060 | |||
| 18eb17028a | |||
| 7942d3e9c9 | |||
| 6636b28472 | |||
| 46caec81c6 | |||
| dc15a72144 | |||
| 386ce16447 | |||
| 8b21c614bc | |||
| 3747d335f5 | |||
| 1e427a7fc3 |
@@ -95,7 +95,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
CHROME_PATH=$(find /home/runner/.cache/ms-playwright -name chrome -type f 2>/dev/null | head -1)
|
CHROME_PATH=$(find /home/runner/.cache/ms-playwright -name chrome -type f 2>/dev/null | head -1)
|
||||||
npm install -g @lhci/cli
|
npm install -g @lhci/cli
|
||||||
CHROME_PATH="$CHROME_PATH" lhci autorun --chrome-flags="--headless=new --no-sandbox --disable-gpu --disable-dev-shm-usage"
|
LHCI_CHROME_PATH="$CHROME_PATH" lhci autorun
|
||||||
|
|
||||||
build-and-push:
|
build-and-push:
|
||||||
runs-on: runners-cartsnitch
|
runs-on: runners-cartsnitch
|
||||||
|
|||||||
+1
-1
@@ -30,4 +30,4 @@ EXPOSE 8000
|
|||||||
HEALTHCHECK --interval=30s --timeout=3s \
|
HEALTHCHECK --interval=30s --timeout=3s \
|
||||||
CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/health')"
|
CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/health')"
|
||||||
|
|
||||||
CMD ["sh", "-c", "python -m alembic upgrade head && uvicorn cartsnitch_api.main:app --host 0.0.0.0 --port 8000"]
|
CMD ["uvicorn", "cartsnitch_api.main:app", "--host", "0.0.0.0", "--port", "8000"]
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
"""Fix users.id UUID->text type mismatch for Better-Auth compatibility.
|
|
||||||
|
|
||||||
Better-Auth generates nanoid-style text IDs (e.g. pGud2ln2WAFHC0KYjBVKR4Rc7mM8OcTI),
|
|
||||||
but the users table was using PostgreSQL uuid type. When Better-Auth tries to INSERT
|
|
||||||
a new user, Postgres throws:
|
|
||||||
ERROR: invalid input syntax for type uuid: "pGud2ln2WAFHC0KYjBVKR4Rc7mM8OcTI"
|
|
||||||
|
|
||||||
The sessions, accounts, and verifications tables already use text IDs — only users,
|
|
||||||
user_store_accounts.user_id, and purchases.user_id needed fixing.
|
|
||||||
|
|
||||||
Revision ID: 004_fix_user_id_text
|
|
||||||
Revises: 003_make_users_hashed_password_nullable
|
|
||||||
Create Date: 2026-03-31
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
from sqlalchemy import text
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "004_fix_user_id_text"
|
|
||||||
down_revision = "003_make_users_hashed_password_nullable"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
# Step 1: Drop existing FK constraints
|
|
||||||
op.execute(text("ALTER TABLE user_store_accounts DROP CONSTRAINT IF EXISTS user_store_accounts_user_id_fkey"))
|
|
||||||
op.execute(text("ALTER TABLE purchases DROP CONSTRAINT IF EXISTS purchases_user_id_fkey"))
|
|
||||||
|
|
||||||
# Step 2: Alter users.id from uuid to text
|
|
||||||
op.alter_column(
|
|
||||||
"users",
|
|
||||||
"id",
|
|
||||||
type_=sa.Text(),
|
|
||||||
existing_type=sa.UUID(),
|
|
||||||
postgresql_using="id::text",
|
|
||||||
)
|
|
||||||
|
|
||||||
# Step 3: Alter user_store_accounts.user_id from uuid to text
|
|
||||||
op.alter_column(
|
|
||||||
"user_store_accounts",
|
|
||||||
"user_id",
|
|
||||||
type_=sa.Text(),
|
|
||||||
existing_type=sa.UUID(),
|
|
||||||
postgresql_using="user_id::text",
|
|
||||||
)
|
|
||||||
|
|
||||||
# Step 4: Alter purchases.user_id from uuid to text
|
|
||||||
op.alter_column(
|
|
||||||
"purchases",
|
|
||||||
"user_id",
|
|
||||||
type_=sa.Text(),
|
|
||||||
existing_type=sa.UUID(),
|
|
||||||
postgresql_using="user_id::text",
|
|
||||||
)
|
|
||||||
|
|
||||||
# Step 5: Re-add FK constraints
|
|
||||||
op.execute(
|
|
||||||
text(
|
|
||||||
"ALTER TABLE user_store_accounts "
|
|
||||||
"ADD CONSTRAINT user_store_accounts_user_id_fkey "
|
|
||||||
"FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
op.execute(
|
|
||||||
text(
|
|
||||||
"ALTER TABLE purchases "
|
|
||||||
"ADD CONSTRAINT purchases_user_id_fkey "
|
|
||||||
"FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
# Drop FK constraints
|
|
||||||
op.execute(text("ALTER TABLE user_store_accounts DROP CONSTRAINT IF EXISTS user_store_accounts_user_id_fkey"))
|
|
||||||
op.execute(text("ALTER TABLE purchases DROP CONSTRAINT IF EXISTS purchases_user_id_fkey"))
|
|
||||||
|
|
||||||
# Revert users.id from text to uuid
|
|
||||||
op.alter_column(
|
|
||||||
"users",
|
|
||||||
"id",
|
|
||||||
type_=sa.UUID(),
|
|
||||||
existing_type=sa.Text(),
|
|
||||||
postgresql_using="id::uuid",
|
|
||||||
)
|
|
||||||
|
|
||||||
# Revert user_store_accounts.user_id from text to uuid
|
|
||||||
op.alter_column(
|
|
||||||
"user_store_accounts",
|
|
||||||
"user_id",
|
|
||||||
type_=sa.UUID(),
|
|
||||||
existing_type=sa.Text(),
|
|
||||||
postgresql_using="user_id::uuid",
|
|
||||||
)
|
|
||||||
|
|
||||||
# Revert purchases.user_id from text to uuid
|
|
||||||
op.alter_column(
|
|
||||||
"purchases",
|
|
||||||
"user_id",
|
|
||||||
type_=sa.UUID(),
|
|
||||||
existing_type=sa.Text(),
|
|
||||||
postgresql_using="user_id::uuid",
|
|
||||||
)
|
|
||||||
|
|
||||||
# Re-add FK constraints (PostgreSQL will auto-name them)
|
|
||||||
op.execute(
|
|
||||||
text(
|
|
||||||
"ALTER TABLE user_store_accounts "
|
|
||||||
"ADD CONSTRAINT user_store_accounts_user_id_fkey "
|
|
||||||
"FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
op.execute(
|
|
||||||
text(
|
|
||||||
"ALTER TABLE purchases "
|
|
||||||
"ADD CONSTRAINT purchases_user_id_fkey "
|
|
||||||
"FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
@@ -5,6 +5,7 @@ Sessions are verified by querying the shared sessions table directly.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
from datetime import UTC, datetime
|
from datetime import UTC, datetime
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
from fastapi import Cookie, Depends, Header, HTTPException, Request, status
|
from fastapi import Cookie, Depends, Header, HTTPException, Request, status
|
||||||
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
|
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
|
||||||
@@ -18,27 +19,18 @@ from cartsnitch_api.database import get_db
|
|||||||
# but we support Bearer tokens for service-to-service or mobile clients.
|
# but we support Bearer tokens for service-to-service or mobile clients.
|
||||||
bearer_scheme = HTTPBearer(auto_error=False)
|
bearer_scheme = HTTPBearer(auto_error=False)
|
||||||
|
|
||||||
# Better-Auth session cookie names.
|
# Better-Auth session cookie name
|
||||||
# Over HTTPS Better-Auth adds the __Secure- prefix automatically.
|
SESSION_COOKIE_NAME = "better-auth.session_token"
|
||||||
SESSION_COOKIE_NAMES = [
|
|
||||||
"__Secure-better-auth.session_token", # HTTPS (deployed)
|
|
||||||
"better-auth.session_token", # HTTP (local dev)
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
async def _validate_session_token(token: str, db: AsyncSession) -> str:
|
async def _validate_session_token(token: str, db: AsyncSession) -> UUID:
|
||||||
"""Validate a Better-Auth session token against the sessions table.
|
"""Validate a Better-Auth session token against the sessions table.
|
||||||
|
|
||||||
Returns the user_id (as str) if the session is valid and not expired.
|
Returns the user_id (as UUID) if the session is valid and not expired.
|
||||||
Better-Auth v1.5.6 stores raw tokens in the DB. The session cookie
|
|
||||||
is signed: ``rawToken.base64HMACSignature``. Strip the signature
|
|
||||||
before querying.
|
|
||||||
"""
|
"""
|
||||||
# Signed cookie format: rawToken.hmacSignature — split and use only the token part
|
|
||||||
raw_token = token.split(".")[0] if "." in token else token
|
|
||||||
result = await db.execute(
|
result = await db.execute(
|
||||||
text("SELECT user_id, expires_at FROM sessions WHERE token = :token"),
|
text("SELECT user_id, expires_at FROM sessions WHERE token = :token"),
|
||||||
{"token": raw_token},
|
{"token": token},
|
||||||
)
|
)
|
||||||
row = result.first()
|
row = result.first()
|
||||||
|
|
||||||
@@ -59,14 +51,14 @@ async def _validate_session_token(token: str, db: AsyncSession) -> str:
|
|||||||
detail="Session expired",
|
detail="Session expired",
|
||||||
)
|
)
|
||||||
|
|
||||||
return str(user_id)
|
return UUID(str(user_id))
|
||||||
|
|
||||||
|
|
||||||
async def get_current_user(
|
async def get_current_user(
|
||||||
request: Request,
|
request: Request,
|
||||||
credentials: HTTPAuthorizationCredentials | None = Depends(bearer_scheme),
|
credentials: HTTPAuthorizationCredentials | None = Depends(bearer_scheme),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
) -> str:
|
) -> UUID:
|
||||||
"""Extract and validate the session token from cookie or Authorization header.
|
"""Extract and validate the session token from cookie or Authorization header.
|
||||||
|
|
||||||
Checks in order:
|
Checks in order:
|
||||||
@@ -75,12 +67,8 @@ async def get_current_user(
|
|||||||
"""
|
"""
|
||||||
token: str | None = None
|
token: str | None = None
|
||||||
|
|
||||||
# 1. Check session cookie (try both names for HTTP/HTTPS compatibility)
|
# 1. Check session cookie
|
||||||
cookie_token = None
|
cookie_token = request.cookies.get(SESSION_COOKIE_NAME)
|
||||||
for name in SESSION_COOKIE_NAMES:
|
|
||||||
cookie_token = request.cookies.get(name)
|
|
||||||
if cookie_token:
|
|
||||||
break
|
|
||||||
if cookie_token:
|
if cookie_token:
|
||||||
token = cookie_token
|
token = cookie_token
|
||||||
|
|
||||||
|
|||||||
@@ -2,21 +2,22 @@
|
|||||||
|
|
||||||
from datetime import UTC, datetime, timedelta
|
from datetime import UTC, datetime, timedelta
|
||||||
from typing import Any, cast
|
from typing import Any, cast
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
from jose import JWTError, jwt
|
from jose import JWTError, jwt
|
||||||
|
|
||||||
from cartsnitch_api.config import settings
|
from cartsnitch_api.config import settings
|
||||||
|
|
||||||
|
|
||||||
def create_access_token(user_id: str) -> str:
|
def create_access_token(user_id: UUID) -> str:
|
||||||
expire = datetime.now(UTC) + timedelta(minutes=settings.jwt_access_token_expire_minutes)
|
expire = datetime.now(UTC) + timedelta(minutes=settings.jwt_access_token_expire_minutes)
|
||||||
payload = {"sub": user_id, "exp": expire, "type": "access"}
|
payload = {"sub": str(user_id), "exp": expire, "type": "access"}
|
||||||
return cast(str, jwt.encode(payload, settings.jwt_secret_key, algorithm=settings.jwt_algorithm))
|
return cast(str, jwt.encode(payload, settings.jwt_secret_key, algorithm=settings.jwt_algorithm))
|
||||||
|
|
||||||
|
|
||||||
def create_refresh_token(user_id: str) -> str:
|
def create_refresh_token(user_id: UUID) -> str:
|
||||||
expire = datetime.now(UTC) + timedelta(days=settings.jwt_refresh_token_expire_days)
|
expire = datetime.now(UTC) + timedelta(days=settings.jwt_refresh_token_expire_days)
|
||||||
payload = {"sub": user_id, "exp": expire, "type": "refresh"}
|
payload = {"sub": str(user_id), "exp": expire, "type": "refresh"}
|
||||||
return cast(str, jwt.encode(payload, settings.jwt_secret_key, algorithm=settings.jwt_algorithm))
|
return cast(str, jwt.encode(payload, settings.jwt_secret_key, algorithm=settings.jwt_algorithm))
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ the Better-Auth service (auth/). This router provides user profile
|
|||||||
endpoints that query our own user data from the shared database.
|
endpoints that query our own user data from the shared database.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, status
|
from fastapi import APIRouter, Depends, HTTPException, status
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
@@ -21,7 +23,7 @@ router = APIRouter(prefix="/auth", tags=["auth"])
|
|||||||
|
|
||||||
@router.get("/me", response_model=UserResponse)
|
@router.get("/me", response_model=UserResponse)
|
||||||
async def get_me(
|
async def get_me(
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = AuthService(db)
|
svc = AuthService(db)
|
||||||
@@ -36,7 +38,7 @@ async def get_me(
|
|||||||
@router.patch("/me", response_model=UserResponse)
|
@router.patch("/me", response_model=UserResponse)
|
||||||
async def update_me(
|
async def update_me(
|
||||||
body: UpdateUserRequest,
|
body: UpdateUserRequest,
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = AuthService(db)
|
svc = AuthService(db)
|
||||||
@@ -52,7 +54,7 @@ async def update_me(
|
|||||||
|
|
||||||
@router.delete("/me", status_code=status.HTTP_204_NO_CONTENT)
|
@router.delete("/me", status_code=status.HTTP_204_NO_CONTENT)
|
||||||
async def delete_me(
|
async def delete_me(
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = AuthService(db)
|
svc = AuthService(db)
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
from contextlib import asynccontextmanager
|
from contextlib import asynccontextmanager
|
||||||
|
|
||||||
from fastapi import APIRouter, FastAPI
|
from fastapi import FastAPI
|
||||||
|
|
||||||
from cartsnitch_api.auth.routes import router as auth_router
|
from cartsnitch_api.auth.routes import router as auth_router
|
||||||
from cartsnitch_api.middleware.cors import add_cors_middleware
|
from cartsnitch_api.middleware.cors import add_cors_middleware
|
||||||
@@ -46,19 +46,15 @@ def create_app() -> FastAPI:
|
|||||||
# Routers
|
# Routers
|
||||||
app.include_router(health_router)
|
app.include_router(health_router)
|
||||||
app.include_router(auth_router)
|
app.include_router(auth_router)
|
||||||
|
app.include_router(stores_router)
|
||||||
# Data endpoints mounted under /api/v1
|
app.include_router(purchases_router)
|
||||||
v1_router = APIRouter(prefix="/api/v1")
|
app.include_router(products_router)
|
||||||
v1_router.include_router(stores_router)
|
app.include_router(prices_router)
|
||||||
v1_router.include_router(purchases_router)
|
app.include_router(coupons_router)
|
||||||
v1_router.include_router(products_router)
|
app.include_router(shopping_router)
|
||||||
v1_router.include_router(prices_router)
|
app.include_router(alerts_router)
|
||||||
v1_router.include_router(coupons_router)
|
app.include_router(scraping_router)
|
||||||
v1_router.include_router(shopping_router)
|
app.include_router(public_router)
|
||||||
v1_router.include_router(alerts_router)
|
|
||||||
v1_router.include_router(scraping_router)
|
|
||||||
v1_router.include_router(public_router)
|
|
||||||
app.include_router(v1_router)
|
|
||||||
|
|
||||||
return app
|
return app
|
||||||
|
|
||||||
|
|||||||
@@ -9,14 +9,14 @@ from sqlalchemy import Boolean, Date, DateTime, ForeignKey, Numeric, String
|
|||||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||||
|
|
||||||
from cartsnitch_api.constants import DiscountType
|
from cartsnitch_api.constants import DiscountType
|
||||||
from cartsnitch_api.models.base import Base, UUIDPrimaryKeyMixin
|
from cartsnitch_api.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from cartsnitch_api.models.product import NormalizedProduct
|
from cartsnitch_api.models.product import NormalizedProduct
|
||||||
from cartsnitch_api.models.store import Store
|
from cartsnitch_api.models.store import Store
|
||||||
|
|
||||||
|
|
||||||
class Coupon(UUIDPrimaryKeyMixin, Base):
|
class Coupon(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
||||||
"""A coupon or deal for a product at a store."""
|
"""A coupon or deal for a product at a store."""
|
||||||
|
|
||||||
__tablename__ = "coupons"
|
__tablename__ = "coupons"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ from sqlalchemy import Date, ForeignKey, Index, Numeric, String
|
|||||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||||
|
|
||||||
from cartsnitch_api.constants import PriceSource
|
from cartsnitch_api.constants import PriceSource
|
||||||
from cartsnitch_api.models.base import Base, UUIDPrimaryKeyMixin
|
from cartsnitch_api.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from cartsnitch_api.models.product import NormalizedProduct
|
from cartsnitch_api.models.product import NormalizedProduct
|
||||||
@@ -17,7 +17,7 @@ if TYPE_CHECKING:
|
|||||||
from cartsnitch_api.models.store import Store
|
from cartsnitch_api.models.store import Store
|
||||||
|
|
||||||
|
|
||||||
class PriceHistory(UUIDPrimaryKeyMixin, Base):
|
class PriceHistory(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
||||||
"""A single price observation for a product at a store on a date."""
|
"""A single price observation for a product at a store on a date."""
|
||||||
|
|
||||||
__tablename__ = "price_history"
|
__tablename__ = "price_history"
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ from sqlalchemy import (
|
|||||||
)
|
)
|
||||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||||
|
|
||||||
from cartsnitch_api.models.base import Base, UUIDPrimaryKeyMixin
|
from cartsnitch_api.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from cartsnitch_api.models.price import PriceHistory
|
from cartsnitch_api.models.price import PriceHistory
|
||||||
@@ -27,12 +27,12 @@ if TYPE_CHECKING:
|
|||||||
from cartsnitch_api.models.user import User
|
from cartsnitch_api.models.user import User
|
||||||
|
|
||||||
|
|
||||||
class Purchase(UUIDPrimaryKeyMixin, Base):
|
class Purchase(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
||||||
"""A single shopping trip / receipt."""
|
"""A single shopping trip / receipt."""
|
||||||
|
|
||||||
__tablename__ = "purchases"
|
__tablename__ = "purchases"
|
||||||
|
|
||||||
user_id: Mapped[str] = mapped_column(ForeignKey("users.id"), nullable=False)
|
user_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("users.id"), nullable=False)
|
||||||
store_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("stores.id"), nullable=False)
|
store_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("stores.id"), nullable=False)
|
||||||
store_location_id: Mapped[uuid.UUID | None] = mapped_column(ForeignKey("store_locations.id"))
|
store_location_id: Mapped[uuid.UUID | None] = mapped_column(ForeignKey("store_locations.id"))
|
||||||
receipt_id: Mapped[str] = mapped_column(String(200), nullable=False)
|
receipt_id: Mapped[str] = mapped_column(String(200), nullable=False)
|
||||||
@@ -61,7 +61,7 @@ class Purchase(UUIDPrimaryKeyMixin, Base):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class PurchaseItem(UUIDPrimaryKeyMixin, Base):
|
class PurchaseItem(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
||||||
"""Individual line item on a receipt."""
|
"""Individual line item on a receipt."""
|
||||||
|
|
||||||
__tablename__ = "purchase_items"
|
__tablename__ = "purchase_items"
|
||||||
|
|||||||
@@ -9,13 +9,13 @@ from sqlalchemy import Date, ForeignKey, Numeric, String
|
|||||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||||
|
|
||||||
from cartsnitch_api.constants import SizeUnit
|
from cartsnitch_api.constants import SizeUnit
|
||||||
from cartsnitch_api.models.base import Base, UUIDPrimaryKeyMixin
|
from cartsnitch_api.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from cartsnitch_api.models.product import NormalizedProduct
|
from cartsnitch_api.models.product import NormalizedProduct
|
||||||
|
|
||||||
|
|
||||||
class ShrinkflationEvent(UUIDPrimaryKeyMixin, Base):
|
class ShrinkflationEvent(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
||||||
"""Detected shrinkflation event — product size changed while price held or rose."""
|
"""Detected shrinkflation event — product size changed while price held or rose."""
|
||||||
|
|
||||||
__tablename__ = "shrinkflation_events"
|
__tablename__ = "shrinkflation_events"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import uuid
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from sqlalchemy import DateTime, ForeignKey, String, Text, UniqueConstraint
|
from sqlalchemy import DateTime, ForeignKey, String, UniqueConstraint
|
||||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||||
|
|
||||||
from cartsnitch_api.constants import AccountStatus
|
from cartsnitch_api.constants import AccountStatus
|
||||||
@@ -16,12 +16,11 @@ if TYPE_CHECKING:
|
|||||||
from cartsnitch_api.models.store import Store
|
from cartsnitch_api.models.store import Store
|
||||||
|
|
||||||
|
|
||||||
class User(TimestampMixin, Base):
|
class User(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
||||||
"""Application user."""
|
"""Application user."""
|
||||||
|
|
||||||
__tablename__ = "users"
|
__tablename__ = "users"
|
||||||
|
|
||||||
id: Mapped[str] = mapped_column(Text, primary_key=True)
|
|
||||||
email: Mapped[str] = mapped_column(String(255), nullable=False, unique=True)
|
email: Mapped[str] = mapped_column(String(255), nullable=False, unique=True)
|
||||||
hashed_password: Mapped[str] = mapped_column(String(255), nullable=False)
|
hashed_password: Mapped[str] = mapped_column(String(255), nullable=False)
|
||||||
display_name: Mapped[str | None] = mapped_column(String(100))
|
display_name: Mapped[str | None] = mapped_column(String(100))
|
||||||
@@ -37,7 +36,7 @@ class UserStoreAccount(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
|||||||
__tablename__ = "user_store_accounts"
|
__tablename__ = "user_store_accounts"
|
||||||
__table_args__ = (UniqueConstraint("user_id", "store_id", name="uq_user_store_account"),)
|
__table_args__ = (UniqueConstraint("user_id", "store_id", name="uq_user_store_account"),)
|
||||||
|
|
||||||
user_id: Mapped[str] = mapped_column(ForeignKey("users.id"), nullable=False)
|
user_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("users.id"), nullable=False)
|
||||||
store_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("stores.id"), nullable=False)
|
store_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("stores.id"), nullable=False)
|
||||||
session_data: Mapped[dict | None] = mapped_column(EncryptedJSON)
|
session_data: Mapped[dict | None] = mapped_column(EncryptedJSON)
|
||||||
session_expires_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
session_expires_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
"""Alert routes: list alerts, manage settings."""
|
"""Alert routes: list alerts, manage settings."""
|
||||||
|
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, status
|
from fastapi import APIRouter, Depends, HTTPException, status
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
@@ -13,7 +15,7 @@ router = APIRouter(prefix="/alerts", tags=["alerts"])
|
|||||||
|
|
||||||
@router.get("", response_model=list[AlertResponse])
|
@router.get("", response_model=list[AlertResponse])
|
||||||
async def list_alerts(
|
async def list_alerts(
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = AlertService(db)
|
svc = AlertService(db)
|
||||||
@@ -22,7 +24,7 @@ async def list_alerts(
|
|||||||
|
|
||||||
@router.get("/settings", response_model=AlertSettingsResponse)
|
@router.get("/settings", response_model=AlertSettingsResponse)
|
||||||
async def get_alert_settings(
|
async def get_alert_settings(
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = AlertService(db)
|
svc = AlertService(db)
|
||||||
@@ -32,7 +34,7 @@ async def get_alert_settings(
|
|||||||
@router.put("/settings")
|
@router.put("/settings")
|
||||||
async def update_alert_settings(
|
async def update_alert_settings(
|
||||||
body: AlertSettingsRequest,
|
body: AlertSettingsRequest,
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ router = APIRouter(prefix="/coupons", tags=["coupons"])
|
|||||||
@router.get("", response_model=list[CouponResponse])
|
@router.get("", response_model=list[CouponResponse])
|
||||||
async def list_coupons(
|
async def list_coupons(
|
||||||
store_id: UUID | None = Query(None),
|
store_id: UUID | None = Query(None),
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = CouponService(db)
|
svc = CouponService(db)
|
||||||
@@ -25,7 +25,7 @@ async def list_coupons(
|
|||||||
|
|
||||||
@router.get("/relevant", response_model=list[CouponResponse])
|
@router.get("/relevant", response_model=list[CouponResponse])
|
||||||
async def relevant_coupons(
|
async def relevant_coupons(
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = CouponService(db)
|
svc = CouponService(db)
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ router = APIRouter(prefix="/prices", tags=["prices"])
|
|||||||
|
|
||||||
@router.get("/trends", response_model=list[PriceTrendResponse])
|
@router.get("/trends", response_model=list[PriceTrendResponse])
|
||||||
async def price_trends(
|
async def price_trends(
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
category: str | None = Query(None),
|
category: str | None = Query(None),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
@@ -30,7 +30,7 @@ async def price_trends(
|
|||||||
|
|
||||||
@router.get("/increases", response_model=list[PriceIncreaseResponse])
|
@router.get("/increases", response_model=list[PriceIncreaseResponse])
|
||||||
async def price_increases(
|
async def price_increases(
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = PriceService(db)
|
svc = PriceService(db)
|
||||||
@@ -40,7 +40,7 @@ async def price_increases(
|
|||||||
@router.get("/comparison", response_model=list[PriceComparisonResponse])
|
@router.get("/comparison", response_model=list[PriceComparisonResponse])
|
||||||
async def price_comparison(
|
async def price_comparison(
|
||||||
product_ids: Annotated[list[UUID], Query()],
|
product_ids: Annotated[list[UUID], Query()],
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = PriceService(db)
|
svc = PriceService(db)
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ router = APIRouter(prefix="/products", tags=["products"])
|
|||||||
|
|
||||||
@router.get("", response_model=list[ProductResponse])
|
@router.get("", response_model=list[ProductResponse])
|
||||||
async def list_products(
|
async def list_products(
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
q: str | None = Query(None),
|
q: str | None = Query(None),
|
||||||
category: str | None = Query(None),
|
category: str | None = Query(None),
|
||||||
page: int = Query(1, ge=1),
|
page: int = Query(1, ge=1),
|
||||||
@@ -29,7 +29,7 @@ async def list_products(
|
|||||||
@router.get("/{product_id}", response_model=ProductDetailResponse)
|
@router.get("/{product_id}", response_model=ProductDetailResponse)
|
||||||
async def get_product(
|
async def get_product(
|
||||||
product_id: UUID,
|
product_id: UUID,
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = ProductService(db)
|
svc = ProductService(db)
|
||||||
@@ -44,7 +44,7 @@ async def get_product(
|
|||||||
@router.get("/{product_id}/prices", response_model=PriceTrendResponse)
|
@router.get("/{product_id}/prices", response_model=PriceTrendResponse)
|
||||||
async def get_product_prices(
|
async def get_product_prices(
|
||||||
product_id: UUID,
|
product_id: UUID,
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = ProductService(db)
|
svc = ProductService(db)
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ router = APIRouter(prefix="/purchases", tags=["purchases"])
|
|||||||
|
|
||||||
@router.get("", response_model=list[PurchaseResponse])
|
@router.get("", response_model=list[PurchaseResponse])
|
||||||
async def list_purchases(
|
async def list_purchases(
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
store_id: UUID | None = Query(None),
|
store_id: UUID | None = Query(None),
|
||||||
page: int = Query(1, ge=1),
|
page: int = Query(1, ge=1),
|
||||||
page_size: int = Query(20, ge=1, le=100),
|
page_size: int = Query(20, ge=1, le=100),
|
||||||
@@ -27,7 +27,7 @@ async def list_purchases(
|
|||||||
|
|
||||||
@router.get("/stats", response_model=PurchaseStatsResponse)
|
@router.get("/stats", response_model=PurchaseStatsResponse)
|
||||||
async def purchase_stats(
|
async def purchase_stats(
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = PurchaseService(db)
|
svc = PurchaseService(db)
|
||||||
@@ -37,7 +37,7 @@ async def purchase_stats(
|
|||||||
@router.get("/{purchase_id}", response_model=PurchaseDetailResponse)
|
@router.get("/{purchase_id}", response_model=PurchaseDetailResponse)
|
||||||
async def get_purchase(
|
async def get_purchase(
|
||||||
purchase_id: UUID,
|
purchase_id: UUID,
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = PurchaseService(db)
|
svc = PurchaseService(db)
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
"""Scraping routes: trigger sync, check status (proxy to ReceiptWitness)."""
|
"""Scraping routes: trigger sync, check status (proxy to ReceiptWitness)."""
|
||||||
|
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, status
|
from fastapi import APIRouter, Depends, HTTPException, status
|
||||||
from httpx import HTTPStatusError, RequestError
|
from httpx import HTTPStatusError, RequestError
|
||||||
|
|
||||||
@@ -11,7 +13,7 @@ router = APIRouter(prefix="/scraping", tags=["scraping"])
|
|||||||
|
|
||||||
|
|
||||||
@router.post("/{store_slug}/sync", response_model=SyncTriggerResponse)
|
@router.post("/{store_slug}/sync", response_model=SyncTriggerResponse)
|
||||||
async def trigger_sync(store_slug: str, user_id: str = Depends(get_current_user)):
|
async def trigger_sync(store_slug: str, user_id: UUID = Depends(get_current_user)):
|
||||||
client = ReceiptWitnessClient()
|
client = ReceiptWitnessClient()
|
||||||
try:
|
try:
|
||||||
result = await client.trigger_sync(str(user_id), store_slug)
|
result = await client.trigger_sync(str(user_id), store_slug)
|
||||||
@@ -29,7 +31,7 @@ async def trigger_sync(store_slug: str, user_id: str = Depends(get_current_user)
|
|||||||
|
|
||||||
|
|
||||||
@router.get("/status", response_model=list[SyncStatusResponse])
|
@router.get("/status", response_model=list[SyncStatusResponse])
|
||||||
async def sync_status(user_id: str = Depends(get_current_user)):
|
async def sync_status(user_id: UUID = Depends(get_current_user)):
|
||||||
client = ReceiptWitnessClient()
|
client = ReceiptWitnessClient()
|
||||||
try:
|
try:
|
||||||
return await client.get_sync_status(str(user_id))
|
return await client.get_sync_status(str(user_id))
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
"""Shopping routes: optimize list, saved lists."""
|
"""Shopping routes: optimize list, saved lists."""
|
||||||
|
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, status
|
from fastapi import APIRouter, Depends, HTTPException, status
|
||||||
from httpx import HTTPStatusError, RequestError
|
from httpx import HTTPStatusError, RequestError
|
||||||
|
|
||||||
@@ -11,7 +13,7 @@ router = APIRouter(prefix="/shopping", tags=["shopping"])
|
|||||||
|
|
||||||
|
|
||||||
@router.post("/optimize", response_model=OptimizeResponse)
|
@router.post("/optimize", response_model=OptimizeResponse)
|
||||||
async def optimize_shopping(body: OptimizeRequest, user_id: str = Depends(get_current_user)):
|
async def optimize_shopping(body: OptimizeRequest, user_id: UUID = Depends(get_current_user)):
|
||||||
client = ClipArtistClient()
|
client = ClipArtistClient()
|
||||||
try:
|
try:
|
||||||
result = await client.optimize(
|
result = await client.optimize(
|
||||||
@@ -35,7 +37,7 @@ async def optimize_shopping(body: OptimizeRequest, user_id: str = Depends(get_cu
|
|||||||
|
|
||||||
|
|
||||||
@router.get("/lists", response_model=list[ShoppingListResponse])
|
@router.get("/lists", response_model=list[ShoppingListResponse])
|
||||||
async def list_shopping_lists(user_id: str = Depends(get_current_user)):
|
async def list_shopping_lists(user_id: UUID = Depends(get_current_user)):
|
||||||
client = ClipArtistClient()
|
client = ClipArtistClient()
|
||||||
try:
|
try:
|
||||||
return await client.get_shopping_lists(str(user_id))
|
return await client.get_shopping_lists(str(user_id))
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
"""Store routes: list stores, manage user store connections."""
|
"""Store routes: list stores, manage user store connections."""
|
||||||
|
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, status
|
from fastapi import APIRouter, Depends, HTTPException, status
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
@@ -19,7 +21,7 @@ async def list_stores(db: AsyncSession = Depends(get_db)):
|
|||||||
|
|
||||||
@router.get("/me/stores", response_model=list[StoreAccountResponse])
|
@router.get("/me/stores", response_model=list[StoreAccountResponse])
|
||||||
async def list_user_stores(
|
async def list_user_stores(
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = StoreService(db)
|
svc = StoreService(db)
|
||||||
@@ -34,7 +36,7 @@ async def list_user_stores(
|
|||||||
async def connect_store(
|
async def connect_store(
|
||||||
store_slug: str,
|
store_slug: str,
|
||||||
body: ConnectStoreRequest,
|
body: ConnectStoreRequest,
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = StoreService(db)
|
svc = StoreService(db)
|
||||||
@@ -49,7 +51,7 @@ async def connect_store(
|
|||||||
@router.delete("/me/stores/{store_slug}", status_code=status.HTTP_204_NO_CONTENT)
|
@router.delete("/me/stores/{store_slug}", status_code=status.HTTP_204_NO_CONTENT)
|
||||||
async def disconnect_store(
|
async def disconnect_store(
|
||||||
store_slug: str,
|
store_slug: str,
|
||||||
user_id: str = Depends(get_current_user),
|
user_id: UUID = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
svc = StoreService(db)
|
svc = StoreService(db)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
"""Pydantic v2 request/response schemas for all API endpoints."""
|
"""Pydantic v2 request/response schemas for all API endpoints."""
|
||||||
|
|
||||||
from datetime import date, datetime
|
from datetime import datetime
|
||||||
from uuid import UUID
|
from uuid import UUID
|
||||||
|
|
||||||
from pydantic import BaseModel, EmailStr, Field
|
from pydantic import BaseModel, EmailStr, Field
|
||||||
@@ -16,7 +16,7 @@ class UpdateUserRequest(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
class UserResponse(BaseModel):
|
class UserResponse(BaseModel):
|
||||||
id: str
|
id: UUID
|
||||||
email: str
|
email: str
|
||||||
display_name: str
|
display_name: str
|
||||||
created_at: datetime
|
created_at: datetime
|
||||||
@@ -60,7 +60,7 @@ class PurchaseResponse(BaseModel):
|
|||||||
id: UUID
|
id: UUID
|
||||||
store_id: UUID
|
store_id: UUID
|
||||||
store_name: str
|
store_name: str
|
||||||
purchased_at: date
|
purchased_at: datetime
|
||||||
total: float
|
total: float
|
||||||
item_count: int
|
item_count: int
|
||||||
|
|
||||||
@@ -142,7 +142,7 @@ class CouponResponse(BaseModel):
|
|||||||
discount_value: float
|
discount_value: float
|
||||||
discount_type: str
|
discount_type: str
|
||||||
product_id: UUID | None = None
|
product_id: UUID | None = None
|
||||||
expires_at: date | None = None
|
expires_at: datetime | None = None
|
||||||
|
|
||||||
|
|
||||||
# ---------- Shopping ----------
|
# ---------- Shopping ----------
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ Alerts are generated by StickerShock and ShrinkRay services and written to the D
|
|||||||
This service reads them for the API gateway.
|
This service reads them for the API gateway.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
from sqlalchemy import select
|
from sqlalchemy import select
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
from sqlalchemy.orm import selectinload
|
from sqlalchemy.orm import selectinload
|
||||||
@@ -13,7 +15,7 @@ class AlertService:
|
|||||||
def __init__(self, db: AsyncSession) -> None:
|
def __init__(self, db: AsyncSession) -> None:
|
||||||
self.db = db
|
self.db = db
|
||||||
|
|
||||||
async def list_alerts(self, user_id: str) -> list[dict]:
|
async def list_alerts(self, user_id: UUID) -> list[dict]:
|
||||||
"""List shrinkflation events for products the user has purchased."""
|
"""List shrinkflation events for products the user has purchased."""
|
||||||
from cartsnitch_api.models import Purchase, PurchaseItem, ShrinkflationEvent
|
from cartsnitch_api.models import Purchase, PurchaseItem, ShrinkflationEvent
|
||||||
|
|
||||||
@@ -55,7 +57,7 @@ class AlertService:
|
|||||||
for e in events
|
for e in events
|
||||||
]
|
]
|
||||||
|
|
||||||
async def get_settings(self, user_id: str) -> dict:
|
async def get_settings(self, user_id: UUID) -> dict:
|
||||||
# Alert settings would be stored in a user_settings table.
|
# Alert settings would be stored in a user_settings table.
|
||||||
# For now, return defaults since the table doesn't exist yet in common lib.
|
# For now, return defaults since the table doesn't exist yet in common lib.
|
||||||
return {
|
return {
|
||||||
@@ -64,7 +66,7 @@ class AlertService:
|
|||||||
"email_notifications": False,
|
"email_notifications": False,
|
||||||
}
|
}
|
||||||
|
|
||||||
async def update_settings(self, user_id: str, **fields) -> dict:
|
async def update_settings(self, user_id: UUID, **fields) -> dict:
|
||||||
# Would update user_settings table. Return merged defaults for now.
|
# Would update user_settings table. Return merged defaults for now.
|
||||||
current = await self.get_settings(user_id)
|
current = await self.get_settings(user_id)
|
||||||
for k, v in fields.items():
|
for k, v in fields.items():
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ handled by the Better-Auth service (auth/). This service provides
|
|||||||
user lookup and profile update operations for the API gateway.
|
user lookup and profile update operations for the API gateway.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
from sqlalchemy import select
|
from sqlalchemy import select
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
@@ -13,7 +15,7 @@ class AuthService:
|
|||||||
def __init__(self, db: AsyncSession) -> None:
|
def __init__(self, db: AsyncSession) -> None:
|
||||||
self.db = db
|
self.db = db
|
||||||
|
|
||||||
async def get_user(self, user_id: str) -> dict:
|
async def get_user(self, user_id: UUID) -> dict:
|
||||||
from cartsnitch_api.models import User
|
from cartsnitch_api.models import User
|
||||||
|
|
||||||
result = await self.db.execute(select(User).where(User.id == user_id))
|
result = await self.db.execute(select(User).where(User.id == user_id))
|
||||||
@@ -28,7 +30,7 @@ class AuthService:
|
|||||||
"created_at": user.created_at,
|
"created_at": user.created_at,
|
||||||
}
|
}
|
||||||
|
|
||||||
async def update_user(self, user_id: str, **fields) -> dict:
|
async def update_user(self, user_id: UUID, **fields) -> dict:
|
||||||
from cartsnitch_api.models import User
|
from cartsnitch_api.models import User
|
||||||
|
|
||||||
result = await self.db.execute(select(User).where(User.id == user_id))
|
result = await self.db.execute(select(User).where(User.id == user_id))
|
||||||
@@ -56,7 +58,7 @@ class AuthService:
|
|||||||
"created_at": user.created_at,
|
"created_at": user.created_at,
|
||||||
}
|
}
|
||||||
|
|
||||||
async def delete_user(self, user_id: str) -> None:
|
async def delete_user(self, user_id: UUID) -> None:
|
||||||
from cartsnitch_api.models import User
|
from cartsnitch_api.models import User
|
||||||
|
|
||||||
result = await self.db.execute(select(User).where(User.id == user_id))
|
result = await self.db.execute(select(User).where(User.id == user_id))
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ class CouponService:
|
|||||||
coupons = result.scalars().all()
|
coupons = result.scalars().all()
|
||||||
return [self._to_dict(c) for c in coupons]
|
return [self._to_dict(c) for c in coupons]
|
||||||
|
|
||||||
async def relevant_coupons(self, user_id: str) -> list[dict]:
|
async def relevant_coupons(self, user_id: UUID) -> list[dict]:
|
||||||
"""Coupons for products the user has purchased."""
|
"""Coupons for products the user has purchased."""
|
||||||
from cartsnitch_api.models import Coupon, PurchaseItem
|
from cartsnitch_api.models import Coupon, PurchaseItem
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ class PurchaseService:
|
|||||||
|
|
||||||
async def list_purchases(
|
async def list_purchases(
|
||||||
self,
|
self,
|
||||||
user_id: str,
|
user_id: UUID,
|
||||||
store_id: UUID | None = None,
|
store_id: UUID | None = None,
|
||||||
page: int = 1,
|
page: int = 1,
|
||||||
page_size: int = 20,
|
page_size: int = 20,
|
||||||
@@ -56,7 +56,7 @@ class PurchaseService:
|
|||||||
for p, item_count, store_name in result.all()
|
for p, item_count, store_name in result.all()
|
||||||
]
|
]
|
||||||
|
|
||||||
async def get_purchase(self, purchase_id: UUID, user_id: str) -> dict:
|
async def get_purchase(self, purchase_id: UUID, user_id: UUID) -> dict:
|
||||||
from cartsnitch_api.models import Purchase
|
from cartsnitch_api.models import Purchase
|
||||||
|
|
||||||
result = await self.db.execute(
|
result = await self.db.execute(
|
||||||
@@ -88,7 +88,7 @@ class PurchaseService:
|
|||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
async def get_stats(self, user_id: str) -> dict:
|
async def get_stats(self, user_id: UUID) -> dict:
|
||||||
from cartsnitch_api.models import Purchase
|
from cartsnitch_api.models import Purchase
|
||||||
|
|
||||||
result = await self.db.execute(
|
result = await self.db.execute(
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
"""Store service — list stores, manage user store account connections."""
|
"""Store service — list stores, manage user store account connections."""
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
from cryptography.fernet import Fernet
|
from cryptography.fernet import Fernet
|
||||||
from sqlalchemy import select
|
from sqlalchemy import select
|
||||||
@@ -34,7 +35,7 @@ class StoreService:
|
|||||||
for s in stores
|
for s in stores
|
||||||
]
|
]
|
||||||
|
|
||||||
async def list_user_stores(self, user_id: str) -> list[dict]:
|
async def list_user_stores(self, user_id: UUID) -> list[dict]:
|
||||||
from cartsnitch_api.models import UserStoreAccount
|
from cartsnitch_api.models import UserStoreAccount
|
||||||
|
|
||||||
result = await self.db.execute(
|
result = await self.db.execute(
|
||||||
@@ -59,7 +60,7 @@ class StoreService:
|
|||||||
for a in accounts
|
for a in accounts
|
||||||
]
|
]
|
||||||
|
|
||||||
async def connect_store(self, user_id: str, store_slug: str, credentials: dict | None) -> dict:
|
async def connect_store(self, user_id: UUID, store_slug: str, credentials: dict | None) -> dict:
|
||||||
from cartsnitch_api.models import Store, UserStoreAccount
|
from cartsnitch_api.models import Store, UserStoreAccount
|
||||||
|
|
||||||
result = await self.db.execute(select(Store).where(Store.slug == store_slug))
|
result = await self.db.execute(select(Store).where(Store.slug == store_slug))
|
||||||
@@ -106,7 +107,7 @@ class StoreService:
|
|||||||
"sync_status": "active",
|
"sync_status": "active",
|
||||||
}
|
}
|
||||||
|
|
||||||
async def disconnect_store(self, user_id: str, store_slug: str) -> None:
|
async def disconnect_store(self, user_id: UUID, store_slug: str) -> None:
|
||||||
from cartsnitch_api.models import Store, UserStoreAccount
|
from cartsnitch_api.models import Store, UserStoreAccount
|
||||||
|
|
||||||
result = await self.db.execute(select(Store).where(Store.slug == store_slug))
|
result = await self.db.execute(select(Store).where(Store.slug == store_slug))
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
import { test as base, expect } from "@playwright/test";
|
|
||||||
import AxeBuilder from "@axe-core/playwright";
|
|
||||||
|
|
||||||
export const test = base.extend<{ axeCheck: void }>({
|
|
||||||
axeCheck: [async ({ page }, use) => {
|
|
||||||
await use();
|
|
||||||
const results = await new AxeBuilder({ page }).analyze();
|
|
||||||
expect(results.violations).toEqual([]);
|
|
||||||
}, { auto: true }],
|
|
||||||
});
|
|
||||||
|
|
||||||
export { expect } from "@playwright/test";
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
import { test, expect } from '@playwright/test';
|
|
||||||
|
|
||||||
const uniqueEmail = () => `betty+e2e-${Date.now()}@cartsnitch.test`;
|
|
||||||
|
|
||||||
test.describe('J1: Registration and Login', () => {
|
|
||||||
test('can register a new account and lands on dashboard', async ({ page }) => {
|
|
||||||
await page.goto('/register');
|
|
||||||
await page.fill('[placeholder="Full Name"]', 'Betty Tester');
|
|
||||||
await page.fill('[placeholder="Email"]', uniqueEmail());
|
|
||||||
await page.fill('[placeholder="Password (min. 8 characters)"]', 'TestPass123!');
|
|
||||||
await page.click('button[type="submit"]');
|
|
||||||
|
|
||||||
// With VITE_MOCK_AUTH=true the app navigates to "/" on success
|
|
||||||
await expect(page).toHaveURL('http://localhost:5173/');
|
|
||||||
await expect(page.getByRole('heading', { name: /cart/i })).toBeVisible();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('shows validation error when registration fields are empty', async ({ page }) => {
|
|
||||||
await page.goto('/register');
|
|
||||||
await page.click('button[type="submit"]');
|
|
||||||
|
|
||||||
await expect(page.locator('.bg-red-50')).toContainText('Please fill in all fields');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('can navigate from register to login', async ({ page }) => {
|
|
||||||
await page.goto('/register');
|
|
||||||
await page.getByRole('link', { name: /sign in/i }).click();
|
|
||||||
|
|
||||||
await expect(page).toHaveURL(/\/login/);
|
|
||||||
await expect(page.getByRole('heading', { name: /cartsnitch/i })).toBeVisible();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('can sign in with credentials and land on dashboard', async ({ page }) => {
|
|
||||||
// Register first so we have a real account
|
|
||||||
const email = uniqueEmail();
|
|
||||||
await page.goto('/register');
|
|
||||||
await page.fill('[placeholder="Full Name"]', 'Login Betty');
|
|
||||||
await page.fill('[placeholder="Email"]', email);
|
|
||||||
await page.fill('[placeholder="Password (min. 8 characters)"]', 'TestPass123!');
|
|
||||||
await page.click('button[type="submit"]');
|
|
||||||
await expect(page).toHaveURL('http://localhost:5173/');
|
|
||||||
|
|
||||||
// Sign out by clearing the mock session (reload with no session)
|
|
||||||
await page.goto('/');
|
|
||||||
await page.reload();
|
|
||||||
|
|
||||||
// Now sign in
|
|
||||||
await page.goto('/login');
|
|
||||||
await page.fill('[placeholder="Email"]', email);
|
|
||||||
await page.fill('[placeholder="Password"]', 'TestPass123!');
|
|
||||||
await page.click('button[type="submit"]');
|
|
||||||
|
|
||||||
await expect(page).toHaveURL('http://localhost:5173/');
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
import { test, expect } from '@playwright/test';
|
|
||||||
|
|
||||||
test.describe('J8: Unauthenticated Access', () => {
|
|
||||||
test('redirects /dashboard (/) to /login when not authenticated', async ({ page }) => {
|
|
||||||
// No session cookie — start fresh
|
|
||||||
await page.context().clearCookies();
|
|
||||||
await page.goto('/');
|
|
||||||
|
|
||||||
await expect(page).toHaveURL(/\/login/);
|
|
||||||
await expect(page.getByRole('heading', { name: /cartsnitch/i })).toBeVisible();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('redirects /purchases to /login when not authenticated', async ({ page }) => {
|
|
||||||
await page.context().clearCookies();
|
|
||||||
await page.goto('/purchases');
|
|
||||||
|
|
||||||
await expect(page).toHaveURL(/\/login/);
|
|
||||||
await expect(page.getByRole('heading', { name: /cartsnitch/i })).toBeVisible();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('redirects /products to /login when not authenticated', async ({ page }) => {
|
|
||||||
await page.context().clearCookies();
|
|
||||||
await page.goto('/products');
|
|
||||||
|
|
||||||
await expect(page).toHaveURL(/\/login/);
|
|
||||||
await expect(page.getByRole('heading', { name: /cartsnitch/i })).toBeVisible();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('redirects /coupons to /login when not authenticated', async ({ page }) => {
|
|
||||||
await page.context().clearCookies();
|
|
||||||
await page.goto('/coupons');
|
|
||||||
|
|
||||||
await expect(page).toHaveURL(/\/login/);
|
|
||||||
await expect(page.getByRole('heading', { name: /cartsnitch/i })).toBeVisible();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('shows loading spinner while auth session is pending', async ({ page }) => {
|
|
||||||
// Intercept but don't respond — session stays pending
|
|
||||||
await page.context().clearCookies();
|
|
||||||
await page.request.fetch('/api/auth/session', {
|
|
||||||
method: 'GET',
|
|
||||||
});
|
|
||||||
|
|
||||||
// Just navigate to a protected route — ProtectedRoute will show spinner while session is pending
|
|
||||||
await page.goto('/purchases');
|
|
||||||
// Spinner is visible briefly; once resolved, should redirect to login
|
|
||||||
await expect(page).toHaveURL(/\/login/, { timeout: 10_000 });
|
|
||||||
});
|
|
||||||
});
|
|
||||||
+2
-4
@@ -1,8 +1,6 @@
|
|||||||
import { test, expect } from './fixtures';
|
import { test, expect } from '@playwright/test';
|
||||||
|
|
||||||
test('app loads', async ({ page }) => {
|
test('app loads', async ({ page }) => {
|
||||||
await page.goto('/');
|
await page.goto('/');
|
||||||
// Unauthenticated users are redirected to /login
|
await expect(page).toHaveTitle(/CartSnitch/);
|
||||||
await expect(page).toHaveURL(/\/login/);
|
|
||||||
await expect(page.getByRole('heading', { name: /CartSnitch/i })).toBeVisible();
|
|
||||||
});
|
});
|
||||||
|
|||||||
+2
-7
@@ -3,12 +3,7 @@
|
|||||||
"collect": {
|
"collect": {
|
||||||
"staticDistDir": "./dist",
|
"staticDistDir": "./dist",
|
||||||
"url": ["http://localhost:4173/"],
|
"url": ["http://localhost:4173/"],
|
||||||
"numberOfRuns": 1,
|
"numberOfRuns": 1
|
||||||
"settings": {
|
|
||||||
"chromeFlags": ["--headless=new", "--no-sandbox", "--disable-gpu", "--disable-dev-shm-usage"],
|
|
||||||
"skipAudits": ["bf-cache"],
|
|
||||||
"disableFullPageScreenshot": true
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"assert": {
|
"assert": {
|
||||||
"assertions": {
|
"assertions": {
|
||||||
@@ -21,4 +16,4 @@
|
|||||||
"target": "temporary-public-storage"
|
"target": "temporary-public-storage"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+1
-26
@@ -18,9 +18,8 @@
|
|||||||
"zustand": "^5.0.0"
|
"zustand": "^5.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@axe-core/playwright": "^4.10.0",
|
|
||||||
"@eslint/js": "^9.39.4",
|
"@eslint/js": "^9.39.4",
|
||||||
"@playwright/test": "^1.58.2",
|
"@playwright/test": "^1.49.0",
|
||||||
"@tailwindcss/vite": "^4.0.0",
|
"@tailwindcss/vite": "^4.0.0",
|
||||||
"@testing-library/jest-dom": "^6.6.3",
|
"@testing-library/jest-dom": "^6.6.3",
|
||||||
"@testing-library/react": "^16.3.2",
|
"@testing-library/react": "^16.3.2",
|
||||||
@@ -34,7 +33,6 @@
|
|||||||
"globals": "^17.4.0",
|
"globals": "^17.4.0",
|
||||||
"jsdom": "^25.0.1",
|
"jsdom": "^25.0.1",
|
||||||
"msw": "^2.12.14",
|
"msw": "^2.12.14",
|
||||||
"playwright": "^1.58.2",
|
|
||||||
"tailwindcss": "^4.0.0",
|
"tailwindcss": "^4.0.0",
|
||||||
"typescript": "^5.7.3",
|
"typescript": "^5.7.3",
|
||||||
"typescript-eslint": "^8.56.1",
|
"typescript-eslint": "^8.56.1",
|
||||||
@@ -71,19 +69,6 @@
|
|||||||
"devOptional": true,
|
"devOptional": true,
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/@axe-core/playwright": {
|
|
||||||
"version": "4.11.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@axe-core/playwright/-/playwright-4.11.1.tgz",
|
|
||||||
"integrity": "sha512-mKEfoUIB1MkVTht0BGZFXtSAEKXMJoDkyV5YZ9jbBmZCcWDz71tegNsdTkIN8zc/yMi5Gm2kx7Z5YQ9PfWNAWw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MPL-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"axe-core": "~4.11.1"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"playwright-core": ">= 1.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@babel/code-frame": {
|
"node_modules/@babel/code-frame": {
|
||||||
"version": "7.29.0",
|
"version": "7.29.0",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
|
||||||
@@ -4508,16 +4493,6 @@
|
|||||||
"url": "https://github.com/sponsors/ljharb"
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/axe-core": {
|
|
||||||
"version": "4.11.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.1.tgz",
|
|
||||||
"integrity": "sha512-BASOg+YwO2C+346x3LZOeoovTIoTrRqEsqMa6fmfAV0P+U9mFr9NsyOEpiYvFjbc64NMrSswhV50WdXzdb/Z5A==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MPL-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/babel-plugin-polyfill-corejs2": {
|
"node_modules/babel-plugin-polyfill-corejs2": {
|
||||||
"version": "0.4.16",
|
"version": "0.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.16.tgz",
|
"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.16.tgz",
|
||||||
|
|||||||
+2
-4
@@ -23,9 +23,8 @@
|
|||||||
"zustand": "^5.0.0"
|
"zustand": "^5.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@axe-core/playwright": "^4.10.0",
|
|
||||||
"@eslint/js": "^9.39.4",
|
"@eslint/js": "^9.39.4",
|
||||||
"@playwright/test": "^1.58.2",
|
"@playwright/test": "^1.49.0",
|
||||||
"@tailwindcss/vite": "^4.0.0",
|
"@tailwindcss/vite": "^4.0.0",
|
||||||
"@testing-library/jest-dom": "^6.6.3",
|
"@testing-library/jest-dom": "^6.6.3",
|
||||||
"@testing-library/react": "^16.3.2",
|
"@testing-library/react": "^16.3.2",
|
||||||
@@ -39,7 +38,6 @@
|
|||||||
"globals": "^17.4.0",
|
"globals": "^17.4.0",
|
||||||
"jsdom": "^25.0.1",
|
"jsdom": "^25.0.1",
|
||||||
"msw": "^2.12.14",
|
"msw": "^2.12.14",
|
||||||
"playwright": "^1.58.2",
|
|
||||||
"tailwindcss": "^4.0.0",
|
"tailwindcss": "^4.0.0",
|
||||||
"typescript": "^5.7.3",
|
"typescript": "^5.7.3",
|
||||||
"typescript-eslint": "^8.56.1",
|
"typescript-eslint": "^8.56.1",
|
||||||
@@ -52,4 +50,4 @@
|
|||||||
"flatted": "^3.4.2",
|
"flatted": "^3.4.2",
|
||||||
"serialize-javascript": "7.0.5"
|
"serialize-javascript": "7.0.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,7 +9,7 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
webServer: {
|
webServer: {
|
||||||
command: 'VITE_MOCK_AUTH=true npm run dev',
|
command: 'npm run dev',
|
||||||
url: 'http://localhost:5173',
|
url: 'http://localhost:5173',
|
||||||
reuseExistingServer: !process.env.CI,
|
reuseExistingServer: !process.env.CI,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -14,13 +14,11 @@ dependencies = [
|
|||||||
"cryptography>=42.0,<44.0",
|
"cryptography>=42.0,<44.0",
|
||||||
"fastapi>=0.115,<1.0",
|
"fastapi>=0.115,<1.0",
|
||||||
"uvicorn[standard]>=0.30,<1.0",
|
"uvicorn[standard]>=0.30,<1.0",
|
||||||
"beautifulsoup4>=4.12,<5.0",
|
|
||||||
"redis>=5.0,<6.0",
|
"redis>=5.0,<6.0",
|
||||||
"pydantic>=2.0,<3.0",
|
"pydantic>=2.0,<3.0",
|
||||||
"pydantic-settings>=2.0,<3.0",
|
"pydantic-settings>=2.0,<3.0",
|
||||||
"sqlalchemy[asyncio]>=2.0,<3.0",
|
"sqlalchemy[asyncio]>=2.0,<3.0",
|
||||||
"asyncpg>=0.29,<1.0",
|
"asyncpg>=0.29,<1.0",
|
||||||
"resend>=2.0",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[project.optional-dependencies]
|
[project.optional-dependencies]
|
||||||
@@ -29,9 +27,6 @@ dev = [
|
|||||||
"pytest-asyncio>=0.23",
|
"pytest-asyncio>=0.23",
|
||||||
"ruff>=0.3",
|
"ruff>=0.3",
|
||||||
"pytest-cov>=5.0",
|
"pytest-cov>=5.0",
|
||||||
"fakeredis[aioredis]>=2.20",
|
|
||||||
"httpx>=0.27",
|
|
||||||
"python-multipart>=0.0.9",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.hatch.build.targets.wheel]
|
[tool.hatch.build.targets.wheel]
|
||||||
|
|||||||
@@ -1,61 +1,9 @@
|
|||||||
"""Internal API routes for triggering scrapes and checking status."""
|
"""Internal API routes for triggering scrapes and checking status."""
|
||||||
|
|
||||||
import hashlib
|
from fastapi import APIRouter
|
||||||
import hmac
|
|
||||||
import re
|
|
||||||
import time
|
|
||||||
|
|
||||||
from fastapi import APIRouter, HTTPException, Request
|
|
||||||
|
|
||||||
from receiptwitness.config import settings
|
|
||||||
from receiptwitness.queue.email import EmailJob, enqueue_email, get_redis
|
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
TOKEN_PATTERN = re.compile(r"receipts\+([A-Za-z0-9_-]+)@")
|
|
||||||
|
|
||||||
|
|
||||||
def verify_mailgun_signature(token: str, timestamp: str, signature: str) -> bool:
|
|
||||||
"""Verify Mailgun webhook signature."""
|
|
||||||
if abs(time.time() - int(timestamp)) > 300: # 5 min freshness
|
|
||||||
return False
|
|
||||||
key = settings.mailgun_webhook_signing_key.encode()
|
|
||||||
hmac_digest = hmac.new(key, f"{timestamp}{token}".encode(), hashlib.sha256).hexdigest()
|
|
||||||
return hmac.compare_digest(signature, hmac_digest)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/inbound/email")
|
|
||||||
async def receive_inbound_email(request: Request):
|
|
||||||
form = await request.form()
|
|
||||||
# 1. Verify Mailgun signature
|
|
||||||
token = str(form.get("token", ""))
|
|
||||||
timestamp = str(form.get("timestamp", ""))
|
|
||||||
signature = str(form.get("signature", ""))
|
|
||||||
if not verify_mailgun_signature(token, timestamp, signature):
|
|
||||||
raise HTTPException(status_code=406, detail="Invalid signature")
|
|
||||||
# 2. Extract account token from recipient
|
|
||||||
recipient = str(form.get("recipient", ""))
|
|
||||||
match = TOKEN_PATTERN.search(recipient)
|
|
||||||
if not match:
|
|
||||||
raise HTTPException(status_code=406, detail="Invalid recipient")
|
|
||||||
account_token = match.group(1)
|
|
||||||
# 3. Enqueue — worker resolves token -> user_id
|
|
||||||
body_html_val = form.get("body-html")
|
|
||||||
body_plain_val = form.get("body-plain")
|
|
||||||
job = EmailJob(
|
|
||||||
user_id=account_token,
|
|
||||||
sender=str(form.get("sender", "")),
|
|
||||||
recipient=recipient,
|
|
||||||
subject=str(form.get("subject", "")),
|
|
||||||
body_html=str(body_html_val) if body_html_val is not None else None,
|
|
||||||
body_plain=str(body_plain_val) if body_plain_val is not None else None,
|
|
||||||
received_at=str(form.get("timestamp", "")),
|
|
||||||
message_id=str(form.get("Message-Id", "")),
|
|
||||||
)
|
|
||||||
client = await get_redis()
|
|
||||||
await enqueue_email(client, job)
|
|
||||||
return {"status": "queued"}
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/health")
|
@router.get("/health")
|
||||||
async def health():
|
async def health():
|
||||||
|
|||||||
@@ -22,13 +22,5 @@ class ReceiptWitnessSettings(BaseSettings):
|
|||||||
headless: bool = True
|
headless: bool = True
|
||||||
browser_timeout_ms: int = 60000
|
browser_timeout_ms: int = 60000
|
||||||
|
|
||||||
# Email notifications (Resend)
|
|
||||||
resend_api_key: str = ""
|
|
||||||
notification_email_from: str = "notifications@cartsnitch.com"
|
|
||||||
notifications_enabled: bool = False
|
|
||||||
|
|
||||||
# Mailgun inbound email webhook
|
|
||||||
mailgun_webhook_signing_key: str = ""
|
|
||||||
|
|
||||||
|
|
||||||
settings = ReceiptWitnessSettings()
|
settings = ReceiptWitnessSettings()
|
||||||
|
|||||||
@@ -2,17 +2,12 @@
|
|||||||
|
|
||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
import uuid
|
|
||||||
from datetime import UTC, datetime
|
from datetime import UTC, datetime
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
|
|
||||||
import redis.asyncio as aioredis
|
import redis.asyncio as aioredis
|
||||||
from cartsnitch_common.database import get_async_session_factory
|
|
||||||
from cartsnitch_common.models.user import User
|
|
||||||
from sqlalchemy import select
|
|
||||||
|
|
||||||
from receiptwitness.config import settings
|
from receiptwitness.config import settings
|
||||||
from receiptwitness.notifications.email import send_receipt_notification
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -44,36 +39,6 @@ async def get_redis_client() -> aioredis.Redis:
|
|||||||
return aioredis.Redis(connection_pool=_get_pool())
|
return aioredis.Redis(connection_pool=_get_pool())
|
||||||
|
|
||||||
|
|
||||||
async def _send_notification_for_event(payload: dict) -> None:
|
|
||||||
"""Look up user email and send receipt notification. Silently skips on error."""
|
|
||||||
try:
|
|
||||||
user_uuid = uuid.UUID(payload["user_id"])
|
|
||||||
except (ValueError, KeyError):
|
|
||||||
logger.warning("Invalid user_id in event payload: %s", payload.get("user_id"))
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
session_factory = get_async_session_factory(settings.database_url)
|
|
||||||
async with session_factory() as session:
|
|
||||||
result = await session.execute(select(User.email).where(User.id == user_uuid))
|
|
||||||
row = result.scalar_one_or_none()
|
|
||||||
if not row:
|
|
||||||
logger.warning("User %s not found for notification", user_uuid)
|
|
||||||
return
|
|
||||||
user_email = row
|
|
||||||
except Exception:
|
|
||||||
logger.exception("Failed to look up user email for notification")
|
|
||||||
return
|
|
||||||
|
|
||||||
await send_receipt_notification(
|
|
||||||
user_email=user_email,
|
|
||||||
store_name=payload["store_slug"],
|
|
||||||
item_count=payload["item_count"],
|
|
||||||
total=payload["total"],
|
|
||||||
purchase_date=payload["purchase_date"],
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
async def publish_receipt_ingested(
|
async def publish_receipt_ingested(
|
||||||
user_id: str,
|
user_id: str,
|
||||||
store_slug: str,
|
store_slug: str,
|
||||||
@@ -83,19 +48,18 @@ async def publish_receipt_ingested(
|
|||||||
total: Decimal | float,
|
total: Decimal | float,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Publish a cartsnitch.receipts.ingested event after successful ingestion."""
|
"""Publish a cartsnitch.receipts.ingested event after successful ingestion."""
|
||||||
payload = {
|
|
||||||
"user_id": user_id,
|
|
||||||
"store_slug": store_slug,
|
|
||||||
"purchase_id": purchase_id,
|
|
||||||
"purchase_date": purchase_date,
|
|
||||||
"item_count": item_count,
|
|
||||||
"total": float(total) if isinstance(total, Decimal) else total,
|
|
||||||
}
|
|
||||||
event = {
|
event = {
|
||||||
"event_type": CHANNEL_RECEIPTS_INGESTED,
|
"event_type": CHANNEL_RECEIPTS_INGESTED,
|
||||||
"timestamp": datetime.now(UTC).isoformat(),
|
"timestamp": datetime.now(UTC).isoformat(),
|
||||||
"service": "receiptwitness",
|
"service": "receiptwitness",
|
||||||
"payload": payload,
|
"payload": {
|
||||||
|
"user_id": user_id,
|
||||||
|
"store_slug": store_slug,
|
||||||
|
"purchase_id": purchase_id,
|
||||||
|
"purchase_date": purchase_date,
|
||||||
|
"item_count": item_count,
|
||||||
|
"total": float(total) if isinstance(total, Decimal) else total,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -109,5 +73,3 @@ async def publish_receipt_ingested(
|
|||||||
except aioredis.ConnectionError:
|
except aioredis.ConnectionError:
|
||||||
logger.error("Failed to publish event — Redis/DragonflyDB connection error")
|
logger.error("Failed to publish event — Redis/DragonflyDB connection error")
|
||||||
raise
|
raise
|
||||||
else:
|
|
||||||
await _send_notification_for_event(payload)
|
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
"""Email notifications via Resend."""
|
|
||||||
|
|
||||||
import asyncio
|
|
||||||
import html
|
|
||||||
import logging
|
|
||||||
|
|
||||||
import resend
|
|
||||||
|
|
||||||
from receiptwitness.config import settings
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
async def send_receipt_notification(
|
|
||||||
user_email: str,
|
|
||||||
store_name: str,
|
|
||||||
item_count: int,
|
|
||||||
total: float,
|
|
||||||
purchase_date: str,
|
|
||||||
) -> None:
|
|
||||||
"""Send receipt ingestion confirmation email via Resend."""
|
|
||||||
if not settings.notifications_enabled or not settings.resend_api_key:
|
|
||||||
logger.debug("Notifications disabled — skipping email send")
|
|
||||||
return
|
|
||||||
|
|
||||||
resend.api_key = settings.resend_api_key
|
|
||||||
store_name_safe = html.escape(store_name)
|
|
||||||
purchase_date_safe = html.escape(purchase_date)
|
|
||||||
try:
|
|
||||||
await asyncio.to_thread(
|
|
||||||
resend.Emails.send,
|
|
||||||
{
|
|
||||||
"from": settings.notification_email_from,
|
|
||||||
"to": [user_email],
|
|
||||||
"subject": f"Receipt processed: {store_name} - ${total:.2f}",
|
|
||||||
"html": (
|
|
||||||
f"<p>Your receipt from <strong>{store_name_safe}</strong> on "
|
|
||||||
f"{purchase_date_safe} has been processed.</p>"
|
|
||||||
f"<p>{item_count} items, total: ${total:.2f}</p>"
|
|
||||||
),
|
|
||||||
},
|
|
||||||
)
|
|
||||||
logger.info("Receipt notification sent to %s", user_email)
|
|
||||||
except Exception:
|
|
||||||
logger.exception("Failed to send receipt notification to %s", user_email)
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
"""Email receipt parsers for retailer email receipts."""
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
"""Base interface for email receipt parsers."""
|
|
||||||
|
|
||||||
from abc import ABC, abstractmethod
|
|
||||||
from dataclasses import dataclass, field
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class EmailReceipt:
|
|
||||||
"""Raw email data before parsing."""
|
|
||||||
|
|
||||||
sender: str
|
|
||||||
recipient: str
|
|
||||||
subject: str
|
|
||||||
body_html: str | None = None
|
|
||||||
body_plain: str | None = None
|
|
||||||
received_at: str | None = None
|
|
||||||
raw_headers: dict = field(default_factory=dict)
|
|
||||||
|
|
||||||
|
|
||||||
class BaseEmailParser(ABC):
|
|
||||||
"""All retailer email parsers implement this interface."""
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def can_parse(self, email: EmailReceipt) -> bool:
|
|
||||||
"""Return True if this parser handles this email."""
|
|
||||||
...
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def parse(self, email: EmailReceipt) -> dict:
|
|
||||||
"""Parse email into a dict matching PurchaseCreate schema fields.
|
|
||||||
Must include an items list matching PurchaseItemCreate fields."""
|
|
||||||
...
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
"""Detect which retailer sent a receipt email."""
|
|
||||||
|
|
||||||
import re
|
|
||||||
|
|
||||||
from receiptwitness.parsers.email.base import EmailReceipt
|
|
||||||
|
|
||||||
RETAILER_PATTERNS: dict[str, list[str]] = {
|
|
||||||
"meijer": [r"@meijer\.com$", r"@email\.meijer\.com$"],
|
|
||||||
"kroger": [r"@kroger\.com$", r"@email\.kroger\.com$"],
|
|
||||||
"target": [r"@target\.com$", r"@email\.target\.com$"],
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def detect_retailer(email: EmailReceipt) -> str | None:
|
|
||||||
"""Return retailer slug or None if unrecognized."""
|
|
||||||
sender = email.sender.lower().strip()
|
|
||||||
# Extract email from "Name <email>" format
|
|
||||||
match = re.search(r"<([^>]+)>", sender)
|
|
||||||
if match:
|
|
||||||
sender = match.group(1)
|
|
||||||
for retailer, patterns in RETAILER_PATTERNS.items():
|
|
||||||
for pattern in patterns:
|
|
||||||
if re.search(pattern, sender):
|
|
||||||
return retailer
|
|
||||||
return None
|
|
||||||
@@ -1,157 +0,0 @@
|
|||||||
"""Kroger email receipt parser."""
|
|
||||||
|
|
||||||
import logging
|
|
||||||
import re
|
|
||||||
from datetime import datetime
|
|
||||||
from decimal import Decimal, InvalidOperation
|
|
||||||
|
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
|
|
||||||
from receiptwitness.parsers.email.base import BaseEmailParser, EmailReceipt
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
def _to_decimal(value: str | float | int | None, default: Decimal = Decimal("0")) -> Decimal:
|
|
||||||
"""Safely convert a value to Decimal."""
|
|
||||||
if value is None:
|
|
||||||
return default
|
|
||||||
try:
|
|
||||||
return Decimal(str(value).replace("$", "").replace(",", "").strip())
|
|
||||||
except (InvalidOperation, ValueError):
|
|
||||||
return default
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_total(body: str) -> Decimal:
|
|
||||||
"""Extract the transaction total from email body."""
|
|
||||||
patterns = [
|
|
||||||
r"Total[:\s]*\$?([0-9,]+\.[0-9]{2})",
|
|
||||||
r"Amount[:\s]*\$?([0-9,]+\.[0-9]{2})",
|
|
||||||
r"Grand\s+Total[:\s]*\$?([0-9,]+\.[0-9]{2})",
|
|
||||||
]
|
|
||||||
for pattern in patterns:
|
|
||||||
match = re.search(pattern, body, re.IGNORECASE)
|
|
||||||
if match:
|
|
||||||
return _to_decimal(match.group(1))
|
|
||||||
return Decimal("0")
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_receipt_id(body: str) -> str | None:
|
|
||||||
"""Extract receipt ID / transaction ID from HTML body.
|
|
||||||
|
|
||||||
Strips HTML tags first so that whitespace between delimiters and values
|
|
||||||
(e.g. from ``</strong> KR-2026-0315-4829`` -> `` KR-2026-0315-4829``)
|
|
||||||
is normalized and the pattern can match cleanly.
|
|
||||||
"""
|
|
||||||
stripped = re.sub(r"<[^>]+>", "", body)
|
|
||||||
patterns = [
|
|
||||||
r"Receipt\s*#[:\s]*([A-Z0-9-]+)",
|
|
||||||
r"Transaction\s*#[:\s]*([A-Z0-9-]+)",
|
|
||||||
r"Order\s*#[:\s]*([A-Z0-9-]+)",
|
|
||||||
r"Confirmation\s*#[:\s]*([A-Z0-9-]+)",
|
|
||||||
]
|
|
||||||
for pattern in patterns:
|
|
||||||
match = re.search(pattern, stripped, re.IGNORECASE)
|
|
||||||
if match:
|
|
||||||
return match.group(1)
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_date(body: str) -> str:
|
|
||||||
"""Extract purchase date from email body. Returns ISO date string or empty string."""
|
|
||||||
patterns = [
|
|
||||||
r"(\d{1,2}[/-]\d{1,2}[/-]\d{2,4})",
|
|
||||||
r"([A-Z][a-z]{2}\s+\d{1,2},?\s+\d{4})",
|
|
||||||
]
|
|
||||||
for pattern in patterns:
|
|
||||||
match = re.search(pattern, body)
|
|
||||||
if match:
|
|
||||||
raw = match.group(1)
|
|
||||||
try:
|
|
||||||
dt = datetime.strptime(raw.replace(",", ""), "%b %d %Y")
|
|
||||||
return dt.strftime("%Y-%m-%d")
|
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
try:
|
|
||||||
for fmt in ("%m/%d/%Y", "%m/%d/%y", "%d/%m/%Y", "%d/%m/%y"):
|
|
||||||
try:
|
|
||||||
dt = datetime.strptime(raw, fmt)
|
|
||||||
return dt.strftime("%Y-%m-%d")
|
|
||||||
except ValueError:
|
|
||||||
continue
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
return ""
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_items_soup(body: str) -> list[dict]:
|
|
||||||
"""Extract line items from HTML email body using BeautifulSoup."""
|
|
||||||
items = []
|
|
||||||
try:
|
|
||||||
soup = BeautifulSoup(body, "html.parser")
|
|
||||||
text = soup.get_text(separator="\n", strip=True)
|
|
||||||
# Strip HTML tags from raw body to normalize whitespace
|
|
||||||
stripped = re.sub(r"<[^>]+>", " ", body)
|
|
||||||
stripped = re.sub(r"\s+", " ", stripped)
|
|
||||||
skip_prefixes = (
|
|
||||||
"Subtotal",
|
|
||||||
"Tax",
|
|
||||||
"Total",
|
|
||||||
"Kroger",
|
|
||||||
"Target",
|
|
||||||
"Date",
|
|
||||||
"Receipt",
|
|
||||||
"Order",
|
|
||||||
"Transaction",
|
|
||||||
"Confirmation",
|
|
||||||
"Thank",
|
|
||||||
"Questions",
|
|
||||||
"Keep",
|
|
||||||
"Receipt",
|
|
||||||
)
|
|
||||||
for line in text.split("\n"):
|
|
||||||
line = line.strip()
|
|
||||||
if not line or line.startswith(skip_prefixes):
|
|
||||||
continue
|
|
||||||
# Match lines like "Product Name $9.99"
|
|
||||||
match = re.match(r"(.+?)\s+\$([0-9]+\.[0-9]{2})\s*$", line)
|
|
||||||
if match:
|
|
||||||
name = match.group(1).strip()
|
|
||||||
price = _to_decimal(match.group(2))
|
|
||||||
if len(name) > 2 and price > 0:
|
|
||||||
items.append(
|
|
||||||
{
|
|
||||||
"product_name_raw": name,
|
|
||||||
"quantity": Decimal("1"),
|
|
||||||
"unit_price": price,
|
|
||||||
"extended_price": price,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
return items[:20]
|
|
||||||
|
|
||||||
|
|
||||||
class KrogerEmailParser(BaseEmailParser):
|
|
||||||
"""Parse Kroger email receipts (digital receipts via kroger.com)."""
|
|
||||||
|
|
||||||
KROGER_KEYWORDS = ("kroger", "kroger.com", "plus")
|
|
||||||
|
|
||||||
def can_parse(self, email: EmailReceipt) -> bool:
|
|
||||||
sender = (email.sender or "").lower()
|
|
||||||
body = (email.body_html or email.body_plain or "").lower()
|
|
||||||
return any(kw in sender or kw in body for kw in self.KROGER_KEYWORDS)
|
|
||||||
|
|
||||||
def parse(self, email: EmailReceipt) -> dict:
|
|
||||||
body = (email.body_html or email.body_plain or "").strip()
|
|
||||||
total = _extract_total(body)
|
|
||||||
receipt_id = _extract_receipt_id(body) or ""
|
|
||||||
purchase_date = _extract_date(body)
|
|
||||||
items = _extract_items_soup(body)
|
|
||||||
|
|
||||||
return {
|
|
||||||
"receipt_id": receipt_id,
|
|
||||||
"purchase_date": purchase_date,
|
|
||||||
"total": total,
|
|
||||||
"items": items,
|
|
||||||
}
|
|
||||||
@@ -1,259 +0,0 @@
|
|||||||
"""Parse Meijer digital receipt emails into structured purchase data."""
|
|
||||||
|
|
||||||
import re
|
|
||||||
from decimal import Decimal, InvalidOperation
|
|
||||||
|
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
from bs4.element import Tag
|
|
||||||
|
|
||||||
from receiptwitness.parsers.email.base import BaseEmailParser, EmailReceipt
|
|
||||||
|
|
||||||
|
|
||||||
def _to_decimal(value, default: str = "0") -> Decimal:
|
|
||||||
"""Safely convert a value to Decimal."""
|
|
||||||
if value is None:
|
|
||||||
return Decimal(default)
|
|
||||||
try:
|
|
||||||
return Decimal(str(value).replace("$", "").replace(",", "").strip())
|
|
||||||
except (InvalidOperation, ValueError, TypeError):
|
|
||||||
return Decimal(default)
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_receipt_id(soup: BeautifulSoup, subject: str | None) -> str | None:
|
|
||||||
"""Extract receipt/transaction ID from subject or body."""
|
|
||||||
if subject:
|
|
||||||
match = re.search(r"TXN[-\s]\d{4}[-\s]\d{4}[-\s]\d+", subject)
|
|
||||||
if match:
|
|
||||||
return match.group(0).replace(" ", "-")
|
|
||||||
# Fallback: look in body
|
|
||||||
text = soup.get_text()
|
|
||||||
match = re.search(r"TXN[-\s]\d{4}[-\s]\d{4}[-\s]\d+", text)
|
|
||||||
if match:
|
|
||||||
return match.group(0).replace(" ", "-")
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_purchase_date(soup: BeautifulSoup, subject: str | None) -> str | None:
|
|
||||||
"""Extract purchase date from subject or body."""
|
|
||||||
text = soup.get_text()
|
|
||||||
|
|
||||||
# Try ISO format first: YYYY-MM-DD
|
|
||||||
match = re.search(r"(\d{4})-(\d{2})-(\d{2})", text)
|
|
||||||
if match:
|
|
||||||
return f"{match.group(1)}-{match.group(2)}-{match.group(3)}"
|
|
||||||
|
|
||||||
# Try written format: March 15, 2026
|
|
||||||
match = re.search(r"([A-Za-z]+)\s+(\d{1,2}),?\s+(\d{4})", text)
|
|
||||||
if match:
|
|
||||||
month_str = match.group(1).lower()
|
|
||||||
day = match.group(2)
|
|
||||||
year = match.group(3)
|
|
||||||
month_map = {
|
|
||||||
"january": "01",
|
|
||||||
"february": "02",
|
|
||||||
"march": "03",
|
|
||||||
"april": "04",
|
|
||||||
"may": "05",
|
|
||||||
"june": "06",
|
|
||||||
"july": "07",
|
|
||||||
"august": "08",
|
|
||||||
"september": "09",
|
|
||||||
"october": "10",
|
|
||||||
"november": "11",
|
|
||||||
"december": "12",
|
|
||||||
}
|
|
||||||
month = month_map.get(month_str)
|
|
||||||
if month:
|
|
||||||
return f"{year}-{month}-{day.zfill(2)}"
|
|
||||||
|
|
||||||
# MM/DD/YYYY
|
|
||||||
match = re.search(r"(\d{1,2})/(\d{1,2})/(\d{4})", text)
|
|
||||||
if match:
|
|
||||||
return f"{match.group(3)}-{match.group(1).zfill(2)}-{match.group(2).zfill(2)}"
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_store_info(soup: BeautifulSoup) -> dict:
|
|
||||||
"""Extract store name and number from the email body."""
|
|
||||||
store_info: dict = {}
|
|
||||||
|
|
||||||
# Look for store number in header
|
|
||||||
store_num_match = re.search(r"Meijer\s+Store\s+#?(\d+)", soup.get_text(), re.IGNORECASE)
|
|
||||||
if store_num_match:
|
|
||||||
store_info["store_number"] = store_num_match.group(1)
|
|
||||||
|
|
||||||
return store_info
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_items(table: Tag | None) -> list[dict]:
|
|
||||||
"""Extract line items from the items table."""
|
|
||||||
items: list[dict] = []
|
|
||||||
if not table:
|
|
||||||
return items
|
|
||||||
|
|
||||||
rows = table.find_all("tr")
|
|
||||||
for row in rows:
|
|
||||||
cells = row.find_all("td")
|
|
||||||
if len(cells) < 3:
|
|
||||||
continue
|
|
||||||
|
|
||||||
name_cell = cells[0].get_text(strip=True)
|
|
||||||
qty_cell = cells[1].get_text(strip=True)
|
|
||||||
price_cell = cells[2].get_text(strip=True)
|
|
||||||
|
|
||||||
if not name_cell or name_cell.lower() in ("item", "description"):
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Skip subtotal/tax/total/savings rows
|
|
||||||
if any(
|
|
||||||
label in name_cell.lower()
|
|
||||||
for label in ("subtotal", "tax", "total", "savings", "grand total")
|
|
||||||
):
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
|
||||||
quantity = Decimal(qty_cell)
|
|
||||||
except (InvalidOperation, ValueError, TypeError):
|
|
||||||
quantity = Decimal("1")
|
|
||||||
|
|
||||||
price_str = price_cell.replace("$", "").replace(",", "").strip()
|
|
||||||
try:
|
|
||||||
unit_price = Decimal(price_str)
|
|
||||||
except (InvalidOperation, ValueError, TypeError):
|
|
||||||
unit_price = Decimal("0")
|
|
||||||
|
|
||||||
extended_price = unit_price # Default to unit price; no qty column in fixture
|
|
||||||
|
|
||||||
items.append(
|
|
||||||
{
|
|
||||||
"product_name_raw": name_cell,
|
|
||||||
"quantity": quantity,
|
|
||||||
"unit_price": unit_price,
|
|
||||||
"extended_price": extended_price,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
return items
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_totals_plain(text: str) -> dict:
|
|
||||||
"""Extract totals from plain text (no HTML)."""
|
|
||||||
totals: dict = {
|
|
||||||
"subtotal": None,
|
|
||||||
"tax": None,
|
|
||||||
"total": None,
|
|
||||||
"savings_total": None,
|
|
||||||
}
|
|
||||||
|
|
||||||
match = re.search(r"\bSubtotal\b[:\s$]*([0-9,]+\.?\d*)", text, re.IGNORECASE)
|
|
||||||
if match:
|
|
||||||
totals["subtotal"] = _to_decimal(match.group(1))
|
|
||||||
|
|
||||||
match = re.search(r"\bTax\b[:\s$]*([0-9,]+\.?\d*)", text, re.IGNORECASE)
|
|
||||||
if match:
|
|
||||||
totals["tax"] = _to_decimal(match.group(1))
|
|
||||||
|
|
||||||
grand_total_match = re.search(r"Grand\s+Total\b[:\s$]*([0-9,]+\.?\d*)", text, re.IGNORECASE)
|
|
||||||
if grand_total_match:
|
|
||||||
totals["total"] = _to_decimal(grand_total_match.group(1))
|
|
||||||
|
|
||||||
savings_match = re.search(r"\bSavings\b[:\s$\-]*([0-9,]+\.?\d*)", text, re.IGNORECASE)
|
|
||||||
if savings_match:
|
|
||||||
totals["savings_total"] = _to_decimal(savings_match.group(1))
|
|
||||||
|
|
||||||
if totals["total"] is None:
|
|
||||||
total_match = re.search(r"\bTotal\b[:\s$]*([0-9,]+\.?\d*)", text, re.IGNORECASE)
|
|
||||||
if total_match:
|
|
||||||
totals["total"] = _to_decimal(total_match.group(1))
|
|
||||||
|
|
||||||
return totals
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_totals(soup: BeautifulSoup) -> dict:
|
|
||||||
"""Extract subtotal, tax, total, and savings from the totals section."""
|
|
||||||
text = soup.get_text()
|
|
||||||
|
|
||||||
totals: dict = {
|
|
||||||
"subtotal": None,
|
|
||||||
"tax": None,
|
|
||||||
"total": None,
|
|
||||||
"savings_total": None,
|
|
||||||
}
|
|
||||||
|
|
||||||
# Subtotal — use word boundary to avoid matching "Subtotal" with "Total"
|
|
||||||
match = re.search(r"\bSubtotal\b[:\s$]*([0-9,]+\.?\d*)", text, re.IGNORECASE)
|
|
||||||
if match:
|
|
||||||
totals["subtotal"] = _to_decimal(match.group(1))
|
|
||||||
|
|
||||||
# Tax
|
|
||||||
match = re.search(r"\bTax\b[:\s$]*([0-9,]+\.?\d*)", text, re.IGNORECASE)
|
|
||||||
if match:
|
|
||||||
totals["tax"] = _to_decimal(match.group(1))
|
|
||||||
|
|
||||||
# Grand Total (before plain "Total" to avoid matching "Subtotal")
|
|
||||||
grand_total_match = re.search(r"Grand\s+Total\b[:\s$]*([0-9,]+\.?\d*)", text, re.IGNORECASE)
|
|
||||||
if grand_total_match:
|
|
||||||
totals["total"] = _to_decimal(grand_total_match.group(1))
|
|
||||||
|
|
||||||
# Savings — allow any combination of whitespace/$- around the number
|
|
||||||
savings_match = re.search(r"\bSavings\b[:\s$\-]*([0-9,]+\.?\d*)", text, re.IGNORECASE)
|
|
||||||
if savings_match:
|
|
||||||
totals["savings_total"] = _to_decimal(savings_match.group(1))
|
|
||||||
|
|
||||||
# Plain "Total" only if Grand Total wasn't found
|
|
||||||
if totals["total"] is None:
|
|
||||||
total_match = re.search(r"\bTotal\b[:\s$]*([0-9,]+\.?\d*)", text, re.IGNORECASE)
|
|
||||||
if total_match:
|
|
||||||
totals["total"] = _to_decimal(total_match.group(1))
|
|
||||||
|
|
||||||
return totals
|
|
||||||
|
|
||||||
|
|
||||||
class MeijerEmailParser(BaseEmailParser):
|
|
||||||
"""Parse Meijer digital receipt emails forwarded by users."""
|
|
||||||
|
|
||||||
def can_parse(self, email: EmailReceipt) -> bool:
|
|
||||||
sender = email.sender.lower().strip()
|
|
||||||
# Extract email from "Name <email>" format
|
|
||||||
match = re.search(r"<([^>]+)>", sender)
|
|
||||||
if match:
|
|
||||||
sender = match.group(1)
|
|
||||||
return "meijer" in sender
|
|
||||||
|
|
||||||
def parse(self, email: EmailReceipt) -> dict:
|
|
||||||
body_html = email.body_html
|
|
||||||
body_plain = email.body_plain or ""
|
|
||||||
body = body_html or body_plain
|
|
||||||
soup = BeautifulSoup(body, "html.parser")
|
|
||||||
|
|
||||||
receipt_id = _extract_receipt_id(soup, email.subject)
|
|
||||||
purchase_date = _extract_purchase_date(soup, email.subject)
|
|
||||||
_ = _extract_store_info(soup)
|
|
||||||
|
|
||||||
# Find the items table — look for one with Item/Qty/Price headers
|
|
||||||
table = None
|
|
||||||
for tbl in soup.find_all("table"):
|
|
||||||
headers = tbl.find_all("th")
|
|
||||||
header_texts = [h.get_text(strip=True).lower() for h in headers]
|
|
||||||
if any("item" in h or "qty" in h or "price" in h for h in header_texts):
|
|
||||||
table = tbl
|
|
||||||
break
|
|
||||||
|
|
||||||
items = _extract_items(table)
|
|
||||||
|
|
||||||
# Extract totals from HTML; fall back to plain text if no HTML
|
|
||||||
if body_html:
|
|
||||||
totals = _extract_totals(soup)
|
|
||||||
else:
|
|
||||||
totals = _extract_totals_plain(body_plain)
|
|
||||||
|
|
||||||
return {
|
|
||||||
"receipt_id": receipt_id or "",
|
|
||||||
"purchase_date": purchase_date or "",
|
|
||||||
"total": totals["total"] or Decimal("0"),
|
|
||||||
"subtotal": totals["subtotal"],
|
|
||||||
"tax": totals["tax"],
|
|
||||||
"savings_total": totals["savings_total"],
|
|
||||||
"items": items,
|
|
||||||
}
|
|
||||||
@@ -1,156 +0,0 @@
|
|||||||
"""Target email receipt parser."""
|
|
||||||
|
|
||||||
import logging
|
|
||||||
import re
|
|
||||||
from datetime import datetime
|
|
||||||
from decimal import Decimal, InvalidOperation
|
|
||||||
|
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
|
|
||||||
from receiptwitness.parsers.email.base import BaseEmailParser, EmailReceipt
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
def _to_decimal(value: str | float | int | None, default: Decimal = Decimal("0")) -> Decimal:
|
|
||||||
"""Safely convert a value to Decimal."""
|
|
||||||
if value is None:
|
|
||||||
return default
|
|
||||||
try:
|
|
||||||
return Decimal(str(value).replace("$", "").replace(",", "").strip())
|
|
||||||
except (InvalidOperation, ValueError):
|
|
||||||
return default
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_total(body: str) -> Decimal:
|
|
||||||
"""Extract the transaction total from email body."""
|
|
||||||
patterns = [
|
|
||||||
r"Total[:\s]*\$?([0-9,]+\.[0-9]{2})",
|
|
||||||
r"Amount[:\s]*\$?([0-9,]+\.[0-9]{2})",
|
|
||||||
r"Grand\s+Total[:\s]*\$?([0-9,]+\.[0-9]{2})",
|
|
||||||
]
|
|
||||||
for pattern in patterns:
|
|
||||||
match = re.search(pattern, body, re.IGNORECASE)
|
|
||||||
if match:
|
|
||||||
return _to_decimal(match.group(1))
|
|
||||||
return Decimal("0")
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_receipt_id(body: str) -> str | None:
|
|
||||||
"""Extract receipt ID / transaction ID from HTML body.
|
|
||||||
|
|
||||||
Strips HTML tags first so that whitespace between delimiters and values
|
|
||||||
(e.g. from ``</strong> TGT-2026-0318-9124`` -> `` TGT-2026-0318-9124``)
|
|
||||||
is normalized and the pattern can match cleanly.
|
|
||||||
"""
|
|
||||||
stripped = re.sub(r"<[^>]+>", "", body)
|
|
||||||
patterns = [
|
|
||||||
r"Receipt\s*#[:\s]*([A-Z0-9-]+)",
|
|
||||||
r"Order\s*#[:\s]*([A-Z0-9-]+)",
|
|
||||||
r"Confirmation\s*#[:\s]*([A-Z0-9-]+)",
|
|
||||||
r"Target\s+Order\s*#[:\s]*([A-Z0-9-]+)",
|
|
||||||
]
|
|
||||||
for pattern in patterns:
|
|
||||||
match = re.search(pattern, stripped, re.IGNORECASE)
|
|
||||||
if match:
|
|
||||||
return match.group(1)
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_date(body: str) -> str:
|
|
||||||
"""Extract purchase date from email body. Returns ISO date string or empty string."""
|
|
||||||
patterns = [
|
|
||||||
r"(\d{1,2}[/-]\d{1,2}[/-]\d{2,4})",
|
|
||||||
r"([A-Z][a-z]{2}\s+\d{1,2},?\s+\d{4})",
|
|
||||||
]
|
|
||||||
for pattern in patterns:
|
|
||||||
match = re.search(pattern, body)
|
|
||||||
if match:
|
|
||||||
raw = match.group(1)
|
|
||||||
try:
|
|
||||||
dt = datetime.strptime(raw.replace(",", ""), "%b %d %Y")
|
|
||||||
return dt.strftime("%Y-%m-%d")
|
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
try:
|
|
||||||
for fmt in ("%m/%d/%Y", "%m/%d/%y", "%d/%m/%Y", "%d/%m/%y"):
|
|
||||||
try:
|
|
||||||
dt = datetime.strptime(raw, fmt)
|
|
||||||
return dt.strftime("%Y-%m-%d")
|
|
||||||
except ValueError:
|
|
||||||
continue
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
return ""
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_items_soup(body: str) -> list[dict]:
|
|
||||||
"""Extract line items from HTML email body using BeautifulSoup."""
|
|
||||||
items = []
|
|
||||||
try:
|
|
||||||
soup = BeautifulSoup(body, "html.parser")
|
|
||||||
text = soup.get_text(separator="\n", strip=True)
|
|
||||||
for line in text.split("\n"):
|
|
||||||
line = line.strip()
|
|
||||||
if not line or line.startswith(
|
|
||||||
(
|
|
||||||
"Subtotal",
|
|
||||||
"Tax",
|
|
||||||
"Total",
|
|
||||||
"Target",
|
|
||||||
"Kroger",
|
|
||||||
"Date",
|
|
||||||
"Receipt",
|
|
||||||
"Order",
|
|
||||||
"Transaction",
|
|
||||||
"Confirmation",
|
|
||||||
"Thank",
|
|
||||||
"Questions",
|
|
||||||
"Keep",
|
|
||||||
"Receipt",
|
|
||||||
"Store",
|
|
||||||
)
|
|
||||||
):
|
|
||||||
continue
|
|
||||||
# Match lines like "Product Name $9.99"
|
|
||||||
match = re.match(r"(.+?)\s+\$([0-9]+\.[0-9]{2})\s*$", line)
|
|
||||||
if match:
|
|
||||||
name = match.group(1).strip()
|
|
||||||
price = _to_decimal(match.group(2))
|
|
||||||
if len(name) > 2 and price > 0:
|
|
||||||
items.append(
|
|
||||||
{
|
|
||||||
"product_name_raw": name,
|
|
||||||
"quantity": Decimal("1"),
|
|
||||||
"unit_price": price,
|
|
||||||
"extended_price": price,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
return items[:20]
|
|
||||||
|
|
||||||
|
|
||||||
class TargetEmailParser(BaseEmailParser):
|
|
||||||
"""Parse Target email receipts (Circle order confirmations)."""
|
|
||||||
|
|
||||||
TARGET_KEYWORDS = ("target.com", "targetnow", "circle", "target")
|
|
||||||
|
|
||||||
def can_parse(self, email: EmailReceipt) -> bool:
|
|
||||||
sender = (email.sender or "").lower()
|
|
||||||
body = (email.body_html or email.body_plain or "").lower()
|
|
||||||
return any(kw in sender or kw in body for kw in self.TARGET_KEYWORDS)
|
|
||||||
|
|
||||||
def parse(self, email: EmailReceipt) -> dict:
|
|
||||||
body = (email.body_html or email.body_plain or "").strip()
|
|
||||||
total = _extract_total(body)
|
|
||||||
receipt_id = _extract_receipt_id(body) or ""
|
|
||||||
purchase_date = _extract_date(body)
|
|
||||||
items = _extract_items_soup(body)
|
|
||||||
|
|
||||||
return {
|
|
||||||
"receipt_id": receipt_id,
|
|
||||||
"purchase_date": purchase_date,
|
|
||||||
"total": total,
|
|
||||||
"items": items,
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
"""DragonflyDB Streams queue for email receipt processing."""
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
"""DragonflyDB Streams queue for email receipt processing."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import json
|
|
||||||
import logging
|
|
||||||
from dataclasses import asdict, dataclass
|
|
||||||
from typing import cast
|
|
||||||
|
|
||||||
import redis.asyncio as aioredis
|
|
||||||
|
|
||||||
from receiptwitness.config import settings
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
STREAM_KEY = "email:receipts"
|
|
||||||
CONSUMER_GROUP = "email-workers"
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class EmailJob:
|
|
||||||
"""Payload for an email receipt processing job."""
|
|
||||||
|
|
||||||
user_id: str
|
|
||||||
sender: str
|
|
||||||
recipient: str
|
|
||||||
subject: str
|
|
||||||
body_html: str | None
|
|
||||||
body_plain: str | None
|
|
||||||
received_at: str
|
|
||||||
message_id: str # from email provider, for dedup
|
|
||||||
|
|
||||||
|
|
||||||
async def get_redis() -> aioredis.Redis:
|
|
||||||
"""Get async Redis/DragonflyDB client."""
|
|
||||||
return cast(aioredis.Redis, aioredis.from_url(settings.redis_url, decode_responses=True))
|
|
||||||
|
|
||||||
|
|
||||||
async def ensure_consumer_group(client: aioredis.Redis) -> None:
|
|
||||||
"""Create consumer group if it does not exist."""
|
|
||||||
try:
|
|
||||||
await client.xgroup_create(STREAM_KEY, CONSUMER_GROUP, id="0", mkstream=True)
|
|
||||||
except aioredis.ResponseError as e:
|
|
||||||
if "BUSYGROUP" not in str(e):
|
|
||||||
raise
|
|
||||||
|
|
||||||
|
|
||||||
async def enqueue_email(client: aioredis.Redis, job: EmailJob) -> str:
|
|
||||||
"""Add email job to the stream. Returns the stream message ID."""
|
|
||||||
payload: dict[str, str | bytes | int | float] = {"data": json.dumps(asdict(job))}
|
|
||||||
msg_id: str = cast(str, await client.xadd(STREAM_KEY, payload)) # type: ignore[arg-type] # redis-py StreamCommands.xadd expects broader FieldT union; runtime behavior is correct
|
|
||||||
logger.info("Enqueued email job %s for user %s", msg_id, job.user_id)
|
|
||||||
return msg_id
|
|
||||||
|
|
||||||
|
|
||||||
async def consume_emails(
|
|
||||||
client: aioredis.Redis,
|
|
||||||
consumer_name: str,
|
|
||||||
count: int = 1,
|
|
||||||
block_ms: int = 5000,
|
|
||||||
) -> list[tuple[str, EmailJob]]:
|
|
||||||
"""Read pending messages from the stream. Returns list of (msg_id, EmailJob)."""
|
|
||||||
await ensure_consumer_group(client)
|
|
||||||
messages = await client.xreadgroup(
|
|
||||||
CONSUMER_GROUP, consumer_name, {STREAM_KEY: ">"}, count=count, block=block_ms
|
|
||||||
)
|
|
||||||
results = []
|
|
||||||
for _stream, entries in messages:
|
|
||||||
for msg_id, fields in entries:
|
|
||||||
job = EmailJob(**json.loads(fields["data"]))
|
|
||||||
results.append((msg_id, job))
|
|
||||||
return results
|
|
||||||
|
|
||||||
|
|
||||||
async def ack_email(client: aioredis.Redis, msg_id: str) -> None:
|
|
||||||
"""Acknowledge a processed message."""
|
|
||||||
await client.xack(STREAM_KEY, CONSUMER_GROUP, msg_id)
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
"""Async email receipt worker consuming from DragonflyDB Streams."""
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
"""Async worker that consumes email receipt jobs from DragonflyDB Streams."""
|
|
||||||
|
|
||||||
import asyncio
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from cartsnitch_common.database import get_async_session_factory
|
|
||||||
from cartsnitch_common.models.user import User
|
|
||||||
from sqlalchemy import select
|
|
||||||
|
|
||||||
from receiptwitness.config import settings
|
|
||||||
from receiptwitness.events import publish_receipt_ingested
|
|
||||||
from receiptwitness.parsers.email.base import BaseEmailParser, EmailReceipt
|
|
||||||
from receiptwitness.parsers.email.detector import detect_retailer
|
|
||||||
from receiptwitness.parsers.email.kroger import KrogerEmailParser
|
|
||||||
from receiptwitness.parsers.email.meijer import MeijerEmailParser
|
|
||||||
from receiptwitness.parsers.email.target import TargetEmailParser
|
|
||||||
from receiptwitness.queue.email import ack_email, consume_emails, get_redis
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
CONSUMER_NAME = "worker-1"
|
|
||||||
|
|
||||||
# Registry of available email parsers
|
|
||||||
PARSERS: dict[str, BaseEmailParser] = {
|
|
||||||
"meijer": MeijerEmailParser(),
|
|
||||||
"kroger": KrogerEmailParser(),
|
|
||||||
"target": TargetEmailParser(),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
async def resolve_user(token: str) -> str | None:
|
|
||||||
"""Look up user_id from email_inbound_token."""
|
|
||||||
session_factory = get_async_session_factory(settings.database_url)
|
|
||||||
async with session_factory() as session:
|
|
||||||
result = await session.execute(select(User.id).where(User.email_inbound_token == token))
|
|
||||||
row = result.scalar_one_or_none()
|
|
||||||
return str(row) if row else None
|
|
||||||
|
|
||||||
|
|
||||||
async def process_job(msg_id: str, job) -> bool:
|
|
||||||
"""Process a single email job. Returns True on success."""
|
|
||||||
# 1. Resolve user from token
|
|
||||||
user_id = await resolve_user(job.user_id) # user_id field holds token
|
|
||||||
if not user_id:
|
|
||||||
logger.warning("Unknown token %s, dropping message %s", job.user_id, msg_id)
|
|
||||||
return True # ack to avoid infinite retry
|
|
||||||
|
|
||||||
# 2. Build EmailReceipt
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender=job.sender,
|
|
||||||
recipient=job.recipient,
|
|
||||||
subject=job.subject,
|
|
||||||
body_html=job.body_html,
|
|
||||||
body_plain=job.body_plain,
|
|
||||||
received_at=job.received_at,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 3. Detect retailer
|
|
||||||
retailer = detect_retailer(email)
|
|
||||||
if not retailer or retailer not in PARSERS:
|
|
||||||
logger.warning(
|
|
||||||
"Unrecognized retailer from %s, archiving msg %s",
|
|
||||||
job.sender,
|
|
||||||
msg_id,
|
|
||||||
)
|
|
||||||
return True # ack — no parser available
|
|
||||||
|
|
||||||
# 4. Parse
|
|
||||||
parser = PARSERS[retailer]
|
|
||||||
parsed = parser.parse(email)
|
|
||||||
|
|
||||||
# 5. Publish event
|
|
||||||
await publish_receipt_ingested(
|
|
||||||
user_id=user_id,
|
|
||||||
store_slug=retailer,
|
|
||||||
purchase_id=parsed.get("receipt_id", msg_id),
|
|
||||||
purchase_date=parsed.get("purchase_date", ""),
|
|
||||||
item_count=len(parsed.get("items", [])),
|
|
||||||
total=parsed.get("total", 0),
|
|
||||||
)
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
async def run_worker() -> None:
|
|
||||||
"""Main worker loop — consume and process email jobs."""
|
|
||||||
client = await get_redis()
|
|
||||||
logger.info("Email worker started, consuming from email:receipts")
|
|
||||||
while True:
|
|
||||||
try:
|
|
||||||
jobs = await consume_emails(client, CONSUMER_NAME, count=5, block_ms=5000)
|
|
||||||
for msg_id, job in jobs:
|
|
||||||
try:
|
|
||||||
success = await process_job(msg_id, job)
|
|
||||||
if success:
|
|
||||||
await ack_email(client, msg_id)
|
|
||||||
except Exception:
|
|
||||||
logger.exception("Failed to process email job %s", msg_id)
|
|
||||||
except Exception:
|
|
||||||
logger.exception("Worker loop error, retrying in 5s")
|
|
||||||
await asyncio.sleep(5)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
asyncio.run(run_worker())
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<title>Kroger Digital Receipt</title>
|
|
||||||
</head>
|
|
||||||
<body style="font-family: Arial, sans-serif; max-width: 600px; margin: 0 auto; padding: 20px; color: #333;">
|
|
||||||
<div style="background-color: #0057a8; color: white; padding: 20px; text-align: center;">
|
|
||||||
<img src="https://www.kroger.com/email-logo.png" alt="Kroger" style="height: 40px;">
|
|
||||||
<h1 style="margin: 10px 0; font-size: 24px;">Your Digital Receipt</h1>
|
|
||||||
<p style="margin: 0;">Kroger Plus Member</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="padding: 20px; background-color: #f5f5f5;">
|
|
||||||
<h2 style="color: #0057a8; margin-top: 0;">Kroger #882 - Downtown</h2>
|
|
||||||
<p style="margin: 5px 0;">123 Main Street<br>Anytown, OH 45202</p>
|
|
||||||
<p style="margin: 5px 0;"><strong>Date:</strong> 03/15/2026</p>
|
|
||||||
<p style="margin: 5px 0;"><strong>Receipt #:</strong> KR-2026-0315-4829</p>
|
|
||||||
<p style="margin: 5px 0;"><strong>Transaction #:</strong> TXN-789123456</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="padding: 20px;">
|
|
||||||
<h3>Items Purchased</h3>
|
|
||||||
<p>Whole Milk 1 Gallon $3.99</p>
|
|
||||||
<p>Sourdough Bread $4.49</p>
|
|
||||||
<p>Free Range Eggs 12ct $5.99</p>
|
|
||||||
<p>Baby Spinach 5oz $4.29</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="padding: 20px; background-color: #e8f4e8; border-left: 4px solid #0057a8;">
|
|
||||||
<p style="margin: 5px 0;"><strong>Subtotal:</strong> $18.76</p>
|
|
||||||
<p style="margin: 5px 0;"><strong>Tax:</strong> $1.24</p>
|
|
||||||
<p style="margin: 5px 0; color: #0057a8; font-weight: bold; font-size: 18px;">Total: $20.00</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="padding: 15px; margin-top: 15px; background-color: #fff8e1; border-left: 4px solid #ffc107;">
|
|
||||||
<p style="margin: 0; font-size: 14px; color: #666;">Kroger Plus Savings: <strong>$3.25</strong> saved on this order.</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="padding: 20px; text-align: center; color: #999; font-size: 12px; margin-top: 20px;">
|
|
||||||
<p>Thank you for shopping at Kroger!</p>
|
|
||||||
<p>Keep your receipt for returns within 90 days.</p>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,127 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
<title>Meijer Digital Receipt</title>
|
|
||||||
<style>
|
|
||||||
body { font-family: Arial, sans-serif; background: #f4f4f4; margin: 0; padding: 20px; }
|
|
||||||
.receipt-container { background: #ffffff; max-width: 600px; margin: 0 auto; padding: 30px; border: 1px solid #dddddd; }
|
|
||||||
.header { background: #003399; color: #ffffff; padding: 20px; text-align: center; margin: -30px -30px 20px -30px; }
|
|
||||||
.header h1 { margin: 0; font-size: 24px; }
|
|
||||||
.store-info { text-align: center; margin-bottom: 20px; border-bottom: 2px dashed #cccccc; padding-bottom: 15px; }
|
|
||||||
.store-info h2 { margin: 0; font-size: 18px; color: #003399; }
|
|
||||||
.receipt-meta { display: flex; justify-content: space-between; font-size: 14px; color: #555555; margin-bottom: 20px; }
|
|
||||||
table { width: 100%; border-collapse: collapse; margin-bottom: 20px; }
|
|
||||||
th { background: #f0f0f0; text-align: left; padding: 8px 10px; font-size: 13px; color: #333333; }
|
|
||||||
td { padding: 8px 10px; border-bottom: 1px solid #eeeeee; font-size: 14px; }
|
|
||||||
.item-name { font-weight: bold; }
|
|
||||||
.totals { margin-left: auto; width: 250px; }
|
|
||||||
.totals-row { display: flex; justify-content: space-between; padding: 6px 0; font-size: 14px; }
|
|
||||||
.totals-row.grand-total { font-weight: bold; font-size: 16px; border-top: 2px solid #333333; padding-top: 10px; margin-top: 4px; }
|
|
||||||
.savings { color: #cc0000; }
|
|
||||||
.footer { text-align: center; font-size: 12px; color: #888888; margin-top: 20px; padding-top: 15px; border-top: 1px solid #dddddd; }
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div class="receipt-container">
|
|
||||||
<div class="header">
|
|
||||||
<h1>MEIJER</h1>
|
|
||||||
<p style="margin: 5px 0 0; font-size: 14px;">Digital Receipt</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="store-info">
|
|
||||||
<h2>Meijer Store #42</h2>
|
|
||||||
<p style="margin: 5px 0 0; font-size: 13px; color: #666;">1555 Lake Drive SE, Grand Rapids, MI 49506</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="receipt-meta">
|
|
||||||
<div>
|
|
||||||
<strong>Date:</strong> March 15, 2026<br />
|
|
||||||
<strong>Time:</strong> 2:34 PM
|
|
||||||
</div>
|
|
||||||
<div style="text-align: right;">
|
|
||||||
<strong>Transaction #</strong><br />
|
|
||||||
TXN-2026-0315-0042
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<table>
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>Item</th>
|
|
||||||
<th style="text-align: center;">Qty</th>
|
|
||||||
<th style="text-align: right;">Price</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td class="item-name">ORGANIC BANANAS</td>
|
|
||||||
<td style="text-align: center;">1</td>
|
|
||||||
<td style="text-align: right;">$0.69</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="item-name">WHOLE MILK 1 GAL</td>
|
|
||||||
<td style="text-align: center;">1</td>
|
|
||||||
<td style="text-align: right;">$4.29</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="item-name">MEIJER WHOLE GRAIN OAT CEREAL 18OZ</td>
|
|
||||||
<td style="text-align: center;">1</td>
|
|
||||||
<td style="text-align: right;">$4.99</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="item-name">FRESH BROCCOLI CROWN</td>
|
|
||||||
<td style="text-align: center;">1</td>
|
|
||||||
<td style="text-align: right;">$2.49</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="item-name">GROUND BEEF 85/15 1LB</td>
|
|
||||||
<td style="text-align: center;">1</td>
|
|
||||||
<td style="text-align: right;">$6.99</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="item-name">SOURDOUGH BREAD</td>
|
|
||||||
<td style="text-align: center;">1</td>
|
|
||||||
<td style="text-align: right;">$3.99</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="item-name">MEIJER BABY SPINACH 5OZ</td>
|
|
||||||
<td style="text-align: center;">1</td>
|
|
||||||
<td style="text-align: right;">$4.49</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="item-name">LARGE EGGS DOZEN</td>
|
|
||||||
<td style="text-align: center;">1</td>
|
|
||||||
<td style="text-align: right;">$3.29</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<div class="totals">
|
|
||||||
<div class="totals-row">
|
|
||||||
<span>Subtotal</span>
|
|
||||||
<span>$31.22</span>
|
|
||||||
</div>
|
|
||||||
<div class="totals-row">
|
|
||||||
<span>Tax</span>
|
|
||||||
<span>$2.19</span>
|
|
||||||
</div>
|
|
||||||
<div class="totals-row savings">
|
|
||||||
<span>Total Savings</span>
|
|
||||||
<span>-$3.40</span>
|
|
||||||
</div>
|
|
||||||
<div class="totals-row grand-total">
|
|
||||||
<span>Total</span>
|
|
||||||
<span>$33.41</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="footer">
|
|
||||||
<p>Thank you for shopping at Meijer!</p>
|
|
||||||
<p>Keep your receipt for your records.<br />
|
|
||||||
Questions? Call 1-800-927-8699 or visit meijer.com</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<title>Target Order Confirmation</title>
|
|
||||||
</head>
|
|
||||||
<body style="font-family: Arial, sans-serif; max-width: 600px; margin: 0 auto; padding: 20px; color: #333;">
|
|
||||||
<div style="background-color: #cc0000; color: white; padding: 20px; text-align: center;">
|
|
||||||
<img src="https://assets.target.com/email-logo.png" alt="Target" style="height: 40px;">
|
|
||||||
<h1 style="margin: 10px 0; font-size: 24px;">Order Confirmation</h1>
|
|
||||||
<p style="margin: 0;">Thanks for shopping Target Circle!</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="padding: 20px; background-color: #f5f5f5;">
|
|
||||||
<h2 style="color: #cc0000; margin-top: 0;">Target Store #1247 - Riverside</h2>
|
|
||||||
<p style="margin: 5px 0;">4500 River Road<br>Columbus, OH 43220</p>
|
|
||||||
<p style="margin: 5px 0;"><strong>Date:</strong> 03/18/2026</p>
|
|
||||||
<p style="margin: 5px 0;"><strong>Order #:</strong> TGT-2026-0318-9124</p>
|
|
||||||
<p style="margin: 5px 0;"><strong>Confirmation #:</strong> CNF-44772819</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="padding: 20px;">
|
|
||||||
<h3>Items Purchased</h3>
|
|
||||||
<p>Good & Gather Whole Milk 1 Gal $3.89</p>
|
|
||||||
<p>Arborio Rice 2lb bag $6.49</p>
|
|
||||||
<p>Parmesan Wedge 8oz $7.99</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="padding: 20px; background-color: #fff8e1; border-left: 4px solid #cc0000;">
|
|
||||||
<p style="margin: 5px 0;"><strong>Subtotal:</strong> $18.37</p>
|
|
||||||
<p style="margin: 5px 0;"><strong>Tax:</strong> $1.45</p>
|
|
||||||
<p style="margin: 5px 0; color: #cc0000; font-weight: bold; font-size: 18px;">Total: $19.82</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="padding: 15px; margin-top: 15px; background-color: #e8f4e8; border-left: 4px solid #4caf50;">
|
|
||||||
<p style="margin: 0; font-size: 14px; color: #333;">Target Circle offer saved you <strong>$0.30</strong> on this order.</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="padding: 20px; text-align: center; color: #999; font-size: 12px; margin-top: 20px;">
|
|
||||||
<p>Questions? Call Target Guest Services at 1-800-591-3869.</p>
|
|
||||||
<p>Receipt valid for returns within 30 days.</p>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
"""Tests for the ReceiptWitness API routes."""
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
"""Tests for the /inbound/email webhook endpoint."""
|
|
||||||
|
|
||||||
import hashlib
|
|
||||||
import hmac
|
|
||||||
import time
|
|
||||||
from unittest.mock import AsyncMock, patch
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
from fastapi.testclient import TestClient
|
|
||||||
|
|
||||||
from receiptwitness.main import app
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def client():
|
|
||||||
return TestClient(app)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def mock_redis():
|
|
||||||
redis_mock = AsyncMock()
|
|
||||||
with patch("receiptwitness.api.routes.get_redis", return_value=redis_mock):
|
|
||||||
enqueue_patcher = patch("receiptwitness.api.routes.enqueue_email", new_callable=AsyncMock)
|
|
||||||
with enqueue_patcher as mock_enqueue:
|
|
||||||
yield {"redis": redis_mock, "enqueue": mock_enqueue}
|
|
||||||
|
|
||||||
|
|
||||||
def make_signature(signing_key: str, token: str, timestamp: str) -> str:
|
|
||||||
return hmac.new(
|
|
||||||
signing_key.encode(),
|
|
||||||
f"{timestamp}{token}".encode(),
|
|
||||||
hashlib.sha256,
|
|
||||||
).hexdigest()
|
|
||||||
|
|
||||||
|
|
||||||
def valid_form(signing_key: str = "test-secret"):
|
|
||||||
ts = str(int(time.time()))
|
|
||||||
token = "test-token"
|
|
||||||
sig = make_signature(signing_key, token, ts)
|
|
||||||
return {
|
|
||||||
"token": token,
|
|
||||||
"timestamp": ts,
|
|
||||||
"signature": sig,
|
|
||||||
"sender": "sender@example.com",
|
|
||||||
"recipient": "receipts+user123@example.com",
|
|
||||||
"subject": "Your Meijer Receipt",
|
|
||||||
"body-html": "<p>Thank you for shopping at Meijer</p>",
|
|
||||||
"body-plain": "Thank you for shopping at Meijer",
|
|
||||||
"Message-Id": "<msg-001@example.com>",
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def test_valid_webhook(client, mock_redis):
|
|
||||||
with patch("receiptwitness.api.routes.settings") as mock_settings:
|
|
||||||
mock_settings.mailgun_webhook_signing_key = "test-secret"
|
|
||||||
response = client.post("/inbound/email", data=valid_form())
|
|
||||||
assert response.status_code == 200
|
|
||||||
assert response.json() == {"status": "queued"}
|
|
||||||
mock_redis["enqueue"].assert_awaited_once()
|
|
||||||
|
|
||||||
|
|
||||||
def test_invalid_signature(client, mock_redis):
|
|
||||||
with patch("receiptwitness.api.routes.settings") as mock_settings:
|
|
||||||
mock_settings.mailgun_webhook_signing_key = "test-secret"
|
|
||||||
form = valid_form()
|
|
||||||
form["signature"] = "wrong-signature"
|
|
||||||
response = client.post("/inbound/email", data=form)
|
|
||||||
assert response.status_code == 406
|
|
||||||
assert response.json()["detail"] == "Invalid signature"
|
|
||||||
mock_redis["enqueue"].assert_not_awaited()
|
|
||||||
|
|
||||||
|
|
||||||
def test_invalid_recipient_no_plus(client, mock_redis):
|
|
||||||
with patch("receiptwitness.api.routes.settings") as mock_settings:
|
|
||||||
mock_settings.mailgun_webhook_signing_key = "test-secret"
|
|
||||||
form = valid_form()
|
|
||||||
form["recipient"] = "receipts@example.com" # no plus-address
|
|
||||||
response = client.post("/inbound/email", data=form)
|
|
||||||
assert response.status_code == 406
|
|
||||||
assert response.json()["detail"] == "Invalid recipient"
|
|
||||||
mock_redis["enqueue"].assert_not_awaited()
|
|
||||||
|
|
||||||
|
|
||||||
def test_stale_timestamp(client, mock_redis):
|
|
||||||
with patch("receiptwitness.api.routes.settings") as mock_settings:
|
|
||||||
mock_settings.mailgun_webhook_signing_key = "test-secret"
|
|
||||||
ts = str(int(time.time()) - 600) # 10 min old
|
|
||||||
token = "test-token"
|
|
||||||
sig = make_signature("test-secret", token, ts)
|
|
||||||
form = {
|
|
||||||
"token": token,
|
|
||||||
"timestamp": ts,
|
|
||||||
"signature": sig,
|
|
||||||
"sender": "sender@example.com",
|
|
||||||
"recipient": "receipts+user123@example.com",
|
|
||||||
"subject": "Receipt",
|
|
||||||
}
|
|
||||||
response = client.post("/inbound/email", data=form)
|
|
||||||
assert response.status_code == 406
|
|
||||||
assert response.json()["detail"] == "Invalid signature"
|
|
||||||
mock_redis["enqueue"].assert_not_awaited()
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
"""Tests for email notifications."""
|
|
||||||
|
|
||||||
from unittest.mock import patch
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
|
|
||||||
class TestSendReceiptNotification:
|
|
||||||
@pytest.fixture
|
|
||||||
def mock_resend(self):
|
|
||||||
with patch("receiptwitness.notifications.email.resend") as mock:
|
|
||||||
yield mock
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_sends_email_with_correct_params(self, mock_resend):
|
|
||||||
from receiptwitness.notifications.email import send_receipt_notification
|
|
||||||
|
|
||||||
with (
|
|
||||||
patch("receiptwitness.notifications.email.settings") as mock_settings,
|
|
||||||
patch(
|
|
||||||
"receiptwitness.notifications.email.asyncio.to_thread",
|
|
||||||
new=lambda fn, *args, **kwargs: fn(*args, **kwargs),
|
|
||||||
),
|
|
||||||
):
|
|
||||||
mock_settings.notifications_enabled = True
|
|
||||||
mock_settings.resend_api_key = "re_testkey_123"
|
|
||||||
mock_settings.notification_email_from = "noreply@test.com"
|
|
||||||
|
|
||||||
await send_receipt_notification(
|
|
||||||
user_email="user@example.com",
|
|
||||||
store_name="Meijer",
|
|
||||||
item_count=5,
|
|
||||||
total=42.99,
|
|
||||||
purchase_date="2026-03-28",
|
|
||||||
)
|
|
||||||
|
|
||||||
mock_resend.Emails.send.assert_called_once_with(
|
|
||||||
{
|
|
||||||
"from": "noreply@test.com",
|
|
||||||
"to": ["user@example.com"],
|
|
||||||
"subject": "Receipt processed: Meijer - $42.99",
|
|
||||||
"html": (
|
|
||||||
"<p>Your receipt from <strong>Meijer</strong> on "
|
|
||||||
"2026-03-28 has been processed.</p>"
|
|
||||||
"<p>5 items, total: $42.99</p>"
|
|
||||||
),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_skips_when_disabled(self, mock_resend):
|
|
||||||
from receiptwitness.notifications.email import send_receipt_notification
|
|
||||||
|
|
||||||
with patch("receiptwitness.notifications.email.settings") as mock_settings:
|
|
||||||
mock_settings.notifications_enabled = False
|
|
||||||
mock_settings.resend_api_key = "re_testkey_123"
|
|
||||||
|
|
||||||
await send_receipt_notification(
|
|
||||||
user_email="user@example.com",
|
|
||||||
store_name="Meijer",
|
|
||||||
item_count=5,
|
|
||||||
total=42.99,
|
|
||||||
purchase_date="2026-03-28",
|
|
||||||
)
|
|
||||||
|
|
||||||
mock_resend.Emails.send.assert_not_called()
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_skips_when_api_key_empty(self, mock_resend):
|
|
||||||
from receiptwitness.notifications.email import send_receipt_notification
|
|
||||||
|
|
||||||
with patch("receiptwitness.notifications.email.settings") as mock_settings:
|
|
||||||
mock_settings.notifications_enabled = True
|
|
||||||
mock_settings.resend_api_key = ""
|
|
||||||
|
|
||||||
await send_receipt_notification(
|
|
||||||
user_email="user@example.com",
|
|
||||||
store_name="Meijer",
|
|
||||||
item_count=5,
|
|
||||||
total=42.99,
|
|
||||||
purchase_date="2026-03-28",
|
|
||||||
)
|
|
||||||
|
|
||||||
mock_resend.Emails.send.assert_not_called()
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
"""Tests for retailer detector."""
|
|
||||||
|
|
||||||
from receiptwitness.parsers.email.base import EmailReceipt
|
|
||||||
from receiptwitness.parsers.email.detector import detect_retailer
|
|
||||||
|
|
||||||
|
|
||||||
def test_detect_meijer():
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="receipts@meijer.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Receipt",
|
|
||||||
)
|
|
||||||
assert detect_retailer(email) == "meijer"
|
|
||||||
|
|
||||||
|
|
||||||
def test_detect_kroger():
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="noreply@email.kroger.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Receipt",
|
|
||||||
)
|
|
||||||
assert detect_retailer(email) == "kroger"
|
|
||||||
|
|
||||||
|
|
||||||
def test_detect_target():
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="Target <receipts@target.com>",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Receipt",
|
|
||||||
)
|
|
||||||
assert detect_retailer(email) == "target"
|
|
||||||
|
|
||||||
|
|
||||||
def test_detect_unknown():
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="noreply@walmart.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Receipt",
|
|
||||||
)
|
|
||||||
assert detect_retailer(email) is None
|
|
||||||
|
|
||||||
|
|
||||||
def test_detect_case_insensitive():
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="Receipts@MEIJER.COM",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Receipt",
|
|
||||||
)
|
|
||||||
assert detect_retailer(email) == "meijer"
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
"""Tests for KrogerEmailParser."""
|
|
||||||
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
from receiptwitness.parsers.email.base import EmailReceipt
|
|
||||||
from receiptwitness.parsers.email.kroger import KrogerEmailParser
|
|
||||||
|
|
||||||
FIXTURE_PATH = Path(__file__).parent.parent.parent / "fixtures" / "kroger_email_receipt.html"
|
|
||||||
|
|
||||||
|
|
||||||
class TestKrogerEmailParser:
|
|
||||||
"""Tests for KrogerEmailParser."""
|
|
||||||
|
|
||||||
def setup_method(self) -> None:
|
|
||||||
self.parser = KrogerEmailParser()
|
|
||||||
self.fixture_html = FIXTURE_PATH.read_text()
|
|
||||||
|
|
||||||
def test_can_parse_kroger_sender(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="noreply@email.kroger.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Kroger Receipt",
|
|
||||||
body_html=self.fixture_html,
|
|
||||||
)
|
|
||||||
assert self.parser.can_parse(email) is True
|
|
||||||
|
|
||||||
def test_can_parse_kroger_in_body(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="someone@unknown.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Receipt",
|
|
||||||
body_html="<html><body>Kroger digital receipt</body></html>",
|
|
||||||
)
|
|
||||||
assert self.parser.can_parse(email) is True
|
|
||||||
|
|
||||||
def test_cannot_parse_unrelated(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="noreply@walmart.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Receipt",
|
|
||||||
body_html="<html><body>Walmart receipt</body></html>",
|
|
||||||
)
|
|
||||||
assert self.parser.can_parse(email) is False
|
|
||||||
|
|
||||||
def test_parse_items(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="noreply@kroger.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Kroger Receipt",
|
|
||||||
body_html=self.fixture_html,
|
|
||||||
)
|
|
||||||
result = self.parser.parse(email)
|
|
||||||
items = result.get("items", [])
|
|
||||||
assert len(items) >= 3
|
|
||||||
product_names = [item["product_name_raw"] for item in items]
|
|
||||||
assert any("Whole Milk" in name for name in product_names)
|
|
||||||
assert any("Sourdough" in name for name in product_names)
|
|
||||||
for item in items:
|
|
||||||
assert "unit_price" in item
|
|
||||||
assert "extended_price" in item
|
|
||||||
|
|
||||||
def test_parse_totals(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="noreply@kroger.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Kroger Receipt",
|
|
||||||
body_html=self.fixture_html,
|
|
||||||
)
|
|
||||||
result = self.parser.parse(email)
|
|
||||||
total = result.get("total", 0)
|
|
||||||
assert total > 0
|
|
||||||
|
|
||||||
def test_parse_receipt_id(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="noreply@kroger.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Kroger Receipt",
|
|
||||||
body_html=self.fixture_html,
|
|
||||||
)
|
|
||||||
result = self.parser.parse(email)
|
|
||||||
receipt_id = result.get("receipt_id", "")
|
|
||||||
assert "KR-2026" in receipt_id or "TXN" in receipt_id
|
|
||||||
|
|
||||||
def test_parse_date(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="noreply@kroger.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Kroger Receipt",
|
|
||||||
body_html=self.fixture_html,
|
|
||||||
)
|
|
||||||
result = self.parser.parse(email)
|
|
||||||
purchase_date = result.get("purchase_date", "")
|
|
||||||
assert purchase_date == "2026-03-15"
|
|
||||||
@@ -1,182 +0,0 @@
|
|||||||
"""Tests for the Meijer email receipt parser."""
|
|
||||||
|
|
||||||
import os
|
|
||||||
from decimal import Decimal
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from receiptwitness.parsers.email.base import EmailReceipt
|
|
||||||
from receiptwitness.parsers.email.meijer import MeijerEmailParser
|
|
||||||
|
|
||||||
FIXTURE_PATH = os.path.join(
|
|
||||||
os.path.dirname(__file__), "..", "..", "fixtures", "meijer_email_receipt.html"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def load_fixture() -> str:
|
|
||||||
with open(FIXTURE_PATH) as f:
|
|
||||||
return f.read()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def meijer_email() -> EmailReceipt:
|
|
||||||
html = load_fixture()
|
|
||||||
return EmailReceipt(
|
|
||||||
sender="Meijer Receipts <receipts@email.meijer.com>",
|
|
||||||
recipient="shopper@example.com",
|
|
||||||
subject="Your Meijer Receipt — Transaction #TXN-2026-0315-0042",
|
|
||||||
body_html=html,
|
|
||||||
body_plain=None,
|
|
||||||
received_at="2026-03-15T14:34:00Z",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def kroger_email() -> EmailReceipt:
|
|
||||||
return EmailReceipt(
|
|
||||||
sender="Kroger <noreply@email.kroger.com>",
|
|
||||||
recipient="shopper@example.com",
|
|
||||||
subject="Your Kroger Receipt",
|
|
||||||
body_html="<html><body>Kroger receipt</body></html>",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class TestCanParse:
|
|
||||||
def test_can_parse_meijer(self, meijer_email: EmailReceipt):
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
assert parser.can_parse(meijer_email) is True
|
|
||||||
|
|
||||||
def test_cannot_parse_kroger(self, kroger_email: EmailReceipt):
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
assert parser.can_parse(kroger_email) is False
|
|
||||||
|
|
||||||
def test_can_parse_meijer_plain_sender(self):
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="receipts@meijer.com",
|
|
||||||
recipient="shopper@example.com",
|
|
||||||
subject="Receipt",
|
|
||||||
body_html="<html></html>",
|
|
||||||
)
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
assert parser.can_parse(email) is True
|
|
||||||
|
|
||||||
def test_cannot_parse_non_meijer(self):
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender=" Target <no-reply@target.com>",
|
|
||||||
recipient="shopper@example.com",
|
|
||||||
subject="Target Receipt",
|
|
||||||
body_html="<html></html>",
|
|
||||||
)
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
assert parser.can_parse(email) is False
|
|
||||||
|
|
||||||
|
|
||||||
class TestParseMeijerReceipt:
|
|
||||||
def test_receipt_id_extracted(self, meijer_email: EmailReceipt):
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
result = parser.parse(meijer_email)
|
|
||||||
assert result["receipt_id"] == "TXN-2026-0315-0042"
|
|
||||||
|
|
||||||
def test_purchase_date_extracted(self, meijer_email: EmailReceipt):
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
result = parser.parse(meijer_email)
|
|
||||||
assert result["purchase_date"] == "2026-03-15"
|
|
||||||
|
|
||||||
def test_items_extracted(self, meijer_email: EmailReceipt):
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
result = parser.parse(meijer_email)
|
|
||||||
items = result["items"]
|
|
||||||
assert len(items) == 8
|
|
||||||
|
|
||||||
names = [item["product_name_raw"] for item in items]
|
|
||||||
assert "ORGANIC BANANAS" in names
|
|
||||||
assert "WHOLE MILK 1 GAL" in names
|
|
||||||
assert "GROUND BEEF 85/15 1LB" in names
|
|
||||||
|
|
||||||
def test_item_quantities(self, meijer_email: EmailReceipt):
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
result = parser.parse(meijer_email)
|
|
||||||
# Find ORGANIC BANANAS
|
|
||||||
bananas = next(i for i in result["items"] if "BANANAS" in i["product_name_raw"])
|
|
||||||
assert bananas["quantity"] == Decimal("1")
|
|
||||||
|
|
||||||
def test_item_prices(self, meijer_email: EmailReceipt):
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
result = parser.parse(meijer_email)
|
|
||||||
# Find ORGANIC BANANAS
|
|
||||||
bananas = next(i for i in result["items"] if "BANANAS" in i["product_name_raw"])
|
|
||||||
assert bananas["unit_price"] == Decimal("0.69")
|
|
||||||
assert bananas["extended_price"] == Decimal("0.69")
|
|
||||||
|
|
||||||
def test_totals(self, meijer_email: EmailReceipt):
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
result = parser.parse(meijer_email)
|
|
||||||
assert result["total"] == Decimal("33.41")
|
|
||||||
assert result["subtotal"] == Decimal("31.22")
|
|
||||||
assert result["tax"] == Decimal("2.19")
|
|
||||||
assert result["savings_total"] == Decimal("3.40")
|
|
||||||
|
|
||||||
|
|
||||||
class TestParseHandlesMissingFields:
|
|
||||||
def test_missing_body_html_falls_back_to_plain(self):
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="receipts@email.meijer.com",
|
|
||||||
recipient="shopper@example.com",
|
|
||||||
subject="Your Meijer Receipt",
|
|
||||||
body_html=None,
|
|
||||||
body_plain="TXN-1234 | March 15, 2026 | Total: $10.00",
|
|
||||||
)
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
result = parser.parse(email)
|
|
||||||
# Should not raise, returns minimal result
|
|
||||||
assert result["receipt_id"] == ""
|
|
||||||
assert result["purchase_date"] == "2026-03-15"
|
|
||||||
assert result["total"] == Decimal("10.00")
|
|
||||||
|
|
||||||
def test_empty_email(self):
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="receipts@email.meijer.com",
|
|
||||||
recipient="shopper@example.com",
|
|
||||||
subject="Receipt",
|
|
||||||
body_html="",
|
|
||||||
body_plain="",
|
|
||||||
)
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
result = parser.parse(email)
|
|
||||||
assert result["receipt_id"] == ""
|
|
||||||
assert result["purchase_date"] == ""
|
|
||||||
assert result["total"] == Decimal("0")
|
|
||||||
assert result["items"] == []
|
|
||||||
|
|
||||||
def test_missing_subject_date_from_body(self):
|
|
||||||
html = """
|
|
||||||
<html>
|
|
||||||
<body>
|
|
||||||
<p>Thank you for shopping on April 1, 2026</p>
|
|
||||||
<p>Total: $15.00</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
"""
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="receipts@email.meijer.com",
|
|
||||||
recipient="shopper@example.com",
|
|
||||||
subject=None,
|
|
||||||
body_html=html,
|
|
||||||
)
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
result = parser.parse(email)
|
|
||||||
assert result["purchase_date"] == "2026-04-01"
|
|
||||||
|
|
||||||
def test_missing_totals_defaults_to_zero(self):
|
|
||||||
html = "<html><body><p>Just an email with no totals</p></body></html>"
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="receipts@email.meijer.com",
|
|
||||||
recipient="shopper@example.com",
|
|
||||||
subject="Receipt",
|
|
||||||
body_html=html,
|
|
||||||
)
|
|
||||||
parser = MeijerEmailParser()
|
|
||||||
result = parser.parse(email)
|
|
||||||
assert result["total"] == Decimal("0")
|
|
||||||
assert result["subtotal"] is None
|
|
||||||
assert result["tax"] is None
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
"""Tests for TargetEmailParser."""
|
|
||||||
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
from receiptwitness.parsers.email.base import EmailReceipt
|
|
||||||
from receiptwitness.parsers.email.target import TargetEmailParser
|
|
||||||
|
|
||||||
FIXTURE_PATH = Path(__file__).parent.parent.parent / "fixtures" / "target_email_receipt.html"
|
|
||||||
|
|
||||||
|
|
||||||
class TestTargetEmailParser:
|
|
||||||
"""Tests for TargetEmailParser."""
|
|
||||||
|
|
||||||
def setup_method(self) -> None:
|
|
||||||
self.parser = TargetEmailParser()
|
|
||||||
self.fixture_html = FIXTURE_PATH.read_text()
|
|
||||||
|
|
||||||
def test_can_parse_target_sender(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="receipts@target.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Target Order Confirmation",
|
|
||||||
body_html=self.fixture_html,
|
|
||||||
)
|
|
||||||
assert self.parser.can_parse(email) is True
|
|
||||||
|
|
||||||
def test_can_parse_circle_in_body(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="someone@unknown.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Receipt",
|
|
||||||
body_html="<html><body>Target Circle savings offer</body></html>",
|
|
||||||
)
|
|
||||||
assert self.parser.can_parse(email) is True
|
|
||||||
|
|
||||||
def test_cannot_parse_unrelated(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="noreply@walmart.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Receipt",
|
|
||||||
body_html="<html><body>Walmart receipt</body></html>",
|
|
||||||
)
|
|
||||||
assert self.parser.can_parse(email) is False
|
|
||||||
|
|
||||||
def test_parse_items(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="orders@target.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Target Order",
|
|
||||||
body_html=self.fixture_html,
|
|
||||||
)
|
|
||||||
result = self.parser.parse(email)
|
|
||||||
items = result.get("items", [])
|
|
||||||
assert len(items) >= 3
|
|
||||||
product_names = [item["product_name_raw"] for item in items]
|
|
||||||
assert any("Whole Milk" in name for name in product_names)
|
|
||||||
assert any("Arborio" in name for name in product_names)
|
|
||||||
for item in items:
|
|
||||||
assert "unit_price" in item
|
|
||||||
assert "extended_price" in item
|
|
||||||
|
|
||||||
def test_parse_totals(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="orders@target.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Target Order",
|
|
||||||
body_html=self.fixture_html,
|
|
||||||
)
|
|
||||||
result = self.parser.parse(email)
|
|
||||||
total = result.get("total", 0)
|
|
||||||
assert total > 0
|
|
||||||
|
|
||||||
def test_parse_receipt_id(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="orders@target.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Target Order",
|
|
||||||
body_html=self.fixture_html,
|
|
||||||
)
|
|
||||||
result = self.parser.parse(email)
|
|
||||||
receipt_id = result.get("receipt_id", "")
|
|
||||||
assert "TGT-2026" in receipt_id or "CNF" in receipt_id
|
|
||||||
|
|
||||||
def test_parse_date(self) -> None:
|
|
||||||
email = EmailReceipt(
|
|
||||||
sender="orders@target.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Target Order",
|
|
||||||
body_html=self.fixture_html,
|
|
||||||
)
|
|
||||||
result = self.parser.parse(email)
|
|
||||||
purchase_date = result.get("purchase_date", "")
|
|
||||||
assert purchase_date == "2026-03-18"
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
"""Tests for email queue using DragonflyDB Streams."""
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
from fakeredis import aioredis as fake_aioredis
|
|
||||||
|
|
||||||
from receiptwitness.queue.email import (
|
|
||||||
CONSUMER_GROUP,
|
|
||||||
STREAM_KEY,
|
|
||||||
EmailJob,
|
|
||||||
ack_email,
|
|
||||||
consume_emails,
|
|
||||||
enqueue_email,
|
|
||||||
ensure_consumer_group,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
async def fake_client():
|
|
||||||
"""Yield a fake async Redis client."""
|
|
||||||
client = fake_aioredis.FakeRedis(decode_responses=True)
|
|
||||||
yield client
|
|
||||||
await client.aclose()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def sample_job():
|
|
||||||
"""Sample EmailJob for testing."""
|
|
||||||
return EmailJob(
|
|
||||||
user_id="user-123",
|
|
||||||
sender="no-reply@kroger.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Kroger Receipt",
|
|
||||||
body_html="<html><body>Receipt</body></html>",
|
|
||||||
body_plain="Receipt",
|
|
||||||
received_at="2026-04-01T12:00:00Z",
|
|
||||||
message_id="msg-abc-123",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_enqueue_and_consume(fake_client, sample_job):
|
|
||||||
"""Enqueue a job, consume it, verify fields match."""
|
|
||||||
msg_id = await enqueue_email(fake_client, sample_job)
|
|
||||||
assert msg_id is not None
|
|
||||||
|
|
||||||
consumed = await consume_emails(fake_client, "test-worker", count=1, block_ms=100)
|
|
||||||
assert len(consumed) == 1
|
|
||||||
consumed_id, consumed_job = consumed[0]
|
|
||||||
assert consumed_id == msg_id
|
|
||||||
assert consumed_job.user_id == sample_job.user_id
|
|
||||||
assert consumed_job.sender == sample_job.sender
|
|
||||||
assert consumed_job.recipient == sample_job.recipient
|
|
||||||
assert consumed_job.subject == sample_job.subject
|
|
||||||
assert consumed_job.message_id == sample_job.message_id
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_ack_removes_from_pending(fake_client, sample_job):
|
|
||||||
"""After ack, message is no longer pending."""
|
|
||||||
msg_id = await enqueue_email(fake_client, sample_job)
|
|
||||||
|
|
||||||
# Consume the message (moves it to pending)
|
|
||||||
consumed = await consume_emails(fake_client, "test-worker", count=1, block_ms=100)
|
|
||||||
assert len(consumed) == 1
|
|
||||||
|
|
||||||
# Acknowledge it
|
|
||||||
await ack_email(fake_client, msg_id)
|
|
||||||
|
|
||||||
# Check pending count for this consumer group
|
|
||||||
pending = await fake_client.xpending(STREAM_KEY, CONSUMER_GROUP)
|
|
||||||
assert pending is None or pending["pending"] == 0
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_ensure_consumer_group_idempotent(fake_client):
|
|
||||||
"""Calling ensure_consumer_group twice does not error."""
|
|
||||||
await ensure_consumer_group(fake_client)
|
|
||||||
# Calling again should not raise
|
|
||||||
await ensure_consumer_group(fake_client)
|
|
||||||
@@ -1,188 +0,0 @@
|
|||||||
"""Tests for email_worker."""
|
|
||||||
|
|
||||||
from decimal import Decimal
|
|
||||||
from unittest.mock import AsyncMock, MagicMock, patch
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
from fakeredis import aioredis as fake_aioredis
|
|
||||||
|
|
||||||
from receiptwitness.parsers.email.base import EmailReceipt
|
|
||||||
from receiptwitness.queue.email import (
|
|
||||||
EmailJob,
|
|
||||||
)
|
|
||||||
from receiptwitness.worker.email_worker import (
|
|
||||||
process_job,
|
|
||||||
resolve_user,
|
|
||||||
)
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Fixtures
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
async def fake_redis():
|
|
||||||
"""Fake async Redis client for queue testing."""
|
|
||||||
client = fake_aioredis.FakeRedis(decode_responses=True)
|
|
||||||
yield client
|
|
||||||
await client.aclose()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def sample_email_job():
|
|
||||||
"""Sample EmailJob matching DragonflyDB queue schema."""
|
|
||||||
return EmailJob(
|
|
||||||
user_id="token-abc-123",
|
|
||||||
sender="no-reply@meijer.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Meijer Receipt",
|
|
||||||
body_html="<html><body>Total: $42.00</body></html>",
|
|
||||||
body_plain="Total: $42.00",
|
|
||||||
received_at="2026-04-01T12:00:00Z",
|
|
||||||
message_id="msg-xyz-789",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def sample_email():
|
|
||||||
"""Sample EmailReceipt for parser testing."""
|
|
||||||
return EmailReceipt(
|
|
||||||
sender="no-reply@meijer.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Your Meijer Receipt",
|
|
||||||
body_html="<html><body>Total: $42.00<br/>Receipt #12345</body></html>",
|
|
||||||
body_plain="Total: $42.00",
|
|
||||||
received_at="2026-04-01T12:00:00Z",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# resolve_user tests
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_resolve_user_valid_token():
|
|
||||||
"""Valid token returns user_id string."""
|
|
||||||
mock_session = AsyncMock()
|
|
||||||
mock_result = MagicMock()
|
|
||||||
mock_result.scalar_one_or_none.return_value = "user-uuid-42"
|
|
||||||
mock_session.execute.return_value = mock_result
|
|
||||||
mock_session.__aenter__ = AsyncMock(return_value=mock_session)
|
|
||||||
mock_session.__aexit__ = AsyncMock(return_value=None)
|
|
||||||
|
|
||||||
factory = MagicMock(return_value=mock_session)
|
|
||||||
|
|
||||||
with patch(
|
|
||||||
"receiptwitness.worker.email_worker.get_async_session_factory",
|
|
||||||
return_value=factory,
|
|
||||||
):
|
|
||||||
user_id = await resolve_user("token-abc-123")
|
|
||||||
|
|
||||||
assert user_id == "user-uuid-42"
|
|
||||||
factory.assert_called_once()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_resolve_user_invalid_token():
|
|
||||||
"""Invalid token returns None."""
|
|
||||||
mock_session = AsyncMock()
|
|
||||||
mock_result = MagicMock()
|
|
||||||
mock_result.scalar_one_or_none.return_value = None
|
|
||||||
mock_session.execute.return_value = mock_result
|
|
||||||
mock_session.__aenter__ = AsyncMock(return_value=mock_session)
|
|
||||||
mock_session.__aexit__ = AsyncMock(return_value=None)
|
|
||||||
|
|
||||||
factory = MagicMock(return_value=mock_session)
|
|
||||||
|
|
||||||
with patch(
|
|
||||||
"receiptwitness.worker.email_worker.get_async_session_factory",
|
|
||||||
return_value=factory,
|
|
||||||
):
|
|
||||||
user_id = await resolve_user("bad-token")
|
|
||||||
|
|
||||||
assert user_id is None
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# process_job tests
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_process_job_unknown_retailer(sample_email_job):
|
|
||||||
"""Unknown retailer logs warning and returns True (ack, no retry)."""
|
|
||||||
unknown_job = EmailJob(
|
|
||||||
user_id="token-abc-123",
|
|
||||||
sender="no-reply@unknownretailer.com",
|
|
||||||
recipient="user@example.com",
|
|
||||||
subject="Receipt",
|
|
||||||
body_html="<html></html>",
|
|
||||||
body_plain="",
|
|
||||||
received_at="2026-04-01T12:00:00Z",
|
|
||||||
message_id="msg-xyz-789",
|
|
||||||
)
|
|
||||||
|
|
||||||
with (
|
|
||||||
patch(
|
|
||||||
"receiptwitness.worker.email_worker.resolve_user",
|
|
||||||
return_value="user-uuid-42",
|
|
||||||
),
|
|
||||||
patch(
|
|
||||||
"receiptwitness.worker.email_worker.publish_receipt_ingested",
|
|
||||||
new_callable=AsyncMock,
|
|
||||||
) as mock_publish,
|
|
||||||
):
|
|
||||||
result = await process_job("msg-id-1", unknown_job)
|
|
||||||
|
|
||||||
assert result is True
|
|
||||||
mock_publish.assert_not_called()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_process_job_success(sample_email_job, sample_email):
|
|
||||||
"""Known retailer: full pipeline runs — parse, normalize, publish event."""
|
|
||||||
parsed_data = {
|
|
||||||
"receipt_id": "RCP-999",
|
|
||||||
"purchase_date": "2026-04-01",
|
|
||||||
"total": Decimal("42.00"),
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"product_name_raw": "ORGANIC BANANAS",
|
|
||||||
"quantity": Decimal("1"),
|
|
||||||
"unit_price": Decimal("0.69"),
|
|
||||||
"extended_price": Decimal("0.69"),
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
mock_parser = MagicMock()
|
|
||||||
mock_parser.parse.return_value = parsed_data
|
|
||||||
|
|
||||||
with (
|
|
||||||
patch(
|
|
||||||
"receiptwitness.worker.email_worker.resolve_user",
|
|
||||||
return_value="user-uuid-42",
|
|
||||||
),
|
|
||||||
patch.dict(
|
|
||||||
"receiptwitness.worker.email_worker.PARSERS",
|
|
||||||
{"meijer": mock_parser},
|
|
||||||
clear=False,
|
|
||||||
),
|
|
||||||
patch(
|
|
||||||
"receiptwitness.worker.email_worker.publish_receipt_ingested",
|
|
||||||
new_callable=AsyncMock,
|
|
||||||
) as mock_publish,
|
|
||||||
):
|
|
||||||
result = await process_job("msg-id-1", sample_email_job)
|
|
||||||
|
|
||||||
assert result is True
|
|
||||||
mock_parser.parse.assert_called_once()
|
|
||||||
mock_publish.assert_called_once_with(
|
|
||||||
user_id="user-uuid-42",
|
|
||||||
store_slug="meijer",
|
|
||||||
purchase_id="RCP-999",
|
|
||||||
purchase_date="2026-04-01",
|
|
||||||
item_count=1,
|
|
||||||
total=Decimal("42.00"),
|
|
||||||
)
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
# seed-dev-job.yaml
|
|
||||||
# K8s Job to run the CartSnitch seed runner against the dev database.
|
|
||||||
#
|
|
||||||
# Usage:
|
|
||||||
# kubectl apply -f seed-dev-job.yaml -n cartsnitch-dev
|
|
||||||
#
|
|
||||||
# To view logs:
|
|
||||||
# kubectl logs -n cartsnitch-dev job/seed-dev -f
|
|
||||||
#
|
|
||||||
# To re-run after fixing issues:
|
|
||||||
# kubectl delete -f seed-dev-job.yaml -n cartsnitch-dev && kubectl apply -f seed-dev-job.yaml -n cartsnitch-dev
|
|
||||||
#
|
|
||||||
apiVersion: batch/v1
|
|
||||||
kind: Job
|
|
||||||
metadata:
|
|
||||||
name: seed-dev
|
|
||||||
namespace: cartsnitch-dev
|
|
||||||
labels:
|
|
||||||
app: cartsnitch
|
|
||||||
component: seed
|
|
||||||
environment: dev
|
|
||||||
annotations:
|
|
||||||
description: "Runs cartsnitch-common seed runner to populate dev database with realistic test data."
|
|
||||||
spec:
|
|
||||||
# Prevent retries — a failed seed run should be investigated, not auto-repeated.
|
|
||||||
backoffLimit: 0
|
|
||||||
# Do not run concurrently; sequential runs are safer for truncate+reseed.
|
|
||||||
concurrencyPolicy: Forbid
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: cartsnitch
|
|
||||||
component: seed
|
|
||||||
environment: dev
|
|
||||||
spec:
|
|
||||||
restartPolicy: Never
|
|
||||||
containers:
|
|
||||||
- name: seed
|
|
||||||
# Use slim Python image with the cartsnitch-common package installed from git.
|
|
||||||
# The common repo is public; no additional secret is needed for the pip install.
|
|
||||||
image: python:3.12-slim
|
|
||||||
command:
|
|
||||||
- sh
|
|
||||||
- -c
|
|
||||||
- |
|
|
||||||
pip install --no-cache-dir "cartsnitch-common @ git+https://github.com/cartsnitch/common.git@main" && \
|
|
||||||
python -m cartsnitch_common.seed --database-url "$${DATABASE_URL}"
|
|
||||||
env:
|
|
||||||
- name: DATABASE_URL
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: cartsnitch-secrets
|
|
||||||
key: database-url-pg
|
|
||||||
optional: false
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 256Mi
|
|
||||||
limits:
|
|
||||||
cpu: 500m
|
|
||||||
memory: 512Mi
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# =============================================================================
|
|
||||||
# seed-dev.sh — Run the CartSnitch seed runner against the dev database.
|
|
||||||
#
|
|
||||||
# Usage:
|
|
||||||
# ./seed-dev.sh Run full seed against dev
|
|
||||||
# ./seed-dev.sh --dry-run Show planned record counts without writing
|
|
||||||
# ./seed-dev.sh --help Show this help
|
|
||||||
#
|
|
||||||
# Prerequisites:
|
|
||||||
# - kubectl configured for the cartsnitch-dev cluster
|
|
||||||
# - Namespace cartsnitch-dev exists (CNPG Postgres must be running)
|
|
||||||
#
|
|
||||||
# What it does:
|
|
||||||
# 1. Starts a background port-forward to cartsnitch-pg-rw:5432
|
|
||||||
# 2. Waits for the tunnel to be ready
|
|
||||||
# 3. Runs python -m cartsnitch_common.seed with --database-url pointing
|
|
||||||
# to localhost:<forwarded-port>/cartsnitch
|
|
||||||
# 4. Cleans up the port-forward on exit (normal, interrupt, or error)
|
|
||||||
# =============================================================================
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
# --- Config -------------------------------------------------------------------
|
|
||||||
readonly NAMESPACE="cartsnitch-dev"
|
|
||||||
readonly SVC_NAME="cartsnitch-pg-rw"
|
|
||||||
readonly LOCAL_PORT="5433" # use a non-privileged port to avoid conflicts
|
|
||||||
readonly DB_NAME="cartsnitch"
|
|
||||||
readonly PG_USER="cartsnitch"
|
|
||||||
# Retrieve password from the CNPG credentials secret
|
|
||||||
readonly PG_PASSWORD="$(
|
|
||||||
kubectl get secret cartsnitch-pg-credentials \
|
|
||||||
-n "$NAMESPACE" \
|
|
||||||
-o jsonpath='{.data.password}' \
|
|
||||||
| base64 -d
|
|
||||||
)"
|
|
||||||
readonly DB_URL="postgresql://${PG_USER}:${PG_PASSWORD}@localhost:${LOCAL_PORT}/${DB_NAME}"
|
|
||||||
|
|
||||||
# --- Helpers ------------------------------------------------------------------
|
|
||||||
log() { echo "[seed-dev] $*"; }
|
|
||||||
fail() { log "ERROR: $*" >&2; exit 1; }
|
|
||||||
|
|
||||||
# Cleanup port-forward and exit.
|
|
||||||
cleanup() {
|
|
||||||
if [[ -n "${PF_PID:-}" ]]; then
|
|
||||||
log "Stopping port-forward (PID $PF_PID)..."
|
|
||||||
kill "$PF_PID" 2>/dev/null || true
|
|
||||||
wait "$PF_PID" 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
trap cleanup EXIT
|
|
||||||
|
|
||||||
# --- Args ---------------------------------------------------------------------
|
|
||||||
DRY_RUN=""
|
|
||||||
HELP_FLAG=""
|
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
|
||||||
case "$1" in
|
|
||||||
--dry-run) DRY_RUN="--dry-run"; shift ;;
|
|
||||||
--help) HELP_FLAG="1"; shift ;;
|
|
||||||
*) fail "Unknown argument: $1";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ -n "$HELP_FLAG" ]]; then
|
|
||||||
sed -n '3,/^# ---/p' "$0" | head -n -1 | sed 's/^# //'
|
|
||||||
echo ""
|
|
||||||
echo "Additional arguments are passed through to the seed runner."
|
|
||||||
echo "Common seed-runner options:"
|
|
||||||
echo " --dry-run Show planned record counts without writing"
|
|
||||||
echo " --seed N Set random seed (default: 42)"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- Prerequisites ------------------------------------------------------------
|
|
||||||
if ! command -v kubectl &>/dev/null; then
|
|
||||||
fail "kubectl not found — must be installed and configured."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- Port-forward -------------------------------------------------------------
|
|
||||||
log "Starting port-forward ${SVC_NAME}:5432 -> localhost:${LOCAL_PORT} ..."
|
|
||||||
kubectl port-forward \
|
|
||||||
-n "$NAMESPACE" \
|
|
||||||
svc/"$SVC_NAME" \
|
|
||||||
"${LOCAL_PORT}:5432" \
|
|
||||||
&>/dev/null &
|
|
||||||
PF_PID=$!
|
|
||||||
|
|
||||||
# Give the tunnel a moment to establish
|
|
||||||
sleep 2
|
|
||||||
|
|
||||||
# Verify the tunnel is up
|
|
||||||
if ! kill -0 "$PF_PID" 2>/dev/null; then
|
|
||||||
fail "Port-forward failed to start."
|
|
||||||
fi
|
|
||||||
log "Port-forward active (PID $PF_PID) on localhost:${LOCAL_PORT}"
|
|
||||||
|
|
||||||
# --- Seed --------------------------------------------------------------------
|
|
||||||
log "Running seed against dev database..."
|
|
||||||
set -x
|
|
||||||
python -m cartsnitch_common.seed --database-url "$DB_URL" $DRY_RUN
|
|
||||||
set +x
|
|
||||||
|
|
||||||
log "Done."
|
|
||||||
+23
-17
@@ -1,17 +1,23 @@
|
|||||||
import { render, screen } from '@testing-library/react'
|
import { render, screen } from '@testing-library/react'
|
||||||
import { describe, it, expect, vi } from 'vitest'
|
import { describe, it, expect, vi } from 'vitest'
|
||||||
import App from './App.tsx'
|
import App from './App.tsx'
|
||||||
|
|
||||||
vi.mock('./lib/auth-client.ts', () => ({
|
vi.mock('./lib/auth-client.ts', () => ({
|
||||||
authClient: {
|
authClient: {
|
||||||
useSession: () => ({ data: null, isPending: false }),
|
useSession: () => ({ data: null, isPending: false }),
|
||||||
},
|
},
|
||||||
}))
|
}))
|
||||||
|
|
||||||
describe('App', () => {
|
describe('App', () => {
|
||||||
it('redirects unauthenticated users to login', () => {
|
it('renders the dashboard on the root route', () => {
|
||||||
render(<App />)
|
render(<App />)
|
||||||
expect(screen.getByText('CartSnitch')).toBeInTheDocument()
|
expect(screen.getByText('CartSnitch')).toBeInTheDocument()
|
||||||
expect(screen.getByRole('button', { name: /sign in/i })).toBeInTheDocument()
|
})
|
||||||
})
|
|
||||||
})
|
it('renders the bottom navigation', () => {
|
||||||
|
render(<App />)
|
||||||
|
expect(screen.getByText('Home')).toBeInTheDocument()
|
||||||
|
expect(screen.getByText('Purchases')).toBeInTheDocument()
|
||||||
|
expect(screen.getByText('Products')).toBeInTheDocument()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|||||||
+1
-1
@@ -31,8 +31,8 @@ export default function App() {
|
|||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route element={<Layout />}>
|
<Route element={<Layout />}>
|
||||||
|
<Route index element={<Dashboard />} />
|
||||||
<Route element={<ProtectedRoute />}>
|
<Route element={<ProtectedRoute />}>
|
||||||
<Route index element={<Dashboard />} />
|
|
||||||
<Route path="purchases" element={<Purchases />} />
|
<Route path="purchases" element={<Purchases />} />
|
||||||
<Route path="purchases/:id" element={<PurchaseDetail />} />
|
<Route path="purchases/:id" element={<PurchaseDetail />} />
|
||||||
<Route path="products" element={<Products />} />
|
<Route path="products" element={<Products />} />
|
||||||
|
|||||||
@@ -4,22 +4,12 @@ import { authClient } from '../lib/auth-client.ts'
|
|||||||
import { useAuthStore } from '../stores/auth.ts'
|
import { useAuthStore } from '../stores/auth.ts'
|
||||||
|
|
||||||
export function ProtectedRoute() {
|
export function ProtectedRoute() {
|
||||||
const isMockAuth = import.meta.env.VITE_MOCK_AUTH === 'true'
|
|
||||||
const { data: session, isPending } = authClient.useSession()
|
const { data: session, isPending } = authClient.useSession()
|
||||||
const isAuthenticated = useAuthStore((s) => s.isAuthenticated)
|
|
||||||
const setAuthenticated = useAuthStore((s) => s.setAuthenticated)
|
const setAuthenticated = useAuthStore((s) => s.setAuthenticated)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isMockAuth) {
|
setAuthenticated(!!session)
|
||||||
setAuthenticated(!!session)
|
}, [session, setAuthenticated])
|
||||||
}
|
|
||||||
}, [session, setAuthenticated, isMockAuth])
|
|
||||||
|
|
||||||
// In mock auth mode, rely on Zustand store (set by Login/Register pages)
|
|
||||||
if (isMockAuth) {
|
|
||||||
if (!isAuthenticated) return <Navigate to="/login" replace />
|
|
||||||
return <Outlet />
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isPending) {
|
if (isPending) {
|
||||||
return (
|
return (
|
||||||
|
|||||||
+2
-2
@@ -35,7 +35,7 @@ export function useProduct(id: string) {
|
|||||||
export function usePriceHistory(productId: string) {
|
export function usePriceHistory(productId: string) {
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ['priceHistory', productId],
|
queryKey: ['priceHistory', productId],
|
||||||
queryFn: () => api.get<PriceHistory[]>(`/products/${productId}/prices`),
|
queryFn: () => api.get<PriceHistory[]>(`/products/${productId}/price-history`),
|
||||||
enabled: !!productId,
|
enabled: !!productId,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -50,6 +50,6 @@ export function useCoupons() {
|
|||||||
export function usePriceAlerts() {
|
export function usePriceAlerts() {
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ['priceAlerts'],
|
queryKey: ['priceAlerts'],
|
||||||
queryFn: () => api.get<PriceAlert[]>('/alerts'),
|
queryFn: () => api.get<PriceAlert[]>('/price-alerts'),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -15,7 +15,7 @@ const mockRoutes: Record<string, (path: string) => unknown> = {
|
|||||||
'/purchases': () => mockPurchases,
|
'/purchases': () => mockPurchases,
|
||||||
'/products': () => mockProducts,
|
'/products': () => mockProducts,
|
||||||
'/coupons': () => mockCoupons,
|
'/coupons': () => mockCoupons,
|
||||||
'/alerts': () => mockAlerts,
|
'/price-alerts': () => mockAlerts,
|
||||||
}
|
}
|
||||||
|
|
||||||
function matchMockRoute<T>(path: string): T | null {
|
function matchMockRoute<T>(path: string): T | null {
|
||||||
@@ -30,7 +30,7 @@ function matchMockRoute<T>(path: string): T | null {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// /products/:id/price-history
|
// /products/:id/price-history
|
||||||
const priceHistoryMatch = path.match(/^\/products\/(.+)\/prices$/)
|
const priceHistoryMatch = path.match(/^\/products\/(.+)\/price-history$/)
|
||||||
if (priceHistoryMatch) {
|
if (priceHistoryMatch) {
|
||||||
return getMockPriceHistory(priceHistoryMatch[1]) as T
|
return getMockPriceHistory(priceHistoryMatch[1]) as T
|
||||||
}
|
}
|
||||||
|
|||||||
+31
-4
@@ -1,8 +1,13 @@
|
|||||||
|
import React, { Suspense } from 'react'
|
||||||
import { Link } from 'react-router-dom'
|
import { Link } from 'react-router-dom'
|
||||||
import { authClient } from '../lib/auth-client.ts'
|
import { authClient } from '../lib/auth-client.ts'
|
||||||
import { usePurchases, usePriceAlerts } from '../hooks/useApi.ts'
|
import { usePurchases, usePriceAlerts, usePriceHistory } from '../hooks/useApi.ts'
|
||||||
import { StoreIcon } from '../components/StoreIcon.tsx'
|
import { StoreIcon } from '../components/StoreIcon.tsx'
|
||||||
|
|
||||||
|
const LazySparklineCard = React.lazy(() =>
|
||||||
|
import('../components/SparklineChart.tsx').then((mod) => ({ default: mod.SparklineCard }))
|
||||||
|
)
|
||||||
|
|
||||||
export function Dashboard() {
|
export function Dashboard() {
|
||||||
const { data: session, isPending } = authClient.useSession()
|
const { data: session, isPending } = authClient.useSession()
|
||||||
|
|
||||||
@@ -39,11 +44,19 @@ export function Dashboard() {
|
|||||||
function AuthenticatedDashboard({ userName }: { userName: string }) {
|
function AuthenticatedDashboard({ userName }: { userName: string }) {
|
||||||
const { data: purchases = [], isLoading: purchasesLoading } = usePurchases()
|
const { data: purchases = [], isLoading: purchasesLoading } = usePurchases()
|
||||||
const { data: alerts = [], isLoading: alertsLoading } = usePriceAlerts()
|
const { data: alerts = [], isLoading: alertsLoading } = usePriceAlerts()
|
||||||
|
const { data: eggHistory = [] } = usePriceHistory('prod10')
|
||||||
|
const { data: milkHistory = [] } = usePriceHistory('prod1')
|
||||||
|
|
||||||
const triggeredAlerts = alerts.filter((a) => a.triggered)
|
const triggeredAlerts = alerts.filter((a) => a.triggered)
|
||||||
const watchingAlerts = alerts.filter((a) => !a.triggered)
|
const watchingAlerts = alerts.filter((a) => !a.triggered)
|
||||||
const recentPurchases = purchases.slice(0, 3)
|
const recentPurchases = purchases.slice(0, 3)
|
||||||
|
|
||||||
|
const sparklineData = eggHistory.filter((p) => p.storeId === 'meijer').slice(-8)
|
||||||
|
const milkSparkline = milkHistory.filter((p) => p.storeId === 'kroger').slice(-8)
|
||||||
|
|
||||||
|
const eggCurrent = sparklineData.length > 0 ? `$${sparklineData[sparklineData.length - 1].price.toFixed(2)}` : '—'
|
||||||
|
const milkCurrent = milkSparkline.length > 0 ? `$${milkSparkline[milkSparkline.length - 1].price.toFixed(2)}` : '—'
|
||||||
|
|
||||||
if (purchasesLoading || alertsLoading) {
|
if (purchasesLoading || alertsLoading) {
|
||||||
return <DashboardSkeleton />
|
return <DashboardSkeleton />
|
||||||
}
|
}
|
||||||
@@ -93,8 +106,11 @@ function AuthenticatedDashboard({ userName }: { userName: string }) {
|
|||||||
{/* Price trend sparklines */}
|
{/* Price trend sparklines */}
|
||||||
<section className="mt-6">
|
<section className="mt-6">
|
||||||
<h2 className="mb-3 text-lg font-semibold text-gray-700">Price Trends</h2>
|
<h2 className="mb-3 text-lg font-semibold text-gray-700">Price Trends</h2>
|
||||||
<div className="rounded-xl bg-white p-4 shadow-sm text-center text-sm text-gray-400">
|
<div className="space-y-3">
|
||||||
Connect a store to see price trends
|
<Suspense fallback={<SparklinePlaceholder />}>
|
||||||
|
<LazySparklineCard label="Eggs (dozen)" data={sparklineData} current={eggCurrent} />
|
||||||
|
<LazySparklineCard label="Whole Milk (1 gal)" data={milkSparkline} current={milkCurrent} />
|
||||||
|
</Suspense>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -157,7 +173,6 @@ function AuthenticatedDashboard({ userName }: { userName: string }) {
|
|||||||
function DashboardSkeleton() {
|
function DashboardSkeleton() {
|
||||||
return (
|
return (
|
||||||
<div className="animate-pulse">
|
<div className="animate-pulse">
|
||||||
<h1 className="sr-only">Loading CartSnitch…</h1>
|
|
||||||
<div className="h-8 w-40 rounded bg-gray-200" />
|
<div className="h-8 w-40 rounded bg-gray-200" />
|
||||||
<div className="mt-4 grid grid-cols-2 gap-3">
|
<div className="mt-4 grid grid-cols-2 gap-3">
|
||||||
<div className="h-24 rounded-xl bg-gray-200" />
|
<div className="h-24 rounded-xl bg-gray-200" />
|
||||||
@@ -171,3 +186,15 @@ function DashboardSkeleton() {
|
|||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function SparklinePlaceholder() {
|
||||||
|
return (
|
||||||
|
<div className="flex items-center gap-4 rounded-xl bg-white p-4 shadow-sm animate-pulse">
|
||||||
|
<div className="min-w-0 flex-1">
|
||||||
|
<div className="h-4 w-24 rounded bg-gray-200" />
|
||||||
|
<div className="mt-2 h-6 w-16 rounded bg-gray-200" />
|
||||||
|
</div>
|
||||||
|
<div className="h-10 w-24 rounded bg-gray-100" />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|||||||
+5
-11
@@ -31,14 +31,8 @@ export function Login() {
|
|||||||
throw new Error(authError.message ?? 'Sign in failed')
|
throw new Error(authError.message ?? 'Sign in failed')
|
||||||
}
|
}
|
||||||
|
|
||||||
// After successful signIn, force a session fetch to confirm the cookie is set
|
setAuthenticated(true)
|
||||||
// before navigating to the protected route
|
navigate('/')
|
||||||
const sessionResult = await authClient.getSession()
|
|
||||||
if (sessionResult.data) {
|
|
||||||
navigate('/')
|
|
||||||
} else {
|
|
||||||
setError('Sign in failed. Please try again.')
|
|
||||||
}
|
|
||||||
} catch {
|
} catch {
|
||||||
if (import.meta.env.VITE_MOCK_AUTH === 'true') {
|
if (import.meta.env.VITE_MOCK_AUTH === 'true') {
|
||||||
setAuthenticated(true)
|
setAuthenticated(true)
|
||||||
@@ -52,7 +46,7 @@ export function Login() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="flex min-h-screen flex-col items-center justify-center px-4">
|
<div className="flex min-h-screen flex-col items-center justify-center px-4">
|
||||||
<h1 className="mb-2 text-3xl font-bold text-gray-900">CartSnitch</h1>
|
<h1 className="mb-2 text-3xl font-bold text-gray-900">CartSnitch</h1>
|
||||||
<p className="mb-8 text-sm text-gray-500">Track prices. Save money.</p>
|
<p className="mb-8 text-sm text-gray-500">Track prices. Save money.</p>
|
||||||
|
|
||||||
@@ -94,10 +88,10 @@ export function Login() {
|
|||||||
|
|
||||||
<p className="mt-6 text-sm text-gray-500">
|
<p className="mt-6 text-sm text-gray-500">
|
||||||
Don't have an account?{' '}
|
Don't have an account?{' '}
|
||||||
<Link to="/register" className="text-brand-blue underline">
|
<Link to="/register" className="text-brand-blue">
|
||||||
Sign up
|
Sign up
|
||||||
</Link>
|
</Link>
|
||||||
</p>
|
</p>
|
||||||
</main>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,15 +38,8 @@ export function Register() {
|
|||||||
throw new Error(authError.message ?? 'Registration failed')
|
throw new Error(authError.message ?? 'Registration failed')
|
||||||
}
|
}
|
||||||
|
|
||||||
// After successful signUp, force a session fetch to confirm the cookie is set
|
setAuthenticated(true)
|
||||||
// before navigating to the protected route
|
navigate('/')
|
||||||
const sessionResult = await authClient.getSession()
|
|
||||||
if (sessionResult.data) {
|
|
||||||
navigate('/')
|
|
||||||
} else {
|
|
||||||
// Session not established — show success message and link to login
|
|
||||||
setError('Account created! Please sign in.')
|
|
||||||
}
|
|
||||||
} catch {
|
} catch {
|
||||||
if (import.meta.env.VITE_MOCK_AUTH === 'true') {
|
if (import.meta.env.VITE_MOCK_AUTH === 'true') {
|
||||||
setAuthenticated(true)
|
setAuthenticated(true)
|
||||||
|
|||||||
@@ -61,5 +61,5 @@ export const handlers = [
|
|||||||
http.get('/api/v1/products', () => HttpResponse.json(mockProducts)),
|
http.get('/api/v1/products', () => HttpResponse.json(mockProducts)),
|
||||||
http.get('/api/v1/products/prod_1', () => HttpResponse.json(mockProducts[0])),
|
http.get('/api/v1/products/prod_1', () => HttpResponse.json(mockProducts[0])),
|
||||||
http.get('/api/v1/coupons', () => HttpResponse.json(mockCoupons)),
|
http.get('/api/v1/coupons', () => HttpResponse.json(mockCoupons)),
|
||||||
http.get('/api/v1/alerts', () => HttpResponse.json(mockAlerts)),
|
http.get('/api/v1/price-alerts', () => HttpResponse.json(mockAlerts)),
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user