feat: T4 wave 4 - rules suggest, takeover, chains, autopilot A1-A3, suggestions page, varroa bands UI
- Automation rules propose suggestions instead of creating tasks; notify per rule config; corrected varroa measurements refresh or resolve their suggestion - Inspection values can be taken over into the colony card (occupiedFrames 0-40, strength deprecated); warning counts use the same visibility rule as the notification list - Biotech chains: swarm check after queen cells, queen acceptance check, split schedules (raise own, queen cell, queen) - Season autopilot core with A1 inspection due, A2 varroa measurement, A3 recheck after treatment; colony sync and daily step - Frontend: suggestions page with groups, bulk accept, undo, paging, focus management and permission gating - Frontend: varroa traffic light from seasonal bands, sample size, one range request for the colony chart - Notifications: mark-read answers 404 for rows the user may no longer see Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
This commit is contained in:
1 parent
64a2b7dad9
commit
02eb16924e
142 files changed
+11847
-1251
No files matched your search
@@ -9,7 +9,7 @@ describe('ApiaryFieldService', () => {
|
||||
apiary: { findUnique: jest.Mock };
|
||||
colony: { findMany: jest.Mock };
|
||||
inspection: { groupBy: jest.Mock; findMany: jest.Mock };
|
||||
notification: { groupBy: jest.Mock };
|
||||
$queryRaw: jest.Mock;
|
||||
queen: { findMany: jest.Mock };
|
||||
task: { findMany: jest.Mock };
|
||||
};
|
||||
@@ -23,6 +23,7 @@ describe('ApiaryFieldService', () => {
|
||||
colonyType: 'PRODUCTION_COLONY',
|
||||
hiveType: null,
|
||||
strength: 5,
|
||||
occupiedFrames: 12,
|
||||
broodStatus: null,
|
||||
feedStatus: null,
|
||||
healthStatus: null,
|
||||
@@ -55,7 +56,7 @@ describe('ApiaryFieldService', () => {
|
||||
groupBy: jest.fn().mockResolvedValue([]),
|
||||
findMany: jest.fn().mockResolvedValue([]),
|
||||
},
|
||||
notification: { groupBy: jest.fn().mockResolvedValue([]) },
|
||||
$queryRaw: jest.fn().mockResolvedValue([]),
|
||||
queen: { findMany: jest.fn().mockResolvedValue([]) },
|
||||
task: { findMany: jest.fn().mockResolvedValue([]) },
|
||||
};
|
||||
@@ -172,27 +173,23 @@ describe('ApiaryFieldService', () => {
|
||||
expect(inspectionArgs.omit).toEqual({ userId: true });
|
||||
});
|
||||
|
||||
const lastQuery = () =>
|
||||
(prisma.$queryRaw.mock.calls[0] as [{ sql: string; values: unknown[] }])[0];
|
||||
|
||||
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 } },
|
||||
prisma.$queryRaw.mockResolvedValue([
|
||||
{ relatedId: 'c2', priority: 'WARNUNG', count: 2 },
|
||||
{ relatedId: 'c2', priority: 'KRITISCH', count: 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'] },
|
||||
userId: 'u1',
|
||||
},
|
||||
}),
|
||||
);
|
||||
const query = lastQuery();
|
||||
expect(query.sql).toContain('"userId" =');
|
||||
expect(query.sql).toContain('"read" = false');
|
||||
expect(query.values).toContain('u1');
|
||||
expect(query.values).toEqual(expect.arrayContaining(['c2', 'c10']));
|
||||
expect(overview.rows[0]).toMatchObject({
|
||||
code: 'V-2',
|
||||
openWarnings: 2,
|
||||
@@ -203,4 +200,16 @@ describe('ApiaryFieldService', () => {
|
||||
openCritical: 0,
|
||||
});
|
||||
});
|
||||
|
||||
it('requires the notification permissions to be a subset of the held ones, stale keys included', async () => {
|
||||
grant('colonies:read', 'varroa:read');
|
||||
|
||||
await service.colonyOverview('apiary-1', 'u1');
|
||||
|
||||
const query = lastQuery();
|
||||
expect(query.sql).toContain('"requiredPermissions" <@');
|
||||
// The held set is passed as is: a key outside the catalog is never
|
||||
// contained in it, so such a row stays hidden (parity with findOwn).
|
||||
expect(query.values).toContainEqual(['colonies:read', 'varroa:read']);
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user