fix pretty name bug, ordering bug
This commit is contained in:
1 parent
dfcb3b4b21
commit
4c8342f379
8 files changed
+22
-17
No files matched your search
@@ -81,6 +81,7 @@ class MongoChecksRepository implements IChecksRepository {
|
||||
os: host?.os ?? "",
|
||||
platform: host?.platform ?? "",
|
||||
kernel_version: host?.kernel_version ?? "",
|
||||
pretty_name: host?.pretty_name ?? "",
|
||||
});
|
||||
|
||||
const mapCapture = (capture?: CheckCaptureInfo): CheckCaptureInfo => ({
|
||||
|
||||
@@ -363,7 +363,7 @@ export class MonitorService implements IMonitorService {
|
||||
const monitorsWithChecks = monitors.map((monitor: Monitor) => {
|
||||
const rawChecks = monitor.recentChecks ?? [];
|
||||
const isSnapshotType = snapshotOnlyRequest || snapshotTypes.includes(monitor.type);
|
||||
const checks = isSnapshotType ? rawChecks.slice(0, 1) : rawChecks;
|
||||
const checks = isSnapshotType ? rawChecks.slice(-1) : rawChecks;
|
||||
monitor.recentChecks = checks;
|
||||
return monitor;
|
||||
});
|
||||
|
||||
@@ -583,7 +583,7 @@ describe("MonitorService", () => {
|
||||
expect(result.monitors).toEqual([]);
|
||||
});
|
||||
|
||||
it("uses snapshot (first check only) for hardware type monitors", async () => {
|
||||
it("uses snapshot (latest check only) for hardware type monitors", async () => {
|
||||
const monitorsRepository = createMonitorsRepositoryMock();
|
||||
(monitorsRepository.findMonitorsSummaryByTeamId as jest.Mock).mockResolvedValue({ totalMonitors: 1 });
|
||||
(monitorsRepository.findMonitorCountByTeamIdAndType as jest.Mock).mockResolvedValue(1);
|
||||
@@ -602,6 +602,7 @@ describe("MonitorService", () => {
|
||||
const result = await service.getMonitorsWithChecksByTeamId({ teamId: TEAM_ID, type: "hardware" });
|
||||
|
||||
expect(result.monitors[0].recentChecks).toHaveLength(1);
|
||||
expect(result.monitors[0].recentChecks[0].responseTime).toBe(30);
|
||||
});
|
||||
|
||||
it("uses snapshot for hardware type when type is array with hardware", async () => {
|
||||
@@ -622,6 +623,7 @@ describe("MonitorService", () => {
|
||||
const result = await service.getMonitorsWithChecksByTeamId({ teamId: TEAM_ID, type: ["hardware"] });
|
||||
|
||||
expect(result.monitors[0].recentChecks).toHaveLength(1);
|
||||
expect(result.monitors[0].recentChecks[0].responseTime).toBe(20);
|
||||
});
|
||||
|
||||
it("normalizes checks for non-snapshot types when type is an array", async () => {
|
||||
|
||||
Reference in new issue
Block a user