Compare commits
1 Commits
feat/front
...
feat/backe
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d318828f73 |
2
PLAN.md
2
PLAN.md
@@ -177,7 +177,7 @@ flowchart LR
|
|||||||
## 10. Чеклист задач (implementation todos)
|
## 10. Чеклист задач (implementation todos)
|
||||||
|
|
||||||
1. Монорепо: `frontend/` + `backend/`, BEM, токены, роутер.
|
1. Монорепо: `frontend/` + `backend/`, BEM, токены, роутер.
|
||||||
2. Postgres в docker-compose, миграции таблицы `races`, бэкенд читает `DB_`*.
|
2. Postgres в docker-compose, миграции таблицы `races`, бэкенд читает `DB`_*.
|
||||||
3. REST CRUD + разовый seed (CSV и/или JSON) → БД.
|
3. REST CRUD + разовый seed (CSV и/или JSON) → БД.
|
||||||
4. Клиент API на фронте, типы, загрузка данных для экранов и PR.
|
4. Клиент API на фронте, типы, загрузка данных для экранов и PR.
|
||||||
5. Экраны месяц и год, модалка по дате.
|
5. Экраны месяц и год, модалка по дате.
|
||||||
|
|||||||
75
frontend/src/api/errors.ts
Normal file
75
frontend/src/api/errors.ts
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
export type ApiErrorCode =
|
||||||
|
| "validation_error"
|
||||||
|
| "not_found"
|
||||||
|
| "database_unavailable"
|
||||||
|
| "conflict"
|
||||||
|
| "network_error"
|
||||||
|
| "unknown_error";
|
||||||
|
|
||||||
|
export interface ApiErrorPayload {
|
||||||
|
error?: string;
|
||||||
|
details?: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ApiError extends Error {
|
||||||
|
public readonly code: ApiErrorCode;
|
||||||
|
public readonly status: number | null;
|
||||||
|
public readonly details: string[];
|
||||||
|
|
||||||
|
constructor(params: {
|
||||||
|
code: ApiErrorCode;
|
||||||
|
message: string;
|
||||||
|
status?: number | null;
|
||||||
|
details?: string[];
|
||||||
|
}) {
|
||||||
|
super(params.message);
|
||||||
|
this.name = "ApiError";
|
||||||
|
this.code = params.code;
|
||||||
|
this.status = params.status ?? null;
|
||||||
|
this.details = params.details ?? [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeApiCode(value: string | undefined): ApiErrorCode {
|
||||||
|
if (
|
||||||
|
value === "validation_error" ||
|
||||||
|
value === "not_found" ||
|
||||||
|
value === "database_unavailable" ||
|
||||||
|
value === "conflict"
|
||||||
|
) {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
return "unknown_error";
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toApiError(status: number, payload: unknown): ApiError {
|
||||||
|
const maybePayload = payload as ApiErrorPayload;
|
||||||
|
const code = normalizeApiCode(maybePayload?.error);
|
||||||
|
const details = Array.isArray(maybePayload?.details)
|
||||||
|
? maybePayload.details.filter((item): item is string => typeof item === "string")
|
||||||
|
: [];
|
||||||
|
|
||||||
|
return new ApiError({
|
||||||
|
code,
|
||||||
|
status,
|
||||||
|
message: getApiErrorMessage(code),
|
||||||
|
details,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getApiErrorMessage(code: ApiErrorCode): string {
|
||||||
|
switch (code) {
|
||||||
|
case "validation_error":
|
||||||
|
return "Проверьте введённые данные и попробуйте снова.";
|
||||||
|
case "not_found":
|
||||||
|
return "Запись не найдена.";
|
||||||
|
case "database_unavailable":
|
||||||
|
return "Сервис временно недоступен. Попробуйте позже.";
|
||||||
|
case "conflict":
|
||||||
|
return "Запись с таким идентификатором уже существует.";
|
||||||
|
case "network_error":
|
||||||
|
return "Не удалось связаться с сервером.";
|
||||||
|
default:
|
||||||
|
return "Произошла неизвестная ошибка.";
|
||||||
|
}
|
||||||
|
}
|
||||||
55
frontend/src/api/http.ts
Normal file
55
frontend/src/api/http.ts
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
import { ApiError, toApiError } from "./errors";
|
||||||
|
|
||||||
|
const API_BASE_URL = (import.meta.env.VITE_API_BASE_URL as string | undefined)?.trim() || "http://localhost:3001";
|
||||||
|
|
||||||
|
function buildUrl(path: string): string {
|
||||||
|
const normalizedPath = path.startsWith("/") ? path : `/${path}`;
|
||||||
|
return `${API_BASE_URL}${normalizedPath}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function parseResponseBody(response: Response): Promise<unknown> {
|
||||||
|
const contentType = response.headers.get("content-type") ?? "";
|
||||||
|
if (!contentType.includes("application/json")) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
return await response.json();
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function requestJson<T>(path: string, init?: RequestInit): Promise<T> {
|
||||||
|
try {
|
||||||
|
const response = await fetch(buildUrl(path), {
|
||||||
|
...init,
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
...(init?.headers ?? {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.status === 204) {
|
||||||
|
return undefined as T;
|
||||||
|
}
|
||||||
|
|
||||||
|
const payload = await parseResponseBody(response);
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw toApiError(response.status, payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
return payload as T;
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof ApiError) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new ApiError({
|
||||||
|
code: "network_error",
|
||||||
|
status: null,
|
||||||
|
message: "Не удалось связаться с сервером.",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1 +1,3 @@
|
|||||||
export {};
|
export type { CreateRacePayload, Race, RacesQuery, RaceStatus, UpdateRacePayload } from "./types";
|
||||||
|
export { ApiError, getApiErrorMessage } from "./errors";
|
||||||
|
export { getRaceById, getRaces, createRace, updateRace, deleteRace } from "./races";
|
||||||
|
|||||||
112
frontend/src/api/races.ts
Normal file
112
frontend/src/api/races.ts
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
import { ApiError } from "./errors";
|
||||||
|
import { requestJson } from "./http";
|
||||||
|
import type { CreateRacePayload, Race, RacesQuery, UpdateRacePayload } from "./types";
|
||||||
|
|
||||||
|
function isString(value: unknown): value is string {
|
||||||
|
return typeof value === "string";
|
||||||
|
}
|
||||||
|
|
||||||
|
function isNullableString(value: unknown): value is string | null {
|
||||||
|
return value === null || typeof value === "string";
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeRace(input: unknown): Race {
|
||||||
|
const race = input as Partial<Race>;
|
||||||
|
|
||||||
|
const isValid =
|
||||||
|
isString(race?.id) &&
|
||||||
|
isString(race?.date) &&
|
||||||
|
isString(race?.title) &&
|
||||||
|
typeof race?.distanceKm === "number" &&
|
||||||
|
(race?.status === null || race?.status === "planned" || race?.status === "completed") &&
|
||||||
|
isNullableString(race?.officialUrl) &&
|
||||||
|
isNullableString(race?.startTime) &&
|
||||||
|
isNullableString(race?.clusterSchedule) &&
|
||||||
|
isNullableString(race?.bibPickup) &&
|
||||||
|
isNullableString(race?.bibNumber) &&
|
||||||
|
isNullableString(race?.finishTime) &&
|
||||||
|
isNullableString(race?.notes) &&
|
||||||
|
isString(race?.createdAt) &&
|
||||||
|
(race?.updatedAt === null || isString(race?.updatedAt));
|
||||||
|
|
||||||
|
if (!isValid) {
|
||||||
|
throw new ApiError({
|
||||||
|
code: "unknown_error",
|
||||||
|
status: null,
|
||||||
|
message: "Некорректный формат данных от API.",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: race.id,
|
||||||
|
date: race.date,
|
||||||
|
title: race.title,
|
||||||
|
distanceKm: race.distanceKm,
|
||||||
|
status: race.status,
|
||||||
|
officialUrl: race.officialUrl,
|
||||||
|
startTime: race.startTime,
|
||||||
|
clusterSchedule: race.clusterSchedule,
|
||||||
|
bibPickup: race.bibPickup,
|
||||||
|
bibNumber: race.bibNumber,
|
||||||
|
finishTime: race.finishTime,
|
||||||
|
notes: race.notes,
|
||||||
|
createdAt: race.createdAt,
|
||||||
|
updatedAt: race.updatedAt,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildRacesQuery(query?: RacesQuery): string {
|
||||||
|
if (!query) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
if (typeof query.year === "number") {
|
||||||
|
params.set("year", String(query.year));
|
||||||
|
}
|
||||||
|
if (typeof query.month === "number") {
|
||||||
|
params.set("month", String(query.month));
|
||||||
|
}
|
||||||
|
|
||||||
|
const serialized = params.toString();
|
||||||
|
return serialized ? `?${serialized}` : "";
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getRaces(query?: RacesQuery): Promise<Race[]> {
|
||||||
|
const response = await requestJson<unknown[]>(`/races${buildRacesQuery(query)}`);
|
||||||
|
if (!Array.isArray(response)) {
|
||||||
|
throw new ApiError({
|
||||||
|
code: "unknown_error",
|
||||||
|
status: null,
|
||||||
|
message: "Некорректный формат списка забегов от API.",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.map(normalizeRace);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getRaceById(id: string): Promise<Race> {
|
||||||
|
return normalizeRace(await requestJson<unknown>(`/races/${id}`));
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createRace(payload: CreateRacePayload): Promise<Race> {
|
||||||
|
return normalizeRace(
|
||||||
|
await requestJson<unknown>("/races", {
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify(payload),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function updateRace(id: string, payload: UpdateRacePayload): Promise<Race> {
|
||||||
|
return normalizeRace(
|
||||||
|
await requestJson<unknown>(`/races/${id}`, {
|
||||||
|
method: "PATCH",
|
||||||
|
body: JSON.stringify(payload),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function deleteRace(id: string): Promise<void> {
|
||||||
|
await requestJson<void>(`/races/${id}`, { method: "DELETE" });
|
||||||
|
}
|
||||||
40
frontend/src/api/types.ts
Normal file
40
frontend/src/api/types.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
export type RaceStatus = "planned" | "completed";
|
||||||
|
|
||||||
|
export interface Race {
|
||||||
|
id: string;
|
||||||
|
date: string;
|
||||||
|
title: string;
|
||||||
|
distanceKm: number;
|
||||||
|
status: RaceStatus | null;
|
||||||
|
officialUrl: string | null;
|
||||||
|
startTime: string | null;
|
||||||
|
clusterSchedule: string | null;
|
||||||
|
bibPickup: string | null;
|
||||||
|
bibNumber: string | null;
|
||||||
|
finishTime: string | null;
|
||||||
|
notes: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface RacesQuery {
|
||||||
|
year?: number;
|
||||||
|
month?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CreateRacePayload {
|
||||||
|
id: string;
|
||||||
|
date: string;
|
||||||
|
title: string;
|
||||||
|
distanceKm: number;
|
||||||
|
status?: RaceStatus | null;
|
||||||
|
officialUrl?: string | null;
|
||||||
|
startTime?: string | null;
|
||||||
|
clusterSchedule?: string | null;
|
||||||
|
bibPickup?: string | null;
|
||||||
|
bibNumber?: string | null;
|
||||||
|
finishTime?: string | null;
|
||||||
|
notes?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type UpdateRacePayload = Partial<Omit<CreateRacePayload, "id">>;
|
||||||
Reference in New Issue
Block a user