Light1YT
86e9ea2937
Многоагентный аудит + имплементация: один воркер на файл, точечные правки. Верификация: py_compile (47/47 .py) + tsc --noEmit (0 ошибок). Unit-тесты не прогонялись (окружение не поднято: rollup native dep / нет pytest-venv). Полностью исправлено (169): #1336, #1337, #1339, #1340, #1341, #1342, #1343, #1345, #1346, #1348, #1349, #1350, #1351, #1354, #1356, #1358, #1359, #1360, #1362, #1364, #1365, #1366, #1367, #1368, #1369, #1370, #1371, #1372, #1373, #1374, #1375, #1376, #1377, #1378, #1379, #1380, #1381, #1382, #1384, #1385, #1386, #1387, #1388, #1389, #1390, #1391, #1392, #1394, #1395, #1396, #1397, #1399, #1400, #1401, #1402, #1403, #1404, #1408, #1409, #1410, #1411, #1412, #1413, #1414, #1415, #1416, #1417, #1418, #1420, #1423, #1425, #1426, #1427, #1428, #1429, #1430, #1431, #1432, #1433, #1434, #1435, #1437, #1438, #1439, #1440, #1441, #1442, #1443, #1444, #1445, #1446, #1447, #1448, #1449, #1450, #1451, #1452, #1453, #1454, #1455, #1456, #1457, #1458, #1459, #1460, #1461, #1462, #1463, #1464, #1465, #1466, #1467, #1468, #1469, #1471, #1472, #1473, #1474, #1476, #1478, #1479, #1481, #1482, #1483, #1484, #1485, #1487, #1488, #1489, #1490, #1491, #1492, #1493, #1494, #1495, #1496, #1497, #1499, #1500, #1501, #1502, #1504, #1505, #1506, #1507, #1510, #1514, #1515, #1516, #1517, #1518, #1519, #1521, #1522, #1523, #1524, #1525, #1526, #1527, #1528, #1529, #1531, #1532, #1533, #1534, #1535, #1536, #1537, #1538 Частично (9, in-file часть, остаток cross-file): #1361, #1419, #1422, #1424, #1470, #1475, #1477, #1480, #1498 Требуют cross-file (3, не тронуты): #1338, #1363, #1421 Пропущено (1): #1539 Не входило в партию: 22 needs-Leha issue (нужны решения владельца). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
156 lines
5.2 KiB
TypeScript
156 lines
5.2 KiB
TypeScript
"use client";
|
|
|
|
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
|
|
import { apiFetch } from "@/lib/api";
|
|
import { getOrCreateSessionId } from "@/lib/sessionId";
|
|
import type {
|
|
CustomPoi,
|
|
CustomPoiCreate,
|
|
CustomPoiUpdate,
|
|
} from "@/types/customPoi";
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Helpers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
function sessionHeaders(): Record<string, string> {
|
|
const id = getOrCreateSessionId();
|
|
return id ? { "X-Session-Id": id } : {};
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Query key factory
|
|
// ---------------------------------------------------------------------------
|
|
|
|
function customPoisKey(parcelCad?: string | null): unknown[] {
|
|
// Scope the cache by session: the list is filtered server-side via the
|
|
// X-Session-Id header (sessionHeaders()), so a session change must yield a
|
|
// distinct key to avoid serving a previous session's POIs (issue #1484).
|
|
// getOrCreateSessionId() is SSR-safe (returns "" when window is absent).
|
|
return ["custom-pois", getOrCreateSessionId(), parcelCad ?? null];
|
|
}
|
|
|
|
// Canonical analyze key prefix is ["parcel-analyze", cad, horizon] (see
|
|
// site-finder-api.ts `useParcelAnalyzeQuery`); invalidating with the
|
|
// prefix [parcel-analyze, cad] matches every horizon variant. Custom-POI
|
|
// add/update/delete also influences the standalone POI score endpoint
|
|
// ["parcel-poi-score", cad] (see `useParcelPoiScoreQuery`), so both must
|
|
// be invalidated to refresh score + breakdown after a mutation. The
|
|
// previous key ["analyze", cad] never matched any live useQuery — bug
|
|
// reference: issue #1241.
|
|
function analyzeKey(parcelCad: string): unknown[] {
|
|
return ["parcel-analyze", parcelCad];
|
|
}
|
|
|
|
function poiScoreKey(parcelCad: string): unknown[] {
|
|
return ["parcel-poi-score", parcelCad];
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Hooks
|
|
// ---------------------------------------------------------------------------
|
|
|
|
/**
|
|
* List custom POIs, optionally filtered by parcel cad number.
|
|
*/
|
|
export function useCustomPois(parcelCad?: string | null) {
|
|
return useQuery({
|
|
queryKey: customPoisKey(parcelCad),
|
|
queryFn: () => {
|
|
const qs = parcelCad
|
|
? `?parcel_cad=${encodeURIComponent(parcelCad)}`
|
|
: "";
|
|
return apiFetch<CustomPoi[]>(`/api/v1/custom-pois${qs}`, {
|
|
headers: sessionHeaders(),
|
|
});
|
|
},
|
|
// Don't auto-fetch until session available (SSR guard).
|
|
enabled: typeof window !== "undefined",
|
|
staleTime: 30_000,
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Create a custom POI. On success invalidates:
|
|
* - ["custom-pois", parcelCad] (scoped list) + ["custom-pois", null] (global)
|
|
* - ["parcel-analyze", parcelCad] prefix (matches every horizon variant)
|
|
* - ["parcel-poi-score", parcelCad] (POI weighted score)
|
|
*/
|
|
export function useAddCustomPoi(parcelCad?: string | null) {
|
|
const queryClient = useQueryClient();
|
|
return useMutation({
|
|
mutationFn: (payload: CustomPoiCreate) =>
|
|
apiFetch<CustomPoi>("/api/v1/custom-pois", {
|
|
method: "POST",
|
|
body: JSON.stringify(payload),
|
|
headers: { ...sessionHeaders() },
|
|
}),
|
|
onSuccess: () => {
|
|
void queryClient.invalidateQueries({
|
|
queryKey: customPoisKey(parcelCad),
|
|
});
|
|
// Invalidate global list too
|
|
void queryClient.invalidateQueries({ queryKey: customPoisKey(null) });
|
|
if (parcelCad) {
|
|
void queryClient.invalidateQueries({ queryKey: analyzeKey(parcelCad) });
|
|
void queryClient.invalidateQueries({
|
|
queryKey: poiScoreKey(parcelCad),
|
|
});
|
|
}
|
|
},
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Update a custom POI by id.
|
|
*/
|
|
export function useUpdateCustomPoi(parcelCad?: string | null) {
|
|
const queryClient = useQueryClient();
|
|
return useMutation({
|
|
mutationFn: ({ id, data }: { id: number; data: CustomPoiUpdate }) =>
|
|
apiFetch<CustomPoi>(`/api/v1/custom-pois/${id}`, {
|
|
method: "PATCH",
|
|
body: JSON.stringify(data),
|
|
headers: { ...sessionHeaders() },
|
|
}),
|
|
onSuccess: () => {
|
|
void queryClient.invalidateQueries({
|
|
queryKey: customPoisKey(parcelCad),
|
|
});
|
|
void queryClient.invalidateQueries({ queryKey: customPoisKey(null) });
|
|
if (parcelCad) {
|
|
void queryClient.invalidateQueries({ queryKey: analyzeKey(parcelCad) });
|
|
void queryClient.invalidateQueries({
|
|
queryKey: poiScoreKey(parcelCad),
|
|
});
|
|
}
|
|
},
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Delete a custom POI by id.
|
|
*/
|
|
export function useDeleteCustomPoi(parcelCad?: string | null) {
|
|
const queryClient = useQueryClient();
|
|
return useMutation({
|
|
mutationFn: (id: number) =>
|
|
apiFetch<unknown>(`/api/v1/custom-pois/${id}`, {
|
|
method: "DELETE",
|
|
headers: sessionHeaders(),
|
|
}),
|
|
onSuccess: () => {
|
|
void queryClient.invalidateQueries({
|
|
queryKey: customPoisKey(parcelCad),
|
|
});
|
|
void queryClient.invalidateQueries({ queryKey: customPoisKey(null) });
|
|
if (parcelCad) {
|
|
void queryClient.invalidateQueries({ queryKey: analyzeKey(parcelCad) });
|
|
void queryClient.invalidateQueries({
|
|
queryKey: poiScoreKey(parcelCad),
|
|
});
|
|
}
|
|
},
|
|
});
|
|
}
|