feat: platform backbone and field capture, first part (checkpoint)
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]>
This commit is contained in:
Nick SzaunigandClaude Opus 5.5 committed
1 parent
10cbe9bf2d
commit
c01a38835a
340 files changed
+25695
-1808
No files matched your search
@@ -0,0 +1,206 @@
|
||||
import { NotFoundException } from '@nestjs/common';
|
||||
import { ApiaryFieldService } from './apiary-field.service';
|
||||
import { PrismaService } from '../prisma/prisma.service';
|
||||
import { PermissionResolverService } from '../auth/permissions/permission-resolver.service';
|
||||
|
||||
describe('ApiaryFieldService', () => {
|
||||
let service: ApiaryFieldService;
|
||||
let prisma: {
|
||||
apiary: { findUnique: jest.Mock };
|
||||
colony: { findMany: jest.Mock };
|
||||
inspection: { groupBy: jest.Mock; findMany: jest.Mock };
|
||||
notification: { groupBy: jest.Mock };
|
||||
queen: { findMany: jest.Mock };
|
||||
task: { findMany: jest.Mock };
|
||||
};
|
||||
let permissionResolver: { getPermissions: jest.Mock };
|
||||
|
||||
const colonyRow = (id: string, code: string, queenId: string | null) => ({
|
||||
id,
|
||||
code,
|
||||
apiaryId: 'apiary-1',
|
||||
status: 'ACTIVE',
|
||||
colonyType: 'PRODUCTION_COLONY',
|
||||
hiveType: null,
|
||||
strength: 5,
|
||||
broodStatus: null,
|
||||
feedStatus: null,
|
||||
healthStatus: null,
|
||||
currentQueenId: queenId,
|
||||
notes: null,
|
||||
});
|
||||
|
||||
const grant = (...keys: string[]) =>
|
||||
permissionResolver.getPermissions.mockResolvedValue(new Set(keys));
|
||||
|
||||
beforeEach(() => {
|
||||
prisma = {
|
||||
apiary: {
|
||||
findUnique: jest.fn().mockResolvedValue({
|
||||
id: 'apiary-1',
|
||||
name: 'Heimstand',
|
||||
location: 'Garten',
|
||||
status: 'ACTIVE',
|
||||
}),
|
||||
},
|
||||
colony: {
|
||||
findMany: jest
|
||||
.fn()
|
||||
.mockResolvedValue([
|
||||
colonyRow('c10', 'V-10', 'q1'),
|
||||
colonyRow('c2', 'V-2', null),
|
||||
]),
|
||||
},
|
||||
inspection: {
|
||||
groupBy: jest.fn().mockResolvedValue([]),
|
||||
findMany: jest.fn().mockResolvedValue([]),
|
||||
},
|
||||
notification: { groupBy: jest.fn().mockResolvedValue([]) },
|
||||
queen: { findMany: jest.fn().mockResolvedValue([]) },
|
||||
task: { findMany: jest.fn().mockResolvedValue([]) },
|
||||
};
|
||||
permissionResolver = { getPermissions: jest.fn() };
|
||||
service = new ApiaryFieldService(
|
||||
prisma as unknown as PrismaService,
|
||||
permissionResolver as unknown as PermissionResolverService,
|
||||
);
|
||||
});
|
||||
|
||||
it('throws NotFoundException for an unknown apiary', async () => {
|
||||
grant('colonies:read');
|
||||
prisma.apiary.findUnique.mockResolvedValue(null);
|
||||
await expect(service.colonyOverview('x', 'u1')).rejects.toBeInstanceOf(
|
||||
NotFoundException,
|
||||
);
|
||||
});
|
||||
|
||||
it('sorts living colonies by code with numeric collation', async () => {
|
||||
grant('colonies:read');
|
||||
const overview = await service.colonyOverview('apiary-1', 'u1');
|
||||
expect(overview.rows.map((row) => row.code)).toEqual(['V-2', 'V-10']);
|
||||
expect(prisma.colony.findMany).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
where: expect.objectContaining({ apiaryId: 'apiary-1' }) as unknown,
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('leaves out inspections, queens and tasks without their read permission', async () => {
|
||||
grant('colonies:read');
|
||||
const pack = await service.offlinePack('apiary-1', 'u1');
|
||||
expect(pack.inspections).toBeNull();
|
||||
expect(pack.queens).toBeNull();
|
||||
expect(pack.tasks).toBeNull();
|
||||
expect(pack.overview.inspectionsVisible).toBe(false);
|
||||
expect(pack.overview.rows.every((r) => r.lastInspectionDate === null)).toBe(
|
||||
true,
|
||||
);
|
||||
expect(prisma.inspection.groupBy).not.toHaveBeenCalled();
|
||||
expect(prisma.inspection.findMany).not.toHaveBeenCalled();
|
||||
expect(prisma.queen.findMany).not.toHaveBeenCalled();
|
||||
expect(prisma.task.findMany).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('fills the permitted sections and the last inspection date', async () => {
|
||||
grant('colonies:read', 'inspections:read', 'queens:read', 'tasks:read');
|
||||
const date = new Date('2026-05-01T10:00:00.000Z');
|
||||
prisma.inspection.groupBy.mockResolvedValue([
|
||||
{ colonyId: 'c2', _max: { date } },
|
||||
]);
|
||||
prisma.queen.findMany.mockResolvedValue([{ id: 'q1', code: 'K-1' }]);
|
||||
prisma.task.findMany.mockResolvedValue([{ id: 't1', title: 'Futter' }]);
|
||||
|
||||
const pack = await service.offlinePack('apiary-1', 'u1');
|
||||
|
||||
expect(pack.overview.inspectionsVisible).toBe(true);
|
||||
expect(pack.overview.rows[0].lastInspectionDate).toBe(date.toISOString());
|
||||
expect(pack.overview.rows[1].lastInspectionDate).toBeNull();
|
||||
expect(pack.queens).toEqual([{ id: 'q1', code: 'K-1' }]);
|
||||
expect(prisma.queen.findMany).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ where: { id: { in: ['q1'] } } }),
|
||||
);
|
||||
expect(pack.tasks).toEqual([{ id: 't1', title: 'Futter' }]);
|
||||
expect(prisma.task.findMany).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
where: {
|
||||
status: { in: ['OPEN', 'IN_PROGRESS'] },
|
||||
OR: [
|
||||
{ relatedType: 'APIARY', relatedId: 'apiary-1' },
|
||||
{ relatedType: 'COLONY', relatedId: { in: ['c2', 'c10'] } },
|
||||
],
|
||||
},
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('keeps at most three inspections per colony, newest first', async () => {
|
||||
grant('colonies:read', 'inspections:read');
|
||||
prisma.inspection.findMany.mockResolvedValue([{ id: 'i1' }]);
|
||||
|
||||
const pack = await service.offlinePack('apiary-1', 'u1');
|
||||
|
||||
expect(prisma.inspection.findMany).toHaveBeenCalledTimes(2);
|
||||
expect(prisma.inspection.findMany).toHaveBeenCalledWith({
|
||||
where: { colonyId: 'c2' },
|
||||
take: 3,
|
||||
orderBy: [{ date: 'desc' }, { createdAt: 'desc' }],
|
||||
omit: { userId: true },
|
||||
});
|
||||
expect(pack.inspections).toHaveLength(2);
|
||||
});
|
||||
|
||||
it('never returns coordinates, address, apiary notes or inspection userId', async () => {
|
||||
grant('colonies:read', 'inspections:read');
|
||||
const pack = await service.offlinePack('apiary-1', 'u1');
|
||||
|
||||
expect(Object.keys(pack.apiary).sort()).toEqual([
|
||||
'id',
|
||||
'location',
|
||||
'name',
|
||||
'status',
|
||||
]);
|
||||
const apiarySelect = (
|
||||
prisma.apiary.findUnique.mock.calls[0] as [{ select: object }]
|
||||
)[0].select;
|
||||
expect(apiarySelect).not.toHaveProperty('latitude');
|
||||
expect(apiarySelect).not.toHaveProperty('longitude');
|
||||
expect(apiarySelect).not.toHaveProperty('address');
|
||||
expect(apiarySelect).not.toHaveProperty('notes');
|
||||
const inspectionArgs = (
|
||||
prisma.inspection.findMany.mock.calls[0] as [{ omit: object }]
|
||||
)[0];
|
||||
expect(inspectionArgs.omit).toEqual({ userId: true });
|
||||
});
|
||||
|
||||
it('counts only unread WARNUNG and KRITISCH colony notifications visible to the caller', async () => {
|
||||
grant('colonies:read');
|
||||
prisma.notification.groupBy.mockResolvedValue([
|
||||
{ relatedId: 'c2', priority: 'WARNUNG', _count: { _all: 2 } },
|
||||
{ relatedId: 'c2', priority: 'KRITISCH', _count: { _all: 1 } },
|
||||
]);
|
||||
|
||||
const overview = await service.colonyOverview('apiary-1', 'u1');
|
||||
|
||||
expect(prisma.notification.groupBy).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
by: ['relatedId', 'priority'],
|
||||
where: {
|
||||
relatedType: 'COLONY',
|
||||
relatedId: { in: ['c2', 'c10'] },
|
||||
read: false,
|
||||
priority: { in: ['WARNUNG', 'KRITISCH'] },
|
||||
OR: [{ userId: 'u1' }, { userId: null }],
|
||||
},
|
||||
}),
|
||||
);
|
||||
expect(overview.rows[0]).toMatchObject({
|
||||
code: 'V-2',
|
||||
openWarnings: 2,
|
||||
openCritical: 1,
|
||||
});
|
||||
expect(overview.rows[1]).toMatchObject({
|
||||
openWarnings: 0,
|
||||
openCritical: 0,
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user