Compare commits

..

5 Commits

2 changed files with 33 additions and 44 deletions

View File

@ -34,6 +34,18 @@ from accounting import db
from accounting.locale import gettext
from accounting.utils.user import user_cls, user_pk_column
timestamp: t.Type[dt.datetime] \
= t.Annotated[dt.datetime, mapped_column(db.DateTime(timezone=True),
server_default=db.func.now())]
"""The timestamp."""
user_pk: t.Type[int] \
= t.Annotated[int, mapped_column(db.ForeignKey(user_pk_column,
onupdate="CASCADE"))]
"""The user primary key."""
random_pk: t.Type[int] \
= t.Annotated[int, mapped_column(primary_key=True, autoincrement=False)]
"""The random primary key."""
class BaseAccount(db.Model):
"""A base account."""
@ -114,21 +126,15 @@ class Account(db.Model):
"""The title."""
is_need_offset: Mapped[bool] = mapped_column(default=False)
"""Whether the journal entry line items of this account need offset."""
created_at: Mapped[dt.datetime] \
= mapped_column(db.DateTime(timezone=True),
server_default=db.func.now())
created_at: Mapped[timestamp]
"""The time of creation."""
created_by_id: Mapped[int] \
= mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
created_by_id: Mapped[user_pk] = mapped_column()
"""The ID of the creator."""
created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
"""The creator."""
updated_at: Mapped[dt.datetime] \
= mapped_column(db.DateTime(timezone=True),
server_default=db.func.now())
updated_at: Mapped[timestamp]
"""The time of last update."""
updated_by_id: Mapped[int] \
= mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
updated_by_id: Mapped[user_pk] = mapped_column()
"""The ID of the updator."""
updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
"""The updator."""
@ -370,21 +376,15 @@ class Currency(db.Model):
"""The code."""
name_l10n: Mapped[str] = mapped_column("name")
"""The name."""
created_at: Mapped[dt.datetime] \
= mapped_column(db.DateTime(timezone=True),
server_default=db.func.now())
created_at: Mapped[timestamp]
"""The time of creation."""
created_by_id: Mapped[int] \
= mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
created_by_id: Mapped[user_pk] = mapped_column()
"""The ID of the creator."""
created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
"""The creator."""
updated_at: Mapped[dt.datetime] \
= mapped_column(db.DateTime(timezone=True),
server_default=db.func.now())
updated_at: Mapped[timestamp]
"""The time of last update."""
updated_by_id: Mapped[int] \
= mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
updated_by_id: Mapped[user_pk] = mapped_column()
"""The ID of the updator."""
updated_by: Mapped[user_cls] \
= db.relationship(foreign_keys=updated_by_id)
@ -543,21 +543,15 @@ class JournalEntry(db.Model):
"""The account number under the date."""
note: Mapped[str | None]
"""The note."""
created_at: Mapped[dt.datetime] \
= mapped_column(db.DateTime(timezone=True),
server_default=db.func.now())
created_at: Mapped[timestamp]
"""The time of creation."""
created_by_id: Mapped[int] \
= mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
created_by_id: Mapped[user_pk] = mapped_column()
"""The ID of the creator."""
created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
"""The creator."""
updated_at: Mapped[dt.datetime] \
= mapped_column(db.DateTime(timezone=True),
server_default=db.func.now())
updated_at: Mapped[timestamp]
"""The time of last update."""
updated_by_id: Mapped[int] \
= mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
updated_by_id: Mapped[user_pk] = mapped_column()
"""The ID of the updator."""
updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
"""The updator."""
@ -883,21 +877,15 @@ class Option(db.Model):
"""The name."""
value: Mapped[str] = mapped_column(db.Text)
"""The option value."""
created_at: Mapped[dt.datetime] \
= mapped_column(db.DateTime(timezone=True),
server_default=db.func.now())
created_at: Mapped[timestamp]
"""The time of creation."""
created_by_id: Mapped[int] \
= mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
created_by_id: Mapped[user_pk] = mapped_column()
"""The ID of the creator."""
created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
"""The creator."""
updated_at: Mapped[dt.datetime] \
= mapped_column(db.DateTime(timezone=True),
server_default=db.func.now())
updated_at: Mapped[timestamp]
"""The time of last update."""
updated_by_id: Mapped[int] \
= mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
updated_by_id: Mapped[user_pk] = mapped_column()
"""The ID of the updator."""
updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
"""The updator."""

View File

@ -21,20 +21,21 @@ import typing as t
from flask import Blueprint, render_template, Flask, redirect, url_for, \
session, request, g, Response, abort
from sqlalchemy.orm import Mapped, mapped_column
from . import db
bp: Blueprint = Blueprint("auth", __name__, url_prefix="/")
"""The authentication blueprint."""
class User(db.Model):
"""A user."""
__tablename__ = "users"
"""The table name."""
id = db.Column(db.Integer, nullable=False, primary_key=True,
autoincrement=True)
"""The ID"""
username = db.Column(db.String, nullable=False, unique=True)
id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
"""The ID."""
username: Mapped[str] = mapped_column(unique=True)
"""The username."""
def __str__(self) -> str: