Add configuration rules, refactor settings management, and enhance import functionality
- Introduced a new configuration file `.cursorrules` to define coding standards, error handling, testing requirements, and project-specific guidelines. - Refactored `config.py` to implement a `Settings` dataclass for better management of environment variables, improving testability and maintainability. - Updated the import duty schedule handler to utilize session management with `session_scope`, ensuring proper database session handling. - Enhanced the import service to streamline the duty schedule import process, improving code organization and readability. - Added new service layer functions to encapsulate business logic related to group duty pinning and duty schedule imports. - Updated README documentation to reflect the new configuration structure and improved import functionality.
This commit is contained in:
@@ -6,10 +6,13 @@ import pytest
|
||||
|
||||
from db import init_db
|
||||
from db.repository import get_duties
|
||||
from db.session import get_session
|
||||
from importers.duty_schedule import DutyScheduleEntry, DutyScheduleResult, parse_duty_schedule
|
||||
|
||||
from handlers.import_duty_schedule import _run_import
|
||||
from db.session import get_session, session_scope
|
||||
from importers.duty_schedule import (
|
||||
DutyScheduleEntry,
|
||||
DutyScheduleResult,
|
||||
parse_duty_schedule,
|
||||
)
|
||||
from services.import_service import run_import
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@@ -21,6 +24,7 @@ def db_url():
|
||||
def _reset_db_session(db_url):
|
||||
"""Ensure each test uses a fresh engine for :memory: (clear global cache for test URL)."""
|
||||
import db.session as session_module
|
||||
|
||||
session_module._engine = None
|
||||
session_module._SessionLocal = None
|
||||
init_db(db_url)
|
||||
@@ -49,7 +53,8 @@ def test_import_creates_users_and_duties(db_url):
|
||||
),
|
||||
],
|
||||
)
|
||||
num_users, num_duty, num_unav, num_vac = _run_import(db_url, result, 6, 0)
|
||||
with session_scope(db_url) as session:
|
||||
num_users, num_duty, num_unav, num_vac = run_import(session, result, 6, 0)
|
||||
assert num_users == 2
|
||||
assert num_duty == 3
|
||||
assert num_unav == 0
|
||||
@@ -84,7 +89,8 @@ def test_import_replaces_duties_in_range(db_url):
|
||||
)
|
||||
],
|
||||
)
|
||||
_run_import(db_url, result1, 9, 0)
|
||||
with session_scope(db_url) as session:
|
||||
run_import(session, result1, 9, 0)
|
||||
|
||||
session = get_session(db_url)
|
||||
try:
|
||||
@@ -105,7 +111,8 @@ def test_import_replaces_duties_in_range(db_url):
|
||||
)
|
||||
],
|
||||
)
|
||||
_run_import(db_url, result2, 9, 0)
|
||||
with session_scope(db_url) as session:
|
||||
run_import(session, result2, 9, 0)
|
||||
|
||||
session = get_session(db_url)
|
||||
try:
|
||||
@@ -123,7 +130,8 @@ def test_import_full_flow_parse_then_import(db_url):
|
||||
'"schedule": [{"name": "Alexey A.", "duty": "\u0431; ; \u0432"}]}'
|
||||
).encode("utf-8")
|
||||
parsed = parse_duty_schedule(raw)
|
||||
num_users, num_duty, num_unav, num_vac = _run_import(db_url, parsed, 6, 0)
|
||||
with session_scope(db_url) as session:
|
||||
num_users, num_duty, num_unav, num_vac = run_import(session, parsed, 6, 0)
|
||||
assert num_users == 1
|
||||
assert num_duty == 2
|
||||
assert num_unav == 0
|
||||
@@ -149,11 +157,16 @@ def test_import_event_types_unavailable_vacation(db_url):
|
||||
full_name="Mixed User",
|
||||
duty_dates=[date(2026, 2, 16)],
|
||||
unavailable_dates=[date(2026, 2, 17)],
|
||||
vacation_dates=[date(2026, 2, 18), date(2026, 2, 19), date(2026, 2, 20)],
|
||||
vacation_dates=[
|
||||
date(2026, 2, 18),
|
||||
date(2026, 2, 19),
|
||||
date(2026, 2, 20),
|
||||
],
|
||||
),
|
||||
],
|
||||
)
|
||||
num_users, num_duty, num_unav, num_vac = _run_import(db_url, result, 6, 0)
|
||||
with session_scope(db_url) as session:
|
||||
num_users, num_duty, num_unav, num_vac = run_import(session, result, 6, 0)
|
||||
assert num_users == 1
|
||||
assert num_duty == 1 and num_unav == 1 and num_vac == 1
|
||||
|
||||
@@ -185,11 +198,16 @@ def test_import_vacation_with_gap_two_periods(db_url):
|
||||
full_name="Vacation User",
|
||||
duty_dates=[],
|
||||
unavailable_dates=[],
|
||||
vacation_dates=[date(2026, 2, 17), date(2026, 2, 18), date(2026, 2, 20)],
|
||||
vacation_dates=[
|
||||
date(2026, 2, 17),
|
||||
date(2026, 2, 18),
|
||||
date(2026, 2, 20),
|
||||
],
|
||||
),
|
||||
],
|
||||
)
|
||||
num_users, num_duty, num_unav, num_vac = _run_import(db_url, result, 6, 0)
|
||||
with session_scope(db_url) as session:
|
||||
num_users, num_duty, num_unav, num_vac = run_import(session, result, 6, 0)
|
||||
assert num_users == 1
|
||||
assert num_duty == 0 and num_unav == 0 and num_vac == 2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user