Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 20ea9e590c | |||
| e119f4d0ce | |||
| fe0a7fac3e | |||
| 5363ba2fbf |
@@ -34,4 +34,4 @@ def upgrade() -> None:
|
|||||||
|
|
||||||
def downgrade() -> None:
|
def downgrade() -> None:
|
||||||
op.drop_constraint("uq_users_email_inbound_token", "users", type_="unique")
|
op.drop_constraint("uq_users_email_inbound_token", "users", type_="unique")
|
||||||
op.drop_column("users", "email_inbound_token")
|
op.drop_column("users", "email_inbound_token")
|
||||||
@@ -39,8 +39,8 @@ class ReceiptWitnessSettings(BaseSettings):
|
|||||||
if not self.session_encryption_key or self.session_encryption_key in _PLACEHOLDER_VALUES:
|
if not self.session_encryption_key or self.session_encryption_key in _PLACEHOLDER_VALUES:
|
||||||
errors.append(
|
errors.append(
|
||||||
"RW_SESSION_ENCRYPTION_KEY must be set to a secure value. "
|
"RW_SESSION_ENCRYPTION_KEY must be set to a secure value. "
|
||||||
"Generate one with: python -c \"from cryptography.fernet import Fernet; "
|
"Generate one with: python -c "
|
||||||
'print(Fernet.generate_key().decode())"'
|
'"from cryptography.fernet import Fernet; print(Fernet.generate_key().decode())"'
|
||||||
)
|
)
|
||||||
if self.notifications_enabled and not self.resend_api_key:
|
if self.notifications_enabled and not self.resend_api_key:
|
||||||
errors.append(
|
errors.append(
|
||||||
|
|||||||
@@ -51,14 +51,13 @@ class Purchase(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
|||||||
nullable=False,
|
nullable=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Relationships (stubs — canonical definitions in cartsnitch/common)
|
|
||||||
user: Mapped["User"] = relationship(back_populates="purchases")
|
|
||||||
|
|
||||||
__table_args__ = (
|
__table_args__ = (
|
||||||
Index("ix_purchases_user_store", "user_id", "store_id"),
|
Index("ix_purchases_user_store", "user_id", "store_id"),
|
||||||
UniqueConstraint("user_id", "store_id", "receipt_id", name="uq_purchase_receipt"),
|
UniqueConstraint("user_id", "store_id", "receipt_id", name="uq_purchase_receipt"),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
user: Mapped["User"] = relationship(back_populates="purchases")
|
||||||
|
|
||||||
|
|
||||||
class PurchaseItem(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
class PurchaseItem(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
||||||
"""Stub: a line item on a receipt. Full definition in cartsnitch/common."""
|
"""Stub: a line item on a receipt. Full definition in cartsnitch/common."""
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ class Store(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
|||||||
logo_url: Mapped[str | None] = mapped_column(String(500))
|
logo_url: Mapped[str | None] = mapped_column(String(500))
|
||||||
website_url: Mapped[str | None] = mapped_column(String(500))
|
website_url: Mapped[str | None] = mapped_column(String(500))
|
||||||
|
|
||||||
# Relationships (stubs — canonical definitions in cartsnitch/common)
|
|
||||||
user_accounts: Mapped[list["UserStoreAccount"]] = relationship(back_populates="store")
|
user_accounts: Mapped[list["UserStoreAccount"]] = relationship(back_populates="store")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import uuid
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from sqlalchemy import JSON, Boolean, DateTime, ForeignKey, String, Text, UniqueConstraint
|
from sqlalchemy import JSON, Boolean, DateTime, ForeignKey, String, Text, UniqueConstraint, text
|
||||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||||
|
|
||||||
from receiptwitness.shared.constants import AccountStatus
|
from receiptwitness.shared.constants import AccountStatus
|
||||||
@@ -27,6 +27,9 @@ class User(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
|||||||
nullable=False,
|
nullable=False,
|
||||||
unique=True,
|
unique=True,
|
||||||
default=lambda: secrets.token_urlsafe(16),
|
default=lambda: secrets.token_urlsafe(16),
|
||||||
|
server_default=text(
|
||||||
|
"replace(replace(trim(trailing '=' from encode(gen_random_bytes(16), 'base64')), '+', '-'), '/', '_')" # noqa: E501
|
||||||
|
),
|
||||||
)
|
)
|
||||||
hashed_password: Mapped[str | None] = mapped_column(String(255), nullable=True)
|
hashed_password: Mapped[str | None] = mapped_column(String(255), nullable=True)
|
||||||
display_name: Mapped[str | None] = mapped_column(String(100))
|
display_name: Mapped[str | None] = mapped_column(String(100))
|
||||||
|
|||||||
@@ -1,16 +1,31 @@
|
|||||||
"""Shared test fixtures for pipeline tests."""
|
"""Shared test fixtures for pipeline tests."""
|
||||||
|
|
||||||
|
import secrets
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from sqlalchemy import create_engine
|
from sqlalchemy import create_engine, event
|
||||||
from sqlalchemy.orm import sessionmaker
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
|
||||||
from receiptwitness.shared.models import Base
|
from receiptwitness.shared.models import Base
|
||||||
|
from receiptwitness.shared.models.user import User
|
||||||
|
|
||||||
|
|
||||||
|
@event.listens_for(User, "before_insert")
|
||||||
|
def _populate_email_inbound_token(mapper, connection, target):
|
||||||
|
"""Populate email_inbound_token with a secure random value when unset.
|
||||||
|
|
||||||
|
SQLite has no gen_random_bytes() function, so we generate it in Python
|
||||||
|
instead of relying on the PostgreSQL server_default.
|
||||||
|
"""
|
||||||
|
if target.email_inbound_token is None:
|
||||||
|
target.email_inbound_token = secrets.token_urlsafe(16)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def engine():
|
def engine():
|
||||||
"""In-memory SQLite engine for unit tests."""
|
"""In-memory SQLite engine for unit tests."""
|
||||||
eng = create_engine("sqlite:///:memory:")
|
eng = create_engine("sqlite:///:memory:")
|
||||||
|
User.__table__.c.email_inbound_token.server_default = None
|
||||||
Base.metadata.create_all(eng)
|
Base.metadata.create_all(eng)
|
||||||
yield eng
|
yield eng
|
||||||
eng.dispose()
|
eng.dispose()
|
||||||
|
|||||||
Reference in New Issue
Block a user