refactor: simplify auth and instrument pages

2026-09-29 05:45:08 +03:00
parent 32a77860c8
commit b404c1802a
38 changed files with 644 additions and 790 deletions
@@ -3,50 +3,16 @@ import { render, screen, within } from "@testing-library/react";
 import { MemoryRouter } from "react-router";
 import { describe, expect, it } from "vitest";

-import type { Portfolio } from "@/entities/portfolio";
-
 import { toAccountPagePositionSections } from "../../model/positions";
+import { portfolio, position, second } from "../../model/positions.fixtures";
 import { PositionSection } from "./components/PositionSection.view";

-const position: Portfolio["positions"][number]
-	= {
-		absoluteReturn: { currency: "RUB", value: "25" },
-		account: { id: "a", name: "Основной" },
-		averagePurchasePrice: { currency: "RUB", value: "280" },
-		currentValue: { currency: "RUB", value: "375" },
-		displayName: "Сбербанк",
-		figi: "FIGI-SBER",
-		isin: "RU0009029540",
-		logoName: null,
-		quantity: "1.25",
-		ticker: "SBER",
-		type: "STOCK",
-	};
-
-const second
-	= {
-		...position,
-		absoluteReturn: null,
-		account: { id: "b", name: "ИИС" },
-		averagePurchasePrice: null,
-		currentValue: null,
-		quantity: "-2",
-	};
-
-function sections(positions: Portfolio["positions"]) {
-	return toAccountPagePositionSections({
-		cashBalances: [],
-		isStale: false,
-		lastSuccessfulAt: "2026-09-09T12:00:00Z",
-		positions,
-		structure: { currencies: [], unvaluedCategories: [] },
-		totalsByCurrency: [],
-	});
-}
-
 describe("Positions grouped by security", () => {
 	it("shows one security with exact per-account quantities and valuations", () => {
-		const section = sections([position, second])[0];
+		const section = toAccountPagePositionSections({
+			...portfolio, positions: [position, second],
+		})[0];
+
 		render(
 			<MantineProvider>
 				<MemoryRouter>
@@ -76,75 +42,4 @@ describe("Positions grouped by security", () => {
 		expect(within(rows[1]).getByText("Количество: -2")).toBeInTheDocument();
 		expect(rows[1]).not.toHaveTextContent("₽");
 	});
-
-	it("uses ISIN only when FIGI is absent, never merging by name or ticker", () => {
-		expect(
-
-			sections([
-				{
-					...position,
-					figi: null,
-				},
-				{ ...second, figi: null },
-			])[0].groups,
-		).toHaveLength(1);
-		expect(
-			sections([position, { ...second, figi: "OTHER-FIGI" }])[0].groups,
-		).toHaveLength(2);
-		expect(
-
-			sections([
-				{
-					...position,
-					figi: null,
-					isin: null,
-				},
-				{
-					...second,
-					figi: null,
-					isin: null,
-				},
-			])[0].groups,
-		).toHaveLength(2);
-	});
-
-	it("preserves one-account cards and does not merge repeated rows on the same account", () => {
-		expect(
-			sections([position, { ...second, account: position.account }])[0].groups,
-		).toHaveLength(2);
-		expect(
-			sections([
-				{ ...position, account: undefined },
-				{ ...second, account: undefined },
-			])[0].groups,
-		).toHaveLength(2);
-	});
-
-	it("keeps currencies and purchase prices attached to their source positions", () => {
-		const source = [
-			position,
-			{
-				...second,
-				averagePurchasePrice: { currency: "USD", value: "0.99" },
-				currentValue: { currency: "USD", value: "1.01" },
-			},
-		];
-
-		const before = structuredClone(source);
-		const [group] = sections(source)[0].groups;
-		expect(
-			group.positions.map(item => [
-				item.quantity,
-				item.currentValue,
-				item.averagePurchasePrice,
-			]),
-		).toEqual(
-			source.map(item => [
-				item.quantity,
-				item.currentValue,
-				item.averagePurchasePrice,
-			]),
-		);
-		expect(source).toEqual(before);
-	});
 });