mirror of
https://github.com/DRYTRIX/TimeTracker.git
synced 2026-05-23 06:40:53 -05:00
Dries Peeters
b4486a627f
- Webhook models: remove duplicate index definitions so db.create_all() no longer raises 'index already exists' (columns already have index=True) - ImportService: fix circular import by late-importing ClientService, ProjectService, TimeTrackingService in __init__ - reports: fix F823 by renaming unpack variable _ to _entry_count to avoid shadowing gettext _ in export_task_excel() - Code quality: add .flake8 with extend-ignore so flake8 CI passes; simplify pyproject.toml isort config (drop unsupported options) - Format: run black and isort on app/ - tests: restore minimal app fixture in test_import_export_models
74 lines
2.7 KiB
Python
74 lines
2.7 KiB
Python
from datetime import datetime
|
|
from decimal import Decimal
|
|
|
|
from app import db
|
|
|
|
|
|
class RateOverride(db.Model):
|
|
"""Billable rate overrides per project and optionally per user.
|
|
|
|
Resolution precedence (highest to lowest) for effective hourly rate:
|
|
- RateOverride for (project_id, user_id)
|
|
- RateOverride for (project_id, user_id=None) # project default override
|
|
- Project.hourly_rate
|
|
- Client.default_hourly_rate
|
|
- 0
|
|
"""
|
|
|
|
__tablename__ = "rate_overrides"
|
|
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
project_id = db.Column(db.Integer, db.ForeignKey("projects.id"), nullable=False, index=True)
|
|
user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=True, index=True)
|
|
hourly_rate = db.Column(db.Numeric(9, 2), nullable=False)
|
|
effective_from = db.Column(db.Date, nullable=True)
|
|
effective_to = db.Column(db.Date, nullable=True)
|
|
|
|
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
|
|
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False)
|
|
|
|
__table_args__ = (
|
|
db.UniqueConstraint("project_id", "user_id", "effective_from", name="ux_rate_override_unique_window"),
|
|
)
|
|
|
|
@classmethod
|
|
def resolve_rate(cls, project, user_id=None, on_date=None):
|
|
"""Resolve effective hourly rate for a project/user at a given date."""
|
|
if not project:
|
|
return Decimal("0")
|
|
|
|
# Step 1: specific user override
|
|
q = cls.query.filter_by(project_id=project.id, user_id=user_id)
|
|
if on_date:
|
|
q = q.filter(
|
|
(cls.effective_from.is_(None) | (cls.effective_from <= on_date))
|
|
& (cls.effective_to.is_(None) | (cls.effective_to >= on_date))
|
|
)
|
|
user_ovr = q.order_by(cls.effective_from.desc().nullslast()).first()
|
|
if user_ovr:
|
|
return Decimal(user_ovr.hourly_rate)
|
|
|
|
# Step 2: project-level override
|
|
q = cls.query.filter_by(project_id=project.id, user_id=None)
|
|
if on_date:
|
|
q = q.filter(
|
|
(cls.effective_from.is_(None) | (cls.effective_from <= on_date))
|
|
& (cls.effective_to.is_(None) | (cls.effective_to >= on_date))
|
|
)
|
|
proj_ovr = q.order_by(cls.effective_from.desc().nullslast()).first()
|
|
if proj_ovr:
|
|
return Decimal(proj_ovr.hourly_rate)
|
|
|
|
# Step 3: project rate
|
|
if project.hourly_rate:
|
|
return Decimal(project.hourly_rate)
|
|
|
|
# Step 4: client default
|
|
try:
|
|
if project.client_obj and project.client_obj.default_hourly_rate:
|
|
return Decimal(project.client_obj.default_hourly_rate)
|
|
except Exception:
|
|
pass
|
|
|
|
return Decimal("0")
|