feat(corporate): persist dated monthly plans and repair verified release gates
Deploy Canina / deploy (push) Successful in 4m38s
Deploy Canina / deploy (push) Successful in 4m38s
This commit is contained in:
1 parent
18094f91a6
commit
216e05ba25
18 files changed
+829
-29
No files matched your search
@@ -1,5 +1,42 @@
|
||||
import { normalizeSearch, pagination, taskInput } from './corporate-policy';
|
||||
import {
|
||||
normalizeSearch,
|
||||
pagination,
|
||||
taskInput,
|
||||
monthlyPlanInput,
|
||||
} from './corporate-policy';
|
||||
describe('corporate contract policy', () => {
|
||||
it.each([
|
||||
['2027-02', 28],
|
||||
['2028-02', 29],
|
||||
['2028-04', 30],
|
||||
['2028-01', 31],
|
||||
])('enforces real calendar coverage for %s', (month, count) => {
|
||||
const id = '11111111-1111-4111-8111-111111111111';
|
||||
const body = {
|
||||
roadmapId: id,
|
||||
month,
|
||||
needs: [],
|
||||
dailyArticles: Array.from({ length: Number(count) }, (_, i) => ({
|
||||
title: 'new article',
|
||||
description: 'instruction',
|
||||
actionType: 'BLOG_NEW',
|
||||
department: 'CONTENT_SEO',
|
||||
goalId: id,
|
||||
sourceIds: [id],
|
||||
dueCycle: `${month}-${String(i + 1).padStart(2, '0')}`,
|
||||
})),
|
||||
};
|
||||
expect(monthlyPlanInput(body).dailyArticles).toHaveLength(Number(count));
|
||||
expect(() =>
|
||||
monthlyPlanInput({ ...body, dailyArticles: body.dailyArticles.slice(1) }),
|
||||
).toThrow();
|
||||
expect(() =>
|
||||
monthlyPlanInput({
|
||||
...body,
|
||||
dailyArticles: [...body.dailyArticles, body.dailyArticles[0]],
|
||||
}),
|
||||
).toThrow();
|
||||
});
|
||||
it('normalizes Persian letters, digits and separators', () => {
|
||||
expect(normalizeSearch('كيك ۱۲۳ (ة)')).toBe('کیک 123 ه');
|
||||
});
|
||||
|
||||
@@ -39,7 +39,7 @@ export function uuid(value: unknown): string {
|
||||
)
|
||||
)
|
||||
throw new BadRequestException('Invalid UUID');
|
||||
return id;
|
||||
return id.toLowerCase();
|
||||
}
|
||||
export function choice(value: unknown, values: string[]): string {
|
||||
if (typeof value !== 'string' || !values.includes(value))
|
||||
@@ -124,12 +124,108 @@ export function taskInput(input: unknown) {
|
||||
'BLOG_NEW',
|
||||
'BLOG_UPDATE',
|
||||
'CATALOG_ENRICH',
|
||||
'WIKI_ENRICH',
|
||||
'RESEARCH',
|
||||
'ENGINEERING',
|
||||
]),
|
||||
dueCycle: b.dueCycle === undefined ? undefined : text(b.dueCycle, 40),
|
||||
};
|
||||
}
|
||||
export function planMonth(value: unknown): string {
|
||||
const month = text(value, 7);
|
||||
if (!/^(?:[2-9]\d{3})-(?:0[1-9]|1[0-2])$/.test(month))
|
||||
throw new BadRequestException('Invalid YYYY-MM month');
|
||||
return month;
|
||||
}
|
||||
export function monthlyPlanInput(input: unknown) {
|
||||
const b = object(input, ['roadmapId', 'month', 'dailyArticles', 'needs']);
|
||||
const month = planMonth(b.month);
|
||||
const days = new Date(
|
||||
Date.UTC(Number(month.slice(0, 4)), Number(month.slice(5)), 0),
|
||||
).getUTCDate();
|
||||
if (
|
||||
!Array.isArray(b.dailyArticles) ||
|
||||
b.dailyArticles.length !== days ||
|
||||
!Array.isArray(b.needs) ||
|
||||
b.needs.length > 200
|
||||
)
|
||||
throw new BadRequestException(
|
||||
'Full daily article coverage and bounded needs required',
|
||||
);
|
||||
const mapping: Record<string, string> = {
|
||||
BLOG_NEW: 'CONTENT_SEO',
|
||||
BLOG_UPDATE: 'CONTENT_SEO',
|
||||
CATALOG_ENRICH: 'CATALOG_COMMERCE',
|
||||
WIKI_ENRICH: 'WIKI_SCIENTIFIC',
|
||||
ENGINEERING: 'TECH_DEVOPS',
|
||||
};
|
||||
const parse = (raw: unknown, daily: boolean) => {
|
||||
const t = object(raw, [
|
||||
'title',
|
||||
'description',
|
||||
'department',
|
||||
'priority',
|
||||
'goalId',
|
||||
'actionType',
|
||||
'dueCycle',
|
||||
'sourceIds',
|
||||
'target',
|
||||
'reason',
|
||||
]);
|
||||
const actionType = choice(
|
||||
t.actionType,
|
||||
daily
|
||||
? ['BLOG_NEW']
|
||||
: ['BLOG_UPDATE', 'CATALOG_ENRICH', 'WIKI_ENRICH', 'ENGINEERING'],
|
||||
);
|
||||
const department = choice(t.department, [mapping[actionType]]);
|
||||
const dueCycle = text(t.dueCycle, 10);
|
||||
const date = new Date(dueCycle + 'T00:00:00Z');
|
||||
if (
|
||||
!/^\d{4}-\d{2}-\d{2}$/.test(dueCycle) ||
|
||||
!dueCycle.startsWith(month + '-') ||
|
||||
!Number.isFinite(date.getTime()) ||
|
||||
date.toISOString().slice(0, 10) !== dueCycle
|
||||
)
|
||||
throw new BadRequestException('Invalid plan day');
|
||||
if (
|
||||
!Array.isArray(t.sourceIds) ||
|
||||
!t.sourceIds.length ||
|
||||
t.sourceIds.length > 30
|
||||
)
|
||||
throw new BadRequestException('Stored sources required');
|
||||
const sourceIds = t.sourceIds.map(uuid);
|
||||
if (new Set(sourceIds).size !== sourceIds.length)
|
||||
throw new BadRequestException('Duplicate source');
|
||||
if (daily && (t.target !== undefined || t.reason !== undefined))
|
||||
throw new BadRequestException('Daily new articles cannot be needs');
|
||||
return {
|
||||
title: text(t.title, 300),
|
||||
description: text(t.description),
|
||||
department,
|
||||
actionType,
|
||||
dueCycle,
|
||||
priority: choice(t.priority ?? 'MEDIUM', priorities),
|
||||
goalId: uuid(t.goalId),
|
||||
sourceIds,
|
||||
...(daily
|
||||
? {}
|
||||
: { target: text(t.target, 2000), reason: text(t.reason) }),
|
||||
};
|
||||
};
|
||||
const dailyArticles = b.dailyArticles.map((t) => parse(t, true));
|
||||
if (new Set(dailyArticles.map((t) => t.dueCycle)).size !== days)
|
||||
throw new BadRequestException(
|
||||
'Exactly one new article per calendar day required',
|
||||
);
|
||||
const needs = b.needs.map((t) => parse(t, false));
|
||||
if (
|
||||
new Set(needs.map((t) => canonical([t.actionType, t.target, t.dueCycle])))
|
||||
.size !== needs.length
|
||||
)
|
||||
throw new BadRequestException('Duplicate need');
|
||||
return { roadmapId: uuid(b.roadmapId), month, dailyArticles, needs };
|
||||
}
|
||||
export function canonical(value: any): string {
|
||||
if (Array.isArray(value)) return '[' + value.map(canonical).join(',') + ']';
|
||||
if (value && typeof value === 'object')
|
||||
@@ -158,7 +254,8 @@ export function publicData(value: any): any {
|
||||
export function httpsUrl(value: unknown): string {
|
||||
const raw = text(value, 2000);
|
||||
try {
|
||||
if (!/^https:\/\/[a-z0-9]/i.test(raw) || /[\s\\]/.test(raw)) throw new Error();
|
||||
if (!/^https:\/\/[a-z0-9]/i.test(raw) || /[\s\\]/.test(raw))
|
||||
throw new Error();
|
||||
const u = new URL(raw);
|
||||
const host = u.hostname.toLowerCase();
|
||||
if (
|
||||
|
||||
@@ -108,6 +108,23 @@ export class CorporateController {
|
||||
) {
|
||||
return this.service.roadmap(this.actor(req), this.key(key), body);
|
||||
}
|
||||
@Post('monthly-plans') persistMonthlyPlan(
|
||||
@Req() req: any,
|
||||
@Headers('idempotency-key') key: string,
|
||||
@Body() body: unknown,
|
||||
) {
|
||||
return this.service.persistMonthlyPlan(
|
||||
this.actor(req),
|
||||
this.key(key),
|
||||
body,
|
||||
);
|
||||
}
|
||||
@Get('monthly-plans/:roadmapId') monthlyPlan(
|
||||
@Param('roadmapId') roadmapId: string,
|
||||
@Query('month') month: string,
|
||||
) {
|
||||
return this.service.monthlyPlan(roadmapId, month);
|
||||
}
|
||||
@Get('reports') reports(@Query() q: Record<string, any>) {
|
||||
return this.service.collection('reports', q);
|
||||
}
|
||||
|
||||
@@ -80,6 +80,284 @@ integration('corporate API / disposable PostgreSQL', () => {
|
||||
'TRUNCATE corporate_operations, corporate_reports, corporate_effects, corporate_reviews, corporate_evidence, corporate_events, corporate_tasks, corporate_goals, corporate_roadmaps, corporate_sources, corporate_research CASCADE',
|
||||
);
|
||||
});
|
||||
async function planFixture(month = '2996-02') {
|
||||
const research = (
|
||||
await post('market-insights', {
|
||||
title: 'monthly fixture',
|
||||
category: 'TREND',
|
||||
source: 'disposable receipt',
|
||||
opportunity: 'test planning',
|
||||
impact: 'LOW',
|
||||
recommendedAction: 'plan',
|
||||
cadence: 'MONTHLY',
|
||||
provenance: {
|
||||
method: 'fixture',
|
||||
collector: 'jest',
|
||||
context: 'disposable',
|
||||
},
|
||||
sources: [
|
||||
{
|
||||
url: 'https://pubmed.ncbi.nlm.nih.gov/',
|
||||
title: 'fixture',
|
||||
excerpt: 'test only',
|
||||
retrievedAt: '2026-01-01T00:00:00Z',
|
||||
sha256: 'a'.repeat(64),
|
||||
},
|
||||
],
|
||||
}).expect(201)
|
||||
).body;
|
||||
const roadmap = (
|
||||
await post('monthly-roadmap', {
|
||||
researchId: research.id,
|
||||
month,
|
||||
cycleName: 'monthly fixture',
|
||||
seasonalTheme: 'test',
|
||||
strategicGoals: ['coverage'],
|
||||
plannedArticlesCount: 29,
|
||||
plannedRefreshesCount: 0,
|
||||
plannedCatalogEnrichments: 0,
|
||||
goals: [
|
||||
'CONTENT_SEO',
|
||||
'CATALOG_COMMERCE',
|
||||
'WIKI_SCIENTIFIC',
|
||||
'TECH_DEVOPS',
|
||||
].map((department) => ({
|
||||
title: department,
|
||||
department,
|
||||
acceptanceCriteria: 'independent QA',
|
||||
metric: 'coverage',
|
||||
})),
|
||||
}).expect(201)
|
||||
).body;
|
||||
const task = (
|
||||
actionType: string,
|
||||
department: string,
|
||||
dueCycle: string,
|
||||
) => ({
|
||||
title: actionType + ' ' + dueCycle,
|
||||
description: 'Evidence-backed instruction requiring QA',
|
||||
actionType,
|
||||
department,
|
||||
dueCycle,
|
||||
goalId: roadmap.goals.find((g: any) => g.department === department).id,
|
||||
sourceIds: [research.sources[0].id],
|
||||
...(actionType === 'BLOG_NEW'
|
||||
? {}
|
||||
: {
|
||||
target: 'https://canina.ir/identified-gap',
|
||||
reason: 'Documented coverage gap',
|
||||
}),
|
||||
});
|
||||
return {
|
||||
research,
|
||||
roadmap,
|
||||
body: {
|
||||
roadmapId: roadmap.id,
|
||||
month,
|
||||
dailyArticles: Array.from({ length: 29 }, (_, i) =>
|
||||
task(
|
||||
'BLOG_NEW',
|
||||
'CONTENT_SEO',
|
||||
`${month}-${String(i + 1).padStart(2, '0')}`,
|
||||
),
|
||||
),
|
||||
needs: [
|
||||
task('BLOG_UPDATE', 'CONTENT_SEO', month + '-01'),
|
||||
task('CATALOG_ENRICH', 'CATALOG_COMMERCE', month + '-02'),
|
||||
task('WIKI_ENRICH', 'WIKI_SCIENTIFIC', month + '-03'),
|
||||
task('ENGINEERING', 'TECH_DEVOPS', month + '-04'),
|
||||
],
|
||||
},
|
||||
};
|
||||
}
|
||||
it('persists a complete leap-month daily-new plan, separate needs and evidence lineage with readback', async () => {
|
||||
const { body, research, roadmap } = await planFixture();
|
||||
body.roadmapId = body.roadmapId.toUpperCase();
|
||||
for (const entry of [...body.dailyArticles, ...body.needs]) {
|
||||
entry.goalId = entry.goalId.toUpperCase();
|
||||
entry.sourceIds = entry.sourceIds.map((id: string) => id.toUpperCase());
|
||||
}
|
||||
const op = key();
|
||||
const created = (
|
||||
await post('monthly-plans', body, 'planner', op).expect(201)
|
||||
).body;
|
||||
expect(created.tasks).toHaveLength(33);
|
||||
const need = created.tasks.find((t: any) => t.actionType === 'WIKI_ENRICH');
|
||||
expect(need.logs[0].payload).toMatchObject({
|
||||
target: body.needs[2].target,
|
||||
reason: body.needs[2].reason,
|
||||
});
|
||||
expect(
|
||||
created.tasks.filter((t: any) => t.actionType === 'BLOG_NEW'),
|
||||
).toHaveLength(29);
|
||||
expect(created.tasks.every((t: any) => t.status === 'TODO')).toBe(true);
|
||||
expect(
|
||||
(await post('monthly-plans', body, 'planner', op).expect(201)).body,
|
||||
).toEqual(created);
|
||||
const read = await request(app.getHttpServer())
|
||||
.get(`/admin/hermes/monthly-plans/${roadmap.id.toUpperCase()}?month=${body.month}`)
|
||||
.set('x-api-key', 'executor')
|
||||
.expect(200);
|
||||
expect(read.body).toEqual(created);
|
||||
const detail = await request(app.getHttpServer())
|
||||
.get('/admin/hermes/tasks/' + created.tasks[0].id)
|
||||
.set('x-api-key', 'executor')
|
||||
.expect(200);
|
||||
expect(detail.body.logs[0].step).toBe('PLANNED');
|
||||
expect(detail.body.logs[0].payload).toMatchObject({
|
||||
researchId: research.id,
|
||||
roadmapId: roadmap.id,
|
||||
month: body.month,
|
||||
dueCycle: body.month + '-01',
|
||||
sourceIds: [research.sources[0].id],
|
||||
});
|
||||
expect(await db.corporateOperation.count()).toBe(3);
|
||||
expect((await post('claims', {}).expect(201)).body.task).toBeNull();
|
||||
});
|
||||
it('validates calendar, action separation, needs and stored lineage without partial writes', async () => {
|
||||
const { body } = await planFixture();
|
||||
const mutations: Array<[number, (b: any) => void]> = [
|
||||
[400, (b) => b.dailyArticles.pop()],
|
||||
[400, (b) => (b.dailyArticles[1].dueCycle = b.dailyArticles[0].dueCycle)],
|
||||
[400, (b) => (b.dailyArticles[0].dueCycle = '2028-02-30')],
|
||||
[400, (b) => (b.month = '2028-13')],
|
||||
[400, (b) => (b.dailyArticles[0].actionType = 'BLOG_UPDATE')],
|
||||
[400, (b) => (b.needs[0].actionType = 'BLOG_NEW')],
|
||||
[400, (b) => (b.needs[0].reason = ' ')],
|
||||
[400, (b) => delete b.needs[0].target],
|
||||
[400, (b) => (b.needs[0].department = 'WIKI_SCIENTIFIC')],
|
||||
[400, (b) => (b.dailyArticles[0].sourceIds = [])],
|
||||
[409, (b) => (b.dailyArticles[0].sourceIds = [key()])],
|
||||
[409, (b) => (b.dailyArticles[0].goalId = key())],
|
||||
[409, (b) => (b.needs[0].goalId = b.needs[1].goalId)],
|
||||
[409, (b) => (b.roadmapId = key())],
|
||||
];
|
||||
for (const [status, mutate] of mutations) {
|
||||
const invalid = JSON.parse(JSON.stringify(body));
|
||||
mutate(invalid);
|
||||
await post('monthly-plans', invalid).expect(status);
|
||||
expect(await db.corporateTask.count()).toBe(0);
|
||||
expect(await db.corporateEvent.count()).toBe(0);
|
||||
expect(await db.corporateOperation.count()).toBe(2);
|
||||
}
|
||||
});
|
||||
it('serializes competing actors and keys on roadmap/month, rejects changed replay and keeps auth dormant', async () => {
|
||||
const { body } = await planFixture();
|
||||
await request(app.getHttpServer())
|
||||
.post('/admin/hermes/monthly-plans')
|
||||
.send(body)
|
||||
.expect(401);
|
||||
await post('monthly-plans', body, 'unscoped').expect(403);
|
||||
const op = key();
|
||||
const otherOp = key();
|
||||
let release!: () => void;
|
||||
let ready!: () => void;
|
||||
const locked = new Promise<void>((r) => (ready = r));
|
||||
const hold = new Promise<void>((r) => (release = r));
|
||||
const scope = JSON.stringify(['monthly-plan', body.roadmapId, body.month]);
|
||||
const blocker = db.$transaction(async (tx) => {
|
||||
await tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtextextended(${scope}, 0))`;
|
||||
ready();
|
||||
await hold;
|
||||
});
|
||||
await locked;
|
||||
const pending = [
|
||||
post('monthly-plans', body, 'planner', op).then((r) => r),
|
||||
post('monthly-plans', body, 'other', otherOp).then((r) => r),
|
||||
];
|
||||
try {
|
||||
let waiters = 0;
|
||||
for (let i = 0; i < 100; i++) {
|
||||
const rows = await db.$queryRaw<any[]>`SELECT pid FROM pg_stat_activity
|
||||
WHERE datname=current_database() AND wait_event_type='Lock' AND query LIKE '%pg_advisory_xact_lock%'`;
|
||||
waiters = rows.length;
|
||||
if (waiters >= 2) break;
|
||||
await new Promise((r) => setTimeout(r, 10));
|
||||
}
|
||||
expect(waiters).toBeGreaterThanOrEqual(2);
|
||||
} finally {
|
||||
release();
|
||||
await blocker;
|
||||
}
|
||||
const results = await Promise.all(pending);
|
||||
expect(results.map((r) => r.status).sort()).toEqual([201, 409]);
|
||||
expect(await db.corporateTask.count()).toBe(33);
|
||||
expect(await db.corporateEvent.count({ where: { step: 'PLANNED' } })).toBe(
|
||||
33,
|
||||
);
|
||||
const winner = results[0].status === 201 ? 'planner' : 'other';
|
||||
const winningOp = winner === 'planner' ? op : otherOp;
|
||||
await post(
|
||||
'monthly-plans',
|
||||
{ ...body, needs: [] },
|
||||
winner,
|
||||
winningOp,
|
||||
).expect(409);
|
||||
expect(
|
||||
(await post('monthly-plans', body, winner, winningOp).expect(201)).body,
|
||||
).toEqual(results[winner === 'planner' ? 0 : 1].body);
|
||||
const runtime = await request(app.getHttpServer())
|
||||
.get('/admin/hermes/runtime')
|
||||
.set('x-api-key', 'executor')
|
||||
.expect(200);
|
||||
expect(runtime.body).toEqual({
|
||||
mode: 'MANUAL_DORMANT',
|
||||
schedulesEnabled: false,
|
||||
externalExecutionEnabled: false,
|
||||
});
|
||||
});
|
||||
it('rolls back a mid-plan database failure including tasks, events and idempotency receipt', async () => {
|
||||
const { body } = await planFixture();
|
||||
// Disposable-only trigger fails after the first task/event have been written.
|
||||
await db.$executeRawUnsafe(
|
||||
`CREATE FUNCTION reject_plan_event() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN IF NEW.step='PLANNED' AND NEW.payload->>'dueCycle'='2996-02-02' THEN RAISE EXCEPTION 'injected plan failure'; END IF; RETURN NEW; END $$`,
|
||||
);
|
||||
await db.$executeRawUnsafe(
|
||||
'CREATE TRIGGER reject_plan_event BEFORE INSERT ON corporate_events FOR EACH ROW EXECUTE FUNCTION reject_plan_event()',
|
||||
);
|
||||
const op = key();
|
||||
try {
|
||||
await post('monthly-plans', body, 'planner', op).expect(500);
|
||||
expect(await db.corporateTask.count()).toBe(0);
|
||||
expect(await db.corporateEvent.count()).toBe(0);
|
||||
expect(await db.corporateOperation.count()).toBe(2);
|
||||
} finally {
|
||||
await db.$executeRawUnsafe(
|
||||
'DROP TRIGGER reject_plan_event ON corporate_events',
|
||||
);
|
||||
await db.$executeRawUnsafe('DROP FUNCTION reject_plan_event()');
|
||||
}
|
||||
await post('monthly-plans', body, 'planner', op).expect(201);
|
||||
});
|
||||
it('gates only PLANNED future tasks while legacy future dueCycle remains claimable and UTC today is eligible', async () => {
|
||||
const { body } = await planFixture();
|
||||
await post('monthly-plans', body).expect(201);
|
||||
const legacy = (
|
||||
await post('tasks', { ...input, dueCycle: '2999-12-31' }).expect(201)
|
||||
).body;
|
||||
expect((await post('claims', {}).expect(201)).body.task.id).toBe(legacy.id);
|
||||
expect((await post('claims', {}).expect(201)).body.task).toBeNull();
|
||||
// Model the persisted event's due-day boundary in the disposable DB without changing system time.
|
||||
const planned = await db.corporateTask.findFirstOrThrow({
|
||||
where: { actionType: 'BLOG_NEW' },
|
||||
});
|
||||
const day = new Date().toISOString().slice(0, 10);
|
||||
await db.corporateTask.update({
|
||||
where: { id: planned.id },
|
||||
data: { dueCycle: day },
|
||||
});
|
||||
expect((await post('claims', {}).expect(201)).body.task).toBeNull(); // mismatch fails closed
|
||||
const event = await db.corporateEvent.findFirstOrThrow({
|
||||
where: { taskId: planned.id, step: 'PLANNED' },
|
||||
});
|
||||
await db.corporateEvent.update({
|
||||
where: { id: event.id },
|
||||
data: { payload: { ...(event.payload as object), dueCycle: day } },
|
||||
});
|
||||
expect((await post('claims', {}).expect(201)).body.task.id).toBe(
|
||||
planned.id,
|
||||
);
|
||||
});
|
||||
it('rejects children after a parent claim commits while child creation waits on its row lock', async () => {
|
||||
const parent = (await post('tasks', input).expect(201)).body;
|
||||
let release!: () => void, locked!: () => void;
|
||||
|
||||
@@ -9,6 +9,8 @@ import { createHash, randomUUID } from 'crypto';
|
||||
import { PrismaService } from '../../prisma/prisma.service';
|
||||
import {
|
||||
canonical,
|
||||
monthlyPlanInput,
|
||||
planMonth,
|
||||
publicData,
|
||||
choice,
|
||||
departments,
|
||||
@@ -188,6 +190,124 @@ export class CorporateService {
|
||||
return task;
|
||||
});
|
||||
}
|
||||
private plannedWhere(
|
||||
roadmapId: string,
|
||||
month: string,
|
||||
): Prisma.CorporateEventWhereInput {
|
||||
return {
|
||||
step: 'PLANNED',
|
||||
AND: [
|
||||
{ payload: { path: ['roadmapId'], equals: roadmapId } },
|
||||
{ payload: { path: ['month'], equals: month } },
|
||||
],
|
||||
};
|
||||
}
|
||||
private async readPlan(tx: Tx, roadmapId: string, month: string) {
|
||||
const roadmap = await tx.corporateRoadmap.findUnique({
|
||||
where: { id: roadmapId },
|
||||
});
|
||||
const tasks = await tx.corporateTask.findMany({
|
||||
where: { logs: { some: this.plannedWhere(roadmapId, month) } },
|
||||
include: {
|
||||
logs: {
|
||||
where: this.plannedWhere(roadmapId, month),
|
||||
orderBy: { id: 'asc' },
|
||||
},
|
||||
},
|
||||
orderBy: [{ dueCycle: 'asc' }, { actionType: 'asc' }, { id: 'asc' }],
|
||||
});
|
||||
if (!roadmap || !tasks.length)
|
||||
throw new NotFoundException('Monthly plan not found');
|
||||
return publicData({
|
||||
roadmapId,
|
||||
month,
|
||||
researchId: roadmap.researchId,
|
||||
tasks,
|
||||
});
|
||||
}
|
||||
monthlyPlan(roadmapId: string, month: unknown) {
|
||||
roadmapId = uuid(roadmapId);
|
||||
const cycle = planMonth(month);
|
||||
return this.db.$transaction((tx) => this.readPlan(tx, roadmapId, cycle), {
|
||||
isolationLevel: Prisma.TransactionIsolationLevel.RepeatableRead,
|
||||
});
|
||||
}
|
||||
persistMonthlyPlan(actor: string, key: string, input: unknown) {
|
||||
const b = monthlyPlanInput(input);
|
||||
return this.operation(actor, 'monthly-plan', key, b, async (tx) => {
|
||||
// Separate actor/key-independent fence: one complete plan per roadmap/month.
|
||||
const scope = canonical(['monthly-plan', b.roadmapId, b.month]);
|
||||
await tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtextextended(${scope}, 0))`;
|
||||
if (
|
||||
await tx.corporateEvent.count({
|
||||
where: this.plannedWhere(b.roadmapId, b.month),
|
||||
})
|
||||
)
|
||||
throw new ConflictException('Monthly plan already persisted');
|
||||
const roadmap = await tx.corporateRoadmap.findUnique({
|
||||
where: { id: b.roadmapId },
|
||||
include: { goals: true, research: { include: { sources: true } } },
|
||||
});
|
||||
if (
|
||||
!roadmap ||
|
||||
roadmap.month !== b.month ||
|
||||
!roadmap.research.sources.length
|
||||
)
|
||||
throw new ConflictException(
|
||||
'Matching evidence-backed roadmap required',
|
||||
);
|
||||
const entries = [...b.dailyArticles, ...b.needs];
|
||||
for (const entry of entries) {
|
||||
if (
|
||||
!roadmap.goals.some(
|
||||
(g) => g.id === entry.goalId && g.department === entry.department,
|
||||
) ||
|
||||
!entry.sourceIds.every((id) =>
|
||||
roadmap.research.sources.some((s) => s.id === id),
|
||||
)
|
||||
)
|
||||
throw new ConflictException(
|
||||
'Goal/department and source lineage must match roadmap research',
|
||||
);
|
||||
}
|
||||
for (const entry of entries) {
|
||||
const { sourceIds, target, reason, ...data } = entry;
|
||||
const taskCode = 'TSK-' + randomUUID();
|
||||
const task = await tx.corporateTask.create({
|
||||
data: {
|
||||
...data,
|
||||
priority: data.priority as CorporatePriority,
|
||||
status: 'TODO',
|
||||
taskCode,
|
||||
normalizedCode: normalizeSearch(taskCode),
|
||||
normalizedTitle: normalizeSearch(data.title),
|
||||
createdBy: actor,
|
||||
},
|
||||
});
|
||||
await this.event(
|
||||
tx,
|
||||
task.id,
|
||||
actor,
|
||||
'PLANNED',
|
||||
entry.description,
|
||||
'SYSTEM',
|
||||
{
|
||||
version: 1,
|
||||
roadmapId: roadmap.id,
|
||||
researchId: roadmap.researchId,
|
||||
month: b.month,
|
||||
goalId: entry.goalId,
|
||||
department: entry.department,
|
||||
actionType: entry.actionType,
|
||||
dueCycle: entry.dueCycle,
|
||||
sourceIds,
|
||||
...(target ? { target, reason } : {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
return this.readPlan(tx, b.roadmapId, b.month);
|
||||
});
|
||||
}
|
||||
claim(actor: string, key: string, input: unknown) {
|
||||
const b = object(input, ['department', 'leaseSeconds']);
|
||||
const department =
|
||||
@@ -205,6 +325,10 @@ export class CorporateService {
|
||||
{ id: string }[]
|
||||
>`SELECT t.id FROM corporate_tasks t
|
||||
WHERE (t.status='TODO' OR (t.status='BLOCKED' AND EXISTS (SELECT 1 FROM corporate_tasks c WHERE c."parentId"=t.id)) OR (t.status='IN_PROGRESS' AND t."leasedUntil"<=clock_timestamp()))
|
||||
AND NOT EXISTS (SELECT 1 FROM corporate_events e WHERE e."taskId"=t.id AND e.step='PLANNED'
|
||||
AND (t."dueCycle" IS NULL OR t."dueCycle" !~ '^[0-9]{4}-[0-9]{2}-[0-9]{2}$'
|
||||
OR e.payload->>'dueCycle' IS DISTINCT FROM t."dueCycle"
|
||||
OR t."dueCycle">to_char(clock_timestamp() AT TIME ZONE 'UTC','YYYY-MM-DD')))
|
||||
AND (${department}::text IS NULL OR t.department=${department})
|
||||
AND NOT EXISTS (SELECT 1 FROM corporate_tasks c WHERE c."parentId"=t.id AND c.status<>'DONE')
|
||||
ORDER BY t.priority ASC,t."updatedAt" ASC,t.id ASC FOR UPDATE OF t SKIP LOCKED LIMIT 1`;
|
||||
|
||||
@@ -72,6 +72,23 @@ run('SEO disposable PostgreSQL integration', () => {
|
||||
periodEnd: '2026-01-02T00:00:00Z',
|
||||
sourceMetadata: metadata,
|
||||
};
|
||||
it('replays exact non-round doubles and nested numeric JSON without accepting changed evidence', async () => {
|
||||
const position = 3.1818181818181817;
|
||||
const precise = {
|
||||
...snapshot, ingestionKey: 'precise-numeric-replay', gscPosition: position,
|
||||
gscClicks: 35, gscImpressions: 11,
|
||||
sourceMetadata: { ...metadata,
|
||||
gsc: { ...metadata.gsc, status: 'available' },
|
||||
worker: { nested: [{ position, duration: 18.333333333333332 }] },
|
||||
},
|
||||
};
|
||||
const [a, b] = await Promise.all([service.addSnapshot(id, precise), service.addSnapshot(id, precise)]);
|
||||
expect(a.id).toBe(b.id);
|
||||
expect((await service.addSnapshot(id, precise)).id).toBe(a.id);
|
||||
await expect(service.addSnapshot(id, { ...precise, gscPosition: position + Number.EPSILON * 2 })).rejects.toMatchObject({ status: 409 });
|
||||
await expect(service.addSnapshot(id, { ...precise, sourceMetadata: { ...precise.sourceMetadata, worker: { nested: [{ position: position + Number.EPSILON * 2, duration: 18.333333333333332 }] } } })).rejects.toMatchObject({ status: 409 });
|
||||
await db.contentPerformanceSnapshot.delete({ where: { id: a.id } });
|
||||
});
|
||||
it('preserves null unavailable, idempotent concurrent retries, and conflicts', async () => {
|
||||
const [a, b] = await Promise.all([
|
||||
service.addSnapshot(id, snapshot),
|
||||
|
||||
@@ -239,21 +239,21 @@ export class SeoTrackingService {
|
||||
findingId_ingestionKey: { findingId, ingestionKey: dto.ingestionKey },
|
||||
},
|
||||
});
|
||||
const same = (row: any) => {
|
||||
const canonical = (v: any): string =>
|
||||
JSON.stringify(
|
||||
v && typeof v === 'object' && !(v instanceof Date)
|
||||
? Object.keys(v)
|
||||
.sort()
|
||||
.reduce(
|
||||
(o, k) => ((o[k] = JSON.parse(canonical(v[k]))), o),
|
||||
{} as Record<string, any>,
|
||||
)
|
||||
: v,
|
||||
);
|
||||
const same = async (row: any) => {
|
||||
// Compare numeric provenance and Float columns in PostgreSQL itself:
|
||||
// Prisma's JSON protocol rounds some doubles on readback. A tolerance in
|
||||
// JavaScript would also accept genuinely changed payloads.
|
||||
const [stored] = await this.prisma.$queryRaw<{ matches: boolean }[]>`
|
||||
SELECT source_metadata = ${JSON.stringify(dto.sourceMetadata)}::jsonb
|
||||
AND gsc_position IS NOT DISTINCT FROM ${metrics.gscPosition === null ? null : String(metrics.gscPosition)}::double precision
|
||||
AND ga4_avg_engagement_sec IS NOT DISTINCT FROM ${metrics.ga4AvgEngagementSec === null ? null : String(metrics.ga4AvgEngagementSec)}::double precision
|
||||
AND ga4_bounce_rate IS NOT DISTINCT FROM ${metrics.ga4BounceRate === null ? null : String(metrics.ga4BounceRate)}::double precision
|
||||
AND ga4_scroll_depth_rate IS NOT DISTINCT FROM ${metrics.ga4ScrollDepthRate === null ? null : String(metrics.ga4ScrollDepthRate)}::double precision AS matches
|
||||
FROM content_performance_snapshots WHERE id = ${row.id}::uuid`;
|
||||
if (!stored?.matches) return false;
|
||||
return Object.entries(data).every(([k, v]) =>
|
||||
k === 'sourceMetadata'
|
||||
? canonical(row[k]) === canonical(v)
|
||||
['sourceMetadata', 'gscPosition', 'ga4AvgEngagementSec', 'ga4BounceRate', 'ga4ScrollDepthRate'].includes(k)
|
||||
? true
|
||||
: k === 'periodStart' || k === 'periodEnd'
|
||||
? new Date(row[k]).getTime() === (v as Date).getTime()
|
||||
: k === 'attributedSalesValue'
|
||||
@@ -264,13 +264,26 @@ export class SeoTrackingService {
|
||||
);
|
||||
};
|
||||
if (existing) {
|
||||
if (!same(existing))
|
||||
if (!(await same(existing)))
|
||||
throw new ConflictException('Ingestion key reused with different data');
|
||||
return existing;
|
||||
}
|
||||
await this.findOne(findingId);
|
||||
try {
|
||||
return await this.prisma.contentPerformanceSnapshot.create({ data });
|
||||
return await this.prisma.$transaction(async (tx) => {
|
||||
const row = await tx.contentPerformanceSnapshot.create({ data });
|
||||
// Preserve JSON/IEEE-754 input exactly despite Prisma's numeric JSON
|
||||
// transport rounding. Text parameters are parsed by PostgreSQL, not
|
||||
// reserialized as engine floats. This update is atomic with creation.
|
||||
await tx.$executeRaw`UPDATE content_performance_snapshots SET
|
||||
source_metadata = ${JSON.stringify(dto.sourceMetadata)}::jsonb,
|
||||
gsc_position = ${metrics.gscPosition === null ? null : String(metrics.gscPosition)}::double precision,
|
||||
ga4_avg_engagement_sec = ${metrics.ga4AvgEngagementSec === null ? null : String(metrics.ga4AvgEngagementSec)}::double precision,
|
||||
ga4_bounce_rate = ${metrics.ga4BounceRate === null ? null : String(metrics.ga4BounceRate)}::double precision,
|
||||
ga4_scroll_depth_rate = ${metrics.ga4ScrollDepthRate === null ? null : String(metrics.ga4ScrollDepthRate)}::double precision
|
||||
WHERE id = ${row.id}::uuid`;
|
||||
return row;
|
||||
});
|
||||
} catch (error) {
|
||||
if ((error as any).code === 'P2002') {
|
||||
const row =
|
||||
@@ -282,7 +295,7 @@ export class SeoTrackingService {
|
||||
},
|
||||
},
|
||||
});
|
||||
if (same(row)) return row;
|
||||
if (await same(row)) return row;
|
||||
throw new ConflictException('Ingestion key reused with different data');
|
||||
}
|
||||
throw error;
|
||||
|
||||
Reference in new issue
Block a user