add-postgres-support #24
+3
-1
@@ -23,7 +23,9 @@ COPY pyproject.toml README.md ./
|
|||||||
COPY src/ ./src/
|
COPY src/ ./src/
|
||||||
|
|
||||||
# Install Python dependencies including all optional dependencies
|
# Install Python dependencies including all optional dependencies
|
||||||
# This makes the image self-contained and ready for any configuration
|
# This makes the image self-contained and ready for any configuration:
|
||||||
|
# - Redis support (redis extra)
|
||||||
|
# - PostgreSQL support (postgres extra)
|
||||||
RUN uv sync --no-dev --all-extras
|
RUN uv sync --no-dev --all-extras
|
||||||
|
|
||||||
# Add virtual environment to PATH
|
# Add virtual environment to PATH
|
||||||
|
|||||||
@@ -81,13 +81,14 @@ uv run uvicorn src.baby_monitor.main:app --reload --host 0.0.0.0 --port 8000
|
|||||||
|
|
||||||
### Environment Variables
|
### Environment Variables
|
||||||
|
|
||||||
| Variable | Default | Description |
|
| Variable | Default | Description |
|
||||||
| ---------------- | ------------ | ------------------------------------------- |
|
| ---------------- | ------------ | ---------------------------------------------- |
|
||||||
| `ENVIRONMENT` | `production` | Set to `development` to enable API docs |
|
| `ENVIRONMENT` | `production` | Set to `development` to enable API docs |
|
||||||
| `ADMIN_PASSWORD` | _(required)_ | Admin user password |
|
| `ADMIN_PASSWORD` | _(required)_ | Admin user password |
|
||||||
| `ADMIN_USERNAME` | `admin` | Admin username |
|
| `ADMIN_USERNAME` | `admin` | Admin username |
|
||||||
| `DATA_DIR` | `/data` | Directory for SQLite database |
|
| `DATA_DIR` | `/data` | Directory for SQLite database (SQLite only) |
|
||||||
| `REDIS_URI` | _(optional)_ | Redis connection URI for distributed tokens |
|
| `REDIS_URI` | _(optional)_ | Redis connection URI for distributed tokens |
|
||||||
|
| `POSTGRES_URI` | _(optional)_ | PostgreSQL connection URI for database storage |
|
||||||
|
|
||||||
### Storage Options
|
### Storage Options
|
||||||
|
|
||||||
@@ -96,18 +97,26 @@ uv run uvicorn src.baby_monitor.main:app --reload --host 0.0.0.0 --port 8000
|
|||||||
- Automatic setup, no configuration needed
|
- Automatic setup, no configuration needed
|
||||||
- Data stored in `/data/baby_monitor.db`
|
- Data stored in `/data/baby_monitor.db`
|
||||||
- Perfect for single-server deployments
|
- Perfect for single-server deployments
|
||||||
|
- Timezone-aware datetimes stored as naive UTC
|
||||||
|
|
||||||
**Redis (Optional)**
|
**Redis (Optional - Token Storage)**
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Enable Redis token storage
|
# Enable Redis token storage for distributed deployments
|
||||||
export REDIS_URI=redis://localhost:6379
|
export REDIS_URI=redis://localhost:6379
|
||||||
```
|
```
|
||||||
|
|
||||||
**PostgreSQL (Future)**
|
**PostgreSQL (Optional - Database)**
|
||||||
|
|
||||||
- Repository interface ready
|
```bash
|
||||||
- Swap implementation in `dependencies.py`
|
# Enable PostgreSQL for production database
|
||||||
|
export POSTGRES_URI=postgresql://user:password@localhost:5432/baby_monitor
|
||||||
|
```
|
||||||
|
|
||||||
|
- Supports timezone-aware datetimes natively
|
||||||
|
- Recommended for production deployments
|
||||||
|
- Better performance for concurrent access
|
||||||
|
- Supports database migrations and backups
|
||||||
|
|
||||||
## 📁 Project Structure
|
## 📁 Project Structure
|
||||||
|
|
||||||
|
|||||||
@@ -5,9 +5,6 @@ services:
|
|||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
volumes:
|
|
||||||
# Persist database to local directory
|
|
||||||
- ./data:/data
|
|
||||||
environment:
|
environment:
|
||||||
# Set environment to production
|
# Set environment to production
|
||||||
- ENVIRONMENT=production
|
- ENVIRONMENT=production
|
||||||
@@ -17,7 +14,7 @@ services:
|
|||||||
# Use Redis for token storage
|
# Use Redis for token storage
|
||||||
- REDIS_URI=redis://redis:6379/0
|
- REDIS_URI=redis://redis:6379/0
|
||||||
# Use PostgreSQL for database
|
# Use PostgreSQL for database
|
||||||
- DATABASE_URL=postgresql://baby_monitor:securepassword@postgres:5432/baby_monitor_db
|
- POSTGRES_URI=postgresql://baby_monitor:securepassword@postgres:5432/baby_monitor_db
|
||||||
command: ["--host", "0.0.0.0", "--port", "8000"]
|
command: ["--host", "0.0.0.0", "--port", "8000"]
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|||||||
@@ -19,9 +19,11 @@ class Child(Base):
|
|||||||
|
|
||||||
id = Column(Integer, primary_key=True, index=True)
|
id = Column(Integer, primary_key=True, index=True)
|
||||||
name = Column(String, nullable=False)
|
name = Column(String, nullable=False)
|
||||||
birth_time = Column(DateTime, nullable=False)
|
birth_time = Column(DateTime(timezone=True), nullable=False)
|
||||||
birth_weight = Column(Float, nullable=False) # in grams
|
birth_weight = Column(Float, nullable=False) # in grams
|
||||||
created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
|
created_at = Column(
|
||||||
|
DateTime(timezone=True), default=datetime.utcnow, nullable=False
|
||||||
|
)
|
||||||
|
|
||||||
def __repr__(self) -> str:
|
def __repr__(self) -> str:
|
||||||
return f"<Child(id={self.id}, name='{self.name}')>"
|
return f"<Child(id={self.id}, name='{self.name}')>"
|
||||||
|
|||||||
@@ -20,7 +20,9 @@ class ChildParent(Base):
|
|||||||
id = Column(Integer, primary_key=True, index=True)
|
id = Column(Integer, primary_key=True, index=True)
|
||||||
child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
|
child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
|
||||||
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
||||||
created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
|
created_at = Column(
|
||||||
|
DateTime(timezone=True), default=datetime.utcnow, nullable=False
|
||||||
|
)
|
||||||
|
|
||||||
def __repr__(self) -> str:
|
def __repr__(self) -> str:
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -19,12 +19,14 @@ class DiaperChange(Base):
|
|||||||
|
|
||||||
id = Column(Integer, primary_key=True, index=True)
|
id = Column(Integer, primary_key=True, index=True)
|
||||||
child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
|
child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
|
||||||
change_time = Column(DateTime, nullable=False)
|
change_time = Column(DateTime(timezone=True), nullable=False)
|
||||||
poop_amount = Column(String, nullable=True) # stores PoopAmount enum
|
poop_amount = Column(String, nullable=True) # stores PoopAmount enum
|
||||||
poop_color = Column(String, nullable=True) # stores PoopColor enum
|
poop_color = Column(String, nullable=True) # stores PoopColor enum
|
||||||
pee_amount = Column(String, nullable=True) # stores PeeAmount enum
|
pee_amount = Column(String, nullable=True) # stores PeeAmount enum
|
||||||
pee_color = Column(String, nullable=True) # stores PeeColor enum
|
pee_color = Column(String, nullable=True) # stores PeeColor enum
|
||||||
created_at = Column(DateTime, default=datetime.now(UTC), nullable=False)
|
created_at = Column(
|
||||||
|
DateTime(timezone=True), default=datetime.now(UTC), nullable=False
|
||||||
|
)
|
||||||
|
|
||||||
def __repr__(self) -> str:
|
def __repr__(self) -> str:
|
||||||
return f"<DiaperChange(id={self.id}, child_id={self.child_id})>"
|
return f"<DiaperChange(id={self.id}, child_id={self.child_id})>"
|
||||||
|
|||||||
@@ -19,10 +19,12 @@ class Feeding(Base):
|
|||||||
|
|
||||||
id = Column(Integer, primary_key=True, index=True)
|
id = Column(Integer, primary_key=True, index=True)
|
||||||
child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
|
child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
|
||||||
start_time = Column(DateTime, nullable=False)
|
start_time = Column(DateTime(timezone=True), nullable=False)
|
||||||
end_time = Column(DateTime, nullable=True)
|
end_time = Column(DateTime(timezone=True), nullable=True)
|
||||||
feeding_type = Column(String, nullable=False) # stores FeedingType enum
|
feeding_type = Column(String, nullable=False) # stores FeedingType enum
|
||||||
created_at = Column(DateTime, default=datetime.now(UTC), nullable=False)
|
created_at = Column(
|
||||||
|
DateTime(timezone=True), default=datetime.now(UTC), nullable=False
|
||||||
|
)
|
||||||
|
|
||||||
def __repr__(self) -> str:
|
def __repr__(self) -> str:
|
||||||
return f"<Feeding(id={self.id}, child_id={self.child_id})>"
|
return f"<Feeding(id={self.id}, child_id={self.child_id})>"
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
"""Sleep database model."""
|
"""Sleep database model."""
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
from sqlalchemy import Column, Integer, DateTime, ForeignKey
|
|
||||||
from datetime import datetime, UTC
|
from datetime import datetime, UTC
|
||||||
|
from sqlalchemy import Column, Integer, DateTime, ForeignKey
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from sqlalchemy.orm import DeclarativeBase
|
from sqlalchemy.orm import DeclarativeBase
|
||||||
@@ -19,9 +19,11 @@ class Sleep(Base):
|
|||||||
|
|
||||||
id = Column(Integer, primary_key=True, index=True)
|
id = Column(Integer, primary_key=True, index=True)
|
||||||
child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
|
child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
|
||||||
start_time = Column(DateTime, nullable=False)
|
start_time = Column(DateTime(timezone=True), nullable=False)
|
||||||
end_time = Column(DateTime, nullable=True)
|
end_time = Column(DateTime(timezone=True), nullable=True)
|
||||||
created_at = Column(DateTime, default=datetime.now(UTC), nullable=False)
|
created_at = Column(
|
||||||
|
DateTime(timezone=True), default=datetime.now(UTC), nullable=False
|
||||||
|
)
|
||||||
|
|
||||||
def __repr__(self) -> str:
|
def __repr__(self) -> str:
|
||||||
return f"<Sleep(id={self.id}, child_id={self.child_id})>"
|
return f"<Sleep(id={self.id}, child_id={self.child_id})>"
|
||||||
|
|||||||
@@ -21,7 +21,9 @@ class User(Base):
|
|||||||
username = Column(String, unique=True, index=True, nullable=False)
|
username = Column(String, unique=True, index=True, nullable=False)
|
||||||
hashed_password = Column(String, nullable=False)
|
hashed_password = Column(String, nullable=False)
|
||||||
is_admin = Column(Boolean, default=False, nullable=False)
|
is_admin = Column(Boolean, default=False, nullable=False)
|
||||||
created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
|
created_at = Column(
|
||||||
|
DateTime(timezone=True), default=datetime.utcnow, nullable=False
|
||||||
|
)
|
||||||
|
|
||||||
def __repr__(self) -> str:
|
def __repr__(self) -> str:
|
||||||
return f"<User(id={self.id}, username='{self.username}')>"
|
return f"<User(id={self.id}, username='{self.username}')>"
|
||||||
|
|||||||
@@ -1,17 +1,23 @@
|
|||||||
"""SQLite implementation of child repository."""
|
"""Database-agnostic implementation of child repository.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL.
|
||||||
|
"""
|
||||||
|
|
||||||
from datetime import datetime, UTC
|
from datetime import datetime, UTC
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from baby_monitor.repositories.interfaces.child_repository_interface import (
|
from baby_monitor.repositories.interfaces import (
|
||||||
ChildRepositoryInterface,
|
ChildRepositoryInterface,
|
||||||
)
|
)
|
||||||
from baby_monitor.models.db.child import Child
|
from baby_monitor.models.db.child import Child
|
||||||
from baby_monitor.models.db.child_parent import ChildParent
|
from baby_monitor.models.db.child_parent import ChildParent
|
||||||
|
|
||||||
|
|
||||||
class SQLiteChildRepository(ChildRepositoryInterface):
|
class DatabaseChildRepository(ChildRepositoryInterface):
|
||||||
"""SQLite implementation for child data access."""
|
"""Database implementation for child data access.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL databases.
|
||||||
|
"""
|
||||||
|
|
||||||
def __init__(self, db: Session):
|
def __init__(self, db: Session):
|
||||||
self.db = db
|
self.db = db
|
||||||
|
|||||||
@@ -1,7 +1,13 @@
|
|||||||
"""Child invitation repository implementations."""
|
"""Child invitation repository implementations."""
|
||||||
|
|
||||||
from baby_monitor.repositories.child_invitation.sqlite_child_invitation import ( # noqa: E501
|
from baby_monitor.repositories.child_invitation.sqlite_child_invitation import ( # noqa: E501
|
||||||
SQLiteChildInvitationRepository,
|
DatabaseChildInvitationRepository,
|
||||||
)
|
)
|
||||||
|
|
||||||
__all__ = ["SQLiteChildInvitationRepository"]
|
# Keep old name for backward compatibility
|
||||||
|
SQLiteChildInvitationRepository = DatabaseChildInvitationRepository
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"DatabaseChildInvitationRepository",
|
||||||
|
"SQLiteChildInvitationRepository",
|
||||||
|
]
|
||||||
|
|||||||
@@ -1,20 +1,45 @@
|
|||||||
"""SQLite implementation of child invitation repository."""
|
"""Database-agnostic implementation of child invitation repository.
|
||||||
|
|
||||||
|
Supports both SQLite and PostgreSQL:
|
||||||
|
- SQLite: stores datetimes as naive UTC
|
||||||
|
- PostgreSQL: stores datetimes as timezone-aware
|
||||||
|
"""
|
||||||
|
|
||||||
from datetime import datetime, UTC
|
from datetime import datetime, UTC
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
from baby_monitor.models.child_invitation import ChildInvitation
|
from baby_monitor.models.child_invitation import ChildInvitation
|
||||||
from baby_monitor.repositories.interfaces.child_invitation import (
|
from baby_monitor.repositories.interfaces import (
|
||||||
ChildInvitationRepositoryInterface,
|
ChildInvitationRepositoryInterface,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class SQLiteChildInvitationRepository(ChildInvitationRepositoryInterface):
|
class DatabaseChildInvitationRepository(ChildInvitationRepositoryInterface):
|
||||||
"""SQLite implementation of child invitation repository."""
|
"""Database implementation of child invitation repository.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL databases.
|
||||||
|
"""
|
||||||
|
|
||||||
def __init__(self, db: Session):
|
def __init__(self, db: Session):
|
||||||
"""Initialize the repository with a database session."""
|
"""Initialize the repository with a database session."""
|
||||||
self.db = db
|
self.db = db
|
||||||
|
|
||||||
|
def _get_now_utc(self, reference_dt: datetime) -> datetime:
|
||||||
|
"""
|
||||||
|
Get current UTC time matching the timezone awareness of reference.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
reference_dt: A datetime from DB to match timezone format
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Current UTC time (naive for SQLite, aware for PostgreSQL)
|
||||||
|
"""
|
||||||
|
now = datetime.now(UTC)
|
||||||
|
if reference_dt.tzinfo is None:
|
||||||
|
# SQLite: return naive UTC
|
||||||
|
return now.replace(tzinfo=None)
|
||||||
|
# PostgreSQL: return timezone-aware
|
||||||
|
return now
|
||||||
|
|
||||||
def create_invitation(
|
def create_invitation(
|
||||||
self,
|
self,
|
||||||
code: str,
|
code: str,
|
||||||
@@ -68,8 +93,8 @@ class SQLiteChildInvitationRepository(ChildInvitationRepositoryInterface):
|
|||||||
if invitation.is_consumed:
|
if invitation.is_consumed:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
# Compare as naive UTC datetimes (SQLite stores without timezone)
|
# Get current time matching database timezone format
|
||||||
now_utc = datetime.now(UTC).replace(tzinfo=None)
|
now_utc = self._get_now_utc(invitation.expires_at)
|
||||||
if invitation.expires_at < now_utc:
|
if invitation.expires_at < now_utc:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|||||||
@@ -4,13 +4,16 @@ from typing import Annotated
|
|||||||
from fastapi import Depends
|
from fastapi import Depends
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
from baby_monitor.repositories.child_invitation.sqlite_child_invitation import ( # noqa: E501
|
from baby_monitor.repositories.child_invitation.sqlite_child_invitation import ( # noqa: E501
|
||||||
SQLiteChildInvitationRepository,
|
DatabaseChildInvitationRepository,
|
||||||
|
)
|
||||||
|
from baby_monitor.repositories.interfaces import (
|
||||||
|
ChildInvitationRepositoryInterface,
|
||||||
)
|
)
|
||||||
from baby_monitor.repositories.dependencies.get_database import get_database
|
from baby_monitor.repositories.dependencies.get_database import get_database
|
||||||
|
|
||||||
|
|
||||||
def get_child_invitation_repository(
|
def get_child_invitation_repository(
|
||||||
db: Annotated[Session, Depends(get_database)],
|
db: Annotated[Session, Depends(get_database)],
|
||||||
) -> SQLiteChildInvitationRepository:
|
) -> ChildInvitationRepositoryInterface:
|
||||||
"""Get child invitation repository instance."""
|
"""Get child invitation repository instance (works with any database)."""
|
||||||
return SQLiteChildInvitationRepository(db)
|
return DatabaseChildInvitationRepository(db)
|
||||||
|
|||||||
@@ -5,11 +5,14 @@ from fastapi import Depends
|
|||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from baby_monitor.repositories.dependencies.get_database import get_database
|
from baby_monitor.repositories.dependencies.get_database import get_database
|
||||||
from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
|
from baby_monitor.repositories.child.sqlite_child import DatabaseChildRepository
|
||||||
|
from baby_monitor.repositories.interfaces.child_repository_interface import (
|
||||||
|
ChildRepositoryInterface,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_child_repository(
|
def get_child_repository(
|
||||||
db: Annotated[Session, Depends(get_database)],
|
db: Annotated[Session, Depends(get_database)],
|
||||||
) -> SQLiteChildRepository:
|
) -> ChildRepositoryInterface:
|
||||||
"""Get child repository instance."""
|
"""Get child repository instance (works with any database)."""
|
||||||
return SQLiteChildRepository(db)
|
return DatabaseChildRepository(db)
|
||||||
|
|||||||
@@ -10,18 +10,30 @@ from sqlalchemy.orm import declarative_base, sessionmaker, Session
|
|||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from sqlalchemy.orm import DeclarativeBase
|
from sqlalchemy.orm import DeclarativeBase
|
||||||
|
|
||||||
# Database directory
|
# Database directory (used for SQLite)
|
||||||
DATA_DIR = Path(os.getenv("DATA_DIR", "/data"))
|
DATA_DIR = Path(os.getenv("DATA_DIR", "/data"))
|
||||||
|
|
||||||
# SQLite database URL
|
# Check for PostgreSQL URI, otherwise use SQLite
|
||||||
DATABASE_URL = f"sqlite:///{DATA_DIR}/baby_monitor.db"
|
POSTGRES_URI = os.getenv("POSTGRES_URI")
|
||||||
|
|
||||||
# Create engine with check_same_thread=False for SQLite
|
if POSTGRES_URI:
|
||||||
engine = create_engine(
|
# Use PostgreSQL
|
||||||
DATABASE_URL,
|
DATABASE_URL = POSTGRES_URI
|
||||||
connect_args={"check_same_thread": False},
|
# PostgreSQL doesn't need special connect_args
|
||||||
echo=False, # Set to True for SQL query logging
|
engine = create_engine(
|
||||||
)
|
DATABASE_URL,
|
||||||
|
echo=False, # Set to True for SQL query logging
|
||||||
|
pool_pre_ping=True, # Verify connections before using them
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
# Use SQLite (default)
|
||||||
|
DATABASE_URL = f"sqlite:///{DATA_DIR}/baby_monitor.db"
|
||||||
|
# Create engine with check_same_thread=False for SQLite
|
||||||
|
engine = create_engine(
|
||||||
|
DATABASE_URL,
|
||||||
|
connect_args={"check_same_thread": False},
|
||||||
|
echo=False, # Set to True for SQL query logging
|
||||||
|
)
|
||||||
|
|
||||||
# Session factory
|
# Session factory
|
||||||
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
||||||
@@ -33,7 +45,7 @@ Base: "type[DeclarativeBase]" = declarative_base()
|
|||||||
def _ensure_admin_user() -> None:
|
def _ensure_admin_user() -> None:
|
||||||
"""Create or update admin user from environment variables."""
|
"""Create or update admin user from environment variables."""
|
||||||
from baby_monitor.models.db.user import User
|
from baby_monitor.models.db.user import User
|
||||||
from baby_monitor.utils.password import hash_password
|
from baby_monitor.utils import hash_password
|
||||||
|
|
||||||
admin_username = os.getenv("ADMIN_USERNAME")
|
admin_username = os.getenv("ADMIN_USERNAME")
|
||||||
admin_password = os.getenv("ADMIN_PASSWORD")
|
admin_password = os.getenv("ADMIN_PASSWORD")
|
||||||
@@ -78,15 +90,23 @@ def init_db() -> None:
|
|||||||
# This must be done before create_all() is called
|
# This must be done before create_all() is called
|
||||||
from baby_monitor.models.db.user import User # noqa: F401
|
from baby_monitor.models.db.user import User # noqa: F401
|
||||||
from baby_monitor.models.db.child import Child # noqa: F401
|
from baby_monitor.models.db.child import Child # noqa: F401
|
||||||
from baby_monitor.models.db.child_parent import ChildParent # noqa: F401
|
from baby_monitor.models.db.child_parent import ( # noqa: F401
|
||||||
|
ChildParent,
|
||||||
|
)
|
||||||
from baby_monitor.models.db.feeding import Feeding # noqa: F401
|
from baby_monitor.models.db.feeding import Feeding # noqa: F401
|
||||||
from baby_monitor.models.db.diaper_change import DiaperChange # noqa: F401
|
from baby_monitor.models.db.diaper_change import ( # noqa: F401
|
||||||
|
DiaperChange,
|
||||||
|
)
|
||||||
from baby_monitor.models.db.sleep import Sleep # noqa: F401
|
from baby_monitor.models.db.sleep import Sleep # noqa: F401
|
||||||
from baby_monitor.models.invitation import Invitation # noqa: F401
|
from baby_monitor.models.invitation import Invitation # noqa: F401
|
||||||
from baby_monitor.models.child_invitation import ChildInvitation # noqa: F401
|
from baby_monitor.models.child_invitation import ( # noqa: F401
|
||||||
|
ChildInvitation,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Ensure data directory exists (only needed for SQLite)
|
||||||
|
if not POSTGRES_URI:
|
||||||
|
DATA_DIR.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
# Ensure data directory exists
|
|
||||||
DATA_DIR.mkdir(parents=True, exist_ok=True)
|
|
||||||
Base.metadata.create_all(bind=engine)
|
Base.metadata.create_all(bind=engine)
|
||||||
|
|
||||||
# Create admin user if it doesn't exist
|
# Create admin user if it doesn't exist
|
||||||
|
|||||||
@@ -6,12 +6,15 @@ from sqlalchemy.orm import Session
|
|||||||
|
|
||||||
from baby_monitor.repositories.dependencies.get_database import get_database
|
from baby_monitor.repositories.dependencies.get_database import get_database
|
||||||
from baby_monitor.repositories.diaper_change.sqlite_diaper_change import (
|
from baby_monitor.repositories.diaper_change.sqlite_diaper_change import (
|
||||||
SQLiteDiaperChangeRepository,
|
DatabaseDiaperChangeRepository,
|
||||||
|
)
|
||||||
|
from baby_monitor.repositories.interfaces.diaper_change_repository_interface import ( # noqa: E501
|
||||||
|
DiaperChangeRepositoryInterface,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_diaper_change_repository(
|
def get_diaper_change_repository(
|
||||||
db: Annotated[Session, Depends(get_database)],
|
db: Annotated[Session, Depends(get_database)],
|
||||||
) -> SQLiteDiaperChangeRepository:
|
) -> DiaperChangeRepositoryInterface:
|
||||||
"""Get diaper change repository instance."""
|
"""Get diaper change repository instance (works with any database)."""
|
||||||
return SQLiteDiaperChangeRepository(db)
|
return DatabaseDiaperChangeRepository(db)
|
||||||
|
|||||||
@@ -6,12 +6,15 @@ from sqlalchemy.orm import Session
|
|||||||
|
|
||||||
from baby_monitor.repositories.dependencies.get_database import get_database
|
from baby_monitor.repositories.dependencies.get_database import get_database
|
||||||
from baby_monitor.repositories.feeding.sqlite_feeding import (
|
from baby_monitor.repositories.feeding.sqlite_feeding import (
|
||||||
SQLiteFeedingRepository,
|
DatabaseFeedingRepository,
|
||||||
|
)
|
||||||
|
from baby_monitor.repositories.interfaces.feeding_repository_interface import (
|
||||||
|
FeedingRepositoryInterface,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_feeding_repository(
|
def get_feeding_repository(
|
||||||
db: Annotated[Session, Depends(get_database)],
|
db: Annotated[Session, Depends(get_database)],
|
||||||
) -> SQLiteFeedingRepository:
|
) -> FeedingRepositoryInterface:
|
||||||
"""Get feeding repository instance."""
|
"""Get feeding repository instance (works with any database)."""
|
||||||
return SQLiteFeedingRepository(db)
|
return DatabaseFeedingRepository(db)
|
||||||
|
|||||||
@@ -6,13 +6,16 @@ from sqlalchemy.orm import Session
|
|||||||
|
|
||||||
from baby_monitor.repositories.dependencies.get_database import get_database
|
from baby_monitor.repositories.dependencies.get_database import get_database
|
||||||
from baby_monitor.repositories.invitation.sqlite_invitation import (
|
from baby_monitor.repositories.invitation.sqlite_invitation import (
|
||||||
SQLiteInvitationRepository,
|
DatabaseInvitationRepository,
|
||||||
|
)
|
||||||
|
from baby_monitor.repositories.interfaces.invitation_repository_interface import (
|
||||||
|
InvitationRepositoryInterface,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_invitation_repository(
|
def get_invitation_repository(
|
||||||
db: Annotated[Session, Depends(get_database)],
|
db: Annotated[Session, Depends(get_database)],
|
||||||
) -> SQLiteInvitationRepository:
|
) -> InvitationRepositoryInterface:
|
||||||
"""
|
"""
|
||||||
Provide an invitation repository instance.
|
Provide an invitation repository instance.
|
||||||
|
|
||||||
@@ -20,6 +23,6 @@ def get_invitation_repository(
|
|||||||
db: Database session from dependency injection
|
db: Database session from dependency injection
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
SQLiteInvitationRepository instance
|
InvitationRepositoryInterface instance (works with any database)
|
||||||
"""
|
"""
|
||||||
return SQLiteInvitationRepository(db)
|
return DatabaseInvitationRepository(db)
|
||||||
|
|||||||
@@ -5,11 +5,14 @@ from fastapi import Depends
|
|||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from baby_monitor.repositories.dependencies.get_database import get_database
|
from baby_monitor.repositories.dependencies.get_database import get_database
|
||||||
from baby_monitor.repositories.sleep.sqlite_sleep import SQLiteSleepRepository
|
from baby_monitor.repositories.sleep.sqlite_sleep import DatabaseSleepRepository
|
||||||
|
from baby_monitor.repositories.interfaces.sleep_repository_interface import (
|
||||||
|
SleepRepositoryInterface,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_sleep_repository(
|
def get_sleep_repository(
|
||||||
db: Annotated[Session, Depends(get_database)],
|
db: Annotated[Session, Depends(get_database)],
|
||||||
) -> SQLiteSleepRepository:
|
) -> SleepRepositoryInterface:
|
||||||
"""Get sleep repository instance."""
|
"""Get sleep repository instance (works with any database)."""
|
||||||
return SQLiteSleepRepository(db)
|
return DatabaseSleepRepository(db)
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ from baby_monitor.repositories.interfaces import (
|
|||||||
UserRepositoryInterface,
|
UserRepositoryInterface,
|
||||||
)
|
)
|
||||||
from baby_monitor.repositories.user.sqlite_user import (
|
from baby_monitor.repositories.user.sqlite_user import (
|
||||||
SQLiteUserRepository,
|
DatabaseUserRepository,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Singleton instance
|
# Singleton instance
|
||||||
@@ -22,12 +22,12 @@ def get_user_repository(
|
|||||||
db: Annotated[Session, Depends(get_database)],
|
db: Annotated[Session, Depends(get_database)],
|
||||||
) -> UserRepositoryInterface:
|
) -> UserRepositoryInterface:
|
||||||
"""
|
"""
|
||||||
Get user repository instance.
|
Get user repository instance (works with any database).
|
||||||
"""
|
"""
|
||||||
|
|
||||||
global _user_repository
|
global _user_repository
|
||||||
|
|
||||||
if _user_repository is None:
|
if _user_repository is None:
|
||||||
_user_repository = SQLiteUserRepository(db)
|
_user_repository = DatabaseUserRepository(db)
|
||||||
|
|
||||||
return _user_repository
|
return _user_repository
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
"""SQLite implementation of diaper change repository."""
|
"""Database-agnostic implementation of diaper change repository.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL.
|
||||||
|
"""
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from baby_monitor.repositories.interfaces.diaper_change_repository_interface import ( # noqa: E501
|
from baby_monitor.repositories.interfaces import ( # noqa: E501
|
||||||
DiaperChangeRepositoryInterface,
|
DiaperChangeRepositoryInterface,
|
||||||
)
|
)
|
||||||
from baby_monitor.models.db.diaper_change import DiaperChange
|
from baby_monitor.models.db.diaper_change import DiaperChange
|
||||||
@@ -11,8 +14,11 @@ from baby_monitor.models.db.child import Child
|
|||||||
from baby_monitor.models.db.child_parent import ChildParent
|
from baby_monitor.models.db.child_parent import ChildParent
|
||||||
|
|
||||||
|
|
||||||
class SQLiteDiaperChangeRepository(DiaperChangeRepositoryInterface):
|
class DatabaseDiaperChangeRepository(DiaperChangeRepositoryInterface):
|
||||||
"""SQLite implementation for diaper change log data access."""
|
"""Database implementation for diaper change log data access.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL databases.
|
||||||
|
"""
|
||||||
|
|
||||||
def __init__(self, db: Session):
|
def __init__(self, db: Session):
|
||||||
self.db = db
|
self.db = db
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
"""SQLite implementation of feeding repository."""
|
"""Database-agnostic implementation of feeding repository.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL.
|
||||||
|
"""
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from baby_monitor.repositories.interfaces.feeding_repository_interface import (
|
from baby_monitor.repositories.interfaces import (
|
||||||
FeedingRepositoryInterface,
|
FeedingRepositoryInterface,
|
||||||
)
|
)
|
||||||
from baby_monitor.models.db.feeding import Feeding
|
from baby_monitor.models.db.feeding import Feeding
|
||||||
@@ -11,8 +14,11 @@ from baby_monitor.models.db.child import Child
|
|||||||
from baby_monitor.models.db.child_parent import ChildParent
|
from baby_monitor.models.db.child_parent import ChildParent
|
||||||
|
|
||||||
|
|
||||||
class SQLiteFeedingRepository(FeedingRepositoryInterface):
|
class DatabaseFeedingRepository(FeedingRepositoryInterface):
|
||||||
"""SQLite implementation for feeding log data access."""
|
"""Database implementation for feeding log data access.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL databases.
|
||||||
|
"""
|
||||||
|
|
||||||
def __init__(self, db: Session):
|
def __init__(self, db: Session):
|
||||||
self.db = db
|
self.db = db
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
"""Repository interfaces package."""
|
"""Repository interfaces package."""
|
||||||
|
|
||||||
from .child_invitation import (
|
from .child_invitation_interface import (
|
||||||
ChildInvitationRepositoryInterface,
|
ChildInvitationRepositoryInterface,
|
||||||
)
|
)
|
||||||
from .credentials_repository_interface import (
|
from .credentials_repository_interface import (
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
"""Invitation repository implementations."""
|
"""Invitation repository implementations."""
|
||||||
|
|
||||||
from baby_monitor.repositories.invitation.sqlite_invitation import (
|
from baby_monitor.repositories.invitation.sqlite_invitation import (
|
||||||
SQLiteInvitationRepository,
|
DatabaseInvitationRepository,
|
||||||
)
|
)
|
||||||
|
|
||||||
__all__ = ["SQLiteInvitationRepository"]
|
# Keep old name for backward compatibility
|
||||||
|
SQLiteInvitationRepository = DatabaseInvitationRepository
|
||||||
|
|
||||||
|
__all__ = ["DatabaseInvitationRepository", "SQLiteInvitationRepository"]
|
||||||
|
|||||||
@@ -1,25 +1,49 @@
|
|||||||
"""SQLite implementation of invitation repository.
|
"""Database-agnostic implementation of invitation repository.
|
||||||
|
|
||||||
Note: SQLite does not support timezone-aware datetimes natively.
|
Supports both SQLite and PostgreSQL:
|
||||||
All datetimes are stored as naive UTC and converted at the application layer.
|
- SQLite: stores datetimes as naive UTC
|
||||||
|
- PostgreSQL: stores datetimes as timezone-aware
|
||||||
|
|
||||||
|
The repository automatically adapts by checking the timezone awareness
|
||||||
|
of datetimes returned from the database.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from datetime import datetime, UTC
|
from datetime import datetime, UTC
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from baby_monitor.models.invitation import Invitation
|
from baby_monitor.models.invitation import Invitation
|
||||||
from baby_monitor.repositories.interfaces.invitation_repository_interface import (
|
from baby_monitor.repositories.interfaces import (
|
||||||
InvitationRepositoryInterface,
|
InvitationRepositoryInterface,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class SQLiteInvitationRepository(InvitationRepositoryInterface):
|
class DatabaseInvitationRepository(InvitationRepositoryInterface):
|
||||||
"""SQLite implementation for managing invitation tokens."""
|
"""Database implementation for managing invitation tokens.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL databases.
|
||||||
|
"""
|
||||||
|
|
||||||
def __init__(self, db: Session) -> None:
|
def __init__(self, db: Session) -> None:
|
||||||
"""Initialize the repository with a database session."""
|
"""Initialize the repository with a database session."""
|
||||||
self.db = db
|
self.db = db
|
||||||
|
|
||||||
|
def _get_now_utc(self, reference_dt: datetime) -> datetime:
|
||||||
|
"""
|
||||||
|
Get current UTC time matching the timezone awareness of reference.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
reference_dt: A datetime from DB to match timezone format
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Current UTC time (naive for SQLite, aware for PostgreSQL)
|
||||||
|
"""
|
||||||
|
now = datetime.now(UTC)
|
||||||
|
if reference_dt.tzinfo is None:
|
||||||
|
# SQLite: return naive UTC
|
||||||
|
return now.replace(tzinfo=None)
|
||||||
|
# PostgreSQL: return timezone-aware
|
||||||
|
return now
|
||||||
|
|
||||||
def create_invitation(
|
def create_invitation(
|
||||||
self, token: str, created_by_user_id: int, expires_at: datetime
|
self, token: str, created_by_user_id: int, expires_at: datetime
|
||||||
) -> None:
|
) -> None:
|
||||||
@@ -63,8 +87,8 @@ class SQLiteInvitationRepository(InvitationRepositoryInterface):
|
|||||||
if not invitation:
|
if not invitation:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
# Compare as naive UTC datetimes (SQLite stores without timezone)
|
# Get current time matching database timezone format
|
||||||
now_utc = datetime.now(UTC).replace(tzinfo=None)
|
now_utc = self._get_now_utc(invitation.expires_at)
|
||||||
if invitation.expires_at < now_utc:
|
if invitation.expires_at < now_utc:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -89,8 +113,8 @@ class SQLiteInvitationRepository(InvitationRepositoryInterface):
|
|||||||
if not invitation:
|
if not invitation:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
# Compare as naive UTC datetimes (SQLite stores without timezone)
|
# Get current time matching database timezone format
|
||||||
now_utc = datetime.now(UTC).replace(tzinfo=None)
|
now_utc = self._get_now_utc(invitation.expires_at)
|
||||||
if invitation.expires_at < now_utc:
|
if invitation.expires_at < now_utc:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -107,6 +131,14 @@ class SQLiteInvitationRepository(InvitationRepositoryInterface):
|
|||||||
|
|
||||||
def cleanup_expired(self) -> None:
|
def cleanup_expired(self) -> None:
|
||||||
"""Remove expired invitation tokens from storage."""
|
"""Remove expired invitation tokens from storage."""
|
||||||
now_utc = datetime.now(UTC).replace(tzinfo=None)
|
# For cleanup, we need to get a sample to determine format
|
||||||
|
# Get any invitation to check timezone format
|
||||||
|
sample = self.db.query(Invitation).first()
|
||||||
|
if sample:
|
||||||
|
now_utc = self._get_now_utc(sample.expires_at)
|
||||||
|
else:
|
||||||
|
# No invitations, use naive UTC (safe default)
|
||||||
|
now_utc = datetime.now(UTC).replace(tzinfo=None)
|
||||||
|
|
||||||
self.db.query(Invitation).filter(Invitation.expires_at < now_utc).delete()
|
self.db.query(Invitation).filter(Invitation.expires_at < now_utc).delete()
|
||||||
self.db.commit()
|
self.db.commit()
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
"""SQLite implementation of sleep repository."""
|
"""Database-agnostic implementation of sleep repository.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL.
|
||||||
|
"""
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from baby_monitor.repositories.interfaces.sleep_repository_interface import (
|
from baby_monitor.repositories.interfaces import (
|
||||||
SleepRepositoryInterface,
|
SleepRepositoryInterface,
|
||||||
)
|
)
|
||||||
from baby_monitor.models.db.sleep import Sleep
|
from baby_monitor.models.db.sleep import Sleep
|
||||||
@@ -11,8 +14,11 @@ from baby_monitor.models.db.child import Child
|
|||||||
from baby_monitor.models.db.child_parent import ChildParent
|
from baby_monitor.models.db.child_parent import ChildParent
|
||||||
|
|
||||||
|
|
||||||
class SQLiteSleepRepository(SleepRepositoryInterface):
|
class DatabaseSleepRepository(SleepRepositoryInterface):
|
||||||
"""SQLite implementation for sleep log data access."""
|
"""Database implementation for sleep log data access.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL databases.
|
||||||
|
"""
|
||||||
|
|
||||||
def __init__(self, db: Session):
|
def __init__(self, db: Session):
|
||||||
self.db = db
|
self.db = db
|
||||||
|
|||||||
@@ -1,64 +0,0 @@
|
|||||||
"""PostgreSQL user repository (future implementation)."""
|
|
||||||
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
from baby_monitor.repositories.interfaces import UserRepositoryInterface
|
|
||||||
from baby_monitor.models.db.user import User
|
|
||||||
|
|
||||||
|
|
||||||
class PostgreSQLUserRepository(UserRepositoryInterface):
|
|
||||||
"""
|
|
||||||
PostgreSQL-based user repository.
|
|
||||||
|
|
||||||
This implementation uses the same SQLAlchemy models as SQLite,
|
|
||||||
just with a different database engine.
|
|
||||||
|
|
||||||
To use this implementation:
|
|
||||||
1. Add psycopg2-binary dependency
|
|
||||||
2. Update DATABASE_URL in database.py:
|
|
||||||
DATABASE_URL = os.getenv(
|
|
||||||
"DATABASE_URL",
|
|
||||||
"postgresql://user:password@localhost:5432/baby_monitor"
|
|
||||||
)
|
|
||||||
3. Replace SQLiteUserRepository with this in dependencies
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, db: Session):
|
|
||||||
self.db = db
|
|
||||||
|
|
||||||
def get_by_username(self, username: str) -> dict | None:
|
|
||||||
"""Get user by username."""
|
|
||||||
user = self.db.query(User).filter(User.username == username).first()
|
|
||||||
if user:
|
|
||||||
return {
|
|
||||||
"id": user.id,
|
|
||||||
"username": user.username,
|
|
||||||
"hashed_password": user.hashed_password,
|
|
||||||
"created_at": user.created_at,
|
|
||||||
}
|
|
||||||
return None
|
|
||||||
|
|
||||||
def create(self, username: str, hashed_password: str) -> dict:
|
|
||||||
"""Create a new user."""
|
|
||||||
user = User(username=username, hashed_password=hashed_password)
|
|
||||||
self.db.add(user)
|
|
||||||
self.db.commit()
|
|
||||||
self.db.refresh(user)
|
|
||||||
return {
|
|
||||||
"id": user.id,
|
|
||||||
"username": user.username,
|
|
||||||
"hashed_password": user.hashed_password,
|
|
||||||
"created_at": user.created_at,
|
|
||||||
}
|
|
||||||
|
|
||||||
def get_by_id(self, user_id: int) -> dict | None:
|
|
||||||
"""Get user by ID."""
|
|
||||||
user = self.db.query(User).filter(User.id == user_id).first()
|
|
||||||
if user:
|
|
||||||
return {
|
|
||||||
"id": user.id,
|
|
||||||
"username": user.username,
|
|
||||||
"hashed_password": user.hashed_password,
|
|
||||||
"created_at": user.created_at,
|
|
||||||
}
|
|
||||||
return None
|
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
"""SQLite implementation of user repository."""
|
"""Database-agnostic implementation of user repository.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL.
|
||||||
|
"""
|
||||||
|
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
@@ -6,8 +9,11 @@ from baby_monitor.repositories.interfaces import UserRepositoryInterface
|
|||||||
from baby_monitor.models.db.user import User
|
from baby_monitor.models.db.user import User
|
||||||
|
|
||||||
|
|
||||||
class SQLiteUserRepository(UserRepositoryInterface):
|
class DatabaseUserRepository(UserRepositoryInterface):
|
||||||
"""SQLite-based user repository."""
|
"""Database-based user repository.
|
||||||
|
|
||||||
|
Works with both SQLite and PostgreSQL databases.
|
||||||
|
"""
|
||||||
|
|
||||||
def __init__(self, db: Session):
|
def __init__(self, db: Session):
|
||||||
self.db = db
|
self.db = db
|
||||||
|
|||||||
@@ -7,22 +7,12 @@ from fastapi import APIRouter, Depends, HTTPException
|
|||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
|
||||||
from baby_monitor.routers.auth import verify_admin
|
from baby_monitor.routers.auth import verify_admin
|
||||||
from baby_monitor.repositories.dependencies.get_invitation_repository import (
|
from baby_monitor.repositories.dependencies import (
|
||||||
get_invitation_repository,
|
get_invitation_repository,
|
||||||
)
|
|
||||||
from baby_monitor.repositories.dependencies.get_user_repository import (
|
|
||||||
get_user_repository,
|
get_user_repository,
|
||||||
)
|
|
||||||
from baby_monitor.repositories.dependencies.get_child_repository import (
|
|
||||||
get_child_repository,
|
get_child_repository,
|
||||||
)
|
|
||||||
from baby_monitor.repositories.dependencies.get_feeding_repository import (
|
|
||||||
get_feeding_repository,
|
get_feeding_repository,
|
||||||
)
|
|
||||||
from baby_monitor.repositories.dependencies.get_diaper_change_repository import (
|
|
||||||
get_diaper_change_repository,
|
get_diaper_change_repository,
|
||||||
)
|
|
||||||
from baby_monitor.repositories.dependencies.get_sleep_repository import (
|
|
||||||
get_sleep_repository,
|
get_sleep_repository,
|
||||||
)
|
)
|
||||||
from baby_monitor.repositories.interfaces import (
|
from baby_monitor.repositories.interfaces import (
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
"""Authentication router for login and user management."""
|
"""Authentication router for login and user management."""
|
||||||
|
|
||||||
import secrets
|
import secrets
|
||||||
from fastapi import APIRouter, HTTPException, Depends, Header
|
|
||||||
from typing import Annotated
|
from typing import Annotated
|
||||||
|
from fastapi import APIRouter, HTTPException, Depends, Header
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
|
||||||
from baby_monitor.models.auth import (
|
from baby_monitor.models.auth import (
|
||||||
@@ -29,7 +29,7 @@ from baby_monitor.repositories.interfaces import (
|
|||||||
DiaperChangeRepositoryInterface,
|
DiaperChangeRepositoryInterface,
|
||||||
SleepRepositoryInterface,
|
SleepRepositoryInterface,
|
||||||
)
|
)
|
||||||
from baby_monitor.utils.password import hash_password, verify_password
|
from baby_monitor.utils import hash_password, verify_password
|
||||||
|
|
||||||
router = APIRouter(prefix="/api", tags=["authentication"])
|
router = APIRouter(prefix="/api", tags=["authentication"])
|
||||||
|
|
||||||
|
|||||||
@@ -8,14 +8,14 @@ from pydantic import BaseModel
|
|||||||
|
|
||||||
from baby_monitor.models.child import CreateChildRequest, ChildResponse
|
from baby_monitor.models.child import CreateChildRequest, ChildResponse
|
||||||
from baby_monitor.routers.auth import verify_token
|
from baby_monitor.routers.auth import verify_token
|
||||||
from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
|
from baby_monitor.repositories.interfaces import (
|
||||||
from baby_monitor.repositories.dependencies.get_child_repository import (
|
ChildRepositoryInterface,
|
||||||
get_child_repository,
|
ChildInvitationRepositoryInterface,
|
||||||
)
|
)
|
||||||
from baby_monitor.repositories.dependencies.get_child_invitation_repository import ( # noqa: E501
|
from baby_monitor.repositories.dependencies import (
|
||||||
|
get_child_repository,
|
||||||
get_child_invitation_repository,
|
get_child_invitation_repository,
|
||||||
)
|
)
|
||||||
from baby_monitor.repositories.interfaces import ChildInvitationRepositoryInterface # noqa: E501
|
|
||||||
|
|
||||||
router = APIRouter(prefix="/api/children", tags=["children"])
|
router = APIRouter(prefix="/api/children", tags=["children"])
|
||||||
|
|
||||||
@@ -45,7 +45,7 @@ class RedeemChildInvitationRequest(BaseModel):
|
|||||||
def create_child(
|
def create_child(
|
||||||
request: CreateChildRequest,
|
request: CreateChildRequest,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> ChildResponse:
|
) -> ChildResponse:
|
||||||
"""Create a new child for the authenticated user."""
|
"""Create a new child for the authenticated user."""
|
||||||
child = child_repo.create(
|
child = child_repo.create(
|
||||||
@@ -61,7 +61,7 @@ def create_child(
|
|||||||
@router.get("", response_model=list[ChildResponse])
|
@router.get("", response_model=list[ChildResponse])
|
||||||
def get_user_children(
|
def get_user_children(
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> list[ChildResponse]:
|
) -> list[ChildResponse]:
|
||||||
"""Get all children for the authenticated user."""
|
"""Get all children for the authenticated user."""
|
||||||
children = child_repo.get_by_user_id(user_id)
|
children = child_repo.get_by_user_id(user_id)
|
||||||
@@ -72,7 +72,7 @@ def get_user_children(
|
|||||||
def get_child(
|
def get_child(
|
||||||
child_id: int,
|
child_id: int,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> ChildResponse:
|
) -> ChildResponse:
|
||||||
"""Get a specific child by ID."""
|
"""Get a specific child by ID."""
|
||||||
child = child_repo.get_by_id(child_id)
|
child = child_repo.get_by_id(child_id)
|
||||||
@@ -93,7 +93,7 @@ def update_child(
|
|||||||
child_id: int,
|
child_id: int,
|
||||||
request: CreateChildRequest,
|
request: CreateChildRequest,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> ChildResponse:
|
) -> ChildResponse:
|
||||||
"""Update a child's information."""
|
"""Update a child's information."""
|
||||||
# First check if child exists and belongs to user
|
# First check if child exists and belongs to user
|
||||||
@@ -124,10 +124,11 @@ def update_child(
|
|||||||
def create_child_invitation(
|
def create_child_invitation(
|
||||||
request: CreateChildInvitationRequest,
|
request: CreateChildInvitationRequest,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)], # noqa: E501
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
invitation_repo: Annotated[
|
invitation_repo: Annotated[
|
||||||
ChildInvitationRepositoryInterface, Depends(get_child_invitation_repository)
|
ChildInvitationRepositoryInterface,
|
||||||
], # noqa: E501
|
Depends(get_child_invitation_repository),
|
||||||
|
],
|
||||||
) -> ChildInvitationResponse:
|
) -> ChildInvitationResponse:
|
||||||
"""Create an invitation code to share child access with another user."""
|
"""Create an invitation code to share child access with another user."""
|
||||||
# Verify the child exists and user has access
|
# Verify the child exists and user has access
|
||||||
@@ -165,10 +166,11 @@ def create_child_invitation(
|
|||||||
def redeem_child_invitation(
|
def redeem_child_invitation(
|
||||||
request: RedeemChildInvitationRequest,
|
request: RedeemChildInvitationRequest,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)], # noqa: E501
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
invitation_repo: Annotated[
|
invitation_repo: Annotated[
|
||||||
ChildInvitationRepositoryInterface, Depends(get_child_invitation_repository)
|
ChildInvitationRepositoryInterface,
|
||||||
], # noqa: E501
|
Depends(get_child_invitation_repository),
|
||||||
|
],
|
||||||
) -> dict:
|
) -> dict:
|
||||||
"""Redeem an invitation code to gain access to a child."""
|
"""Redeem an invitation code to gain access to a child."""
|
||||||
# Verify the invitation code
|
# Verify the invitation code
|
||||||
|
|||||||
@@ -9,17 +9,15 @@ from baby_monitor.models.diaper_change import (
|
|||||||
DiaperChangeResponse,
|
DiaperChangeResponse,
|
||||||
)
|
)
|
||||||
from baby_monitor.routers.auth import verify_token
|
from baby_monitor.routers.auth import verify_token
|
||||||
from baby_monitor.repositories.diaper_change.sqlite_diaper_change import (
|
from baby_monitor.repositories.interfaces import (
|
||||||
SQLiteDiaperChangeRepository,
|
DiaperChangeRepositoryInterface,
|
||||||
|
ChildRepositoryInterface,
|
||||||
)
|
)
|
||||||
from baby_monitor.repositories.dependencies.get_diaper_change_repository import ( # noqa: E501
|
from baby_monitor.repositories.dependencies import (
|
||||||
get_diaper_change_repository,
|
get_diaper_change_repository,
|
||||||
)
|
|
||||||
from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
|
|
||||||
from baby_monitor.repositories.dependencies.get_child_repository import (
|
|
||||||
get_child_repository,
|
get_child_repository,
|
||||||
)
|
)
|
||||||
from baby_monitor.utils.access_control import verify_child_access
|
from baby_monitor.utils.verify_child_access import verify_child_access
|
||||||
|
|
||||||
router = APIRouter(prefix="/api/diaper-changes", tags=["diaper-changes"])
|
router = APIRouter(prefix="/api/diaper-changes", tags=["diaper-changes"])
|
||||||
|
|
||||||
@@ -29,9 +27,9 @@ def create_diaper_change(
|
|||||||
request: CreateDiaperChangeRequest,
|
request: CreateDiaperChangeRequest,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
diaper_repo: Annotated[
|
diaper_repo: Annotated[
|
||||||
SQLiteDiaperChangeRepository, Depends(get_diaper_change_repository)
|
DiaperChangeRepositoryInterface, Depends(get_diaper_change_repository)
|
||||||
],
|
],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> DiaperChangeResponse:
|
) -> DiaperChangeResponse:
|
||||||
"""Create a new diaper change log entry."""
|
"""Create a new diaper change log entry."""
|
||||||
# Verify the child belongs to the authenticated user
|
# Verify the child belongs to the authenticated user
|
||||||
@@ -53,7 +51,7 @@ def create_diaper_change(
|
|||||||
def get_user_diaper_changes(
|
def get_user_diaper_changes(
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
diaper_repo: Annotated[
|
diaper_repo: Annotated[
|
||||||
SQLiteDiaperChangeRepository, Depends(get_diaper_change_repository)
|
DiaperChangeRepositoryInterface, Depends(get_diaper_change_repository)
|
||||||
],
|
],
|
||||||
) -> list[DiaperChangeResponse]:
|
) -> list[DiaperChangeResponse]:
|
||||||
"""Get all diaper change logs for the authenticated user's children."""
|
"""Get all diaper change logs for the authenticated user's children."""
|
||||||
@@ -66,9 +64,9 @@ def get_diaper_change(
|
|||||||
diaper_change_id: int,
|
diaper_change_id: int,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
diaper_repo: Annotated[
|
diaper_repo: Annotated[
|
||||||
SQLiteDiaperChangeRepository, Depends(get_diaper_change_repository)
|
DiaperChangeRepositoryInterface, Depends(get_diaper_change_repository)
|
||||||
],
|
],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> DiaperChangeResponse:
|
) -> DiaperChangeResponse:
|
||||||
"""Get a specific diaper change log by ID."""
|
"""Get a specific diaper change log by ID."""
|
||||||
diaper_change = diaper_repo.get_by_id(diaper_change_id)
|
diaper_change = diaper_repo.get_by_id(diaper_change_id)
|
||||||
@@ -88,9 +86,9 @@ def update_diaper_change(
|
|||||||
request: UpdateDiaperChangeRequest,
|
request: UpdateDiaperChangeRequest,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
diaper_repo: Annotated[
|
diaper_repo: Annotated[
|
||||||
SQLiteDiaperChangeRepository, Depends(get_diaper_change_repository)
|
DiaperChangeRepositoryInterface, Depends(get_diaper_change_repository)
|
||||||
],
|
],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> DiaperChangeResponse:
|
) -> DiaperChangeResponse:
|
||||||
"""Update an existing diaper change log."""
|
"""Update an existing diaper change log."""
|
||||||
diaper_change = diaper_repo.get_by_id(diaper_change_id)
|
diaper_change = diaper_repo.get_by_id(diaper_change_id)
|
||||||
@@ -123,9 +121,9 @@ def delete_diaper_change(
|
|||||||
diaper_change_id: int,
|
diaper_change_id: int,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
diaper_repo: Annotated[
|
diaper_repo: Annotated[
|
||||||
SQLiteDiaperChangeRepository, Depends(get_diaper_change_repository)
|
DiaperChangeRepositoryInterface, Depends(get_diaper_change_repository)
|
||||||
],
|
],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Delete a diaper change log."""
|
"""Delete a diaper change log."""
|
||||||
diaper_change = diaper_repo.get_by_id(diaper_change_id)
|
diaper_change = diaper_repo.get_by_id(diaper_change_id)
|
||||||
|
|||||||
@@ -9,17 +9,15 @@ from baby_monitor.models.feeding import (
|
|||||||
FeedingResponse,
|
FeedingResponse,
|
||||||
)
|
)
|
||||||
from baby_monitor.routers.auth import verify_token
|
from baby_monitor.routers.auth import verify_token
|
||||||
from baby_monitor.repositories.feeding.sqlite_feeding import (
|
from baby_monitor.repositories.interfaces import (
|
||||||
SQLiteFeedingRepository,
|
ChildRepositoryInterface,
|
||||||
|
FeedingRepositoryInterface,
|
||||||
)
|
)
|
||||||
from baby_monitor.repositories.dependencies.get_feeding_repository import (
|
from baby_monitor.repositories.dependencies import (
|
||||||
get_feeding_repository,
|
get_feeding_repository,
|
||||||
)
|
|
||||||
from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
|
|
||||||
from baby_monitor.repositories.dependencies.get_child_repository import (
|
|
||||||
get_child_repository,
|
get_child_repository,
|
||||||
)
|
)
|
||||||
from baby_monitor.utils.access_control import verify_child_access
|
from baby_monitor.utils import verify_child_access
|
||||||
|
|
||||||
router = APIRouter(prefix="/api/feedings", tags=["feedings"])
|
router = APIRouter(prefix="/api/feedings", tags=["feedings"])
|
||||||
|
|
||||||
@@ -28,8 +26,10 @@ router = APIRouter(prefix="/api/feedings", tags=["feedings"])
|
|||||||
def create_feeding(
|
def create_feeding(
|
||||||
request: CreateFeedingRequest,
|
request: CreateFeedingRequest,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
|
feeding_repo: Annotated[
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
FeedingRepositoryInterface, Depends(get_feeding_repository)
|
||||||
|
],
|
||||||
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> FeedingResponse:
|
) -> FeedingResponse:
|
||||||
"""Create a new feeding log entry."""
|
"""Create a new feeding log entry."""
|
||||||
# Verify the child belongs to the authenticated user
|
# Verify the child belongs to the authenticated user
|
||||||
@@ -48,8 +48,10 @@ def create_feeding(
|
|||||||
@router.get("/active", response_model=FeedingResponse | None)
|
@router.get("/active", response_model=FeedingResponse | None)
|
||||||
def get_active_feeding(
|
def get_active_feeding(
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
|
feeding_repo: Annotated[
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
FeedingRepositoryInterface, Depends(get_feeding_repository)
|
||||||
|
],
|
||||||
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> FeedingResponse | None:
|
) -> FeedingResponse | None:
|
||||||
"""Get the current active feeding (where end_time is null) for the user."""
|
"""Get the current active feeding (where end_time is null) for the user."""
|
||||||
feedings = feeding_repo.get_by_user_id(user_id)
|
feedings = feeding_repo.get_by_user_id(user_id)
|
||||||
@@ -70,7 +72,9 @@ def get_active_feeding(
|
|||||||
@router.get("", response_model=list[FeedingResponse])
|
@router.get("", response_model=list[FeedingResponse])
|
||||||
def get_user_feedings(
|
def get_user_feedings(
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
|
feeding_repo: Annotated[
|
||||||
|
FeedingRepositoryInterface, Depends(get_feeding_repository)
|
||||||
|
],
|
||||||
) -> list[FeedingResponse]:
|
) -> list[FeedingResponse]:
|
||||||
"""Get all feeding logs for the authenticated user's children."""
|
"""Get all feeding logs for the authenticated user's children."""
|
||||||
feedings = feeding_repo.get_by_user_id(user_id)
|
feedings = feeding_repo.get_by_user_id(user_id)
|
||||||
@@ -81,8 +85,10 @@ def get_user_feedings(
|
|||||||
def get_feeding(
|
def get_feeding(
|
||||||
feeding_id: int,
|
feeding_id: int,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
|
feeding_repo: Annotated[
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
FeedingRepositoryInterface, Depends(get_feeding_repository)
|
||||||
|
],
|
||||||
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> FeedingResponse:
|
) -> FeedingResponse:
|
||||||
"""Get a specific feeding log by ID."""
|
"""Get a specific feeding log by ID."""
|
||||||
feeding = feeding_repo.get_by_id(feeding_id)
|
feeding = feeding_repo.get_by_id(feeding_id)
|
||||||
@@ -101,8 +107,10 @@ def update_feeding(
|
|||||||
feeding_id: int,
|
feeding_id: int,
|
||||||
request: UpdateFeedingRequest,
|
request: UpdateFeedingRequest,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
|
feeding_repo: Annotated[
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
FeedingRepositoryInterface, Depends(get_feeding_repository)
|
||||||
|
],
|
||||||
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> FeedingResponse:
|
) -> FeedingResponse:
|
||||||
"""Update a feeding log entry."""
|
"""Update a feeding log entry."""
|
||||||
feeding = feeding_repo.get_by_id(feeding_id)
|
feeding = feeding_repo.get_by_id(feeding_id)
|
||||||
@@ -114,11 +122,12 @@ def update_feeding(
|
|||||||
verify_child_access(child_repo, feeding["child_id"], user_id)
|
verify_child_access(child_repo, feeding["child_id"], user_id)
|
||||||
|
|
||||||
# Update the feeding
|
# Update the feeding
|
||||||
|
feeding_type_value = request.feeding_type.value if request.feeding_type else None
|
||||||
updated_feeding = feeding_repo.update(
|
updated_feeding = feeding_repo.update(
|
||||||
feeding_id=feeding_id,
|
feeding_id=feeding_id,
|
||||||
start_time=request.start_time,
|
start_time=request.start_time,
|
||||||
end_time=request.end_time,
|
end_time=request.end_time,
|
||||||
feeding_type=request.feeding_type.value if request.feeding_type else None,
|
feeding_type=feeding_type_value,
|
||||||
)
|
)
|
||||||
|
|
||||||
if not updated_feeding:
|
if not updated_feeding:
|
||||||
@@ -131,8 +140,10 @@ def update_feeding(
|
|||||||
def delete_feeding(
|
def delete_feeding(
|
||||||
feeding_id: int,
|
feeding_id: int,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
|
feeding_repo: Annotated[
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
FeedingRepositoryInterface, Depends(get_feeding_repository)
|
||||||
|
],
|
||||||
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Delete a feeding log entry."""
|
"""Delete a feeding log entry."""
|
||||||
feeding = feeding_repo.get_by_id(feeding_id)
|
feeding = feeding_repo.get_by_id(feeding_id)
|
||||||
|
|||||||
@@ -9,15 +9,15 @@ from baby_monitor.models.sleep import (
|
|||||||
SleepResponse,
|
SleepResponse,
|
||||||
)
|
)
|
||||||
from baby_monitor.routers.auth import verify_token
|
from baby_monitor.routers.auth import verify_token
|
||||||
from baby_monitor.repositories.sleep.sqlite_sleep import SQLiteSleepRepository
|
from baby_monitor.repositories.interfaces import (
|
||||||
from baby_monitor.repositories.dependencies.get_sleep_repository import (
|
SleepRepositoryInterface,
|
||||||
get_sleep_repository,
|
ChildRepositoryInterface,
|
||||||
)
|
)
|
||||||
from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
|
from baby_monitor.repositories.dependencies import (
|
||||||
from baby_monitor.repositories.dependencies.get_child_repository import (
|
get_sleep_repository,
|
||||||
get_child_repository,
|
get_child_repository,
|
||||||
)
|
)
|
||||||
from baby_monitor.utils.access_control import verify_child_access
|
from baby_monitor.utils import verify_child_access
|
||||||
|
|
||||||
router = APIRouter(prefix="/api/sleep", tags=["sleep"])
|
router = APIRouter(prefix="/api/sleep", tags=["sleep"])
|
||||||
|
|
||||||
@@ -26,8 +26,8 @@ router = APIRouter(prefix="/api/sleep", tags=["sleep"])
|
|||||||
def create_sleep(
|
def create_sleep(
|
||||||
request: CreateSleepRequest,
|
request: CreateSleepRequest,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
|
sleep_repo: Annotated[SleepRepositoryInterface, Depends(get_sleep_repository)],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> SleepResponse:
|
) -> SleepResponse:
|
||||||
"""Create a new sleep log entry."""
|
"""Create a new sleep log entry."""
|
||||||
# Verify the child belongs to the authenticated user
|
# Verify the child belongs to the authenticated user
|
||||||
@@ -44,8 +44,8 @@ def create_sleep(
|
|||||||
@router.get("/active", response_model=SleepResponse | None)
|
@router.get("/active", response_model=SleepResponse | None)
|
||||||
def get_active_sleep(
|
def get_active_sleep(
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
|
sleep_repo: Annotated[SleepRepositoryInterface, Depends(get_sleep_repository)],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> SleepResponse | None:
|
) -> SleepResponse | None:
|
||||||
"""Get the current active sleep (where end_time is null) for the user."""
|
"""Get the current active sleep (where end_time is null) for the user."""
|
||||||
sleeps = sleep_repo.get_by_user_id(user_id)
|
sleeps = sleep_repo.get_by_user_id(user_id)
|
||||||
@@ -66,7 +66,7 @@ def get_active_sleep(
|
|||||||
@router.get("", response_model=list[SleepResponse])
|
@router.get("", response_model=list[SleepResponse])
|
||||||
def get_user_sleeps(
|
def get_user_sleeps(
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
|
sleep_repo: Annotated[SleepRepositoryInterface, Depends(get_sleep_repository)],
|
||||||
) -> list[SleepResponse]:
|
) -> list[SleepResponse]:
|
||||||
"""Get all sleep logs for the authenticated user's children."""
|
"""Get all sleep logs for the authenticated user's children."""
|
||||||
sleeps = sleep_repo.get_by_user_id(user_id)
|
sleeps = sleep_repo.get_by_user_id(user_id)
|
||||||
@@ -77,8 +77,8 @@ def get_user_sleeps(
|
|||||||
def get_sleep(
|
def get_sleep(
|
||||||
sleep_id: int,
|
sleep_id: int,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
|
sleep_repo: Annotated[SleepRepositoryInterface, Depends(get_sleep_repository)],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> SleepResponse:
|
) -> SleepResponse:
|
||||||
"""Get a specific sleep log by ID."""
|
"""Get a specific sleep log by ID."""
|
||||||
sleep = sleep_repo.get_by_id(sleep_id)
|
sleep = sleep_repo.get_by_id(sleep_id)
|
||||||
@@ -97,8 +97,8 @@ def update_sleep(
|
|||||||
sleep_id: int,
|
sleep_id: int,
|
||||||
request: UpdateSleepRequest,
|
request: UpdateSleepRequest,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
|
sleep_repo: Annotated[SleepRepositoryInterface, Depends(get_sleep_repository)],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> SleepResponse:
|
) -> SleepResponse:
|
||||||
"""Update an existing sleep log."""
|
"""Update an existing sleep log."""
|
||||||
sleep = sleep_repo.get_by_id(sleep_id)
|
sleep = sleep_repo.get_by_id(sleep_id)
|
||||||
@@ -124,8 +124,8 @@ def update_sleep(
|
|||||||
def delete_sleep(
|
def delete_sleep(
|
||||||
sleep_id: int,
|
sleep_id: int,
|
||||||
user_id: Annotated[int, Depends(verify_token)],
|
user_id: Annotated[int, Depends(verify_token)],
|
||||||
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
|
sleep_repo: Annotated[SleepRepositoryInterface, Depends(get_sleep_repository)],
|
||||||
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
|
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Delete a sleep log."""
|
"""Delete a sleep log."""
|
||||||
sleep = sleep_repo.get_by_id(sleep_id)
|
sleep = sleep_repo.get_by_id(sleep_id)
|
||||||
|
|||||||
@@ -192,12 +192,20 @@
|
|||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<div id="skipOption" style="text-align: center; margin-top: 20px; display: none;">
|
<div
|
||||||
<p style="color: #666; font-size: 14px; margin-bottom: 10px;">
|
id="skipOption"
|
||||||
|
style="text-align: center; margin-top: 20px; display: none"
|
||||||
|
>
|
||||||
|
<p style="color: #666; font-size: 14px; margin-bottom: 10px">
|
||||||
Want to accept a child share invitation first?
|
Want to accept a child share invitation first?
|
||||||
</p>
|
</p>
|
||||||
<button type="button" class="button secondary" onclick="skipToHome()" style="margin: 0;">
|
<button
|
||||||
|
type="button"
|
||||||
|
class="button secondary"
|
||||||
|
onclick="skipToHome()"
|
||||||
|
style="margin: 0"
|
||||||
|
>
|
||||||
Skip for now
|
Skip for now
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -267,7 +267,8 @@
|
|||||||
|
|
||||||
let allDiaperChanges = [];
|
let allDiaperChanges = [];
|
||||||
let allChildren = [];
|
let allChildren = [];
|
||||||
let currentDaysRange = parseInt(localStorage.getItem("lastDiaperTimeRange")) || 7;
|
let currentDaysRange =
|
||||||
|
parseInt(localStorage.getItem("lastDiaperTimeRange")) || 7;
|
||||||
let selectedChildId = null; // null means "All Children"
|
let selectedChildId = null; // null means "All Children"
|
||||||
|
|
||||||
// Restore last selected child from localStorage
|
// Restore last selected child from localStorage
|
||||||
@@ -640,8 +641,8 @@
|
|||||||
// Create 8 three-hour buckets
|
// Create 8 three-hour buckets
|
||||||
for (let i = 7; i >= 0; i--) {
|
for (let i = 7; i >= 0; i--) {
|
||||||
const periodStart = new Date(now);
|
const periodStart = new Date(now);
|
||||||
periodStart.setHours(periodStart.getHours() - (i * 3), 0, 0, 0);
|
periodStart.setHours(periodStart.getHours() - i * 3, 0, 0, 0);
|
||||||
|
|
||||||
const periodEnd = new Date(periodStart);
|
const periodEnd = new Date(periodStart);
|
||||||
periodEnd.setHours(periodEnd.getHours() + 3);
|
periodEnd.setHours(periodEnd.getHours() + 3);
|
||||||
|
|
||||||
@@ -675,8 +676,8 @@
|
|||||||
// Show 8-hour aggregates for 3 days (9 buckets total)
|
// Show 8-hour aggregates for 3 days (9 buckets total)
|
||||||
for (let i = 8; i >= 0; i--) {
|
for (let i = 8; i >= 0; i--) {
|
||||||
const periodStart = new Date(now);
|
const periodStart = new Date(now);
|
||||||
periodStart.setHours(periodStart.getHours() - (i * 8), 0, 0, 0);
|
periodStart.setHours(periodStart.getHours() - i * 8, 0, 0, 0);
|
||||||
|
|
||||||
const periodEnd = new Date(periodStart);
|
const periodEnd = new Date(periodStart);
|
||||||
periodEnd.setHours(periodEnd.getHours() + 8);
|
periodEnd.setHours(periodEnd.getHours() + 8);
|
||||||
|
|
||||||
|
|||||||
@@ -304,7 +304,8 @@
|
|||||||
|
|
||||||
let allFeedings = [];
|
let allFeedings = [];
|
||||||
let allChildren = [];
|
let allChildren = [];
|
||||||
let currentDaysRange = parseInt(localStorage.getItem("lastFeedingTimeRange")) || 7;
|
let currentDaysRange =
|
||||||
|
parseInt(localStorage.getItem("lastFeedingTimeRange")) || 7;
|
||||||
let selectedChildId = null; // null means "All Children"
|
let selectedChildId = null; // null means "All Children"
|
||||||
let barChartInstance = null;
|
let barChartInstance = null;
|
||||||
|
|
||||||
@@ -672,15 +673,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Only use completed feedings
|
// Only use completed feedings
|
||||||
const completedFeedings = filteredFeedings.filter(f => f.end_time);
|
const completedFeedings = filteredFeedings.filter((f) => f.end_time);
|
||||||
|
|
||||||
// If 24 hours selected, show 3-hour aggregates
|
// If 24 hours selected, show 3-hour aggregates
|
||||||
if (currentDaysRange === 1) {
|
if (currentDaysRange === 1) {
|
||||||
// Create 8 three-hour buckets
|
// Create 8 three-hour buckets
|
||||||
for (let i = 7; i >= 0; i--) {
|
for (let i = 7; i >= 0; i--) {
|
||||||
const periodStart = new Date(now);
|
const periodStart = new Date(now);
|
||||||
periodStart.setHours(periodStart.getHours() - (i * 3), 0, 0, 0);
|
periodStart.setHours(periodStart.getHours() - i * 3, 0, 0, 0);
|
||||||
|
|
||||||
const periodEnd = new Date(periodStart);
|
const periodEnd = new Date(periodStart);
|
||||||
periodEnd.setHours(periodEnd.getHours() + 3);
|
periodEnd.setHours(periodEnd.getHours() + 3);
|
||||||
|
|
||||||
@@ -699,13 +700,13 @@
|
|||||||
const feedingDate = new Date(f.start_time);
|
const feedingDate = new Date(f.start_time);
|
||||||
return feedingDate >= periodStart && feedingDate < periodEnd;
|
return feedingDate >= periodStart && feedingDate < periodEnd;
|
||||||
});
|
});
|
||||||
|
|
||||||
const feedingDurations = periodFeedings.map(feeding => {
|
const feedingDurations = periodFeedings.map((feeding) => {
|
||||||
const start = new Date(feeding.start_time);
|
const start = new Date(feeding.start_time);
|
||||||
const end = new Date(feeding.end_time);
|
const end = new Date(feeding.end_time);
|
||||||
return (end - start) / 60000; // Convert to minutes
|
return (end - start) / 60000; // Convert to minutes
|
||||||
});
|
});
|
||||||
|
|
||||||
durations.push(feedingDurations);
|
durations.push(feedingDurations);
|
||||||
feedingCounts.push(periodFeedings.length);
|
feedingCounts.push(periodFeedings.length);
|
||||||
}
|
}
|
||||||
@@ -713,8 +714,8 @@
|
|||||||
// Show 8-hour aggregates for 3 days (9 buckets total)
|
// Show 8-hour aggregates for 3 days (9 buckets total)
|
||||||
for (let i = 8; i >= 0; i--) {
|
for (let i = 8; i >= 0; i--) {
|
||||||
const periodStart = new Date(now);
|
const periodStart = new Date(now);
|
||||||
periodStart.setHours(periodStart.getHours() - (i * 8), 0, 0, 0);
|
periodStart.setHours(periodStart.getHours() - i * 8, 0, 0, 0);
|
||||||
|
|
||||||
const periodEnd = new Date(periodStart);
|
const periodEnd = new Date(periodStart);
|
||||||
periodEnd.setHours(periodEnd.getHours() + 8);
|
periodEnd.setHours(periodEnd.getHours() + 8);
|
||||||
|
|
||||||
@@ -739,13 +740,13 @@
|
|||||||
const feedingDate = new Date(f.start_time);
|
const feedingDate = new Date(f.start_time);
|
||||||
return feedingDate >= periodStart && feedingDate < periodEnd;
|
return feedingDate >= periodStart && feedingDate < periodEnd;
|
||||||
});
|
});
|
||||||
|
|
||||||
const feedingDurations = periodFeedings.map(feeding => {
|
const feedingDurations = periodFeedings.map((feeding) => {
|
||||||
const start = new Date(feeding.start_time);
|
const start = new Date(feeding.start_time);
|
||||||
const end = new Date(feeding.end_time);
|
const end = new Date(feeding.end_time);
|
||||||
return (end - start) / 60000; // Convert to minutes
|
return (end - start) / 60000; // Convert to minutes
|
||||||
});
|
});
|
||||||
|
|
||||||
durations.push(feedingDurations);
|
durations.push(feedingDurations);
|
||||||
feedingCounts.push(periodFeedings.length);
|
feedingCounts.push(periodFeedings.length);
|
||||||
}
|
}
|
||||||
@@ -770,13 +771,13 @@
|
|||||||
const feedingDate = new Date(f.start_time);
|
const feedingDate = new Date(f.start_time);
|
||||||
return feedingDate >= date && feedingDate < nextDay;
|
return feedingDate >= date && feedingDate < nextDay;
|
||||||
});
|
});
|
||||||
|
|
||||||
const feedingDurations = dayFeedings.map(feeding => {
|
const feedingDurations = dayFeedings.map((feeding) => {
|
||||||
const start = new Date(feeding.start_time);
|
const start = new Date(feeding.start_time);
|
||||||
const end = new Date(feeding.end_time);
|
const end = new Date(feeding.end_time);
|
||||||
return (end - start) / 60000; // Convert to minutes
|
return (end - start) / 60000; // Convert to minutes
|
||||||
});
|
});
|
||||||
|
|
||||||
durations.push(feedingDurations);
|
durations.push(feedingDurations);
|
||||||
feedingCounts.push(dayFeedings.length);
|
feedingCounts.push(dayFeedings.length);
|
||||||
}
|
}
|
||||||
@@ -794,7 +795,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Find the maximum number of feedings in any period
|
// Find the maximum number of feedings in any period
|
||||||
const maxFeedings = Math.max(...chartData.durations.map(d => d.length), 0);
|
const maxFeedings = Math.max(
|
||||||
|
...chartData.durations.map((d) => d.length),
|
||||||
|
0,
|
||||||
|
);
|
||||||
|
|
||||||
// If no feedings at all, show empty chart
|
// If no feedings at all, show empty chart
|
||||||
if (maxFeedings === 0) {
|
if (maxFeedings === 0) {
|
||||||
@@ -802,11 +806,13 @@
|
|||||||
type: "bar",
|
type: "bar",
|
||||||
data: {
|
data: {
|
||||||
labels: chartData.labels,
|
labels: chartData.labels,
|
||||||
datasets: [{
|
datasets: [
|
||||||
label: "No Data",
|
{
|
||||||
data: new Array(chartData.labels.length).fill(0),
|
label: "No Data",
|
||||||
backgroundColor: "rgba(102, 126, 234, 0.3)",
|
data: new Array(chartData.labels.length).fill(0),
|
||||||
}],
|
backgroundColor: "rgba(102, 126, 234, 0.3)",
|
||||||
|
},
|
||||||
|
],
|
||||||
},
|
},
|
||||||
options: {
|
options: {
|
||||||
responsive: true,
|
responsive: true,
|
||||||
@@ -833,30 +839,32 @@
|
|||||||
|
|
||||||
// Create color palette for different feedings
|
// Create color palette for different feedings
|
||||||
const colors = [
|
const colors = [
|
||||||
'rgba(102, 126, 234, 0.8)',
|
"rgba(102, 126, 234, 0.8)",
|
||||||
'rgba(118, 75, 162, 0.8)',
|
"rgba(118, 75, 162, 0.8)",
|
||||||
'rgba(255, 159, 64, 0.8)',
|
"rgba(255, 159, 64, 0.8)",
|
||||||
'rgba(76, 175, 80, 0.8)',
|
"rgba(76, 175, 80, 0.8)",
|
||||||
'rgba(244, 67, 54, 0.8)',
|
"rgba(244, 67, 54, 0.8)",
|
||||||
'rgba(156, 39, 176, 0.8)',
|
"rgba(156, 39, 176, 0.8)",
|
||||||
'rgba(102, 126, 234, 0.6)',
|
"rgba(102, 126, 234, 0.6)",
|
||||||
'rgba(118, 75, 162, 0.6)',
|
"rgba(118, 75, 162, 0.6)",
|
||||||
'rgba(255, 159, 64, 0.6)',
|
"rgba(255, 159, 64, 0.6)",
|
||||||
'rgba(76, 175, 80, 0.6)',
|
"rgba(76, 175, 80, 0.6)",
|
||||||
];
|
];
|
||||||
|
|
||||||
// Create datasets - one for each feeding position
|
// Create datasets - one for each feeding position
|
||||||
const datasets = [];
|
const datasets = [];
|
||||||
for (let feedingIndex = 0; feedingIndex < maxFeedings; feedingIndex++) {
|
for (let feedingIndex = 0; feedingIndex < maxFeedings; feedingIndex++) {
|
||||||
const dataForFeeding = chartData.durations.map(periodDurations =>
|
const dataForFeeding = chartData.durations.map(
|
||||||
periodDurations[feedingIndex] || 0
|
(periodDurations) => periodDurations[feedingIndex] || 0,
|
||||||
);
|
);
|
||||||
|
|
||||||
datasets.push({
|
datasets.push({
|
||||||
label: `Feeding ${feedingIndex + 1}`,
|
label: `Feeding ${feedingIndex + 1}`,
|
||||||
data: dataForFeeding,
|
data: dataForFeeding,
|
||||||
backgroundColor: colors[feedingIndex % colors.length],
|
backgroundColor: colors[feedingIndex % colors.length],
|
||||||
borderColor: colors[feedingIndex % colors.length].replace('0.8', '1').replace('0.6', '1'),
|
borderColor: colors[feedingIndex % colors.length]
|
||||||
|
.replace("0.8", "1")
|
||||||
|
.replace("0.6", "1"),
|
||||||
borderWidth: 1,
|
borderWidth: 1,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -897,9 +905,9 @@
|
|||||||
font: {
|
font: {
|
||||||
size: 12,
|
size: 12,
|
||||||
},
|
},
|
||||||
callback: function(value) {
|
callback: function (value) {
|
||||||
return Math.round(value) + 'm';
|
return Math.round(value) + "m";
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
grid: {
|
grid: {
|
||||||
color: "rgba(0, 0, 0, 0.05)",
|
color: "rgba(0, 0, 0, 0.05)",
|
||||||
@@ -920,17 +928,19 @@
|
|||||||
size: 13,
|
size: 13,
|
||||||
},
|
},
|
||||||
callbacks: {
|
callbacks: {
|
||||||
label: function(context) {
|
label: function (context) {
|
||||||
const minutes = Math.round(context.parsed.y);
|
const minutes = Math.round(context.parsed.y);
|
||||||
return `${context.dataset.label}: ${minutes}m`;
|
return `${context.dataset.label}: ${minutes}m`;
|
||||||
},
|
},
|
||||||
footer: function(tooltipItems) {
|
footer: function (tooltipItems) {
|
||||||
const periodIndex = tooltipItems[0].dataIndex;
|
const periodIndex = tooltipItems[0].dataIndex;
|
||||||
const totalMinutes = chartData.durations[periodIndex].reduce((sum, val) => sum + val, 0);
|
const totalMinutes = chartData.durations[
|
||||||
|
periodIndex
|
||||||
|
].reduce((sum, val) => sum + val, 0);
|
||||||
const feedingCount = chartData.feedingCounts[periodIndex];
|
const feedingCount = chartData.feedingCounts[periodIndex];
|
||||||
return `Total: ${Math.round(totalMinutes)}m (${feedingCount} feeding${feedingCount !== 1 ? 's' : ''})`;
|
return `Total: ${Math.round(totalMinutes)}m (${feedingCount} feeding${feedingCount !== 1 ? "s" : ""})`;
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -547,15 +547,15 @@
|
|||||||
const sessionCounts = []; // For reference
|
const sessionCounts = []; // For reference
|
||||||
|
|
||||||
// Only use completed sleep sessions
|
// Only use completed sleep sessions
|
||||||
const completedSessions = sleepSessions.filter(s => s.end_time);
|
const completedSessions = sleepSessions.filter((s) => s.end_time);
|
||||||
|
|
||||||
// If 24 hours selected, show 3-hour aggregates
|
// If 24 hours selected, show 3-hour aggregates
|
||||||
if (timeRange === 1) {
|
if (timeRange === 1) {
|
||||||
// Create 8 three-hour buckets
|
// Create 8 three-hour buckets
|
||||||
for (let i = 7; i >= 0; i--) {
|
for (let i = 7; i >= 0; i--) {
|
||||||
const periodStart = new Date(now);
|
const periodStart = new Date(now);
|
||||||
periodStart.setHours(periodStart.getHours() - (i * 3), 0, 0, 0);
|
periodStart.setHours(periodStart.getHours() - i * 3, 0, 0, 0);
|
||||||
|
|
||||||
const periodEnd = new Date(periodStart);
|
const periodEnd = new Date(periodStart);
|
||||||
periodEnd.setHours(periodEnd.getHours() + 3);
|
periodEnd.setHours(periodEnd.getHours() + 3);
|
||||||
|
|
||||||
@@ -574,11 +574,12 @@
|
|||||||
const startDate = new Date(session.start_time);
|
const startDate = new Date(session.start_time);
|
||||||
return startDate >= periodStart && startDate < periodEnd;
|
return startDate >= periodStart && startDate < periodEnd;
|
||||||
});
|
});
|
||||||
|
|
||||||
const sessionDurations = periodSessions.map(session =>
|
const sessionDurations = periodSessions.map(
|
||||||
calculateDuration(session.start_time, session.end_time) / 60
|
(session) =>
|
||||||
|
calculateDuration(session.start_time, session.end_time) / 60,
|
||||||
);
|
);
|
||||||
|
|
||||||
durations.push(sessionDurations);
|
durations.push(sessionDurations);
|
||||||
sessionCounts.push(periodSessions.length);
|
sessionCounts.push(periodSessions.length);
|
||||||
}
|
}
|
||||||
@@ -586,8 +587,8 @@
|
|||||||
// Show 8-hour aggregates for 3 days (9 buckets total)
|
// Show 8-hour aggregates for 3 days (9 buckets total)
|
||||||
for (let i = 8; i >= 0; i--) {
|
for (let i = 8; i >= 0; i--) {
|
||||||
const periodStart = new Date(now);
|
const periodStart = new Date(now);
|
||||||
periodStart.setHours(periodStart.getHours() - (i * 8), 0, 0, 0);
|
periodStart.setHours(periodStart.getHours() - i * 8, 0, 0, 0);
|
||||||
|
|
||||||
const periodEnd = new Date(periodStart);
|
const periodEnd = new Date(periodStart);
|
||||||
periodEnd.setHours(periodEnd.getHours() + 8);
|
periodEnd.setHours(periodEnd.getHours() + 8);
|
||||||
|
|
||||||
@@ -612,11 +613,12 @@
|
|||||||
const startDate = new Date(session.start_time);
|
const startDate = new Date(session.start_time);
|
||||||
return startDate >= periodStart && startDate < periodEnd;
|
return startDate >= periodStart && startDate < periodEnd;
|
||||||
});
|
});
|
||||||
|
|
||||||
const sessionDurations = periodSessions.map(session =>
|
const sessionDurations = periodSessions.map(
|
||||||
calculateDuration(session.start_time, session.end_time) / 60
|
(session) =>
|
||||||
|
calculateDuration(session.start_time, session.end_time) / 60,
|
||||||
);
|
);
|
||||||
|
|
||||||
durations.push(sessionDurations);
|
durations.push(sessionDurations);
|
||||||
sessionCounts.push(periodSessions.length);
|
sessionCounts.push(periodSessions.length);
|
||||||
}
|
}
|
||||||
@@ -641,29 +643,39 @@
|
|||||||
const startDate = new Date(session.start_time);
|
const startDate = new Date(session.start_time);
|
||||||
return startDate >= date && startDate < nextDay;
|
return startDate >= date && startDate < nextDay;
|
||||||
});
|
});
|
||||||
|
|
||||||
const sessionDurations = daySessions.map(session => {
|
const sessionDurations = daySessions.map((session) => {
|
||||||
const dur = calculateDuration(session.start_time, session.end_time) / 60;
|
const dur =
|
||||||
console.log(` Session: ${session.start_time} to ${session.end_time}, duration: ${dur} hours (${calculateDuration(session.start_time, session.end_time)} minutes)`);
|
calculateDuration(session.start_time, session.end_time) / 60;
|
||||||
|
console.log(
|
||||||
|
` Session: ${session.start_time} to ${session.end_time}, duration: ${dur} hours (${calculateDuration(session.start_time, session.end_time)} minutes)`,
|
||||||
|
);
|
||||||
return dur;
|
return dur;
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log(`${dateStr}: ${daySessions.length} sessions, durations:`, sessionDurations);
|
console.log(
|
||||||
|
`${dateStr}: ${daySessions.length} sessions, durations:`,
|
||||||
|
sessionDurations,
|
||||||
|
);
|
||||||
|
|
||||||
durations.push(sessionDurations);
|
durations.push(sessionDurations);
|
||||||
sessionCounts.push(daySessions.length);
|
sessionCounts.push(daySessions.length);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('Final prepareBarChartData result:', { labels, durations, sessionCounts });
|
console.log("Final prepareBarChartData result:", {
|
||||||
|
labels,
|
||||||
|
durations,
|
||||||
|
sessionCounts,
|
||||||
|
});
|
||||||
|
|
||||||
// Log the actual duration values for debugging
|
// Log the actual duration values for debugging
|
||||||
durations.forEach((periodDurations, idx) => {
|
durations.forEach((periodDurations, idx) => {
|
||||||
if (periodDurations.length > 0) {
|
if (periodDurations.length > 0) {
|
||||||
console.log(` ${labels[idx]}: durations =`, periodDurations);
|
console.log(` ${labels[idx]}: durations =`, periodDurations);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return { labels, durations, sessionCounts };
|
return { labels, durations, sessionCounts };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -699,31 +711,36 @@
|
|||||||
|
|
||||||
function renderBarChart(chartData) {
|
function renderBarChart(chartData) {
|
||||||
const ctx = document.getElementById("barChart");
|
const ctx = document.getElementById("barChart");
|
||||||
|
|
||||||
// Destroy existing chart if it exists
|
// Destroy existing chart if it exists
|
||||||
if (barChartInstance) {
|
if (barChartInstance) {
|
||||||
barChartInstance.destroy();
|
barChartInstance.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Debug: Log the data
|
// Debug: Log the data
|
||||||
console.log('Bar chart data:', chartData);
|
console.log("Bar chart data:", chartData);
|
||||||
|
|
||||||
// Find the maximum number of sessions in any period
|
// Find the maximum number of sessions in any period
|
||||||
const maxSessions = Math.max(...chartData.durations.map(d => d.length), 0);
|
const maxSessions = Math.max(
|
||||||
|
...chartData.durations.map((d) => d.length),
|
||||||
console.log('Max sessions:', maxSessions);
|
0,
|
||||||
|
);
|
||||||
|
|
||||||
|
console.log("Max sessions:", maxSessions);
|
||||||
|
|
||||||
// If no sessions at all, show empty chart
|
// If no sessions at all, show empty chart
|
||||||
if (maxSessions === 0) {
|
if (maxSessions === 0) {
|
||||||
barChartInstance = new Chart(ctx, {
|
barChartInstance = new Chart(ctx, {
|
||||||
type: "bar",
|
type: "bar",
|
||||||
data: {
|
data: {
|
||||||
labels: chartData.labels,
|
labels: chartData.labels,
|
||||||
datasets: [{
|
datasets: [
|
||||||
label: "No Data",
|
{
|
||||||
data: new Array(chartData.labels.length).fill(0),
|
label: "No Data",
|
||||||
backgroundColor: "rgba(79, 172, 254, 0.3)",
|
data: new Array(chartData.labels.length).fill(0),
|
||||||
}],
|
backgroundColor: "rgba(79, 172, 254, 0.3)",
|
||||||
|
},
|
||||||
|
],
|
||||||
},
|
},
|
||||||
options: {
|
options: {
|
||||||
responsive: true,
|
responsive: true,
|
||||||
@@ -747,57 +764,64 @@
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create color palette for different sessions
|
// Create color palette for different sessions
|
||||||
const colors = [
|
const colors = [
|
||||||
'rgba(79, 172, 254, 0.8)',
|
"rgba(79, 172, 254, 0.8)",
|
||||||
'rgba(0, 242, 254, 0.8)',
|
"rgba(0, 242, 254, 0.8)",
|
||||||
'rgba(58, 155, 232, 0.8)',
|
"rgba(58, 155, 232, 0.8)",
|
||||||
'rgba(32, 137, 220, 0.8)',
|
"rgba(32, 137, 220, 0.8)",
|
||||||
'rgba(21, 119, 208, 0.8)',
|
"rgba(21, 119, 208, 0.8)",
|
||||||
'rgba(11, 101, 196, 0.8)',
|
"rgba(11, 101, 196, 0.8)",
|
||||||
'rgba(79, 172, 254, 0.6)',
|
"rgba(79, 172, 254, 0.6)",
|
||||||
'rgba(0, 242, 254, 0.6)',
|
"rgba(0, 242, 254, 0.6)",
|
||||||
'rgba(58, 155, 232, 0.6)',
|
"rgba(58, 155, 232, 0.6)",
|
||||||
'rgba(32, 137, 220, 0.6)',
|
"rgba(32, 137, 220, 0.6)",
|
||||||
];
|
];
|
||||||
|
|
||||||
// Create datasets - one for each session position
|
// Create datasets - one for each session position
|
||||||
const datasets = [];
|
const datasets = [];
|
||||||
for (let sessionIndex = 0; sessionIndex < maxSessions; sessionIndex++) {
|
for (let sessionIndex = 0; sessionIndex < maxSessions; sessionIndex++) {
|
||||||
const dataForSession = chartData.durations.map(periodDurations =>
|
const dataForSession = chartData.durations.map(
|
||||||
periodDurations[sessionIndex] || 0
|
(periodDurations) => periodDurations[sessionIndex] || 0,
|
||||||
);
|
);
|
||||||
|
|
||||||
console.log(`Session ${sessionIndex + 1} data:`, dataForSession);
|
console.log(`Session ${sessionIndex + 1} data:`, dataForSession);
|
||||||
|
|
||||||
datasets.push({
|
datasets.push({
|
||||||
label: `Session ${sessionIndex + 1}`,
|
label: `Session ${sessionIndex + 1}`,
|
||||||
data: dataForSession,
|
data: dataForSession,
|
||||||
backgroundColor: colors[sessionIndex % colors.length],
|
backgroundColor: colors[sessionIndex % colors.length],
|
||||||
borderColor: colors[sessionIndex % colors.length].replace('0.8', '1').replace('0.6', '1'),
|
borderColor: colors[sessionIndex % colors.length]
|
||||||
|
.replace("0.8", "1")
|
||||||
|
.replace("0.6", "1"),
|
||||||
borderWidth: 1,
|
borderWidth: 1,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('Datasets:', datasets);
|
console.log("Datasets:", datasets);
|
||||||
|
|
||||||
// Determine the maximum total duration across all periods (in hours)
|
// Determine the maximum total duration across all periods (in hours)
|
||||||
const maxDuration = Math.max(...chartData.durations.map(periodDurations =>
|
const maxDuration = Math.max(
|
||||||
periodDurations.reduce((sum, val) => sum + val, 0)
|
...chartData.durations.map((periodDurations) =>
|
||||||
), 0);
|
periodDurations.reduce((sum, val) => sum + val, 0),
|
||||||
|
),
|
||||||
console.log('Max duration (hours):', maxDuration);
|
0,
|
||||||
|
);
|
||||||
|
|
||||||
|
console.log("Max duration (hours):", maxDuration);
|
||||||
|
|
||||||
// Decide whether to use minutes or hours based on max duration
|
// Decide whether to use minutes or hours based on max duration
|
||||||
const useMinutes = maxDuration < 2; // Use minutes if max is less than 2 hours
|
const useMinutes = maxDuration < 2; // Use minutes if max is less than 2 hours
|
||||||
|
|
||||||
// Convert data to minutes if needed
|
// Convert data to minutes if needed
|
||||||
const finalDatasets = useMinutes ? datasets.map(dataset => ({
|
const finalDatasets = useMinutes
|
||||||
...dataset,
|
? datasets.map((dataset) => ({
|
||||||
data: dataset.data.map(hours => hours * 60) // Convert hours to minutes
|
...dataset,
|
||||||
})) : datasets;
|
data: dataset.data.map((hours) => hours * 60), // Convert hours to minutes
|
||||||
|
}))
|
||||||
|
: datasets;
|
||||||
|
|
||||||
barChartInstance = new Chart(ctx, {
|
barChartInstance = new Chart(ctx, {
|
||||||
type: "bar",
|
type: "bar",
|
||||||
data: {
|
data: {
|
||||||
@@ -819,13 +843,13 @@
|
|||||||
text: useMinutes ? "Minutes" : "Hours",
|
text: useMinutes ? "Minutes" : "Hours",
|
||||||
},
|
},
|
||||||
ticks: {
|
ticks: {
|
||||||
callback: function(value) {
|
callback: function (value) {
|
||||||
if (useMinutes) {
|
if (useMinutes) {
|
||||||
return Math.round(value) + 'm';
|
return Math.round(value) + "m";
|
||||||
} else {
|
} else {
|
||||||
return value.toFixed(1) + 'h';
|
return value.toFixed(1) + "h";
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -835,8 +859,10 @@
|
|||||||
},
|
},
|
||||||
tooltip: {
|
tooltip: {
|
||||||
callbacks: {
|
callbacks: {
|
||||||
label: function(context) {
|
label: function (context) {
|
||||||
const value = useMinutes ? context.parsed.y / 60 : context.parsed.y;
|
const value = useMinutes
|
||||||
|
? context.parsed.y / 60
|
||||||
|
: context.parsed.y;
|
||||||
const hours = Math.floor(value);
|
const hours = Math.floor(value);
|
||||||
const minutes = Math.round((value - hours) * 60);
|
const minutes = Math.round((value - hours) * 60);
|
||||||
if (hours === 0) {
|
if (hours === 0) {
|
||||||
@@ -844,18 +870,21 @@
|
|||||||
}
|
}
|
||||||
return `${context.dataset.label}: ${hours}h ${minutes}m`;
|
return `${context.dataset.label}: ${hours}h ${minutes}m`;
|
||||||
},
|
},
|
||||||
footer: function(tooltipItems) {
|
footer: function (tooltipItems) {
|
||||||
const periodIndex = tooltipItems[0].dataIndex;
|
const periodIndex = tooltipItems[0].dataIndex;
|
||||||
const totalHours = chartData.durations[periodIndex].reduce((sum, val) => sum + val, 0);
|
const totalHours = chartData.durations[periodIndex].reduce(
|
||||||
|
(sum, val) => sum + val,
|
||||||
|
0,
|
||||||
|
);
|
||||||
const hours = Math.floor(totalHours);
|
const hours = Math.floor(totalHours);
|
||||||
const minutes = Math.round((totalHours - hours) * 60);
|
const minutes = Math.round((totalHours - hours) * 60);
|
||||||
const sessionCount = chartData.sessionCounts[periodIndex];
|
const sessionCount = chartData.sessionCounts[periodIndex];
|
||||||
if (hours === 0) {
|
if (hours === 0) {
|
||||||
return `Total: ${minutes}m (${sessionCount} session${sessionCount !== 1 ? 's' : ''})`;
|
return `Total: ${minutes}m (${sessionCount} session${sessionCount !== 1 ? "s" : ""})`;
|
||||||
}
|
}
|
||||||
return `Total: ${hours}h ${minutes}m (${sessionCount} session${sessionCount !== 1 ? 's' : ''})`;
|
return `Total: ${hours}h ${minutes}m (${sessionCount} session${sessionCount !== 1 ? "s" : ""})`;
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -864,12 +893,12 @@
|
|||||||
|
|
||||||
function renderDurationChart(chartData) {
|
function renderDurationChart(chartData) {
|
||||||
const ctx = document.getElementById("durationChart");
|
const ctx = document.getElementById("durationChart");
|
||||||
|
|
||||||
// Destroy existing chart if it exists
|
// Destroy existing chart if it exists
|
||||||
if (durationChartInstance) {
|
if (durationChartInstance) {
|
||||||
durationChartInstance.destroy();
|
durationChartInstance.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
durationChartInstance = new Chart(ctx, {
|
durationChartInstance = new Chart(ctx, {
|
||||||
type: "pie",
|
type: "pie",
|
||||||
data: {
|
data: {
|
||||||
@@ -905,7 +934,7 @@
|
|||||||
if (avgDurationChartInstance) {
|
if (avgDurationChartInstance) {
|
||||||
avgDurationChartInstance.destroy();
|
avgDurationChartInstance.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
const days = {};
|
const days = {};
|
||||||
const today = new Date();
|
const today = new Date();
|
||||||
today.setHours(0, 0, 0, 0);
|
today.setHours(0, 0, 0, 0);
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
"""Utility functions for the baby monitor application."""
|
||||||
|
|
||||||
|
from .hash_password import hash_password
|
||||||
|
from .verify_child_access import verify_child_access
|
||||||
|
from .verify_password import verify_password
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"verify_child_access",
|
||||||
|
"hash_password",
|
||||||
|
"verify_password",
|
||||||
|
]
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
"""Definition of hash_password function."""
|
||||||
|
|
||||||
|
import bcrypt
|
||||||
|
|
||||||
|
|
||||||
|
def hash_password(password: str) -> str:
|
||||||
|
"""Hash a password using bcrypt.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
password: Plain text password to hash
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Hashed password as a string
|
||||||
|
"""
|
||||||
|
salt = bcrypt.gensalt()
|
||||||
|
hashed: bytes = bcrypt.hashpw(password.encode("utf-8"), salt)
|
||||||
|
return hashed.decode("utf-8")
|
||||||
+5
-3
@@ -1,11 +1,13 @@
|
|||||||
"""Access control utility functions for verifying resource ownership."""
|
"""Definition of verify_child_access function."""
|
||||||
|
|
||||||
from fastapi import HTTPException
|
from fastapi import HTTPException
|
||||||
from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
|
from baby_monitor.repositories.interfaces import (
|
||||||
|
ChildRepositoryInterface,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def verify_child_access(
|
def verify_child_access(
|
||||||
child_repo: SQLiteChildRepository, child_id: int, user_id: int
|
child_repo: ChildRepositoryInterface, child_id: int, user_id: int
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Verify that user has access to the child.
|
"""Verify that user has access to the child.
|
||||||
|
|
||||||
@@ -1,22 +1,8 @@
|
|||||||
"""Password hashing utilities using bcrypt."""
|
"""Definition of verify_password function."""
|
||||||
|
|
||||||
import bcrypt
|
import bcrypt
|
||||||
|
|
||||||
|
|
||||||
def hash_password(password: str) -> str:
|
|
||||||
"""Hash a password using bcrypt.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
password: Plain text password to hash
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Hashed password as a string
|
|
||||||
"""
|
|
||||||
salt = bcrypt.gensalt()
|
|
||||||
hashed: bytes = bcrypt.hashpw(password.encode("utf-8"), salt)
|
|
||||||
return hashed.decode("utf-8")
|
|
||||||
|
|
||||||
|
|
||||||
def verify_password(password: str, hashed_password: str) -> bool:
|
def verify_password(password: str, hashed_password: str) -> bool:
|
||||||
"""Verify a password against a hashed password.
|
"""Verify a password against a hashed password.
|
||||||
|
|
||||||
Reference in New Issue
Block a user