feat: platform backbone and field capture complete (checkpoint)
Platform backbone (plan 2026-10-13-plattform-rueckgrat), all tasks reviewed: - webhooks with delivery table, retries and stable delivery id - calendar handlers; a finished task removes its Outlook event - tasks, automations, inspections, varroa, treatments, feedings, harvests, colonies, wintering, stock and bottling record domain events in the same transaction; legacy post-commit calls removed - row locks through one helper (lockRowForUpdate, lockRowsForShare, lockRowsForUpdate) - job framework with JobRun, cli exit codes, cleanup, task templates, daily evaluation, hourly app-backup and the rekey job - system API and page "Verwaltung > System" with retry - @nestjs/schedule removed, guard tests against in-process schedulers Field capture T3 (plan 2026-10-13-t3-erfassung-am-stand), all tasks reviewed: - inspection photo offline without metadata - bulk capture for treatments, feedings and varroa (backend + frontend) - offline stand mode with service worker, offline pages and packs - offline session, cold start and logout on shared devices Docs: ARCHITECTURE.md assumptions and sections updated, TASKS.md. Gates: backend lint, typecheck, 1770 unit, 420 e2e, build, no schema drift; frontend lint, typecheck, 913 tests, build. Not rolled out. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
This commit is contained in:
Nick SzaunigandClaude Opus 5.5 committed
1 parent
c01a38835a
commit
cdd30cf3ee
288 files changed
+39165
-2853
No files matched your search
@@ -1,4 +1,4 @@
|
||||
import { INestApplication } from '@nestjs/common';
|
||||
import { INestApplication, Logger } from '@nestjs/common';
|
||||
import * as bcrypt from 'bcryptjs';
|
||||
import request from 'supertest';
|
||||
import { App } from 'supertest/types';
|
||||
@@ -6,14 +6,18 @@ import { PrismaService } from '../src/prisma/prisma.service';
|
||||
import { NotificationsService } from '../src/notifications/notifications.service';
|
||||
import { CalendarSyncSettingsService } from '../src/calendar-sync/calendar-sync-settings.service';
|
||||
import { AutomationService } from '../src/automation/automation.service';
|
||||
import { AutomationTriggerType, Prisma } from '../generated/prisma';
|
||||
import { createTestApp } from './utils/create-test-app';
|
||||
import { login } from './utils/api';
|
||||
import { drainDomainEvents } from './utils/domain-events';
|
||||
|
||||
/**
|
||||
* Side effects that follow a committed write (automation rules, calendar
|
||||
* sync, webhooks) must never turn that write into an error response: the
|
||||
* offline queue would send the request again and store the record twice -
|
||||
* for treatments that is a duplicate entry in the Bestandsbuch.
|
||||
* Side effects of a committed write (automation rules, calendar sync,
|
||||
* webhooks) must never turn that write into an error response: the offline
|
||||
* queue would send the request again and store the record twice - for
|
||||
* treatments that is a duplicate entry in the Bestandsbuch. Producers that
|
||||
* record a domain event run none of them in the request; the handlers do,
|
||||
* and a failed handler is retried without repeating what already worked.
|
||||
*/
|
||||
describe('Post-commit side effects (e2e)', () => {
|
||||
let app: INestApplication<App>;
|
||||
@@ -22,32 +26,121 @@ describe('Post-commit side effects (e2e)', () => {
|
||||
const email = `post-commit-e2e-${suffix}@example.com`;
|
||||
const password = 'SuperSecret123!';
|
||||
let token: string;
|
||||
let userId: string;
|
||||
let apiaryId: string;
|
||||
const colonyIds: string[] = [];
|
||||
const stockItemIds: string[] = [];
|
||||
|
||||
const server = () => app.getHttpServer();
|
||||
const auth = () => ({ Authorization: `Bearer ${token}` });
|
||||
|
||||
function post(path: string, body: object, idempotencyKey?: string) {
|
||||
const call = request(server()).post(path).set(auth());
|
||||
return (
|
||||
idempotencyKey === undefined
|
||||
? call
|
||||
: call.set('Idempotency-Key', idempotencyKey)
|
||||
).send(body);
|
||||
}
|
||||
|
||||
async function createColony(code: string) {
|
||||
return prisma.colony.create({
|
||||
const colony = await prisma.colony.create({
|
||||
data: {
|
||||
code: `${code}-${suffix}`,
|
||||
apiaryId,
|
||||
colonyType: 'PRODUCTION_COLONY',
|
||||
},
|
||||
});
|
||||
colonyIds.push(colony.id);
|
||||
return colony;
|
||||
}
|
||||
|
||||
/** Open or not: a rule task that exists at all. */
|
||||
const taskCount = (trigger: AutomationTriggerType, relatedId: string) =>
|
||||
prisma.task.count({
|
||||
where: { sourceAutomationTrigger: trigger, relatedId },
|
||||
});
|
||||
|
||||
const openTaskCount = (trigger: AutomationTriggerType, relatedId: string) =>
|
||||
prisma.task.count({
|
||||
where: {
|
||||
sourceAutomationTrigger: trigger,
|
||||
relatedId,
|
||||
status: { in: ['OPEN', 'IN_PROGRESS'] },
|
||||
},
|
||||
});
|
||||
|
||||
/** Everything this file wrote, scoped by its own ids. */
|
||||
async function cleanUp(): Promise<void> {
|
||||
const byColony = {
|
||||
where: { colonyId: { in: colonyIds } },
|
||||
select: { id: true },
|
||||
};
|
||||
const recordIds = (
|
||||
await Promise.all([
|
||||
prisma.inspection.findMany(byColony),
|
||||
prisma.treatment.findMany(byColony),
|
||||
prisma.varroaMeasurement.findMany(byColony),
|
||||
])
|
||||
)
|
||||
.flat()
|
||||
.map((record) => record.id);
|
||||
const relatedIds = [...colonyIds, ...stockItemIds];
|
||||
const taskIds = (
|
||||
await prisma.task.findMany({
|
||||
where: { relatedId: { in: relatedIds } },
|
||||
select: { id: true },
|
||||
})
|
||||
).map((task) => task.id);
|
||||
const aggregateIds = [...recordIds, ...taskIds];
|
||||
// Deliveries go with their event (ON DELETE CASCADE).
|
||||
await prisma.domainEvent.deleteMany({
|
||||
where: { aggregateId: { in: aggregateIds } },
|
||||
});
|
||||
await prisma.calendarSyncOutboxEntry.deleteMany({
|
||||
where: { sourceId: { in: aggregateIds } },
|
||||
});
|
||||
// Rule tasks and the rules' own entries are written without a user.
|
||||
await prisma.auditLog.deleteMany({
|
||||
where: {
|
||||
OR: [
|
||||
{ userId },
|
||||
{ entityType: 'Task', entityId: { in: taskIds } },
|
||||
...relatedIds.map((relatedId) => ({
|
||||
entityType: 'AutomationRule',
|
||||
afterData: { path: ['relatedId'], equals: relatedId },
|
||||
})),
|
||||
],
|
||||
},
|
||||
});
|
||||
await prisma.notification.deleteMany({
|
||||
where: { relatedId: { in: relatedIds } },
|
||||
});
|
||||
await prisma.task.deleteMany({ where: { id: { in: taskIds } } });
|
||||
await prisma.inspection.deleteMany({ where: byColony.where });
|
||||
await prisma.treatment.deleteMany({ where: byColony.where });
|
||||
await prisma.varroaMeasurement.deleteMany({ where: byColony.where });
|
||||
await prisma.stockItem.deleteMany({ where: { id: { in: stockItemIds } } });
|
||||
await prisma.colony.deleteMany({ where: { id: { in: colonyIds } } });
|
||||
await prisma.apiary.deleteMany({ where: { id: apiaryId } });
|
||||
await prisma.idempotencyRecord.deleteMany({ where: { userId } });
|
||||
await prisma.refreshToken.deleteMany({ where: { userId } });
|
||||
await prisma.user.deleteMany({ where: { id: userId } });
|
||||
}
|
||||
|
||||
beforeAll(async () => {
|
||||
app = await createTestApp();
|
||||
prisma = app.get(PrismaService);
|
||||
await prisma.user.create({
|
||||
data: {
|
||||
email,
|
||||
passwordHash: await bcrypt.hash(password, 12),
|
||||
name: 'Post Commit',
|
||||
role: { connect: { key: 'ADMIN' } },
|
||||
},
|
||||
});
|
||||
userId = (
|
||||
await prisma.user.create({
|
||||
data: {
|
||||
email,
|
||||
passwordHash: await bcrypt.hash(password, 12),
|
||||
name: 'Post Commit',
|
||||
role: { connect: { key: 'ADMIN' } },
|
||||
},
|
||||
})
|
||||
).id;
|
||||
token = (await login(app, email, password)).accessToken;
|
||||
apiaryId = (
|
||||
await prisma.apiary.create({ data: { name: `Post Commit ${suffix}` } })
|
||||
@@ -59,12 +152,66 @@ describe('Post-commit side effects (e2e)', () => {
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await cleanUp();
|
||||
await app.close();
|
||||
});
|
||||
|
||||
describe('when a side effect fails', () => {
|
||||
let errorLog: jest.SpyInstance;
|
||||
|
||||
/** The error lines the automation's legacy path logged for one record. */
|
||||
const automationFailuresFor = (entityType: string, entityId: string) =>
|
||||
errorLog.mock.calls
|
||||
.map(([message]) => String(message))
|
||||
.filter((message) =>
|
||||
message.startsWith(
|
||||
`Automation rule evaluation failed for ${entityType} ${entityId}:`,
|
||||
),
|
||||
);
|
||||
|
||||
/**
|
||||
* Every transaction still runs for real, but inside it the seeding of
|
||||
* the automation rules (ensureDefaults → tx.automationRule.createMany)
|
||||
* fails: the first write of every rule evaluation. A rule evaluated
|
||||
* inside the request's own transaction would turn it into a 500.
|
||||
*/
|
||||
function failRuleSeedingInTransactions(): void {
|
||||
type Work = (tx: Prisma.TransactionClient) => Promise<unknown>;
|
||||
const runTransaction = prisma.$transaction.bind(prisma) as (
|
||||
work: Work,
|
||||
options?: unknown,
|
||||
) => Promise<unknown>;
|
||||
const failingRules = (rules: object) =>
|
||||
new Proxy(rules, {
|
||||
get: (target, property): unknown =>
|
||||
property === 'createMany'
|
||||
? () => Promise.reject(new Error('automation rules down'))
|
||||
: Reflect.get(target, property),
|
||||
});
|
||||
const withFailingRuleSeeding = (tx: Prisma.TransactionClient) =>
|
||||
new Proxy(tx, {
|
||||
get: (target, property): unknown =>
|
||||
property === 'automationRule'
|
||||
? failingRules(target.automationRule)
|
||||
: Reflect.get(target, property),
|
||||
});
|
||||
jest
|
||||
.spyOn(prisma, '$transaction')
|
||||
.mockImplementation((work: unknown, options?: unknown) =>
|
||||
typeof work === 'function'
|
||||
? runTransaction(
|
||||
(tx) => (work as Work)(withFailingRuleSeeding(tx)),
|
||||
options,
|
||||
)
|
||||
: runTransaction(work as Work, options),
|
||||
);
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
// Automation: the task is created, then the warning fails.
|
||||
errorLog = jest
|
||||
.spyOn(Logger.prototype, 'error')
|
||||
.mockImplementation(() => undefined);
|
||||
// Automation: the warning cannot be written.
|
||||
jest
|
||||
.spyOn(app.get(NotificationsService), 'record')
|
||||
.mockRejectedValue(new Error('notifications down'));
|
||||
@@ -78,7 +225,7 @@ describe('Post-commit side effects (e2e)', () => {
|
||||
.mockRejectedValue(new Error('webhook subscriptions down'));
|
||||
});
|
||||
|
||||
it('still answers 201 for an inspection and replays it on a retry', async () => {
|
||||
it('still answers 201 and replays on retry with the same Idempotency-Key (no side effect in the request)', async () => {
|
||||
const colony = await createColony('PC-INSP');
|
||||
const key = `post-commit-${suffix}-inspection`;
|
||||
const body = {
|
||||
@@ -88,40 +235,36 @@ describe('Post-commit side effects (e2e)', () => {
|
||||
eggsPresent: false,
|
||||
};
|
||||
|
||||
const first = await request(server())
|
||||
.post('/api/v1/inspections')
|
||||
.set(auth())
|
||||
.set('Idempotency-Key', key)
|
||||
.send(body)
|
||||
.expect(201);
|
||||
const retry = await request(server())
|
||||
.post('/api/v1/inspections')
|
||||
.set(auth())
|
||||
.set('Idempotency-Key', key)
|
||||
.send(body)
|
||||
.expect(201);
|
||||
const first = await post('/api/v1/inspections', body, key).expect(201);
|
||||
const retry = await post('/api/v1/inspections', body, key).expect(201);
|
||||
|
||||
expect((retry.body as { id: string }).id).toBe(
|
||||
(first.body as { id: string }).id,
|
||||
);
|
||||
const inspectionId = (first.body as { id: string }).id;
|
||||
expect((retry.body as { id: string }).id).toBe(inspectionId);
|
||||
expect(
|
||||
await prisma.inspection.count({ where: { colonyId: colony.id } }),
|
||||
).toBe(1);
|
||||
// The rule still did its main job before the warning failed.
|
||||
expect(
|
||||
await prisma.task.count({
|
||||
where: {
|
||||
relatedId: colony.id,
|
||||
sourceAutomationTrigger: 'QUEENLESS_NO_EGGS',
|
||||
},
|
||||
// The request only recorded its event - the replay not even that.
|
||||
const events = await prisma.domainEvent.findMany({
|
||||
where: { aggregateId: inspectionId },
|
||||
});
|
||||
expect(events).toEqual([
|
||||
expect.objectContaining({
|
||||
type: 'InspectionRecorded',
|
||||
status: 'PENDING',
|
||||
attempts: 0,
|
||||
}),
|
||||
).toBe(1);
|
||||
]);
|
||||
// No rule ran in the request, not even one that failed: the task
|
||||
// follows when the handler runs.
|
||||
expect(automationFailuresFor('Inspection', inspectionId)).toEqual([]);
|
||||
expect(await taskCount('QUEENLESS_NO_EGGS', colony.id)).toBe(0);
|
||||
expect(
|
||||
await prisma.notification.count({ where: { relatedId: colony.id } }),
|
||||
).toBe(0);
|
||||
});
|
||||
|
||||
it('still answers 201 for a treatment when the rule evaluation fails', async () => {
|
||||
jest
|
||||
.spyOn(prisma.automationRule, 'upsert')
|
||||
.mockRejectedValue(new Error('automation rules down'));
|
||||
it('still answers 201 for a treatment when the rule evaluation would fail, and replays it', async () => {
|
||||
failRuleSeedingInTransactions();
|
||||
const colony = await createColony('PC-TREAT');
|
||||
const key = `post-commit-${suffix}-treatment`;
|
||||
const body = {
|
||||
@@ -130,18 +273,8 @@ describe('Post-commit side effects (e2e)', () => {
|
||||
product: 'Oxalsäure',
|
||||
};
|
||||
|
||||
const first = await request(server())
|
||||
.post('/api/v1/treatments')
|
||||
.set(auth())
|
||||
.set('Idempotency-Key', key)
|
||||
.send(body)
|
||||
.expect(201);
|
||||
const retry = await request(server())
|
||||
.post('/api/v1/treatments')
|
||||
.set(auth())
|
||||
.set('Idempotency-Key', key)
|
||||
.send(body)
|
||||
.expect(201);
|
||||
const first = await post('/api/v1/treatments', body, key).expect(201);
|
||||
const retry = await post('/api/v1/treatments', body, key).expect(201);
|
||||
|
||||
expect((retry.body as { id: string }).id).toBe(
|
||||
(first.body as { id: string }).id,
|
||||
@@ -152,8 +285,56 @@ describe('Post-commit side effects (e2e)', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('when an automation handler fails', () => {
|
||||
it('creates exactly one automation task when the handler fails once and is retried', async () => {
|
||||
jest.spyOn(Logger.prototype, 'warn').mockImplementation(() => undefined);
|
||||
const colonyId = (await createColony('PC-RETRY')).id;
|
||||
jest
|
||||
.spyOn(app.get(NotificationsService), 'record')
|
||||
.mockRejectedValueOnce(new Error('notifications down'));
|
||||
|
||||
const { body } = (await post('/api/v1/inspections', {
|
||||
colonyId,
|
||||
date: '2026-07-01T00:00:00.000Z',
|
||||
queenSeen: false,
|
||||
eggsPresent: false,
|
||||
}).expect(201)) as { body: { id: string } };
|
||||
|
||||
await drainDomainEvents(app, [body.id]);
|
||||
// The warning failed, so the whole evaluation rolled back.
|
||||
expect(await taskCount('QUEENLESS_NO_EGGS', colonyId)).toBe(0);
|
||||
expect(
|
||||
await prisma.notification.count({ where: { relatedId: colonyId } }),
|
||||
).toBe(0);
|
||||
|
||||
// Due again now instead of after the 30 s backoff.
|
||||
await prisma.$executeRaw`UPDATE "DomainEvent" SET "availableAt" = now() WHERE "aggregateId" = ${body.id}`;
|
||||
await drainDomainEvents(app, [body.id]);
|
||||
expect(await taskCount('QUEENLESS_NO_EGGS', colonyId)).toBe(1);
|
||||
expect(
|
||||
await prisma.notification.count({ where: { relatedId: colonyId } }),
|
||||
).toBe(1);
|
||||
|
||||
const deliveries = await prisma.domainEventDelivery.findMany({
|
||||
where: { event: { aggregateId: body.id } },
|
||||
});
|
||||
expect(
|
||||
deliveries.find((d) => d.handler === 'automation.inspection-rules'),
|
||||
).toMatchObject({ status: 'DONE', attempts: 2 });
|
||||
// What already worked did not run again.
|
||||
expect(
|
||||
deliveries.find((d) => d.handler === 'webhooks.forward'),
|
||||
).toMatchObject({ status: 'DONE', attempts: 1 });
|
||||
await expect(
|
||||
prisma.domainEvent.findFirstOrThrow({
|
||||
where: { aggregateId: body.id },
|
||||
}),
|
||||
).resolves.toMatchObject({ status: 'DONE', attempts: 1 });
|
||||
});
|
||||
});
|
||||
|
||||
describe('automation tasks', () => {
|
||||
it('leaves one open task when several triggers for the same colony arrive at once', async () => {
|
||||
it('leaves one open reorder task when several triggers for the same stock item arrive at once', async () => {
|
||||
const automation = app.get(AutomationService);
|
||||
// The same object crossing the threshold on several pods/requests at
|
||||
// once: every evaluation sees "no open task yet" unless checking and
|
||||
@@ -167,24 +348,17 @@ describe('Post-commit side effects (e2e)', () => {
|
||||
minThreshold: 5,
|
||||
},
|
||||
});
|
||||
stockItemIds.push(item.id);
|
||||
|
||||
await Promise.all(
|
||||
Array.from({ length: 8 }, () => automation.evaluateStockItem(item)),
|
||||
);
|
||||
|
||||
expect(
|
||||
await prisma.task.count({
|
||||
where: {
|
||||
relatedId: item.id,
|
||||
sourceAutomationTrigger: 'STOCK_ITEM_LOW',
|
||||
status: { in: ['OPEN', 'IN_PROGRESS'] },
|
||||
},
|
||||
}),
|
||||
).toBe(1);
|
||||
expect(await openTaskCount('STOCK_ITEM_LOW', item.id)).toBe(1);
|
||||
});
|
||||
|
||||
it('leaves one open task when several measurements for the same colony arrive at once', async () => {
|
||||
const colony = await createColony('PC-RACE-HTTP');
|
||||
it('leaves one open task when several triggers for the same colony arrive at once', async () => {
|
||||
const colony = await createColony('PC-RACE');
|
||||
const measurement = {
|
||||
colonyId: colony.id,
|
||||
date: '2026-08-15T00:00:00.000Z',
|
||||
@@ -194,25 +368,19 @@ describe('Post-commit side effects (e2e)', () => {
|
||||
durationMinutes: 24 * 60,
|
||||
};
|
||||
|
||||
await Promise.all(
|
||||
const responses = await Promise.all(
|
||||
Array.from({ length: 6 }, () =>
|
||||
request(server())
|
||||
.post('/api/v1/varroa-measurements')
|
||||
.set(auth())
|
||||
.send(measurement)
|
||||
.expect(201),
|
||||
post('/api/v1/varroa-measurements', measurement).expect(201),
|
||||
),
|
||||
);
|
||||
// One worker each: the handlers evaluate the rule at the same moment.
|
||||
await Promise.all(
|
||||
responses.map(({ body }) =>
|
||||
drainDomainEvents(app, [(body as { id: string }).id]),
|
||||
),
|
||||
);
|
||||
|
||||
expect(
|
||||
await prisma.task.count({
|
||||
where: {
|
||||
relatedId: colony.id,
|
||||
sourceAutomationTrigger: 'VARROA_THRESHOLD',
|
||||
status: { in: ['OPEN', 'IN_PROGRESS'] },
|
||||
},
|
||||
}),
|
||||
).toBe(1);
|
||||
expect(await openTaskCount('VARROA_THRESHOLD', colony.id)).toBe(1);
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user