Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "devnogi-front",
"version": "1.0.8",
"version": "1.0.9",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-production-workflow.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ test("production Compose requires the immutable image reference", () => {
test("package and lockfile agree on the next release version", () => {
const pkg = JSON.parse(read("package.json"));
const lock = JSON.parse(read("package-lock.json"));
assert.equal(pkg.version, "1.0.8");
assert.equal(pkg.version, "1.0.9");
assert.equal(lock.version, pkg.version);
assert.equal(lock.packages[""].version, pkg.version);
});
2 changes: 1 addition & 1 deletion scripts/workflow-contract.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ test("release version and immutable image contract are fixed", () => {
);
const pkg = JSON.parse(read("package.json"));
const lock = JSON.parse(read("package-lock.json"));
assert.equal(pkg.version, "1.0.8");
assert.equal(pkg.version, "1.0.9");
assert.equal(lock.version, pkg.version);
assert.equal(lock.packages[""].version, pkg.version);
assert.match(
Expand Down
33 changes: 32 additions & 1 deletion src/app/(main)/auction-history/AuctionHistoryClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import CategorySection from "@/components/commons/Category";
import CategoryDropdown from "@/components/commons/CategoryDropdown";
import { MetalwareFilterItem } from "@/components/commons/MetalwareSearchFilter";
import AuctionItemSearch from "@/components/page/auction-common/AuctionItemSearch";
import AuctionHistoryList from "@/components/page/auction-history/AuctionHistoryList";
import MobileFilterChips from "@/components/page/auction-history/MobileFilterChips";
import MobileFilterModal from "@/components/page/auction-history/MobileFilterModal";
Expand All @@ -33,7 +34,9 @@ import { Skeleton } from "@/components/ui/skeleton";
import { ItemCategory } from "@/data/item-category";
import { useAuctionHistory } from "@/hooks/useAuctionHistory";
import { useAuctionHistoryLayout } from "@/hooks/useAuctionHistoryLayout";
import { useAuctionItemPreviewPreference } from "@/hooks/useAuctionItemPreviewPreference";
import { useItemCategories } from "@/hooks/useItemCategories";
import { ItemInfo } from "@/hooks/useItemInfos";
import { AuctionHistorySearchParams } from "@/types/auction-history";
import { ActiveFilter } from "@/types/search-filter";

Expand Down Expand Up @@ -524,6 +527,8 @@ export default function Page() {
} = useAuctionHistoryLayout();

const { data, isLoading, isFetching } = useAuctionHistory(searchParams);
const { isPreviewEnabled, setIsPreviewEnabled } =
useAuctionItemPreviewPreference();

const allItems = data?.items ?? [];
const meta = data?.meta;
Expand Down Expand Up @@ -726,6 +731,25 @@ export default function Page() {
});
};

const handleItemSearch = (name: string, selectedItem?: ItemInfo) => {
setItemName(name);
if (selectedItem) {
setSelectedCategory(
`${selectedItem.topCategory}/${selectedItem.subCategory}`,
);
}
setSearchParams((prev) => {
const next = { ...prev, page: 1 };
if (name) next.itemName = name;
else delete next.itemName;
if (selectedItem) {
next.itemTopCategory = selectedItem.topCategory;
next.itemSubCategory = selectedItem.subCategory;
}
return normalizeCategorySelection(next);
});
};

const handleToggleExpand = (categoryId: string) => {
setExpandedIds((prev) => {
const newSet = new Set(prev);
Expand Down Expand Up @@ -1019,6 +1043,7 @@ export default function Page() {
}`}
>
<div className="w-full max-w-4xl px-4 md:px-6 pt-4 md:pt-6 pb-4 md:pb-8">
<AuctionItemSearch value={itemName} onSearch={handleItemSearch} />
{showMobileFilter && (
<div className="mb-4">
<MobileFilterChips
Expand Down Expand Up @@ -1144,7 +1169,11 @@ export default function Page() {
</div>
</div>

<AuctionHistoryList items={allItems} isLoading={isLoading} />
<AuctionHistoryList
items={allItems}
isLoading={isLoading}
previewEnabled={isPreviewEnabled}
/>

{isFetching && !isLoading && (
<div className="h-12 flex items-center justify-center">
Expand Down Expand Up @@ -1173,6 +1202,8 @@ export default function Page() {
layoutMode={layoutMode}
isExactItemName={!!searchParams.isExactItemName}
onExactItemNameChange={handleExactItemNameChange}
isItemPreviewEnabled={isPreviewEnabled}
onItemPreviewEnabledChange={setIsPreviewEnabled}
/>
)}

Expand Down
27 changes: 27 additions & 0 deletions src/app/(main)/auction-history/[auctionBuyId]/page.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { getAuctionDetail } from "@/lib/auction/detail";

import { generateMetadata } from "./page";

jest.mock("@/lib/auction/detail", () => ({
getAuctionDetail: jest.fn(),
safeReturnTo: jest.fn(),
}));

describe("auction history detail metadata", () => {
it("uses the exact item title without the global template", async () => {
jest.mocked(getAuctionDetail).mockResolvedValue({
status: "available",
source: "history",
record: { itemName: "테스트 검" },
dailyStatistics: [],
weeklyStatistics: [],
} as never);
const metadata = await generateMetadata({
params: Promise.resolve({ auctionBuyId: "history-1" }),
searchParams: Promise.resolve({}),
});
expect(metadata.title).toEqual({
absolute: "테스트 검 거래 내역 | 마비노기",
});
});
});
43 changes: 43 additions & 0 deletions src/app/(main)/auction-history/[auctionBuyId]/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import type { Metadata } from "next";

import AuctionDetailView from "@/components/page/auction-common/AuctionDetailView";
import { getAuctionDetail, safeReturnTo } from "@/lib/auction/detail";

interface PageProps {
params: Promise<{ auctionBuyId: string }>;
searchParams: Promise<{ return_to?: string | string[] }>;
}

export const dynamic = "force-dynamic";

export async function generateMetadata({
params,
}: PageProps): Promise<Metadata> {
const { auctionBuyId } = await params;
const result = await getAuctionDetail("history", auctionBuyId);
return {
title: {
absolute: result.record
? `${result.record.itemName} 거래 내역 | 마비노기`
: "경매장 거래 내역 | 마비노기",
},
robots:
result.status === "available"
? undefined
: { index: false, follow: false },
};
}

export default async function AuctionHistoryDetailPage({
params,
searchParams,
}: PageProps) {
const [{ auctionBuyId }, query] = await Promise.all([params, searchParams]);
const result = await getAuctionDetail("history", auctionBuyId);
return (
<AuctionDetailView
result={result}
returnTo={safeReturnTo("history", query.return_to)}
/>
);
}
59 changes: 59 additions & 0 deletions src/app/(main)/auction-history/page.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,35 @@ jest.mock("@/components/page/auction-history/AuctionHistoryList", () => {
};
});

jest.mock("@/components/page/auction-common/AuctionItemSearch", () => {
return function MockAuctionItemSearch({
onSearch,
}: {
onSearch: (
name: string,
item?: { name: string; topCategory: string; subCategory: string },
) => void;
}) {
return (
<div data-testid="auction-item-search">
<button onClick={() => onSearch("직접 검색")}>Direct Search</button>
<button
onClick={() =>
onSearch("롱소드", {
name: "롱소드",
topCategory: "근거리 장비",
subCategory: "검",
})
}
>
Autocomplete Search
</button>
<button onClick={() => onSearch("")}>Clear Search</button>
</div>
);
};
});

function response(names: string[]) {
return Response.json({
success: true,
Expand Down Expand Up @@ -210,6 +239,36 @@ describe("TradeLogPage", () => {
);
});

it("아이템 직접 검색, 자동완성 선택, 초기화 시 페이지를 1로 되돌린다", async () => {
mockUrlParams = new URLSearchParams({ page: "3", itemName: "이전 검색" });
fetchSpy.mockImplementation(() => Promise.resolve(response(["result"])));
renderPage();
await waitFor(() => expect(lastQuery().get("page")).toBe("3"));

fireEvent.click(screen.getByRole("button", { name: "Direct Search" }));
await waitFor(() => {
expect(lastQuery().get("page")).toBe("1");
expect(lastQuery().get("itemName")).toBe("직접 검색");
});

fireEvent.click(
screen.getByRole("button", { name: "Autocomplete Search" }),
);
await waitFor(() => {
expect(lastQuery().get("page")).toBe("1");
expect(lastQuery().get("itemName")).toBe("롱소드");
expect(lastQuery().get("itemTopCategory")).toBe("근거리 장비");
expect(lastQuery().get("itemSubCategory")).toBe("검");
});

fireEvent.click(screen.getByRole("button", { name: "Clear Search" }));
await waitFor(() => {
expect(lastQuery().get("page")).toBe("1");
expect(lastQuery().has("itemName")).toBe(false);
expect(lastQuery().get("itemTopCategory")).toBe("근거리 장비");
});
});

it("API 오류가 나면 로딩을 마치고 빈 목록을 렌더링한다", async () => {
fetchSpy.mockRejectedValue(new Error("API Error"));
renderPage();
Expand Down
33 changes: 32 additions & 1 deletion src/app/(main)/auction-realtime/AuctionRealtimeClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import CategorySection from "@/components/commons/Category";
import CategoryDropdown from "@/components/commons/CategoryDropdown";
import { MetalwareFilterItem } from "@/components/commons/MetalwareSearchFilter";
import AuctionItemSearch from "@/components/page/auction-common/AuctionItemSearch";
import AuctionRealtimeList from "@/components/page/auction-realtime/AuctionRealtimeList";
import MobileFilterChips from "@/components/page/auction-realtime/MobileFilterChips";
import MobileFilterModal from "@/components/page/auction-realtime/MobileFilterModal";
Expand All @@ -32,8 +33,10 @@ import { Checkbox } from "@/components/ui/checkbox";
import { Skeleton } from "@/components/ui/skeleton";
import { ItemCategory } from "@/data/item-category";
import { useAuctionHistoryLayout } from "@/hooks/useAuctionHistoryLayout";
import { useAuctionItemPreviewPreference } from "@/hooks/useAuctionItemPreviewPreference";
import { useAuctionRealtime } from "@/hooks/useAuctionRealtime";
import { useItemCategories } from "@/hooks/useItemCategories";
import { ItemInfo } from "@/hooks/useItemInfos";
import { AuctionRealtimeSearchParams } from "@/types/auction-realtime";
import { ActiveFilter } from "@/types/search-filter";

Expand Down Expand Up @@ -499,6 +502,8 @@ export default function Page() {
} = useAuctionHistoryLayout();

const { data, isLoading, isFetching } = useAuctionRealtime(searchParams);
const { isPreviewEnabled, setIsPreviewEnabled } =
useAuctionItemPreviewPreference();

const allItems = data?.items ?? [];
const meta = data?.meta;
Expand Down Expand Up @@ -696,6 +701,25 @@ export default function Page() {
});
};

const handleItemSearch = (name: string, selectedItem?: ItemInfo) => {
setItemName(name);
if (selectedItem) {
setSelectedCategory(
`${selectedItem.topCategory}/${selectedItem.subCategory}`,
);
}
setSearchParams((prev) => {
const next = { ...prev, page: 1 };
if (name) next.itemName = name;
else delete next.itemName;
if (selectedItem) {
next.itemTopCategory = selectedItem.topCategory;
next.itemSubCategory = selectedItem.subCategory;
}
return normalizeCategorySelection(next);
});
};

const handleToggleExpand = (categoryId: string) => {
setExpandedIds((prev) => {
const newSet = new Set(prev);
Expand Down Expand Up @@ -966,6 +990,7 @@ export default function Page() {
}`}
>
<div className="w-full max-w-4xl px-4 md:px-6 pt-4 md:pt-6 pb-4 md:pb-8">
<AuctionItemSearch value={itemName} onSearch={handleItemSearch} />
{showMobileFilter && (
<div className="mb-4">
<MobileFilterChips
Expand Down Expand Up @@ -1089,7 +1114,11 @@ export default function Page() {
</div>
</div>

<AuctionRealtimeList items={allItems} isLoading={isLoading} />
<AuctionRealtimeList
items={allItems}
isLoading={isLoading}
previewEnabled={isPreviewEnabled}
/>

{isFetching && !isLoading && (
<div className="h-12 flex items-center justify-center">
Expand Down Expand Up @@ -1118,6 +1147,8 @@ export default function Page() {
layoutMode={layoutMode}
isExactItemName={!!searchParams.isExactItemName}
onExactItemNameChange={handleExactItemNameChange}
isItemPreviewEnabled={isPreviewEnabled}
onItemPreviewEnabledChange={setIsPreviewEnabled}
/>
)}

Expand Down
27 changes: 27 additions & 0 deletions src/app/(main)/auction-realtime/[auctionId]/page.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { getAuctionDetail } from "@/lib/auction/detail";

import { generateMetadata } from "./page";

jest.mock("@/lib/auction/detail", () => ({
getAuctionDetail: jest.fn(),
safeReturnTo: jest.fn(),
}));

describe("auction realtime detail metadata", () => {
it("uses the exact item title without the global template", async () => {
jest.mocked(getAuctionDetail).mockResolvedValue({
status: "available",
source: "realtime",
record: { itemName: "테스트 검" },
dailyStatistics: [],
weeklyStatistics: [],
} as never);
const metadata = await generateMetadata({
params: Promise.resolve({ auctionId: "10" }),
searchParams: Promise.resolve({}),
});
expect(metadata.title).toEqual({
absolute: "테스트 검 실시간 거래 | 마비노기",
});
});
});
Loading
Loading