feat(admin): 分类管理(分类树增删改移 + 后台页面)
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
@@ -5,9 +5,10 @@ import ProductList from "./components/ProductList";
|
|||||||
import ProductDetail from "./components/ProductDetail";
|
import ProductDetail from "./components/ProductDetail";
|
||||||
import SubmissionsPage from "./components/SubmissionsPage";
|
import SubmissionsPage from "./components/SubmissionsPage";
|
||||||
import ApiKeysPage from "./components/ApiKeysPage";
|
import ApiKeysPage from "./components/ApiKeysPage";
|
||||||
import { Inbox, KeyRound, LogOut, Package } from "lucide-react";
|
import CategoriesPage from "./components/CategoriesPage";
|
||||||
|
import { FolderTree, Inbox, KeyRound, LogOut, Package } from "lucide-react";
|
||||||
|
|
||||||
type Tab = "products" | "submissions" | "keys";
|
type Tab = "products" | "submissions" | "categories" | "keys";
|
||||||
type View = { name: "list" } | { name: "detail"; id: string };
|
type View = { name: "list" } | { name: "detail"; id: string };
|
||||||
|
|
||||||
export default function App() {
|
export default function App() {
|
||||||
@@ -100,6 +101,19 @@ export default function App() {
|
|||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</button>
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => {
|
||||||
|
setTab("categories");
|
||||||
|
setView({ name: "list" });
|
||||||
|
}}
|
||||||
|
className={`px-3 py-1.5 rounded-md flex items-center gap-1.5 ${
|
||||||
|
tab === "categories"
|
||||||
|
? "bg-emerald-50 text-emerald-700"
|
||||||
|
: "text-gray-600 hover:bg-gray-100"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<FolderTree className="h-4 w-4" /> 分类管理
|
||||||
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={() => setTab("keys")}
|
onClick={() => setTab("keys")}
|
||||||
className={`px-3 py-1.5 rounded-md flex items-center gap-1.5 ${
|
className={`px-3 py-1.5 rounded-md flex items-center gap-1.5 ${
|
||||||
@@ -125,6 +139,8 @@ export default function App() {
|
|||||||
<main className="flex-1 overflow-auto p-6">
|
<main className="flex-1 overflow-auto p-6">
|
||||||
{tab === "keys" ? (
|
{tab === "keys" ? (
|
||||||
<ApiKeysPage />
|
<ApiKeysPage />
|
||||||
|
) : tab === "categories" ? (
|
||||||
|
<CategoriesPage />
|
||||||
) : tab === "submissions" ? (
|
) : tab === "submissions" ? (
|
||||||
<SubmissionsPage onPending={setPending} />
|
<SubmissionsPage onPending={setPending} />
|
||||||
) : view.name === "list" ? (
|
) : view.name === "list" ? (
|
||||||
|
|||||||
@@ -104,6 +104,18 @@ export const api = {
|
|||||||
request<{ items: import("./types").Brand[] }>("/brands"),
|
request<{ items: import("./types").Brand[] }>("/brands"),
|
||||||
listCategories: () =>
|
listCategories: () =>
|
||||||
request<{ items: import("./types").Category[] }>("/categories"),
|
request<{ items: import("./types").Category[] }>("/categories"),
|
||||||
|
createCategory: (body: import("./types").CategoryInput) =>
|
||||||
|
request<import("./types").Category>("/categories", {
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify(body),
|
||||||
|
}),
|
||||||
|
updateCategory: (id: string, body: import("./types").CategoryInput) =>
|
||||||
|
request<import("./types").Category>(`/categories/${id}`, {
|
||||||
|
method: "PUT",
|
||||||
|
body: JSON.stringify(body),
|
||||||
|
}),
|
||||||
|
deleteCategory: (id: string) =>
|
||||||
|
request<{ status: string }>(`/categories/${id}`, { method: "DELETE" }),
|
||||||
listSubmissions: (status: string, page: number, size: number) =>
|
listSubmissions: (status: string, page: number, size: number) =>
|
||||||
request<{
|
request<{
|
||||||
items: import("./types").SubmissionRow[];
|
items: import("./types").SubmissionRow[];
|
||||||
|
|||||||
@@ -0,0 +1,311 @@
|
|||||||
|
import { useEffect, useMemo, useState } from "react";
|
||||||
|
import { api, ApiError } from "../api";
|
||||||
|
import type { Category, CategoryInput } from "../types";
|
||||||
|
import { FolderTree, Pencil, Plus, Trash2 } from "lucide-react";
|
||||||
|
|
||||||
|
type FormState = {
|
||||||
|
mode: "create" | "edit";
|
||||||
|
id?: string;
|
||||||
|
name_zh: string;
|
||||||
|
name_en: string;
|
||||||
|
slug: string;
|
||||||
|
parent_id: string; // "" = top level
|
||||||
|
gpc_brick_code: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
function emptyForm(parentId = ""): FormState {
|
||||||
|
return {
|
||||||
|
mode: "create",
|
||||||
|
name_zh: "",
|
||||||
|
name_en: "",
|
||||||
|
slug: "",
|
||||||
|
parent_id: parentId,
|
||||||
|
gpc_brick_code: "",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function CategoriesPage() {
|
||||||
|
const [rows, setRows] = useState<Category[]>([]);
|
||||||
|
const [error, setError] = useState("");
|
||||||
|
const [form, setForm] = useState<FormState | null>(null);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
setError("");
|
||||||
|
try {
|
||||||
|
const res = await api.listCategories();
|
||||||
|
setRows(res.items);
|
||||||
|
} catch (e) {
|
||||||
|
setError(e instanceof ApiError ? e.message : "加载失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
load();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
async function remove(c: Category) {
|
||||||
|
if (!confirm(`确认删除分类「${c.name_zh}」(${c.path})?`)) return;
|
||||||
|
setError("");
|
||||||
|
try {
|
||||||
|
await api.deleteCategory(c.id);
|
||||||
|
await load();
|
||||||
|
} catch (e) {
|
||||||
|
setError(e instanceof ApiError ? e.message : "删除失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="max-w-5xl">
|
||||||
|
<div className="flex items-center justify-between mb-4">
|
||||||
|
<div>
|
||||||
|
<h2 className="text-lg font-semibold text-gray-800 flex items-center gap-2">
|
||||||
|
<FolderTree className="h-5 w-5 text-emerald-600" /> 分类管理
|
||||||
|
</h2>
|
||||||
|
<p className="text-sm text-gray-500 mt-1">
|
||||||
|
维护商品分类树。英文标识(slug)用于分类路径,新建后不可修改;可重命名、移动层级、删除空分类。
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={() => setForm(emptyForm())}
|
||||||
|
className="px-4 py-2 rounded-lg bg-emerald-600 text-white text-sm font-medium hover:bg-emerald-700 flex items-center gap-1.5"
|
||||||
|
>
|
||||||
|
<Plus className="h-4 w-4" /> 新建顶级分类
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{error && (
|
||||||
|
<div className="mb-3 bg-red-50 text-red-700 text-sm rounded px-4 py-2">{error}</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{form && (
|
||||||
|
<CategoryForm
|
||||||
|
form={form}
|
||||||
|
categories={rows}
|
||||||
|
onClose={() => setForm(null)}
|
||||||
|
onSaved={() => {
|
||||||
|
setForm(null);
|
||||||
|
load();
|
||||||
|
}}
|
||||||
|
onError={setError}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="bg-white border rounded-lg overflow-hidden">
|
||||||
|
<table className="w-full text-sm">
|
||||||
|
<thead className="bg-gray-50 text-gray-500 text-left">
|
||||||
|
<tr>
|
||||||
|
<th className="px-4 py-2 font-medium">名称</th>
|
||||||
|
<th className="px-4 py-2 font-medium">路径</th>
|
||||||
|
<th className="px-4 py-2 font-medium">GPC</th>
|
||||||
|
<th className="px-4 py-2 font-medium">商品数</th>
|
||||||
|
<th className="px-4 py-2 font-medium"></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody className="divide-y">
|
||||||
|
{rows.length === 0 ? (
|
||||||
|
<tr>
|
||||||
|
<td colSpan={5} className="px-4 py-8 text-center text-gray-400">
|
||||||
|
暂无分类
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
) : (
|
||||||
|
rows.map((c) => (
|
||||||
|
<tr key={c.id} className="hover:bg-gray-50">
|
||||||
|
<td className="px-4 py-2 text-gray-800">
|
||||||
|
<span style={{ paddingLeft: `${c.level * 18}px` }} className="inline-flex items-center gap-2">
|
||||||
|
{c.level > 0 && <span className="text-gray-300">└</span>}
|
||||||
|
<span className="font-medium">{c.name_zh}</span>
|
||||||
|
{c.name_en && <span className="text-xs text-gray-400">{c.name_en}</span>}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-2 text-gray-500">
|
||||||
|
<code className="text-xs">{c.path}</code>
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-2 text-gray-500 text-xs">{c.gpc_brick_code || "—"}</td>
|
||||||
|
<td className="px-4 py-2 text-gray-600">{c.product_count}</td>
|
||||||
|
<td className="px-4 py-2 text-right whitespace-nowrap">
|
||||||
|
<button
|
||||||
|
onClick={() => setForm(emptyForm(c.id))}
|
||||||
|
className="text-gray-400 hover:text-emerald-600 mr-3"
|
||||||
|
title="新增子分类"
|
||||||
|
>
|
||||||
|
<Plus className="h-4 w-4" />
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() =>
|
||||||
|
setForm({
|
||||||
|
mode: "edit",
|
||||||
|
id: c.id,
|
||||||
|
name_zh: c.name_zh,
|
||||||
|
name_en: c.name_en ?? "",
|
||||||
|
slug: c.path,
|
||||||
|
parent_id: c.parent_id ?? "",
|
||||||
|
gpc_brick_code: c.gpc_brick_code ?? "",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
className="text-gray-400 hover:text-emerald-600 mr-3"
|
||||||
|
title="编辑"
|
||||||
|
>
|
||||||
|
<Pencil className="h-4 w-4" />
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => remove(c)}
|
||||||
|
className="text-gray-400 hover:text-red-600"
|
||||||
|
title="删除"
|
||||||
|
>
|
||||||
|
<Trash2 className="h-4 w-4" />
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function CategoryForm({
|
||||||
|
form,
|
||||||
|
categories,
|
||||||
|
onClose,
|
||||||
|
onSaved,
|
||||||
|
onError,
|
||||||
|
}: {
|
||||||
|
form: FormState;
|
||||||
|
categories: Category[];
|
||||||
|
onClose: () => void;
|
||||||
|
onSaved: () => void;
|
||||||
|
onError: (msg: string) => void;
|
||||||
|
}) {
|
||||||
|
const [state, setState] = useState<FormState>(form);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
|
||||||
|
// When editing, the node itself and its descendants are not valid parents.
|
||||||
|
const parentOptions = useMemo(() => {
|
||||||
|
if (state.mode === "create") return categories;
|
||||||
|
const self = categories.find((c) => c.id === state.id);
|
||||||
|
if (!self) return categories;
|
||||||
|
return categories.filter(
|
||||||
|
(c) => c.id !== self.id && !c.path.startsWith(self.path + "."),
|
||||||
|
);
|
||||||
|
}, [categories, state.mode, state.id]);
|
||||||
|
|
||||||
|
function set<K extends keyof FormState>(key: K, value: FormState[K]) {
|
||||||
|
setState((s) => ({ ...s, [key]: value }));
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submit() {
|
||||||
|
if (!state.name_zh.trim()) {
|
||||||
|
onError("分类名称不能为空");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setBusy(true);
|
||||||
|
onError("");
|
||||||
|
const body: CategoryInput = {
|
||||||
|
name_zh: state.name_zh.trim(),
|
||||||
|
name_en: state.name_en.trim() || null,
|
||||||
|
parent_id: state.parent_id || null,
|
||||||
|
gpc_brick_code: state.gpc_brick_code.trim() || null,
|
||||||
|
};
|
||||||
|
if (state.mode === "create") body.slug = state.slug.trim() || null;
|
||||||
|
try {
|
||||||
|
if (state.mode === "create") {
|
||||||
|
await api.createCategory(body);
|
||||||
|
} else if (state.id) {
|
||||||
|
await api.updateCategory(state.id, body);
|
||||||
|
}
|
||||||
|
onSaved();
|
||||||
|
} catch (e) {
|
||||||
|
onError(e instanceof ApiError ? e.message : "保存失败");
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="mb-4 bg-white border rounded-lg p-5">
|
||||||
|
<h3 className="font-medium text-gray-700 mb-3">
|
||||||
|
{state.mode === "create" ? "新建分类" : "编辑分类"}
|
||||||
|
</h3>
|
||||||
|
<div className="grid grid-cols-2 gap-4">
|
||||||
|
<label className="block">
|
||||||
|
<span className="text-xs text-gray-500">中文名称 *</span>
|
||||||
|
<input
|
||||||
|
className="w-full border rounded-md px-3 py-2 text-sm mt-1"
|
||||||
|
value={state.name_zh}
|
||||||
|
onChange={(e) => set("name_zh", e.target.value)}
|
||||||
|
placeholder="例如:饮料"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label className="block">
|
||||||
|
<span className="text-xs text-gray-500">英文名称(可选)</span>
|
||||||
|
<input
|
||||||
|
className="w-full border rounded-md px-3 py-2 text-sm mt-1"
|
||||||
|
value={state.name_en}
|
||||||
|
onChange={(e) => set("name_en", e.target.value)}
|
||||||
|
placeholder="Beverages"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label className="block">
|
||||||
|
<span className="text-xs text-gray-500">上级分类</span>
|
||||||
|
<select
|
||||||
|
className="w-full border rounded-md px-3 py-2 text-sm mt-1 bg-white"
|
||||||
|
value={state.parent_id}
|
||||||
|
onChange={(e) => set("parent_id", e.target.value)}
|
||||||
|
>
|
||||||
|
<option value="">(顶级分类)</option>
|
||||||
|
{parentOptions.map((c) => (
|
||||||
|
<option key={c.id} value={c.id}>
|
||||||
|
{"\u00A0".repeat(c.level * 2)}
|
||||||
|
{c.name_zh} ({c.path})
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
{state.mode === "create" ? (
|
||||||
|
<label className="block">
|
||||||
|
<span className="text-xs text-gray-500">英文标识 slug(可选,留空自动生成)</span>
|
||||||
|
<input
|
||||||
|
className="w-full border rounded-md px-3 py-2 text-sm mt-1"
|
||||||
|
value={state.slug}
|
||||||
|
onChange={(e) => set("slug", e.target.value)}
|
||||||
|
placeholder="beverages"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
) : (
|
||||||
|
<label className="block">
|
||||||
|
<span className="text-xs text-gray-500">路径(不可修改)</span>
|
||||||
|
<input
|
||||||
|
className="w-full border rounded-md px-3 py-2 text-sm mt-1 bg-gray-50 text-gray-400"
|
||||||
|
value={state.slug}
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
|
<label className="block">
|
||||||
|
<span className="text-xs text-gray-500">GPC Brick 编码(可选)</span>
|
||||||
|
<input
|
||||||
|
className="w-full border rounded-md px-3 py-2 text-sm mt-1"
|
||||||
|
value={state.gpc_brick_code}
|
||||||
|
onChange={(e) => set("gpc_brick_code", e.target.value)}
|
||||||
|
placeholder="10000224"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div className="mt-4 flex gap-2">
|
||||||
|
<button
|
||||||
|
onClick={submit}
|
||||||
|
disabled={busy}
|
||||||
|
className="px-4 py-2 rounded bg-emerald-600 text-white text-sm hover:bg-emerald-700 disabled:opacity-60"
|
||||||
|
>
|
||||||
|
保存
|
||||||
|
</button>
|
||||||
|
<button onClick={onClose} className="px-4 py-2 rounded border text-sm text-gray-600">
|
||||||
|
取消
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -74,6 +74,17 @@ export interface Category {
|
|||||||
name_en: string | null;
|
name_en: string | null;
|
||||||
path: string;
|
path: string;
|
||||||
level: number;
|
level: number;
|
||||||
|
parent_id: string | null;
|
||||||
|
gpc_brick_code: string | null;
|
||||||
|
product_count: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CategoryInput {
|
||||||
|
name_zh: string;
|
||||||
|
name_en?: string | null;
|
||||||
|
slug?: string | null;
|
||||||
|
parent_id?: string | null;
|
||||||
|
gpc_brick_code?: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface AuditEntry {
|
export interface AuditEntry {
|
||||||
|
|||||||
@@ -77,6 +77,9 @@ func (h *Handler) Router() http.Handler {
|
|||||||
r.Post("/api/products/{id}/barcodes/{barcodeID}/primary", h.SetPrimaryBarcode)
|
r.Post("/api/products/{id}/barcodes/{barcodeID}/primary", h.SetPrimaryBarcode)
|
||||||
r.Get("/api/brands", h.ListBrands)
|
r.Get("/api/brands", h.ListBrands)
|
||||||
r.Get("/api/categories", h.ListCategories)
|
r.Get("/api/categories", h.ListCategories)
|
||||||
|
r.Post("/api/categories", h.CreateCategory)
|
||||||
|
r.Put("/api/categories/{id}", h.UpdateCategory)
|
||||||
|
r.Delete("/api/categories/{id}", h.DeleteCategory)
|
||||||
|
|
||||||
r.Get("/api/submissions", h.ListSubmissions)
|
r.Get("/api/submissions", h.ListSubmissions)
|
||||||
r.Get("/api/submissions/{id}", h.GetSubmission)
|
r.Get("/api/submissions/{id}", h.GetSubmission)
|
||||||
@@ -328,6 +331,74 @@ func (h *Handler) ListCategories(w http.ResponseWriter, r *http.Request) {
|
|||||||
writeJSON(w, http.StatusOK, map[string]any{"items": items})
|
writeJSON(w, http.StatusOK, map[string]any{"items": items})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CreateCategory adds a category node.
|
||||||
|
func (h *Handler) CreateCategory(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var in adminstore.CategoryInput
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
||||||
|
writeError(w, http.StatusBadRequest, "bad_request", "invalid body")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(in.NameZH) == "" {
|
||||||
|
writeError(w, http.StatusBadRequest, "bad_request", "分类名称不能为空")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c, err := h.store.CreateCategory(r.Context(), auth.UserFrom(r.Context()), in)
|
||||||
|
if h.handleCategoryErr(w, err) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
writeJSON(w, http.StatusCreated, c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateCategory renames and/or moves a category node.
|
||||||
|
func (h *Handler) UpdateCategory(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var in adminstore.CategoryInput
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
||||||
|
writeError(w, http.StatusBadRequest, "bad_request", "invalid body")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(in.NameZH) == "" {
|
||||||
|
writeError(w, http.StatusBadRequest, "bad_request", "分类名称不能为空")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c, err := h.store.UpdateCategory(r.Context(), chi.URLParam(r, "id"), auth.UserFrom(r.Context()), in)
|
||||||
|
if h.handleCategoryErr(w, err) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
writeJSON(w, http.StatusOK, c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteCategory removes a leaf category that no product uses.
|
||||||
|
func (h *Handler) DeleteCategory(w http.ResponseWriter, r *http.Request) {
|
||||||
|
err := h.store.DeleteCategory(r.Context(), chi.URLParam(r, "id"), auth.UserFrom(r.Context()))
|
||||||
|
if h.handleCategoryErr(w, err) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
writeJSON(w, http.StatusOK, map[string]string{"status": "deleted"})
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleCategoryErr maps category-specific errors to client statuses, falling
|
||||||
|
// back to handleErr otherwise.
|
||||||
|
func (h *Handler) handleCategoryErr(w http.ResponseWriter, err error) bool {
|
||||||
|
if err == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
switch {
|
||||||
|
case errors.Is(err, adminstore.ErrDuplicatePath):
|
||||||
|
writeError(w, http.StatusConflict, "duplicate_path", "该分类路径已存在,请换一个英文标识(slug)")
|
||||||
|
return true
|
||||||
|
case errors.Is(err, adminstore.ErrCategoryHasChildren):
|
||||||
|
writeError(w, http.StatusConflict, "has_children", "该分类存在子分类,请先删除或移动其子分类")
|
||||||
|
return true
|
||||||
|
case errors.Is(err, adminstore.ErrCategoryInUse):
|
||||||
|
writeError(w, http.StatusConflict, "in_use", "仍有商品归属于该分类,请先改归其它分类")
|
||||||
|
return true
|
||||||
|
case errors.Is(err, adminstore.ErrInvalidParent):
|
||||||
|
writeError(w, http.StatusBadRequest, "invalid_parent", "上级分类无效(不存在或不能移动到自身/子级下)")
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return h.handleErr(w, err)
|
||||||
|
}
|
||||||
|
|
||||||
// ---------- submissions ----------
|
// ---------- submissions ----------
|
||||||
|
|
||||||
// CreateSubmission accepts an anonymous public contribution into the queue.
|
// CreateSubmission accepts an anonymous public contribution into the queue.
|
||||||
|
|||||||
@@ -0,0 +1,297 @@
|
|||||||
|
package adminstore
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/hex"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgconn"
|
||||||
|
)
|
||||||
|
|
||||||
|
// randomHex returns n random lowercase hex characters for fallback ltree slugs.
|
||||||
|
func randomHex(n int) string {
|
||||||
|
b := make([]byte, (n+1)/2)
|
||||||
|
if _, err := rand.Read(b); err != nil {
|
||||||
|
return "x"
|
||||||
|
}
|
||||||
|
return hex.EncodeToString(b)[:n]
|
||||||
|
}
|
||||||
|
|
||||||
|
// Category-management errors, mapped to client statuses by the handler.
|
||||||
|
var (
|
||||||
|
// ErrDuplicatePath is returned when a category path already exists.
|
||||||
|
ErrDuplicatePath = errors.New("duplicate category path")
|
||||||
|
// ErrCategoryHasChildren blocks deleting a node that still has children.
|
||||||
|
ErrCategoryHasChildren = errors.New("category has children")
|
||||||
|
// ErrCategoryInUse blocks deleting a node still referenced by products.
|
||||||
|
ErrCategoryInUse = errors.New("category in use")
|
||||||
|
// ErrInvalidParent is returned for a missing parent or an illegal move
|
||||||
|
// (onto itself or one of its own descendants).
|
||||||
|
ErrInvalidParent = errors.New("invalid parent category")
|
||||||
|
)
|
||||||
|
|
||||||
|
// CategoryInput is the payload accepted when creating or editing a category.
|
||||||
|
// Slug is the ltree label (ASCII); when empty it is derived from NameEN, then
|
||||||
|
// from a random suffix, since ltree labels cannot contain CJK or spaces.
|
||||||
|
type CategoryInput struct {
|
||||||
|
NameZH string `json:"name_zh"`
|
||||||
|
NameEN *string `json:"name_en"`
|
||||||
|
Slug *string `json:"slug"`
|
||||||
|
ParentID *string `json:"parent_id"`
|
||||||
|
GPCBrickCode *string `json:"gpc_brick_code"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var slugInvalid = regexp.MustCompile(`[^a-z0-9_]+`)
|
||||||
|
|
||||||
|
// slugify converts a string into a valid ltree label ([a-z0-9_]).
|
||||||
|
func slugify(s string) string {
|
||||||
|
s = strings.ToLower(strings.TrimSpace(s))
|
||||||
|
s = slugInvalid.ReplaceAllString(s, "_")
|
||||||
|
s = strings.Trim(s, "_")
|
||||||
|
for strings.Contains(s, "__") {
|
||||||
|
s = strings.ReplaceAll(s, "__", "_")
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
// resolveSlug picks an ltree label from the explicit slug, then NameEN, then a
|
||||||
|
// random fallback so a Chinese-only category still gets a valid path label.
|
||||||
|
func resolveSlug(in CategoryInput) string {
|
||||||
|
if in.Slug != nil {
|
||||||
|
if s := slugify(*in.Slug); s != "" {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if in.NameEN != nil {
|
||||||
|
if s := slugify(*in.NameEN); s != "" {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "cat_" + randomHex(6)
|
||||||
|
}
|
||||||
|
|
||||||
|
func trimPtr(p *string) *string {
|
||||||
|
if p == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
t := strings.TrimSpace(*p)
|
||||||
|
if t == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return &t
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateCategory inserts a new category node. With no parent it becomes a root
|
||||||
|
// (level 0); otherwise its path is parentPath.slug and level is parentLevel+1.
|
||||||
|
func (s *Store) CreateCategory(ctx context.Context, actor string, in CategoryInput) (*Category, error) {
|
||||||
|
name := strings.TrimSpace(in.NameZH)
|
||||||
|
if name == "" {
|
||||||
|
return nil, errors.New("name_zh required")
|
||||||
|
}
|
||||||
|
|
||||||
|
parentPath := ""
|
||||||
|
parentLevel := -1
|
||||||
|
var parentID *string
|
||||||
|
if pid := trimPtr(in.ParentID); pid != nil {
|
||||||
|
var path string
|
||||||
|
var level int
|
||||||
|
err := s.pool.QueryRow(ctx, "SELECT path::text, level FROM category WHERE id = $1", *pid).Scan(&path, &level)
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return nil, ErrInvalidParent
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
parentPath, parentLevel, parentID = path, level, pid
|
||||||
|
}
|
||||||
|
|
||||||
|
slug := resolveSlug(in)
|
||||||
|
path := slug
|
||||||
|
if parentPath != "" {
|
||||||
|
path = parentPath + "." + slug
|
||||||
|
}
|
||||||
|
level := parentLevel + 1
|
||||||
|
|
||||||
|
var c Category
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
INSERT INTO category (name_zh, name_en, parent_id, path, gpc_brick_code, level)
|
||||||
|
VALUES ($1, $2, $3, $4::ltree, $5, $6)
|
||||||
|
RETURNING id, name_zh, name_en, path::text, level, parent_id::text, gpc_brick_code, 0`,
|
||||||
|
name, trimPtr(in.NameEN), parentID, path, trimPtr(in.GPCBrickCode), level).
|
||||||
|
Scan(&c.ID, &c.NameZH, &c.NameEN, &c.Path, &c.Level, &c.ParentID, &c.GPCBrickCode, &c.ProductCount)
|
||||||
|
if isUniqueViolation(err) {
|
||||||
|
return nil, ErrDuplicatePath
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = s.writeAudit(ctx, actor, "create", "category", &c.ID, []string{"name_zh", "path"}, nil, c)
|
||||||
|
return &c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateCategory renames a node and/or moves it under a new parent. Moving
|
||||||
|
// rewrites the path of the node and every descendant via ltree, keeping level
|
||||||
|
// in sync. Moving a node onto itself or a descendant is rejected.
|
||||||
|
func (s *Store) UpdateCategory(ctx context.Context, id, actor string, in CategoryInput) (*Category, error) {
|
||||||
|
name := strings.TrimSpace(in.NameZH)
|
||||||
|
if name == "" {
|
||||||
|
return nil, errors.New("name_zh required")
|
||||||
|
}
|
||||||
|
|
||||||
|
tx, err := s.pool.Begin(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer tx.Rollback(ctx)
|
||||||
|
|
||||||
|
var oldPath string
|
||||||
|
var oldLevel int
|
||||||
|
var oldParent *string
|
||||||
|
err = tx.QueryRow(ctx, "SELECT path::text, level, parent_id::text FROM category WHERE id = $1", id).
|
||||||
|
Scan(&oldPath, &oldLevel, &oldParent)
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return nil, ErrNotFound
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := tx.Exec(ctx,
|
||||||
|
"UPDATE category SET name_zh = $1, name_en = $2, gpc_brick_code = $3 WHERE id = $4",
|
||||||
|
name, trimPtr(in.NameEN), trimPtr(in.GPCBrickCode), id); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
newParent := trimPtr(in.ParentID)
|
||||||
|
if !strEq(newParent, oldParent) {
|
||||||
|
if err := s.moveCategoryTx(ctx, tx, id, oldPath, newParent); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tx.Commit(ctx); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
out, err := s.getCategory(ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
_ = s.writeAudit(ctx, actor, "update", "category", &id, []string{"name_zh", "name_en", "gpc_brick_code", "parent_id"}, nil, out)
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// moveCategoryTx re-parents a subtree. The node's slug (last path label) is
|
||||||
|
// preserved; only its ancestor prefix and level change.
|
||||||
|
func (s *Store) moveCategoryTx(ctx context.Context, tx pgx.Tx, id, oldPath string, newParent *string) error {
|
||||||
|
slug := oldPath
|
||||||
|
if i := strings.LastIndex(oldPath, "."); i >= 0 {
|
||||||
|
slug = oldPath[i+1:]
|
||||||
|
}
|
||||||
|
|
||||||
|
newBase := slug
|
||||||
|
if newParent != nil {
|
||||||
|
var parentPath string
|
||||||
|
err := tx.QueryRow(ctx, "SELECT path::text FROM category WHERE id = $1", *newParent).Scan(&parentPath)
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return ErrInvalidParent
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Disallow moving a node under itself or one of its descendants.
|
||||||
|
if parentPath == oldPath || strings.HasPrefix(parentPath, oldPath+".") {
|
||||||
|
return ErrInvalidParent
|
||||||
|
}
|
||||||
|
newBase = parentPath + "." + slug
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rewrite the node and all descendants in one statement; level tracks depth.
|
||||||
|
_, err := tx.Exec(ctx, `
|
||||||
|
UPDATE category
|
||||||
|
SET path = ($1::ltree || subpath(path, nlevel($2::ltree) - 1)),
|
||||||
|
level = nlevel($1::ltree) + (nlevel(path) - nlevel($2::ltree)) - 1
|
||||||
|
WHERE path = $2::ltree OR path <@ $2::ltree`, newBase, oldPath)
|
||||||
|
if isUniqueViolation(err) {
|
||||||
|
return ErrDuplicatePath
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = tx.Exec(ctx, "UPDATE category SET parent_id = $1 WHERE id = $2", newParent, id)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteCategory removes a leaf node not referenced by any product. Nodes with
|
||||||
|
// children or in-use nodes are rejected with a specific error.
|
||||||
|
func (s *Store) DeleteCategory(ctx context.Context, id, actor string) error {
|
||||||
|
before, err := s.getCategory(ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
var children int
|
||||||
|
if err := s.pool.QueryRow(ctx, "SELECT count(*) FROM category WHERE parent_id = $1", id).Scan(&children); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if children > 0 {
|
||||||
|
return ErrCategoryHasChildren
|
||||||
|
}
|
||||||
|
|
||||||
|
var products int
|
||||||
|
if err := s.pool.QueryRow(ctx, "SELECT count(*) FROM product WHERE category_id = $1", id).Scan(&products); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if products > 0 {
|
||||||
|
return fmt.Errorf("%w: %d products", ErrCategoryInUse, products)
|
||||||
|
}
|
||||||
|
|
||||||
|
ct, err := s.pool.Exec(ctx, "DELETE FROM category WHERE id = $1", id)
|
||||||
|
if err != nil {
|
||||||
|
// A concurrent product assignment can still trip the FK.
|
||||||
|
if isForeignKeyViolation(err) {
|
||||||
|
return ErrCategoryInUse
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if ct.RowsAffected() == 0 {
|
||||||
|
return ErrNotFound
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = s.writeAudit(ctx, actor, "delete", "category", &id, []string{"path"}, before, nil)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) getCategory(ctx context.Context, id string) (*Category, error) {
|
||||||
|
var c Category
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT c.id, c.name_zh, c.name_en, c.path::text, c.level, c.parent_id::text,
|
||||||
|
c.gpc_brick_code,
|
||||||
|
(SELECT count(*) FROM product p WHERE p.category_id = c.id)
|
||||||
|
FROM category c WHERE c.id = $1`, id).
|
||||||
|
Scan(&c.ID, &c.NameZH, &c.NameEN, &c.Path, &c.Level, &c.ParentID, &c.GPCBrickCode, &c.ProductCount)
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return nil, ErrNotFound
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func isUniqueViolation(err error) bool {
|
||||||
|
var pgErr *pgconn.PgError
|
||||||
|
return errors.As(err, &pgErr) && pgErr.Code == "23505"
|
||||||
|
}
|
||||||
|
|
||||||
|
func isForeignKeyViolation(err error) bool {
|
||||||
|
var pgErr *pgconn.PgError
|
||||||
|
return errors.As(err, &pgErr) && pgErr.Code == "23503"
|
||||||
|
}
|
||||||
@@ -0,0 +1,130 @@
|
|||||||
|
package adminstore
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// newTestStore connects to the test database, skipping when it is unreachable
|
||||||
|
// or migrations have not been applied.
|
||||||
|
func newTestStore(t *testing.T) *Store {
|
||||||
|
t.Helper()
|
||||||
|
dsn := os.Getenv("OPENGOODS_DATABASE_URL")
|
||||||
|
if dsn == "" {
|
||||||
|
dsn = "postgres://opengoods:opengoods@localhost:5432/opengoods?sslmode=disable"
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
pool, err := pgxpool.New(ctx, dsn)
|
||||||
|
if err != nil {
|
||||||
|
t.Skipf("no database: %v", err)
|
||||||
|
}
|
||||||
|
if err := pool.Ping(ctx); err != nil {
|
||||||
|
pool.Close()
|
||||||
|
t.Skipf("database not reachable: %v", err)
|
||||||
|
}
|
||||||
|
var hasTable bool
|
||||||
|
if err := pool.QueryRow(ctx, "SELECT to_regclass('public.category') IS NOT NULL").Scan(&hasTable); err != nil || !hasTable {
|
||||||
|
pool.Close()
|
||||||
|
t.Skip("migrations not applied (category missing)")
|
||||||
|
}
|
||||||
|
t.Cleanup(pool.Close)
|
||||||
|
return New(pool)
|
||||||
|
}
|
||||||
|
|
||||||
|
func ptr(s string) *string { return &s }
|
||||||
|
|
||||||
|
func TestCategoryLifecycle(t *testing.T) {
|
||||||
|
s := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
root, err := s.CreateCategory(ctx, "tester", CategoryInput{
|
||||||
|
NameZH: "测试根", Slug: ptr("test_root_" + randomHex(6)),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create root: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _, _ = s.pool.Exec(ctx, "DELETE FROM category WHERE path <@ $1::ltree", root.Path) })
|
||||||
|
|
||||||
|
if root.Level != 0 || root.ParentID != nil {
|
||||||
|
t.Fatalf("root level/parent wrong: level=%d parent=%v", root.Level, root.ParentID)
|
||||||
|
}
|
||||||
|
|
||||||
|
child, err := s.CreateCategory(ctx, "tester", CategoryInput{
|
||||||
|
NameZH: "测试子", NameEN: ptr("Test Child"), ParentID: &root.ID,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create child: %v", err)
|
||||||
|
}
|
||||||
|
if child.Level != 1 || child.ParentID == nil || *child.ParentID != root.ID {
|
||||||
|
t.Fatalf("child hierarchy wrong: %+v", child)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deleting a node with children must fail.
|
||||||
|
if err := s.DeleteCategory(ctx, root.ID, "tester"); !errors.Is(err, ErrCategoryHasChildren) {
|
||||||
|
t.Fatalf("expected ErrCategoryHasChildren, got %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rename child.
|
||||||
|
renamed, err := s.UpdateCategory(ctx, child.ID, "tester", CategoryInput{NameZH: "测试子-改名"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("rename: %v", err)
|
||||||
|
}
|
||||||
|
if renamed.NameZH != "测试子-改名" {
|
||||||
|
t.Fatalf("rename not applied: %q", renamed.NameZH)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Move child to a second root, descendants' path/level should follow.
|
||||||
|
root2, err := s.CreateCategory(ctx, "tester", CategoryInput{
|
||||||
|
NameZH: "测试根2", Slug: ptr("test_root2_" + randomHex(6)),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create root2: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _, _ = s.pool.Exec(ctx, "DELETE FROM category WHERE path <@ $1::ltree", root2.Path) })
|
||||||
|
|
||||||
|
moved, err := s.UpdateCategory(ctx, child.ID, "tester", CategoryInput{NameZH: "测试子-改名", ParentID: &root2.ID})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("move: %v", err)
|
||||||
|
}
|
||||||
|
if moved.ParentID == nil || *moved.ParentID != root2.ID {
|
||||||
|
t.Fatalf("move parent wrong: %+v", moved)
|
||||||
|
}
|
||||||
|
if moved.Level != 1 {
|
||||||
|
t.Fatalf("moved level wrong: %d", moved.Level)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Moving a node under itself must be rejected.
|
||||||
|
if _, err := s.UpdateCategory(ctx, root2.ID, "tester", CategoryInput{NameZH: "测试根2", ParentID: &child.ID}); !errors.Is(err, ErrInvalidParent) {
|
||||||
|
t.Fatalf("expected ErrInvalidParent for self-move, got %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Duplicate path on create must be rejected.
|
||||||
|
if _, err := s.CreateCategory(ctx, "tester", CategoryInput{NameZH: "dup", Slug: ptr(root.Path)}); !errors.Is(err, ErrDuplicatePath) {
|
||||||
|
t.Fatalf("expected ErrDuplicatePath, got %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Now the leaf can be deleted.
|
||||||
|
if err := s.DeleteCategory(ctx, child.ID, "tester"); err != nil {
|
||||||
|
t.Fatalf("delete leaf: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSlugify(t *testing.T) {
|
||||||
|
cases := map[string]string{
|
||||||
|
"Cooking Oil": "cooking_oil",
|
||||||
|
" Hello--Wld": "hello_wld",
|
||||||
|
"食品": "",
|
||||||
|
"a__b": "a_b",
|
||||||
|
}
|
||||||
|
for in, want := range cases {
|
||||||
|
if got := slugify(in); got != want {
|
||||||
|
t.Errorf("slugify(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -354,19 +354,27 @@ func (s *Store) ListBrands(ctx context.Context) ([]Brand, error) {
|
|||||||
return out, rows.Err()
|
return out, rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Category is a category option for the edit form.
|
// Category is a category option for the edit form and the management view.
|
||||||
type Category struct {
|
type Category struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
NameZH string `json:"name_zh"`
|
NameZH string `json:"name_zh"`
|
||||||
NameEN *string `json:"name_en"`
|
NameEN *string `json:"name_en"`
|
||||||
Path string `json:"path"`
|
Path string `json:"path"`
|
||||||
Level int `json:"level"`
|
Level int `json:"level"`
|
||||||
|
ParentID *string `json:"parent_id"`
|
||||||
|
GPCBrickCode *string `json:"gpc_brick_code"`
|
||||||
|
ProductCount int `json:"product_count"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListCategories returns the full category tree.
|
// ListCategories returns the full category tree (path order) with the number of
|
||||||
|
// products directly assigned to each node.
|
||||||
func (s *Store) ListCategories(ctx context.Context) ([]Category, error) {
|
func (s *Store) ListCategories(ctx context.Context) ([]Category, error) {
|
||||||
rows, err := s.pool.Query(ctx,
|
rows, err := s.pool.Query(ctx, `
|
||||||
"SELECT id, name_zh, name_en, path::text, level FROM category ORDER BY path")
|
SELECT c.id, c.name_zh, c.name_en, c.path::text, c.level, c.parent_id::text,
|
||||||
|
c.gpc_brick_code,
|
||||||
|
(SELECT count(*) FROM product p WHERE p.category_id = c.id) AS product_count
|
||||||
|
FROM category c
|
||||||
|
ORDER BY c.path`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -374,7 +382,8 @@ func (s *Store) ListCategories(ctx context.Context) ([]Category, error) {
|
|||||||
out := []Category{}
|
out := []Category{}
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var c Category
|
var c Category
|
||||||
if err := rows.Scan(&c.ID, &c.NameZH, &c.NameEN, &c.Path, &c.Level); err != nil {
|
if err := rows.Scan(&c.ID, &c.NameZH, &c.NameEN, &c.Path, &c.Level,
|
||||||
|
&c.ParentID, &c.GPCBrickCode, &c.ProductCount); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
out = append(out, c)
|
out = append(out, c)
|
||||||
|
|||||||
Reference in New Issue
Block a user