Platform backbone (plan 2026-10-13-plattform-rueckgrat), reviewed tasks: - run roles api/worker/job/all with shared startup checks (Task 1) - schema and migration for DomainEvent, deliveries, JobRun, ThrottlerHit (Task 2) - audit, notifications and domain events written in the same transaction (Task 3) - dispatcher with SKIP LOCKED claims, retries and stale release (Task 4) - worker building blocks: tick, LISTEN/NOTIFY wake-up, health (Task 5) - worker process and entry points (Task 6) - throttler counters in Postgres (Task 19) - separate keys per purpose with key ring (Task 20) - public origin page without exact location (Task 22) - shop keys split into read and write (Task 23) - Kustomize base, components, overlay encry, CI validation (Task 26) Field capture T3 (plan 2026-10-13-t3-erfassung-am-stand), reviewed tasks: - brood frames, read endpoints, apiary overview and offline pack - network basics, offline queue v3, navigation sheets, form building blocks - new inspection with last-time hints and weather, varroa per day, treatment prefill, apiary page with round - inspection photo (Task 10) is implemented, review pending Not rolled out. Remaining tasks follow in later commits. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
191 lines
6.2 KiB
TypeScript
191 lines
6.2 KiB
TypeScript
import { INestApplication } from '@nestjs/common';
|
|
import * as bcrypt from 'bcryptjs';
|
|
import request from 'supertest';
|
|
import { App } from 'supertest/types';
|
|
import { PrismaService } from '../src/prisma/prisma.service';
|
|
import { createTestApp } from './utils/create-test-app';
|
|
import { login } from './utils/api';
|
|
|
|
interface VarroaMeasurementBody {
|
|
id: string;
|
|
colonyId: string;
|
|
calculatedValue: number | null;
|
|
}
|
|
|
|
describe('Varroa measurements (e2e)', () => {
|
|
let app: INestApplication<App>;
|
|
let prisma: PrismaService;
|
|
const beekeeperEmail = `varroa-e2e-beekeeper-${Date.now()}@example.com`;
|
|
const staffEmail = `varroa-e2e-staff-${Date.now()}@example.com`;
|
|
const password = 'SuperSecret123!';
|
|
let beekeeperId: string;
|
|
let staffId: string;
|
|
let beekeeperToken: string;
|
|
let staffToken: string;
|
|
let apiaryId: string;
|
|
let colonyId: string;
|
|
let measurementId: string;
|
|
let noVarroaRoleId: string;
|
|
let noVarroaUserId: string;
|
|
let noVarroaToken: string;
|
|
|
|
beforeAll(async () => {
|
|
app = await createTestApp();
|
|
prisma = app.get(PrismaService);
|
|
|
|
const passwordHash = await bcrypt.hash(password, 12);
|
|
const beekeeper = await prisma.user.create({
|
|
data: {
|
|
email: beekeeperEmail,
|
|
passwordHash,
|
|
name: 'Beekeeper',
|
|
role: { connect: { key: 'BEEKEEPER' } },
|
|
},
|
|
});
|
|
beekeeperId = beekeeper.id;
|
|
const staff = await prisma.user.create({
|
|
data: {
|
|
email: staffEmail,
|
|
passwordHash,
|
|
name: 'Staff',
|
|
role: { connect: { key: 'STAFF' } },
|
|
},
|
|
});
|
|
staffId = staff.id;
|
|
beekeeperToken = (await login(app, beekeeperEmail, password)).accessToken;
|
|
staffToken = (await login(app, staffEmail, password)).accessToken;
|
|
|
|
const apiary = await prisma.apiary.create({
|
|
data: { name: `Stand ${Date.now()}` },
|
|
});
|
|
apiaryId = apiary.id;
|
|
const colony = await prisma.colony.create({
|
|
data: {
|
|
code: `V-${Date.now()}`,
|
|
apiaryId,
|
|
colonyType: 'PRODUCTION_COLONY',
|
|
},
|
|
});
|
|
colonyId = colony.id;
|
|
|
|
const noVarroaRole = await prisma.role.create({
|
|
data: {
|
|
key: `NO_VARROA_${Date.now()}`,
|
|
name: 'Ohne Varroa',
|
|
permissions: {
|
|
create: [{ permission: { connect: { key: 'apiaries:read' } } }],
|
|
},
|
|
},
|
|
});
|
|
noVarroaRoleId = noVarroaRole.id;
|
|
const noVarroaEmail = `varroa-e2e-novarroa-${Date.now()}@example.com`;
|
|
const noVarroaUser = await prisma.user.create({
|
|
data: {
|
|
email: noVarroaEmail,
|
|
passwordHash,
|
|
name: 'Ohne Varroa',
|
|
role: { connect: { id: noVarroaRoleId } },
|
|
},
|
|
});
|
|
noVarroaUserId = noVarroaUser.id;
|
|
noVarroaToken = (await login(app, noVarroaEmail, password)).accessToken;
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await prisma.varroaMeasurement.deleteMany({ where: { colonyId } });
|
|
await prisma.colony.deleteMany({ where: { id: colonyId } });
|
|
await prisma.apiary.deleteMany({ where: { id: apiaryId } });
|
|
await prisma.refreshToken.deleteMany({
|
|
where: { userId: { in: [beekeeperId, staffId, noVarroaUserId] } },
|
|
});
|
|
await prisma.auditLog.deleteMany({
|
|
where: { userId: { in: [beekeeperId, staffId, noVarroaUserId] } },
|
|
});
|
|
await prisma.user.deleteMany({
|
|
where: { id: { in: [beekeeperId, staffId, noVarroaUserId] } },
|
|
});
|
|
await prisma.role.deleteMany({ where: { id: noVarroaRoleId } });
|
|
await app.close();
|
|
});
|
|
|
|
it('rejects create for a STAFF user', () => {
|
|
return request(app.getHttpServer())
|
|
.post('/api/v1/varroa-measurements')
|
|
.set('Authorization', `Bearer ${staffToken}`)
|
|
.send({
|
|
colonyId,
|
|
date: new Date().toISOString(),
|
|
method: 'NATURAL_MITE_FALL',
|
|
})
|
|
.expect(403);
|
|
});
|
|
|
|
it('lets a BEEKEEPER user record a measurement', async () => {
|
|
const response = await request(app.getHttpServer())
|
|
.post('/api/v1/varroa-measurements')
|
|
.set('Authorization', `Bearer ${beekeeperToken}`)
|
|
.send({
|
|
colonyId,
|
|
date: new Date().toISOString(),
|
|
method: 'NATURAL_MITE_FALL',
|
|
miteCount: 12,
|
|
durationMinutes: 4320,
|
|
})
|
|
.expect(201);
|
|
const created = response.body as VarroaMeasurementBody;
|
|
measurementId = created.id;
|
|
expect(measurementId).toEqual(expect.any(String));
|
|
expect(created.calculatedValue).toBe(4);
|
|
});
|
|
|
|
it('recomputes mites/day when the count is corrected', async () => {
|
|
// The edit dialog sends the whole form, the stored rate included.
|
|
const response = await request(app.getHttpServer())
|
|
.patch(`/api/v1/varroa-measurements/${measurementId}`)
|
|
.set('Authorization', `Bearer ${beekeeperToken}`)
|
|
.send({
|
|
colonyId,
|
|
date: new Date().toISOString(),
|
|
method: 'NATURAL_MITE_FALL',
|
|
miteCount: 30,
|
|
durationMinutes: 4320,
|
|
calculatedValue: 4,
|
|
})
|
|
.expect(200);
|
|
expect((response.body as VarroaMeasurementBody).calculatedValue).toBe(10);
|
|
});
|
|
|
|
it('lists measurements for the colony', async () => {
|
|
const response = await request(app.getHttpServer())
|
|
.get(`/api/v1/colonies/${colonyId}/varroa-measurements`)
|
|
.set('Authorization', `Bearer ${staffToken}`)
|
|
.expect(200);
|
|
const measurements = response.body as VarroaMeasurementBody[];
|
|
expect(measurements.some((entry) => entry.id === measurementId)).toBe(true);
|
|
});
|
|
|
|
describe('GET /varroa-measurements/threshold', () => {
|
|
const thresholdBody = (token: string) =>
|
|
request(app.getHttpServer())
|
|
.get('/api/v1/varroa-measurements/threshold')
|
|
.set('Authorization', `Bearer ${token}`);
|
|
|
|
it('returns the threshold shape and is not shadowed by :id', async () => {
|
|
const response = await thresholdBody(staffToken).expect(200);
|
|
|
|
const body = response.body as { thresholdMitesPerDay: number | null };
|
|
expect(Object.keys(body)).toEqual(['thresholdMitesPerDay']);
|
|
expect(
|
|
body.thresholdMitesPerDay === null ||
|
|
typeof body.thresholdMitesPerDay === 'number',
|
|
).toBe(true);
|
|
});
|
|
|
|
// The shared rule is never written here (parallel e2e workers); the
|
|
// inactive / custom value cases are covered by varroa-threshold.spec.ts.
|
|
|
|
it('rejects a role without any varroa permission', () =>
|
|
thresholdBody(noVarroaToken).expect(403));
|
|
});
|
|
});
|