diff --git a/src/features/tech-log/adapters/http/http-management-gateway.ts b/src/features/tech-log/adapters/http/http-management-gateway.ts index 70dd832..520cbe4 100644 --- a/src/features/tech-log/adapters/http/http-management-gateway.ts +++ b/src/features/tech-log/adapters/http/http-management-gateway.ts @@ -7,6 +7,8 @@ import type { UpdateProjectActivityRequest, ProjectEditResponse, ProjectIndexPage, + QuestionIndexPage, + DecisionResponse, ProjectUpdateRequest, PublishResponse, ReleaseEditResponse, @@ -80,6 +82,13 @@ export function createHttpManagementGateway( }, listProjects: (page?: number, size?: number) => run("listStudioProjects", { ...(page !== undefined ? { page } : {}), ...(size !== undefined ? { size } : {}) }), + listQuestions: (page?: number, size?: number) => + run("listStudioQuestions", { + ...(page !== undefined ? { page } : {}), + ...(size !== undefined ? { size } : {}), + }), + listProjectDecisions: (projectId: string) => + run("listStudioProjectDecisions", { id: projectId }), getProject: (id: string) => run("getProjectForEdit", { id }), createProject: (title: string) => run("createProject", { title }), updateProject: (id: string, body: ProjectUpdateRequest) => diff --git a/src/features/tech-log/application/ports/management-gateway.ts b/src/features/tech-log/application/ports/management-gateway.ts index 4628afa..6f411ab 100644 --- a/src/features/tech-log/application/ports/management-gateway.ts +++ b/src/features/tech-log/application/ports/management-gateway.ts @@ -7,6 +7,8 @@ import type { UpdateProjectActivityRequest, ProjectEditResponse, ProjectIndexPage, + QuestionIndexPage, + DecisionResponse, ProjectUpdateRequest, PublishResponse, ReleaseEditResponse, @@ -31,6 +33,12 @@ export type ManagementGateway = Readonly<{ updateTopic(id: string, body: TopicEdit): Promise; deleteTopic(id: string, expectedVersion: number): Promise; listProjects(page?: number, size?: number): Promise; + /* + 홈 「지금 집중하는 것」 편집기가 쓰는 둘. 질문 항목은 `primaryProject` 를 들고 오므로 그것으로 + 거르고, 결정은 경로 자체가 프로젝트를 요구하므로 고른 프로젝트의 것만 온다. + */ + listQuestions(page?: number, size?: number): Promise; + listProjectDecisions(projectId: string): Promise; getProject(id: string): Promise; createProject(title: string): Promise; updateProject(id: string, body: ProjectUpdateRequest): Promise; diff --git a/src/features/tech-log/contracts/management/contract.ts b/src/features/tech-log/contracts/management/contract.ts index 79a0bab..7743689 100644 --- a/src/features/tech-log/contracts/management/contract.ts +++ b/src/features/tech-log/contracts/management/contract.ts @@ -6,6 +6,8 @@ export type TopicEdit = Schemas["TopicEdit"]; export type ProjectEditResponse = Schemas["ProjectEditResponse"]; export type ProjectIndexItem = Schemas["ProjectIndexItem"]; export type ProjectIndexPage = Schemas["ProjectIndexPage"]; +export type QuestionIndexPage = Schemas["QuestionIndexPage"]; +export type DecisionResponse = Schemas["DecisionResponse"]; export type ProjectUpdateRequest = Schemas["ProjectUpdateRequest"]; export type CreateDraftRequest = Schemas["CreateDraftRequest"]; export type CreateDraftResponse = Schemas["CreateDraftResponse"]; diff --git a/src/features/tech-log/contracts/tech-log-management-contract-contribution.ts b/src/features/tech-log/contracts/tech-log-management-contract-contribution.ts index e3b0be5..14953fe 100644 --- a/src/features/tech-log/contracts/tech-log-management-contract-contribution.ts +++ b/src/features/tech-log/contracts/tech-log-management-contract-contribution.ts @@ -219,6 +219,18 @@ const HTTP_CONTRACTS = Object.freeze([ return Object.freeze({ pathValues: NO_PATH, queryEntries: Object.freeze(entries) }); }), readOperation("getProjectForEdit", `${P}/{id}`, 262_144, byId), + /* + 홈 「지금 집중하는 것」 편집기가 프로젝트에 속한 질문·결정만 고르게 하려면 이 둘이 필요하다. + 계약에는 있었지만 여기 등록되지 않아 부를 수 없었다. + */ + readOperation("listStudioQuestions", `${D}/questions`, 262_144, (input: never) => { + const value = input as unknown as Readonly<{ page?: number; size?: number }> | undefined; + const entries: (readonly [string, string])[] = []; + if (value?.page !== undefined) entries.push(["page", String(value.page)]); + if (value?.size !== undefined) entries.push(["size", String(value.size)]); + return Object.freeze({ pathValues: NO_PATH, queryEntries: Object.freeze(entries) }); + }), + readOperation("listStudioProjectDecisions", `${P}/{id}/decisions`, 262_144, byId), writeOperation( "createProject", "POST", diff --git a/src/features/tech-log/presentation/studio/components/home-focus-editor.tsx b/src/features/tech-log/presentation/studio/components/home-focus-editor.tsx index 9445469..a8a390e 100644 --- a/src/features/tech-log/presentation/studio/components/home-focus-editor.tsx +++ b/src/features/tech-log/presentation/studio/components/home-focus-editor.tsx @@ -9,7 +9,6 @@ import { managementFailureMessage } from "../../../application/ports/management- import { GuardedStudioLink } from "./guarded-studio-link.tsx"; import { useStudio } from "../use-studio.ts"; -type CatalogEntry = components["schemas"]["CatalogEntry"]; /** * 공개 홈의 "지금 집중하는 것" 을 정하는 화면. @@ -29,10 +28,11 @@ export function HomeFocusEditor() { const { gateway, managementGateway, setRequestAnnouncement } = useStudio(); const [focus, setFocus] = useState(null); const [projects, setProjects] = useState([]); - const [relations, setRelations] = useState([]); const [projectId, setProjectId] = useState(""); const [questionId, setQuestionId] = useState(""); const [decisionId, setDecisionId] = useState(""); + const [projectQuestions, setProjectQuestions] = useState<{ id: string; label: string }[]>([]); + const [projectDecisions, setProjectDecisions] = useState<{ id: string; label: string }[]>([]); const [pending, setPending] = useState(false); const [error, setError] = useState(""); const [generation, setGeneration] = useState(0); @@ -49,15 +49,13 @@ export function HomeFocusEditor() { */ void (async () => { try { - const [current, projectPage, catalog] = await Promise.all([ + const [current, projectPage] = await Promise.all([ managementGateway.getHomeFocus(), managementGateway.listProjects(0, 50), - gateway.getCatalog({ type: "RELATION", limit: 100 }), ]); if (cancelled) return; setFocus(current); setProjects(projectPage.items ?? []); - setRelations(catalog.items ?? []); setProjectId(current.currentProjectId ?? ""); setQuestionId(current.openQuestionId ?? ""); setDecisionId(current.recentDecisionId ?? ""); @@ -71,8 +69,65 @@ export function HomeFocusEditor() { }; }, [gateway, managementGateway, generation]); - const questions = relations.filter((entry) => entry.kind === "QUESTION"); - const decisions = relations.filter((entry) => entry.kind === "PROJECT_DECISION"); + /* + 고른 프로젝트의 질문·결정만 불러온다. 프로젝트를 바꾸면 이전 프로젝트의 선택은 목록에 + 없으므로 함께 비운다 — 남겨 두면 홈에서 다른 프로젝트의 결정이 나온다. + */ + useEffect(() => { + let cancelled = false; + if (!projectId) { + setProjectQuestions([]); + setProjectDecisions([]); + return () => { + cancelled = true; + }; + } + void (async () => { + try { + const [questionPage, decisionList] = await Promise.all([ + managementGateway.listQuestions(0, 100), + managementGateway.listProjectDecisions(projectId), + ]); + if (cancelled) return; + /* + 질문 항목은 프로젝트를 slug 로 알려 준다(계약의 `ProjectSummary` 에는 id 가 없다). + 그래서 고른 프로젝트의 slug 와 맞춘다. + */ + const chosenSlug = projects + .find((project) => project.id === projectId) + ?.publication.canonicalPath?.split("/") + .filter(Boolean) + .pop(); + setProjectQuestions( + (questionPage.items ?? []) + .filter((item) => !chosenSlug || item.primaryProject?.slug === chosenSlug) + .map((item) => ({ id: item.id, label: item.question })), + ); + setProjectDecisions( + decisionList.map((item) => ({ id: item.id, label: item.statement })), + ); + } catch { + if (!cancelled) { + setProjectQuestions([]); + setProjectDecisions([]); + } + } + })(); + return () => { + cancelled = true; + }; + }, [managementGateway, projectId, projects, generation]); + + /* + 이 화면은 「지금 집중하는 것」 하나를 고르는 자리다. 셋(프로젝트·질문·결정)이 서로 다른 + 프로젝트를 가리키면 홈에서 프로젝트는 A 인데 결정은 B 의 것이 나온다 — 실제로 그렇게 나왔다. + 그래서 프로젝트를 고르면 그 프로젝트의 질문·결정만 고르게 한다. + + 질문 항목은 `primaryProject` 를 들고 오므로 그것으로 거르고, 결정은 경로 자체가 프로젝트를 + 요구하므로 고른 프로젝트의 것만 온다. + */ + const questions = projectQuestions; + const decisions = projectDecisions; const save = async (event: FormEvent) => { event.preventDefault(); @@ -127,7 +182,18 @@ export function HomeFocusEditor() {