replace findAll with findAllForScheduling
This commit is contained in:
1 parent
4c8342f379
commit
5fa74bd883
7 files changed
+47
-23
No files matched your search
@@ -1,6 +1,6 @@
|
||||
import type { IMonitorsRepository, TeamQueryConfig, SummaryConfig } from "../../src/domain/monitors/monitor.repository.interface.ts";
|
||||
import type { CheckSnapshot } from "../../src/domain/checks/check.type.ts";
|
||||
import type { Monitor, MonitorsSummary } from "../../src/domain/monitors/monitor.type.ts";
|
||||
import type { Monitor, MonitorScheduleFields, MonitorsSummary } from "../../src/domain/monitors/monitor.type.ts";
|
||||
|
||||
export class InMemoryMonitorsRepository implements IMonitorsRepository {
|
||||
private monitors: Monitor[] = [];
|
||||
@@ -24,8 +24,15 @@ export class InMemoryMonitorsRepository implements IMonitorsRepository {
|
||||
return { ...monitor };
|
||||
}
|
||||
|
||||
async findAll(): Promise<Monitor[]> {
|
||||
return this.monitors.map((m) => ({ ...m }));
|
||||
async findAllForScheduling(): Promise<MonitorScheduleFields[]> {
|
||||
return this.monitors.map((m) => ({
|
||||
id: m.id,
|
||||
type: m.type,
|
||||
isActive: m.isActive,
|
||||
interval: m.interval,
|
||||
geoCheckEnabled: m.geoCheckEnabled ?? false,
|
||||
geoCheckInterval: m.geoCheckInterval ?? 300000,
|
||||
}));
|
||||
}
|
||||
|
||||
async findByTeamId(_teamId: string, _config: TeamQueryConfig): Promise<Monitor[]> {
|
||||
|
||||
@@ -84,7 +84,7 @@ const createWorker = (overrides?: { queueMode?: QueueMode; queuePrimaryProcesses
|
||||
const monitorsRepository = {
|
||||
findByIds: jest.fn<any>().mockResolvedValue([makeMonitor()]),
|
||||
findByIdLean: jest.fn<any>().mockResolvedValue(makeMonitor()),
|
||||
findAll: jest.fn<any>().mockResolvedValue([]),
|
||||
findAllForScheduling: jest.fn<any>().mockResolvedValue([]),
|
||||
updateById: jest.fn<any>().mockResolvedValue({}),
|
||||
};
|
||||
const checksRepository = {
|
||||
@@ -183,7 +183,11 @@ describe("DBQueueWorker", () => {
|
||||
queueMode: "primary",
|
||||
queuePrimaryProcesses: false, // isolate reconcile from the polling loops
|
||||
mocks: {
|
||||
monitorsRepository: { findByIds: jest.fn<any>(), findAll: jest.fn<any>().mockResolvedValue([makeMonitor()]), updateById: jest.fn<any>() },
|
||||
monitorsRepository: {
|
||||
findByIds: jest.fn<any>(),
|
||||
findAllForScheduling: jest.fn<any>().mockResolvedValue([makeMonitor()]),
|
||||
updateById: jest.fn<any>(),
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
@@ -200,7 +204,11 @@ describe("DBQueueWorker", () => {
|
||||
queueMode: "primary",
|
||||
queuePrimaryProcesses: false,
|
||||
mocks: {
|
||||
monitorsRepository: { findByIds: jest.fn<any>(), findAll: jest.fn<any>().mockResolvedValue([geoMonitor]), updateById: jest.fn<any>() },
|
||||
monitorsRepository: {
|
||||
findByIds: jest.fn<any>(),
|
||||
findAllForScheduling: jest.fn<any>().mockResolvedValue([geoMonitor]),
|
||||
updateById: jest.fn<any>(),
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ const createScheduler = (overrides?: { queueMode?: QueueMode; mocks?: Record<str
|
||||
deleteById: jest.fn<any>().mockResolvedValue(undefined),
|
||||
};
|
||||
const monitorsRepository = {
|
||||
findAll: jest.fn<any>().mockResolvedValue([]),
|
||||
findAllForScheduling: jest.fn<any>().mockResolvedValue([]),
|
||||
};
|
||||
const logger = createMockLogger();
|
||||
const mocks = { jobsRepository, queueWorkersRepository, monitorsRepository, logger, ...overrides?.mocks };
|
||||
@@ -73,7 +73,7 @@ describe("JobScheduler", () => {
|
||||
it("primary mode reconciles: seeds a check row per monitor plus the two cleanup rows", async () => {
|
||||
const { scheduler, mocks } = createScheduler({
|
||||
queueMode: "primary",
|
||||
mocks: { monitorsRepository: { findAll: jest.fn<any>().mockResolvedValue([makeMonitor()]) } },
|
||||
mocks: { monitorsRepository: { findAllForScheduling: jest.fn<any>().mockResolvedValue([makeMonitor()]) } },
|
||||
});
|
||||
await scheduler.init();
|
||||
|
||||
@@ -87,7 +87,7 @@ describe("JobScheduler", () => {
|
||||
it("primary mode also seeds a geo-check row for geo-enabled monitors", async () => {
|
||||
const { scheduler, mocks } = createScheduler({
|
||||
queueMode: "primary",
|
||||
mocks: { monitorsRepository: { findAll: jest.fn<any>().mockResolvedValue([makeMonitor({ geoCheckEnabled: true })]) } },
|
||||
mocks: { monitorsRepository: { findAllForScheduling: jest.fn<any>().mockResolvedValue([makeMonitor({ geoCheckEnabled: true })]) } },
|
||||
});
|
||||
await scheduler.init();
|
||||
|
||||
@@ -98,12 +98,12 @@ describe("JobScheduler", () => {
|
||||
it("worker mode heartbeats but does not reconcile (no monitor reads, no seeds)", async () => {
|
||||
const { scheduler, mocks } = createScheduler({
|
||||
queueMode: "worker",
|
||||
mocks: { monitorsRepository: { findAll: jest.fn<any>().mockResolvedValue([makeMonitor()]) } },
|
||||
mocks: { monitorsRepository: { findAllForScheduling: jest.fn<any>().mockResolvedValue([makeMonitor()]) } },
|
||||
});
|
||||
await scheduler.init();
|
||||
|
||||
expect(mocks.queueWorkersRepository.upsert).toHaveBeenCalledWith("worker-1", "worker", false);
|
||||
expect(mocks.monitorsRepository.findAll).not.toHaveBeenCalled();
|
||||
expect(mocks.monitorsRepository.findAllForScheduling).not.toHaveBeenCalled();
|
||||
expect(mocks.jobsRepository.upsertJob).not.toHaveBeenCalled();
|
||||
expect(mocks.jobsRepository.upsertCleanupJob).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user