log schedule search requests
This commit is contained in:
parent
e7e8876714
commit
7e030d1059
4 changed files with 58 additions and 1 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -13,3 +13,4 @@ schedule_client.py
|
||||||
config.py
|
config.py
|
||||||
.env
|
.env
|
||||||
.venv
|
.venv
|
||||||
|
/schedule_requests.json*
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ from models.schedule import (
|
||||||
group_target,
|
group_target,
|
||||||
search_targets,
|
search_targets,
|
||||||
)
|
)
|
||||||
|
from models.schedule_request_log import append_schedule_request
|
||||||
from models.user import getAllUsers, validate
|
from models.user import getAllUsers, validate
|
||||||
from utils import convert
|
from utils import convert
|
||||||
|
|
||||||
|
|
@ -33,6 +34,10 @@ def start(message: Message):
|
||||||
if not search_target_kind:
|
if not search_target_kind:
|
||||||
return send(message, "Не удалось определить тип расписания по ссылке.")
|
return send(message, "Не удалось определить тип расписания по ссылке.")
|
||||||
search_query = convert.decode(query[3:])
|
search_query = convert.decode(query[3:])
|
||||||
|
try:
|
||||||
|
append_schedule_request(search_query)
|
||||||
|
except (OSError, ValueError) as error:
|
||||||
|
logger.error("Schedule", f"[{user.id}] Failed to save request: {error}")
|
||||||
try:
|
try:
|
||||||
results = search_targets(search_target_kind, search_query, limit=10)
|
results = search_targets(search_target_kind, search_query, limit=10)
|
||||||
except ScheduleAPIError as error:
|
except ScheduleAPIError as error:
|
||||||
|
|
@ -123,6 +128,10 @@ def _finish_registration(message: Message, group_name: str) -> None:
|
||||||
)
|
)
|
||||||
def selectGroupState(message: Message):
|
def selectGroupState(message: Message):
|
||||||
query = (message.text or "").strip()
|
query = (message.text or "").strip()
|
||||||
|
try:
|
||||||
|
append_schedule_request(query)
|
||||||
|
except (OSError, ValueError) as error:
|
||||||
|
logger.error("Schedule", f"[{message.from_user.id}] Failed to save request: {error}")
|
||||||
try:
|
try:
|
||||||
matches = find_main_groups(query)
|
matches = find_main_groups(query)
|
||||||
if len(matches) == 1 and group_exists(query):
|
if len(matches) == 1 and group_exists(query):
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ from models.schedule import (
|
||||||
generateWeekSchedule,
|
generateWeekSchedule,
|
||||||
search_targets,
|
search_targets,
|
||||||
)
|
)
|
||||||
|
from models.schedule_request_log import append_schedule_request
|
||||||
from models.user import User, validate
|
from models.user import User, validate
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -108,8 +109,13 @@ def search_query(message: Message):
|
||||||
return open_schedule_viewer(message, selected)
|
return open_schedule_viewer(message, selected)
|
||||||
|
|
||||||
kind = str(user.state).partition(":")[2]
|
kind = str(user.state).partition(":")[2]
|
||||||
|
query = message.text or ""
|
||||||
try:
|
try:
|
||||||
results = search_targets(kind, message.text or "", limit=10) # type: ignore
|
append_schedule_request(query)
|
||||||
|
except (OSError, ValueError) as error:
|
||||||
|
logger.error("Schedule", f"[{user.id}] Failed to save request: {error}")
|
||||||
|
try:
|
||||||
|
results = search_targets(kind, query, limit=10) # type: ignore
|
||||||
except ScheduleAPIError as error:
|
except ScheduleAPIError as error:
|
||||||
logger.error("Schedule", f"[{user.id}] {error}")
|
logger.error("Schedule", f"[{user.id}] {error}")
|
||||||
return send(message, "Сервер расписания сейчас недоступен. Попробуй ещё раз позже.")
|
return send(message, "Сервер расписания сейчас недоступен. Попробуй ещё раз позже.")
|
||||||
|
|
|
||||||
41
models/schedule_request_log.py
Normal file
41
models/schedule_request_log.py
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
import datetime
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import threading
|
||||||
|
from pathlib import Path
|
||||||
|
from zoneinfo import ZoneInfo
|
||||||
|
|
||||||
|
|
||||||
|
_MOSCOW = ZoneInfo("Europe/Moscow")
|
||||||
|
_LOG_PATH = Path("schedule_requests.json")
|
||||||
|
_LOCK = threading.RLock()
|
||||||
|
|
||||||
|
|
||||||
|
def append_schedule_request(request: str) -> None:
|
||||||
|
"""Append a user-entered schedule search to the persistent JSON history."""
|
||||||
|
value = request.strip()
|
||||||
|
if not value:
|
||||||
|
return
|
||||||
|
|
||||||
|
with _LOCK:
|
||||||
|
try:
|
||||||
|
with _LOG_PATH.open("r", encoding="utf-8") as file:
|
||||||
|
history = json.load(file)
|
||||||
|
except FileNotFoundError:
|
||||||
|
history = []
|
||||||
|
|
||||||
|
if not isinstance(history, list):
|
||||||
|
raise ValueError(f"{_LOG_PATH} must contain a JSON list")
|
||||||
|
|
||||||
|
history.append(
|
||||||
|
{
|
||||||
|
"time": datetime.datetime.now(_MOSCOW).isoformat(timespec="seconds"),
|
||||||
|
"request": value,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
temporary_path = _LOG_PATH.with_suffix(".json.tmp")
|
||||||
|
with temporary_path.open("w", encoding="utf-8") as file:
|
||||||
|
json.dump(history, file, ensure_ascii=False, indent=2)
|
||||||
|
file.write("\n")
|
||||||
|
os.replace(temporary_path, _LOG_PATH)
|
||||||
Loading…
Add table
Reference in a new issue