feat: Evotor + VK catalog sync, connections, and store/group filters
- Evotor catalog: background Celery task syncing stores/groups/products from Evotor API; UI pages with per-store and per-group sync toggles - VK connection: manual token + group ID entry with inline test button - Evotor connection: inline test button (calls /stores) - VK catalog: background task syncing VK Market albums and products; separate catalog UI at /vk-catalog/albums - SyncFilter extended to support entity_type=group with parent_entity_id - Migration 0004: vk_cached_albums + vk_cached_products tables - Beat schedule updated to run both refresh_catalog and refresh_vk_catalog - README updated with new schema, routes, tasks, and config Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
mguschin
252
web/routes/catalog.py
Normal file
252
web/routes/catalog.py
Normal file
@@ -0,0 +1,252 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi import APIRouter, Depends, Request
|
||||
from fastapi.responses import HTMLResponse, RedirectResponse
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from web.auth.session import get_current_user
|
||||
from web.config import settings
|
||||
from web.database import get_db
|
||||
from web.models.connections import CachedGroup, CachedProduct, CachedStore, SyncConfig, SyncFilter
|
||||
from web.templates_env import templates
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
def _get_or_create_sync_config(db: Session, user_id: int) -> SyncConfig:
|
||||
cfg = db.query(SyncConfig).filter_by(user_id=user_id).first()
|
||||
if not cfg:
|
||||
cfg = SyncConfig(user_id=user_id, is_enabled=True)
|
||||
db.add(cfg)
|
||||
db.flush()
|
||||
return cfg
|
||||
|
||||
|
||||
def _enabled_store_ids(db: Session, user_id: int) -> set[str] | None:
|
||||
"""Return set of enabled store evotor_ids, or None if no filters set (all enabled)."""
|
||||
cfg = db.query(SyncConfig).filter_by(user_id=user_id).first()
|
||||
if not cfg:
|
||||
return None
|
||||
filters = db.query(SyncFilter).filter_by(
|
||||
sync_config_id=cfg.id, entity_type="store", filter_mode="include"
|
||||
).all()
|
||||
if not filters:
|
||||
return None
|
||||
return {f.entity_id for f in filters}
|
||||
|
||||
|
||||
def _enabled_group_ids(db: Session, user_id: int, store_evotor_id: str) -> set[str] | None:
|
||||
"""Return set of enabled group evotor_ids for a store, or None if all enabled."""
|
||||
cfg = db.query(SyncConfig).filter_by(user_id=user_id).first()
|
||||
if not cfg:
|
||||
return None
|
||||
filters = db.query(SyncFilter).filter_by(
|
||||
sync_config_id=cfg.id, entity_type="group", filter_mode="include",
|
||||
parent_entity_id=store_evotor_id,
|
||||
).all()
|
||||
if not filters:
|
||||
return None
|
||||
return {f.entity_id for f in filters}
|
||||
|
||||
|
||||
def _render(request: Request, template: str, ctx: dict) -> HTMLResponse:
|
||||
ctx["request"] = request
|
||||
ctx.setdefault("jivosite_widget_id", settings.JIVOSITE_WIDGET_ID)
|
||||
return templates.TemplateResponse(ctx.pop("request"), template, ctx)
|
||||
|
||||
|
||||
@router.get("/catalog/stores")
|
||||
async def catalog_stores(request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
stores = (
|
||||
db.query(CachedStore)
|
||||
.filter(CachedStore.user_id == user.id)
|
||||
.order_by(CachedStore.name)
|
||||
.all()
|
||||
)
|
||||
enabled_ids = _enabled_store_ids(db, user.id)
|
||||
return _render(request, "catalog/stores.html", {
|
||||
"user": user,
|
||||
"stores": stores,
|
||||
"enabled_ids": enabled_ids, # None = all enabled, set = explicit list
|
||||
"refresh_interval": settings.CATALOG_REFRESH_INTERVAL_SECONDS,
|
||||
})
|
||||
|
||||
|
||||
@router.get("/catalog/stores/{store_evotor_id}/groups")
|
||||
async def catalog_groups(store_evotor_id: str, request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
store = (
|
||||
db.query(CachedStore)
|
||||
.filter(CachedStore.user_id == user.id, CachedStore.evotor_id == store_evotor_id)
|
||||
.first()
|
||||
)
|
||||
if not store:
|
||||
return RedirectResponse("/catalog/stores", 303)
|
||||
|
||||
groups = (
|
||||
db.query(CachedGroup)
|
||||
.filter(CachedGroup.user_id == user.id, CachedGroup.store_evotor_id == store_evotor_id)
|
||||
.order_by(CachedGroup.name)
|
||||
.all()
|
||||
)
|
||||
enabled_ids = _enabled_group_ids(db, user.id, store_evotor_id)
|
||||
return _render(request, "catalog/groups.html", {
|
||||
"user": user, "store": store, "groups": groups,
|
||||
"enabled_ids": enabled_ids,
|
||||
})
|
||||
|
||||
|
||||
@router.get("/catalog/stores/{store_evotor_id}/products")
|
||||
async def catalog_products(store_evotor_id: str, request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
store = (
|
||||
db.query(CachedStore)
|
||||
.filter(CachedStore.user_id == user.id, CachedStore.evotor_id == store_evotor_id)
|
||||
.first()
|
||||
)
|
||||
if not store:
|
||||
return RedirectResponse("/catalog/stores", 303)
|
||||
|
||||
group_id = request.query_params.get("group")
|
||||
q = db.query(CachedProduct).filter(
|
||||
CachedProduct.user_id == user.id,
|
||||
CachedProduct.store_evotor_id == store_evotor_id,
|
||||
)
|
||||
if group_id:
|
||||
q = q.filter(CachedProduct.group_evotor_id == group_id)
|
||||
|
||||
products = q.order_by(CachedProduct.name).all()
|
||||
groups = (
|
||||
db.query(CachedGroup)
|
||||
.filter(CachedGroup.user_id == user.id, CachedGroup.store_evotor_id == store_evotor_id)
|
||||
.order_by(CachedGroup.name)
|
||||
.all()
|
||||
)
|
||||
return _render(request, "catalog/products.html", {
|
||||
"user": user,
|
||||
"store": store,
|
||||
"products": products,
|
||||
"groups": groups,
|
||||
"group_id": group_id,
|
||||
})
|
||||
|
||||
|
||||
@router.post("/catalog/stores/{store_evotor_id}/toggle")
|
||||
async def catalog_store_toggle(store_evotor_id: str, request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
cfg = _get_or_create_sync_config(db, user.id)
|
||||
|
||||
# If no filters exist yet, that means all stores are implicitly enabled.
|
||||
# Toggling one store OFF means we create include-filters for all OTHER stores.
|
||||
existing = db.query(SyncFilter).filter_by(
|
||||
sync_config_id=cfg.id, entity_type="store", filter_mode="include"
|
||||
).all()
|
||||
existing_ids = {f.entity_id for f in existing}
|
||||
|
||||
if store_evotor_id in existing_ids:
|
||||
# Currently enabled → disable: remove its filter
|
||||
db.query(SyncFilter).filter_by(
|
||||
sync_config_id=cfg.id, entity_type="store",
|
||||
entity_id=store_evotor_id, filter_mode="include",
|
||||
).delete()
|
||||
else:
|
||||
if not existing_ids:
|
||||
# First toggle: seed include-filters for all OTHER stores
|
||||
all_stores = db.query(CachedStore).filter_by(user_id=user.id).all()
|
||||
now = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
for s in all_stores:
|
||||
if s.evotor_id == store_evotor_id:
|
||||
continue
|
||||
db.add(SyncFilter(
|
||||
sync_config_id=cfg.id,
|
||||
entity_type="store",
|
||||
entity_id=s.evotor_id,
|
||||
entity_name=s.name,
|
||||
filter_mode="include",
|
||||
created_at=now,
|
||||
))
|
||||
else:
|
||||
# Re-enable: add its filter back
|
||||
db.add(SyncFilter(
|
||||
sync_config_id=cfg.id,
|
||||
entity_type="store",
|
||||
entity_id=store_evotor_id,
|
||||
filter_mode="include",
|
||||
created_at=datetime.now(timezone.utc).replace(tzinfo=None),
|
||||
))
|
||||
|
||||
db.commit()
|
||||
return RedirectResponse("/catalog/stores", 303)
|
||||
|
||||
|
||||
@router.post("/catalog/stores/{store_evotor_id}/groups/{group_evotor_id}/toggle")
|
||||
async def catalog_group_toggle(
|
||||
store_evotor_id: str, group_evotor_id: str,
|
||||
request: Request, db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
cfg = _get_or_create_sync_config(db, user.id)
|
||||
|
||||
existing = db.query(SyncFilter).filter_by(
|
||||
sync_config_id=cfg.id, entity_type="group", filter_mode="include",
|
||||
parent_entity_id=store_evotor_id,
|
||||
).all()
|
||||
existing_ids = {f.entity_id for f in existing}
|
||||
|
||||
if group_evotor_id in existing_ids:
|
||||
db.query(SyncFilter).filter_by(
|
||||
sync_config_id=cfg.id, entity_type="group",
|
||||
entity_id=group_evotor_id, filter_mode="include",
|
||||
).delete()
|
||||
else:
|
||||
if not existing_ids:
|
||||
# First toggle: seed include-filters for all OTHER groups in this store
|
||||
all_groups = db.query(CachedGroup).filter_by(
|
||||
user_id=user.id, store_evotor_id=store_evotor_id,
|
||||
).all()
|
||||
now = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
for g in all_groups:
|
||||
if g.evotor_id == group_evotor_id:
|
||||
continue
|
||||
db.add(SyncFilter(
|
||||
sync_config_id=cfg.id,
|
||||
entity_type="group",
|
||||
entity_id=g.evotor_id,
|
||||
entity_name=g.name,
|
||||
filter_mode="include",
|
||||
parent_entity_id=store_evotor_id,
|
||||
created_at=now,
|
||||
))
|
||||
else:
|
||||
db.add(SyncFilter(
|
||||
sync_config_id=cfg.id,
|
||||
entity_type="group",
|
||||
entity_id=group_evotor_id,
|
||||
filter_mode="include",
|
||||
parent_entity_id=store_evotor_id,
|
||||
created_at=datetime.now(timezone.utc).replace(tzinfo=None),
|
||||
))
|
||||
|
||||
db.commit()
|
||||
return RedirectResponse(f"/catalog/stores/{store_evotor_id}/groups", 303)
|
||||
229
web/routes/connections.py
Normal file
229
web/routes/connections.py
Normal file
@@ -0,0 +1,229 @@
|
||||
import secrets
|
||||
from datetime import datetime, timezone
|
||||
|
||||
import httpx
|
||||
from fastapi import APIRouter, Depends, Request
|
||||
from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from web.auth.session import get_current_user
|
||||
from web.config import settings
|
||||
from web.database import get_db
|
||||
from web.models.connections import EvotorConnection, VkConnection
|
||||
from web.templates_env import templates
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
def _render(request: Request, template: str, ctx: dict) -> HTMLResponse:
|
||||
ctx["request"] = request
|
||||
ctx.setdefault("jivosite_widget_id", settings.JIVOSITE_WIDGET_ID)
|
||||
return templates.TemplateResponse(ctx.pop("request"), template, ctx)
|
||||
|
||||
|
||||
def _now() -> datetime:
|
||||
return datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
|
||||
|
||||
@router.get("/connections")
|
||||
async def connections_get(request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
evotor = db.query(EvotorConnection).filter_by(user_id=user.id).first()
|
||||
vk = db.query(VkConnection).filter_by(user_id=user.id).first()
|
||||
return _render(request, "connections.html", {"user": user, "evotor": evotor, "vk": vk})
|
||||
|
||||
|
||||
@router.post("/connections/evotor")
|
||||
async def connections_evotor_post(request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
form = await request.form()
|
||||
access_token = str(form.get("access_token", "")).strip()
|
||||
evotor_user_id = str(form.get("evotor_user_id", "")).strip() or None
|
||||
|
||||
if not access_token:
|
||||
evotor = db.query(EvotorConnection).filter_by(user_id=user.id).first()
|
||||
return _render(request, "connections.html", {
|
||||
"user": user,
|
||||
"evotor": evotor,
|
||||
"errors": ["API-токен обязателен"],
|
||||
})
|
||||
|
||||
now = _now()
|
||||
conn = db.query(EvotorConnection).filter_by(user_id=user.id).first()
|
||||
if conn:
|
||||
conn.access_token = access_token
|
||||
if evotor_user_id:
|
||||
conn.evotor_user_id = evotor_user_id
|
||||
conn.updated_at = now
|
||||
else:
|
||||
conn = EvotorConnection(
|
||||
user_id=user.id,
|
||||
evotor_user_id=evotor_user_id,
|
||||
access_token=access_token,
|
||||
api_token=secrets.token_urlsafe(32),
|
||||
connected_at=now,
|
||||
updated_at=now,
|
||||
)
|
||||
db.add(conn)
|
||||
|
||||
if evotor_user_id and not user.evotor_user_id:
|
||||
user.evotor_user_id = evotor_user_id
|
||||
|
||||
db.commit()
|
||||
return RedirectResponse("/connections?success=1", 303)
|
||||
|
||||
|
||||
@router.post("/connections/evotor/disconnect")
|
||||
async def connections_evotor_disconnect(request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
conn = db.query(EvotorConnection).filter_by(user_id=user.id).first()
|
||||
if conn:
|
||||
db.delete(conn)
|
||||
db.commit()
|
||||
return RedirectResponse("/connections", 303)
|
||||
|
||||
|
||||
@router.post("/connections/vk")
|
||||
async def connections_vk_post(request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
form = await request.form()
|
||||
access_token = str(form.get("access_token", "")).strip()
|
||||
vk_group_id = str(form.get("vk_group_id", "")).strip() or None
|
||||
|
||||
if not access_token:
|
||||
evotor = db.query(EvotorConnection).filter_by(user_id=user.id).first()
|
||||
vk = db.query(VkConnection).filter_by(user_id=user.id).first()
|
||||
return _render(request, "connections.html", {
|
||||
"user": user,
|
||||
"evotor": evotor,
|
||||
"vk": vk,
|
||||
"errors": ["Токен VK обязателен"],
|
||||
})
|
||||
|
||||
now = _now()
|
||||
conn = db.query(VkConnection).filter_by(user_id=user.id).first()
|
||||
if conn:
|
||||
conn.access_token = access_token
|
||||
if vk_group_id:
|
||||
conn.vk_user_id = vk_group_id
|
||||
conn.updated_at = now
|
||||
else:
|
||||
conn = VkConnection(
|
||||
user_id=user.id,
|
||||
access_token=access_token,
|
||||
vk_user_id=vk_group_id,
|
||||
connected_at=now,
|
||||
updated_at=now,
|
||||
)
|
||||
db.add(conn)
|
||||
|
||||
db.commit()
|
||||
return RedirectResponse("/connections?success=1", 303)
|
||||
|
||||
|
||||
@router.post("/connections/vk/disconnect")
|
||||
async def connections_vk_disconnect(request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
conn = db.query(VkConnection).filter_by(user_id=user.id).first()
|
||||
if conn:
|
||||
db.delete(conn)
|
||||
db.commit()
|
||||
return RedirectResponse("/connections", 303)
|
||||
|
||||
|
||||
@router.post("/connections/evotor/test")
|
||||
async def connections_evotor_test(request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return JSONResponse({"ok": False, "message": "Не авторизован"}, status_code=401)
|
||||
|
||||
conn = db.query(EvotorConnection).filter_by(user_id=user.id).first()
|
||||
if not conn:
|
||||
return JSONResponse({"ok": False, "message": "Подключение не настроено"})
|
||||
|
||||
try:
|
||||
r = httpx.get(
|
||||
"https://api.evotor.ru/stores",
|
||||
headers={
|
||||
"Authorization": f"Bearer {conn.access_token}",
|
||||
"Accept": "application/vnd.evotor.v2+json",
|
||||
},
|
||||
timeout=10,
|
||||
)
|
||||
if r.status_code == 200:
|
||||
data = r.json()
|
||||
items = data.get("items", data) if isinstance(data, dict) else data
|
||||
count = len(items) if isinstance(items, list) else "?"
|
||||
return JSONResponse({"ok": True, "message": f"Успешно. Найдено магазинов: {count}"})
|
||||
elif r.status_code == 401:
|
||||
return JSONResponse({"ok": False, "message": "Токен недействителен (401)"})
|
||||
else:
|
||||
return JSONResponse({"ok": False, "message": f"Ошибка API: HTTP {r.status_code}"})
|
||||
except httpx.TimeoutException:
|
||||
return JSONResponse({"ok": False, "message": "Таймаут запроса к Эвотор"})
|
||||
except Exception as e:
|
||||
return JSONResponse({"ok": False, "message": f"Ошибка: {e}"})
|
||||
|
||||
|
||||
@router.post("/connections/vk/test")
|
||||
async def connections_vk_test(request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return JSONResponse({"ok": False, "message": "Не авторизован"}, status_code=401)
|
||||
|
||||
conn = db.query(VkConnection).filter_by(user_id=user.id).first()
|
||||
if not conn:
|
||||
return JSONResponse({"ok": False, "message": "Подключение не настроено"})
|
||||
|
||||
try:
|
||||
params = {
|
||||
"access_token": conn.access_token,
|
||||
"v": settings.VK_API_VERSION,
|
||||
}
|
||||
if conn.vk_user_id:
|
||||
params["group_ids"] = conn.vk_user_id
|
||||
|
||||
r = httpx.get(
|
||||
"https://api.vk.com/method/groups.getById",
|
||||
params=params,
|
||||
timeout=10,
|
||||
)
|
||||
data = r.json()
|
||||
if "error" in data:
|
||||
code = data["error"].get("error_code")
|
||||
msg = data["error"].get("error_msg", "Неизвестная ошибка")
|
||||
return JSONResponse({"ok": False, "message": f"Ошибка VK API ({code}): {msg}"})
|
||||
|
||||
groups = data.get("response", {}).get("groups", [])
|
||||
if groups:
|
||||
name = groups[0].get("name", "—")
|
||||
return JSONResponse({"ok": True, "message": f"Успешно. Сообщество: «{name}»"})
|
||||
else:
|
||||
return JSONResponse({"ok": True, "message": "Токен действителен. Укажите ID сообщества для полной проверки."})
|
||||
except httpx.TimeoutException:
|
||||
return JSONResponse({"ok": False, "message": "Таймаут запроса к VK"})
|
||||
except Exception as e:
|
||||
return JSONResponse({"ok": False, "message": f"Ошибка: {e}"})
|
||||
|
||||
63
web/routes/vk_catalog.py
Normal file
63
web/routes/vk_catalog.py
Normal file
@@ -0,0 +1,63 @@
|
||||
from fastapi import APIRouter, Depends, Request
|
||||
from fastapi.responses import HTMLResponse, RedirectResponse
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from web.auth.session import get_current_user
|
||||
from web.config import settings
|
||||
from web.database import get_db
|
||||
from web.models.connections import VkCachedAlbum, VkCachedProduct, VkConnection
|
||||
from web.templates_env import templates
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
def _render(request: Request, template: str, ctx: dict) -> HTMLResponse:
|
||||
ctx["request"] = request
|
||||
ctx.setdefault("jivosite_widget_id", settings.JIVOSITE_WIDGET_ID)
|
||||
return templates.TemplateResponse(ctx.pop("request"), template, ctx)
|
||||
|
||||
|
||||
@router.get("/vk-catalog/albums")
|
||||
async def vk_catalog_albums(request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
vk_conn = db.query(VkConnection).filter_by(user_id=user.id).first()
|
||||
albums = (
|
||||
db.query(VkCachedAlbum)
|
||||
.filter(VkCachedAlbum.user_id == user.id)
|
||||
.order_by(VkCachedAlbum.title)
|
||||
.all()
|
||||
)
|
||||
return _render(request, "vk_catalog/albums.html", {
|
||||
"user": user,
|
||||
"albums": albums,
|
||||
"vk_conn": vk_conn,
|
||||
"refresh_interval": settings.CATALOG_REFRESH_INTERVAL_SECONDS,
|
||||
})
|
||||
|
||||
|
||||
@router.get("/vk-catalog/albums/{album_id}/products")
|
||||
async def vk_catalog_products(album_id: str, request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
except Exception:
|
||||
return RedirectResponse("/login", 303)
|
||||
|
||||
album = db.query(VkCachedAlbum).filter_by(user_id=user.id, album_id=album_id).first()
|
||||
if not album:
|
||||
return RedirectResponse("/vk-catalog/albums", 303)
|
||||
|
||||
products = (
|
||||
db.query(VkCachedProduct)
|
||||
.filter(VkCachedProduct.user_id == user.id, VkCachedProduct.album_id == album_id)
|
||||
.order_by(VkCachedProduct.name)
|
||||
.all()
|
||||
)
|
||||
return _render(request, "vk_catalog/products.html", {
|
||||
"user": user,
|
||||
"album": album,
|
||||
"products": products,
|
||||
})
|
||||
Reference in New Issue
Block a user