lino.mlv/MokPyo
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Correction of configuration and database models

Browse Source
This commit is contained in:
Lino Mallevaey
2025-08-19 12:18:05 +02:00
parent 756af47782
commit c30ce3af56
3 changed files with 97 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/core/config.py
View File

@@ -15,7 +15,6 @@ class Settings(BaseSettings):
DATABASE_USER: str DATABASE_USER: str
DATABASE_PASSWORD: str DATABASE_PASSWORD: str
DATABASE_NAME: str DATABASE_NAME: str
DATABASE_DRIVER: str
# ========================= # =========================
# FASTAPI # FASTAPI

2
app/db/__init__.py
View File

@@ -8,4 +8,4 @@ __version__ = "1.0.0"
from .engine import engine, async_engine from .engine import engine, async_engine
from .session import SessionLocal, AsyncSessionLocal, get_db, get_async_db from .session import SessionLocal, AsyncSessionLocal, get_db, get_async_db
from .models import Base from .models import *

141
app/db/models.py
View File

@@ -1,90 +1,134 @@
from datetime import date
from sqlalchemy import ( from sqlalchemy import (
sa, Column,
Column, Integer,
Integer, String,
String, Text,
Boolean, Boolean,
Date, Date,
DateTime,
Time,
Enum, Enum,
ForeignKey ForeignKey,
text,
) )
from sqlalchemy.orm import DeclarativeBase, relationship from sqlalchemy.orm import DeclarativeBase, relationship
# ----------------------------------------------------------------------
# Base class
# ----------------------------------------------------------------------
class Base(DeclarativeBase): class Base(DeclarativeBase):
pass pass
# ----------------------------------------------------------------------
# User
# ----------------------------------------------------------------------
class User(Base): class User(Base):
__tablename__ = "users" __tablename__ = "users"
id = Column(Integer, primary_key=True, index=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True, index=True)
email = Column(String, unique=True, index=True) email = Column(String(255), nullable=False, unique=True, index=True)
username = Column(String, unique=True, index=True) username = Column(String(150), nullable=False, unique=True, index=True)
hashed_password = Column(String) hashed_password = Column(String(255), nullable=False)
stats = Column(String)
is_active = Column(Boolean, default=True)
tasks = relationship("Item", back_populates="owner") # JSON est idéal pour stocker un dict, sinon utilise String + server_default
events = relationship("Event", back_populates="owner") stats = Column(Text, nullable=False)
goals = relationship("Goal", back_populates="owner")
sub_goals = relationship("SubGoal", back_populates="owner") # bool → TINYINT(1) avec server_default
notes = relationship("Note", back_populates="owner") is_active = Column(Boolean, nullable=False, server_default=text("1"))
# Relations
tasks = relationship("Task", back_populates="owner", cascade="all, delete-orphan")
events = relationship("Event", back_populates="owner", cascade="all, delete-orphan")
goals = relationship("Goal", back_populates="owner", cascade="all, delete-orphan")
sub_goals = relationship("SubGoal", back_populates="owner", cascade="all, delete-orphan")
notes = relationship("Note", back_populates="owner", cascade="all, delete-orphan")
# ----------------------------------------------------------------------
# Task
# ----------------------------------------------------------------------
class Task(Base): class Task(Base):
__tablename__ = "tasks" __tablename__ = "tasks"
id = Column(Integer, primary_key=True, index=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True, index=True)
description = Column(String, index=True, nullable=False) description = Column(String(255), nullable=False, index=True)
frequency = Column(Integer, default=4223, nullable=False) frequency = Column(Integer, nullable=False,
server_default=text("4223")) # valeur par défaut côté serveur
reward = Column(Integer, nullable=True) reward = Column(Integer, nullable=True)
goal_id = Column(Integer, ForeignKey("goals.id"), default=None, nullable=True)
goal_id = Column(Integer, ForeignKey("goals.id"), nullable=True)
owner_id = Column(Integer, ForeignKey("users.id"), nullable=False) owner_id = Column(Integer, ForeignKey("users.id"), nullable=False)
start_date = Column(Date, server_default=sa.text("CURRENT_DATE"), nullable=False) start_date = Column(Date, nullable=False)
next_date = Column(Date, nullable=True) next_date = Column(Date, nullable=True)
owner = relationship("User", back_populates="tasks") owner = relationship("User", back_populates="tasks")
goal = relationship("Goal", back_populates="tasks") goal = relationship("Goal", back_populates="tasks")
# ----------------------------------------------------------------------
# Event
# ----------------------------------------------------------------------
class Event(Base): class Event(Base):
__tablename__ = "events" __tablename__ = "events"
id = Column(Integer, primary_key=True, index=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True, index=True)
name = Column(String, index=True, nullable=False) name = Column(String(255), nullable=False, index=True) # texte court → String
description = Column(String, index=True, nullable=True) description = Column(String(255), nullable=True, index=True)
frequency = Column(Integer, default=4223, nullable=False) frequency = Column(Integer, nullable=False, server_default=text("4223"))
owner_id = Column(Integer, ForeignKey("users.id"), nullable=False) start_time = Column(Time, nullable=False)
end_time = Column(Time, nullable=False)
owner_id = Column(Integer, ForeignKey("users.id"), nullable=False)
owner = relationship("User", back_populates="events") owner = relationship("User", back_populates="events")
# ----------------------------------------------------------------------
# Goal
# ----------------------------------------------------------------------
class Goal(Base): class Goal(Base):
__tablename__ = "goals" __tablename__ = "goals"
id = Column(Integer, primary_key=True, index=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True, index=True)
title = Column(String, index=True, nullable=False) title = Column(String(255), nullable=False, index=True)
description = Column(String, index=True, nullable=True) description = Column(Text, nullable=True)
state = Column(Enum("in_progress", "successful", "failed", "aborted"), default="in_progress", nullable=False)
# Enum avec nom explicite
state = Column(
Enum("in_progress", "successful", "failed", "aborted",
name="goal_state"),
nullable=False,
server_default=text("'in_progress'")
)
owner_id = Column(Integer, ForeignKey("users.id"), nullable=False) owner_id = Column(Integer, ForeignKey("users.id"), nullable=False)
tasks = relationship("Task", back_populates="goal") tasks = relationship("Task", back_populates="goal", cascade="all, delete-orphan")
notes = relationship("Note", back_populates="goal") notes = relationship("Note", back_populates="goal", cascade="all, delete-orphan")
sub_goals = relationship("SubGoal", back_populates="goal") sub_goals = relationship("SubGoal", back_populates="goal", cascade="all, delete-orphan")
owner = relationship("User", back_populates="goals") owner = relationship("User", back_populates="goals")
# ----------------------------------------------------------------------
# SubGoal
# ----------------------------------------------------------------------
class SubGoal(Base): class SubGoal(Base):
__tablename__ = "sub_goals" __tablename__ = "sub_goals"
id = Column(Integer, primary_key=True, index=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True, index=True)
title = Column(String, index=True, nullable=False) title = Column(String(255), nullable=False, index=True)
description = Column(String, index=True, nullable=True) description = Column(Text, nullable=True)
state = Column(Enum("in_progress", "successful", "failed", "aborted"), default="in_progress", nullable=False)
state = Column(
Enum("in_progress", "successful", "failed", "aborted",
name="subgoal_state"),
nullable=False,
server_default=text("'in_progress'")
)
reward = Column(Integer, nullable=True) reward = Column(Integer, nullable=True)
goal_id = Column(Integer, ForeignKey("goals.id"), nullable=False) goal_id = Column(Integer, ForeignKey("goals.id"), nullable=False)
owner_id = Column(Integer, ForeignKey("users.id"), nullable=False) owner_id = Column(Integer, ForeignKey("users.id"), nullable=False)
@@ -92,19 +136,26 @@ class SubGoal(Base):
owner = relationship("User", back_populates="sub_goals") owner = relationship("User", back_populates="sub_goals")
# ----------------------------------------------------------------------
# Note
# ----------------------------------------------------------------------
class Note(Base): class Note(Base):
__tablename__ = "notes" __tablename__ = "notes"
id = Column(Integer, primary_key=True, index=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True, index=True)
title = Column(String, index=True, nullable=False) title = Column(String(255), nullable=False, index=True)
description = Column(String, index=True, nullable=True) description = Column(Text, nullable=True)
content = Column(String, index=True, nullable=True) content = Column(Text, nullable=True)
goal_id = Column(Integer, ForeignKey("goals.id"), nullable=True) goal_id = Column(Integer, ForeignKey("goals.id"), nullable=True)
owner_id = Column(Integer, ForeignKey("users.id"), nullable=False) owner_id = Column(Integer, ForeignKey("users.id"), nullable=False)
created_at = Column(Date, server_default=sa.text("CURRENT_DATE"), nullable=False) created_at = Column(DateTime, nullable=False)
updated_at = Column(Date, server_default=sa.text("CURRENT_DATE"), nullable=False) updated_at = Column(DateTime, nullable=False)
goal = relationship("Goal", back_populates="notes") goal = relationship("Goal", back_populates="notes")
owner = relationship("User", back_populates="notes") owner = relationship("User", back_populates="notes")
# --------------------------------------------------------------
__all__ = ["Base", "User", "Task", "Event", "Goal", "SubGoal", "Note"]