XiaChangSong/BPOS-TMP-REPO
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作成果里摆着别单的资料:「这一单产出的」认本单碰过的行

Browse Source 
放行存档(archiveAssetFiles)与在办列单(assetFilesOf)取行都用 taskView(where:{}) ——
那是「正式版全表 + 本单草稿」的合并视图,而资料常落在主数据上,整表里躺着别单放行过的行。
抽 assetRowsOf 两处同用,touched 为必填入参;e2e 补份数断言。
顺手清两笔:wake.test.ts 的 as unknown as(lint 红)、wake 契约的 api-report 快照(api:check 红)。
This commit is contained in:
xcs
2026-08-25 15:38:10 +08:00
parent 094386f02c
commit d788140548
9 changed files with 260 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/src/app/__tests__/asset-archive.test.ts
+87 -2
View File
@@ -8,7 +8,7 @@
*/
import { describe, expect, it } from 'vitest';
import type { TaskId } from '@contracts';
import { archiveAssetFiles, keyText } from '../asset-archive.ts';
import { archiveAssetFiles, assetRowsOf, keyText } from '../asset-archive.ts';
const TASK = 't-1' as TaskId;
@@ -54,6 +54,11 @@ describe('keyText —— 主键拼法必须稳定', () => {
});
});
/** 本单碰过的行 —— `ledger.taskDrafts()` 那一份的形状 */
function touch(...ids: string[]) {
return ids.map((content_id) => ({ domain: 'content', object: 'asset', key: { content_id } }));
}
describe('archiveAssetFiles —— 存哪些、不存哪些', () => {
it('一行一份,存下来的是真字节(存几份就写几笔)', async () => {
const db = fakeDb();
@@ -62,6 +67,7 @@ describe('archiveAssetFiles —— 存哪些、不存哪些', () => {
taskId: TASK,
ids,
declarations: [ASSET],
touched: touch('CT-1', 'CT-2'),
rowsOfAddress: async () => [
{ content_id: 'CT-1', title: '白皮书', body_md: '# 白皮书\n\n正文', file_format: 'docx' },
{ content_id: 'CT-2', title: '对照表', body_md: '| a | b |\n| - | - |\n| 1 | 2 |', file_format: 'xlsx' },
@@ -72,6 +78,56 @@ describe('archiveAssetFiles —— 存哪些、不存哪些', () => {
expect(db.writes.join()).toContain('白皮书');
});
/*
* 2026-08-25 柴浩实测:「工作成果怎么有 4 个资料,这单只会产出一个」——
* 资料落在**主数据**上,整表里躺着历次跑出来的资产,前三份都是别单的成果。
*/
it('**别单放行过的行不算这一单产出的** —— 整表四行,本单只碰过一行,就只存一份', async () => {
const db = fakeDb();
const saved = await archiveAssetFiles({
db,
taskId: TASK,
ids,
declarations: [ASSET],
touched: touch('CT-2026-0004'),
rowsOfAddress: async () => [
{ content_id: 'CT-2026-0001', title: '白皮书', body_md: '别单的正文', file_format: 'docx' },
{ content_id: 'CT-2026-0002', title: '白皮书 2026', body_md: '别单的正文', file_format: 'docx' },
{ content_id: 'CT-2026-0003', title: '产品介绍书', body_md: '别单的正文', file_format: 'docx' },
{ content_id: 'CT-2026-0004', title: '白皮书 E04 定制版', body_md: '这一单写的正文', file_format: 'docx' },
],
});
expect(saved).toBe(1);
expect(db.writes.join()).toContain('CT-2026-0004');
expect(db.writes.join()).not.toContain('CT-2026-0001');
});
it('这一单一行也没碰过:表里再多行也存 0 份', async () => {
const db = fakeDb();
const saved = await archiveAssetFiles({
db,
taskId: TASK,
ids,
declarations: [ASSET],
touched: [],
rowsOfAddress: async () => [{ content_id: 'CT-1', title: 'T', body_md: '正文', file_format: 'md' }],
});
expect(saved).toBe(0);
});
it('别的表碰过不算这张表碰过 —— 地址得对上', async () => {
const db = fakeDb();
const saved = await archiveAssetFiles({
db,
taskId: TASK,
ids,
declarations: [ASSET],
touched: [{ domain: 'content_brand', object: 'requirement', key: { content_id: 'CT-1' } }],
rowsOfAddress: async () => [{ content_id: 'CT-1', title: 'T', body_md: '正文', file_format: 'md' }],
});
expect(saved).toBe(0);
});
it('**没正文的行不存** —— 一份空壳存进去,人点开只会看见一张白纸', async () => {
const db = fakeDb();
const saved = await archiveAssetFiles({
@@ -79,6 +135,7 @@ describe('archiveAssetFiles —— 存哪些、不存哪些', () => {
taskId: TASK,
ids,
declarations: [ASSET],
touched: touch('CT-1'),
rowsOfAddress: async () => [{ content_id: 'CT-1', title: '还没写', body_md: ' ', file_format: 'md' }],
});
expect(saved).toBe(0);
@@ -92,6 +149,7 @@ describe('archiveAssetFiles —— 存哪些、不存哪些', () => {
taskId: TASK,
ids,
declarations: [ASSET],
touched: touch(''),
rowsOfAddress: async () => [{ content_id: '', title: 'T', body_md: '正文', file_format: 'md' }],
});
expect(saved).toBe(0);
@@ -104,6 +162,7 @@ describe('archiveAssetFiles —— 存哪些、不存哪些', () => {
taskId: TASK,
ids,
declarations: [{ ...ASSET, file: undefined }],
touched: touch('CT-1'),
rowsOfAddress: async () => [{ content_id: 'CT-1', title: 'T', body_md: '正文', file_format: 'md' }],
});
expect(saved).toBe(0);
@@ -116,6 +175,7 @@ describe('archiveAssetFiles —— 存哪些、不存哪些', () => {
taskId: TASK,
ids,
declarations: [ASSET],
touched: touch('CT-1'),
rowsOfAddress: async () => [{ content_id: 'CT-1', title: 'T', body_md: '正文', file_format: 'pdf' }],
});
expect(saved).toBe(1);
@@ -125,7 +185,32 @@ describe('archiveAssetFiles —— 存哪些、不存哪些', () => {
it('大多数活动不产资料 —— 一张带 file 段的表都没有时返回 0,不报错', async () => {
const db = fakeDb();
expect(
await archiveAssetFiles({ db, taskId: TASK, ids, declarations: [], rowsOfAddress: async () => [] }),
await archiveAssetFiles({ db, taskId: TASK, ids, declarations: [], touched: [], rowsOfAddress: async () => [] }),
).toBe(0);
});
});
describe('assetRowsOf —— 存档与工作成果同一段', () => {
it('值取合并行那一份:这轮只改了标题,正文仍按落库后的样子造', () => {
const picked = assetRowsOf(
ASSET,
[{ content_id: 'CT-1', title: '改过的标题', body_md: '早先写下的正文', file_format: 'docx' }],
touch('CT-1'),
);
expect(picked).toEqual([
{
address: 'content.asset',
key: { content_id: 'CT-1' },
title: '改过的标题',
format: 'docx',
markdown: '早先写下的正文',
},
]);
});
it('标题空着:退主键,不摆一份没名字的资料', () => {
const picked = assetRowsOf(ASSET, [{ content_id: 'CT-1', title: ' ', body_md: '正文' }], touch('CT-1'));
expect(picked[0]?.title).toBe('CT-1');
expect(picked[0]?.format).toBe('md');
});
});
apps/api/src/app/asset-archive.ts
+81 -28
View File
@@ -10,6 +10,9 @@
* 不存这一份,试跑单一放行,人在工作成果里就什么都点不开了。
*
* 一单一行一份,重复放行覆盖(不留两份说法不一的档)。
*
* **「这一单产出的」认的是本单碰过的行**,不是这张表里现有的所有行 ——
* 见 `assetRowsOf` 的病根记档。
*/
import { sql } from 'drizzle-orm';
import type { TaskId } from '@contracts';
@@ -35,6 +38,71 @@ function rowsOf<T>(result: unknown): T[] {
return Array.isArray(rows) ? (rows as T[]) : [];
}
/** 一张台账表的声明 —— 带 `file` 段的才产资料;这份声明同时是授权面 */
export type AssetDeclaration = {
readonly domain: string;
readonly object: string;
readonly fields: ReadonlyArray<{ name: string; primaryKey?: boolean }>;
readonly file?: { titleColumn: string; bodyColumn: string; formatColumn: string } | undefined;
};
/** 本单碰过的一行(`ledger.taskDrafts()` 那一份的形状) */
export type TouchedKey = {
readonly domain: string;
readonly object: string;
readonly key: Readonly<Record<string, unknown>>;
};
/** 这一单产出的一份资料 —— 还没造成字节的那一步 */
export type AssetRow = {
readonly address: string;
readonly key: Record<string, string>;
readonly title: string;
readonly format: FileFormat;
readonly markdown: string;
};
/**
* 这一单**产出的**资料行 —— 存档与工作成果两处同一段,不各写一份。
*
* 「产出的」认的是**本单碰过的行**(草稿键),不是这张表里现有的所有行。
* 病根记档(2026-08-25 柴浩实测:「工作成果怎么有 4 个资料,这单只会产出一个」):
* 两处从前都拿 `taskView` 的整页,而那是「正式版全表 + 本单草稿」的合并视图 ——
* 资料常落在**主数据**上(品牌内容库 `content.asset`,历次跑出来的资产都躺在里面),
* 于是一单产 1 份、工作成果里摆 4 份:前三份是别单的成果,冒充这一单交出去的东西。
* 台账契约本就把这两件事分得很清楚(`taskDrafts` 的注释:「引擎求值要区分
* 『这一单的事实』与『别人放行后的事实』」),视图模版也一律绑 `mine:` ——
* 只有资料这两处忘了。
*
* 值仍取合并视图那一份(正式现值 + 本单草稿叠加):改过一格的行要按
* 「落库后的样子」造文件,只拿草稿会缺掉这轮没碰过的那几列(与 `touched:` 同一道理)。
*/
export function assetRowsOf(
declared: AssetDeclaration,
rows: ReadonlyArray<Record<string, unknown>>,
touched: ReadonlyArray<TouchedKey>,
): AssetRow[] {
const spec = declared.file;
if (spec === undefined) return []; // 没声明 `file` 段的表不产资料 —— 存档与列表都认这道授权面
const keys = declared.fields.filter((f) => f.primaryKey === true).map((f) => f.name);
if (keys.length === 0) return [];
const mine = touched.filter((t) => t.domain === declared.domain && t.object === declared.object);
const address = `${declared.domain}.${declared.object}`;
const out: AssetRow[] = [];
for (const row of rows) {
const key: Record<string, string> = {};
for (const k of keys) key[k] = String(row[k] ?? '');
if (Object.values(key).some((v) => v === '')) continue; // 主键不全的行认不出来,存了也取不回
if (!mine.some((t) => keys.every((k) => String(t.key[k] ?? '') === key[k]))) continue; // 别单的成果不算这一单的
const markdown = String(row[spec.bodyColumn] ?? '').trim();
if (markdown === '') continue; // 没正文的行不是资料,别摆一份空壳
const title = String(row[spec.titleColumn] ?? '').trim() || Object.values(key).join('-');
const rawFormat = String(row[spec.formatColumn] ?? '').trim().toLowerCase();
out.push({ address, key, title, format: isFileFormat(rawFormat) ? rawFormat : 'md', markdown });
}
return out;
}
/**
* 主键 → 一个**稳定的**字符串(按列名排序后拼)。
* 稳定是要害:存的时候与取的时候拼法不一样,那一行就永远对不上。
@@ -111,7 +179,7 @@ export async function readArchived(
* 把这一单产出的资料**全部存一份**。放行落地之前调 —— 那时草稿还在、人的修订也已落回,
* 存下来的正是他签字那一刻的样子。
*
* 返回存了几份;一份都没有(活动没声明 `file` 段、或一行都没写)时返回 0,不报错 ——
* 返回存了几份;一份都没有(活动没声明 `file` 段、或这一单一行也没写)时返回 0,不报错 ——
* 大多数活动本来就不产资料文件。
*/
export async function archiveAssetFiles(input: {
@@ -119,40 +187,25 @@ export async function archiveAssetFiles(input: {
readonly taskId: TaskId;
readonly ids: { next(): string };
/** 活动清单声明的台账对象(带 `file` 段的才算) */
readonly declarations: ReadonlyArray<{
domain: string;
object: string;
fields: ReadonlyArray<{ name: string; primaryKey?: boolean }>;
file?: { titleColumn: string; bodyColumn: string; formatColumn: string } | undefined;
}>;
/** 本单在该地址写下的行(正式版 + 本单草稿) */
readonly declarations: ReadonlyArray<AssetDeclaration>;
/**
* **本单碰过的行** —— `ledger.taskDrafts()` 那一份。
* 「哪几行是这一单产出的」只有这一个答案:表里现有的行不作数(见 `assetRowsOf`)。
*/
readonly touched: ReadonlyArray<TouchedKey>;
/** 该地址的合并行(正式现值 + 本单草稿)—— 值按「落库后的样子」造文件 */
readonly rowsOfAddress: (address: { domain: string; object: string }) => Promise<Array<Record<string, unknown>>>;
}): Promise<number> {
let saved = 0;
for (const declared of input.declarations) {
const spec = declared.file;
if (spec === undefined) continue;
const keys = declared.fields.filter((f) => f.primaryKey === true).map((f) => f.name);
if (keys.length === 0) continue;
if (declared.file === undefined) continue; // 整张表不产资料,连取行都免了
const rows = await input.rowsOfAddress({ domain: declared.domain, object: declared.object });
for (const row of rows) {
const markdown = String(row[spec.bodyColumn] ?? '').trim();
if (markdown === '') continue; // 没正文的行不是资料,别存一份空壳
const key: Record<string, string> = {};
for (const k of keys) key[k] = String(row[k] ?? '');
if (Object.values(key).some((v) => v === '')) continue; // 主键不全的行认不出来,存了也取不回
const title = String(row[spec.titleColumn] ?? '').trim() || Object.values(key).join('-');
const rawFormat = String(row[spec.formatColumn] ?? '').trim().toLowerCase();
const format: FileFormat = isFileFormat(rawFormat) ? rawFormat : 'md';
const composed = composeFile({ title, markdown, format });
const address = `${declared.domain}.${declared.object}`;
for (const asset of assetRowsOf(declared, rows, input.touched)) {
const composed = composeFile({ title: asset.title, markdown: asset.markdown, format: asset.format });
await input.db.execute(sql`
insert into sys.task_asset_file (id, task_id, address, row_key, title, format, name, bytes, size)
values (${input.ids.next()}, ${input.taskId}, ${address}, ${JSON.stringify(key)}::jsonb,
${title}, ${format}, ${composed.fileName}, ${Buffer.from(composed.bytes)}, ${composed.bytes.length})
values (${input.ids.next()}, ${input.taskId}, ${asset.address}, ${JSON.stringify(asset.key)}::jsonb,
${asset.title}, ${asset.format}, ${composed.fileName}, ${Buffer.from(composed.bytes)}, ${composed.bytes.length})
on conflict (task_id, address, row_key) do update set
title = excluded.title, format = excluded.format, name = excluded.name,
bytes = excluded.bytes, size = excluded.size, created_at = now()`);
apps/api/src/app/routes/desk.ts
+13 -19
View File
@@ -28,7 +28,7 @@ import {
} from '@contracts';
import { ReplyRejectedError } from '@modules/human-tool';
import { advanceOrder } from '@modules/process';
import { keyText, listArchived, readArchived } from '../asset-archive.ts';
import { assetRowsOf, keyText, listArchived, readArchived } from '../asset-archive.ts';
import { composeFile, isFileFormat, MIME_OF, safeFileName, type FileFormat } from '../file-compose.ts';
import { toFileDoc } from '../file-doc.ts';
import { displayLog } from './log-lines.ts';
@@ -510,6 +510,9 @@ async function landingOf(
* 两个来源,**存档优先**:放行之后那一份已经冻住(归档件点开的必须是他签字那一刻
* 的那一份);在办期间还没有存档,就照台账现列 —— 人在审的那几份也该看得见。
* 认行一律 `address + key`,与件上 `data-file` 那一串同一形状:点开走同一条路。
*
* 在办这一路挑哪几行与存档同一段(`assetRowsOf`):认**本单碰过的行**,
* 不是这张表里现有的所有行 —— 两处各写一份的下场见那段的病根记档。
*/
async function assetFilesOf(
container: Container,
@@ -529,12 +532,11 @@ async function assetFilesOf(
}
const declarations = await declarationsOf(container, taskId);
// 本单碰过的行 —— 「这一单产出的」只有这一个答案(整表里还躺着别单放行过的资产)
const touched = await container.ledger.taskDrafts(taskId).catch(() => []);
const out: Array<{ address: string; key: string; title: string; format: string; name: string; archived: boolean }> = [];
for (const declared of declarations ?? []) {
const spec = declared.file;
if (spec === undefined) continue;
const keys = declared.fields.filter((f) => f.primaryKey).map((f) => f.name);
if (keys.length === 0) continue;
if (declared.file === undefined) continue;
const page = await container.ledger
.taskView(taskId, {
address: { domain: declared.domain, object: declared.object },
@@ -544,21 +546,13 @@ async function assetFilesOf(
offset: 0,
})
.catch(() => ({ rows: [] as Array<Record<string, unknown>> }));
for (const row of page.rows) {
// 没正文的行不是资料 —— 摆出来点开只会落一句「还没产出」
if (String(row[spec.bodyColumn] ?? '').trim() === '') continue;
const key: Record<string, string> = {};
for (const k of keys) key[k] = String(row[k] ?? '');
if (Object.values(key).some((v) => v === '')) continue;
const rawFormat = String(row[spec.formatColumn] ?? '').trim().toLowerCase();
const format = isFileFormat(rawFormat) ? rawFormat : 'md';
const title = String(row[spec.titleColumn] ?? '').trim() || Object.values(key).join('-');
for (const asset of assetRowsOf(declared, page.rows as Array<Record<string, unknown>>, touched)) {
out.push({
address: `${declared.domain}.${declared.object}`,
key: keyText(key),
title,
format,
name: safeFileName(title, format),
address: asset.address,
key: keyText(asset.key),
title: asset.title,
format: asset.format,
name: safeFileName(asset.title, asset.format),
archived: false,
});
}
apps/api/src/app/wiring/engines.ts
+2
View File
@@ -2277,6 +2277,8 @@ export function wireEngines(deps: EngineWiringDeps): EngineWiring {
taskId: input.taskId,
ids,
declarations: manifest.declarations.ledger,
// 「这一单产出的」= 本单碰过的行:整表里躺着历次跑出来的资产,不是这一单的成果
touched: await deps.ledger.taskDrafts(input.taskId),
rowsOfAddress: async (address) =>
(
await deps.ledger.taskView(input.taskId, { address, where: {}, orderBy: [], limit: 500, offset: 0 })