add dateRange to checks query

This commit is contained in:
Alex Holliday committed 2026-01-27 20:46:28 +00:00
1 parent 0af7cfe714
commit 63d2bb97ee
8 files changed
+19 -13

No files matched your search

+3 -3
View File
@@ -137,7 +137,7 @@ const useFetchChecksByMonitor = ({
return [checks, checksCount, isLoading, networkError]; return [checks, checksCount, isLoading, networkError];
}; };
const useFetchChecksSummaryByTeamId = ({ updateTrigger } = {}) => { const useFetchChecksSummaryByTeamId = ({ dateRange, updateTrigger } = {}) => {
const [summary, setSummary] = useState(undefined); const [summary, setSummary] = useState(undefined);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [networkError, setNetworkError] = useState(false); const [networkError, setNetworkError] = useState(false);
@@ -147,7 +147,7 @@ const useFetchChecksSummaryByTeamId = ({ updateTrigger } = {}) => {
try { try {
setIsLoading(true); setIsLoading(true);
const res = await networkService.getChecksAndSummaryByTeamId(); const res = await networkService.getChecksAndSummaryByTeamId({ dateRange });
setSummary(res.data.data); setSummary(res.data.data);
} catch (error) { } catch (error) {
setNetworkError(true); setNetworkError(true);
@@ -158,7 +158,7 @@ const useFetchChecksSummaryByTeamId = ({ updateTrigger } = {}) => {
}; };
fetchSummary(); fetchSummary();
}, [updateTrigger]); }, [dateRange, updateTrigger]);
return [summary, isLoading, networkError]; return [summary, isLoading, networkError];
}; };
@@ -19,7 +19,7 @@ import { useState } from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { useFetchChecksTeam, useFetchChecksByMonitor } from "@/Hooks/checkHooks.js"; import { useFetchChecksTeam, useFetchChecksByMonitor } from "@/Hooks/checkHooks.js";
import { Button, Typography, useTheme } from "@mui/material"; import { Typography, useTheme } from "@mui/material";
import { lighten } from "@mui/material/styles"; import { lighten } from "@mui/material/styles";
const GetTooltip = (row) => { const GetTooltip = (row) => {
+2 -2
View File
@@ -5,7 +5,6 @@ import GenericFallback from "@/Components/v1/GenericFallback/index.jsx";
import IncidentTable from "./Components/IncidentTable/index.jsx"; import IncidentTable from "./Components/IncidentTable/index.jsx";
import OptionsHeader from "./Components/OptionsHeader/index.jsx"; import OptionsHeader from "./Components/OptionsHeader/index.jsx";
import StatusBoxes from "./Components/StatusBoxes/index.jsx"; import StatusBoxes from "./Components/StatusBoxes/index.jsx";
import { Box, Button } from "@mui/material";
//Utils //Utils
import { useTheme } from "@emotion/react"; import { useTheme } from "@emotion/react";
@@ -26,7 +25,7 @@ const Checks = () => {
// Local state // Local state
const [selectedMonitor, setSelectedMonitor] = useState("0"); const [selectedMonitor, setSelectedMonitor] = useState("0");
const [filter, setFilter] = useState(undefined); const [filter, setFilter] = useState(undefined);
const [dateRange, setDateRange] = useState(undefined); const [dateRange, setDateRange] = useState("hour");
const [monitorLookup, setMonitorLookup] = useState(undefined); const [monitorLookup, setMonitorLookup] = useState(undefined);
const [updateTrigger, setUpdateTrigger] = useState(false); const [updateTrigger, setUpdateTrigger] = useState(false);
@@ -36,6 +35,7 @@ const Checks = () => {
const theme = useTheme(); const theme = useTheme();
const [monitors, , isLoading, networkError] = useFetchMonitorsByTeamId({}); const [monitors, , isLoading, networkError] = useFetchMonitorsByTeamId({});
const [summary, isLoadingSummary, networkErrorSummary] = useFetchChecksSummaryByTeamId({ const [summary, isLoadingSummary, networkErrorSummary] = useFetchChecksSummaryByTeamId({
dateRange,
updateTrigger, updateTrigger,
}); });
const { monitorId } = useParams(); const { monitorId } = useParams();
+2 -2
View File
@@ -594,8 +594,8 @@ class NetworkService {
* @async * @async
* @returns {Promise<AxiosResponse>} The response from the axios GET request. * @returns {Promise<AxiosResponse>} The response from the axios GET request.
*/ */
getChecksAndSummaryByTeamId = async () => { getChecksAndSummaryByTeamId = async ({ dateRange }) => {
return this.axiosInstance.get(`/checks/team/summary`); return this.axiosInstance.get(`/checks/team/summary?dateRange=${dateRange}`);
}; };
/** /**
+2 -1
View File
@@ -66,7 +66,8 @@ class CheckController {
getChecksSummaryByTeamId = async (req: Request, res: Response, next: NextFunction) => { getChecksSummaryByTeamId = async (req: Request, res: Response, next: NextFunction) => {
try { try {
const summary = await this.checkService.getChecksSummaryByTeamId({ teamId: req?.user?.teamId }); const dateRange = req.query?.dateRange || "hour";
const summary = await this.checkService.getChecksSummaryByTeamId({ teamId: req?.user?.teamId, dateRange });
return res.status(200).json({ return res.status(200).json({
success: true, success: true,
msg: "Checks summary retrieved successfully", msg: "Checks summary retrieved successfully",
@@ -33,7 +33,7 @@ export interface IChecksRepository {
dateString: string, dateString: string,
options?: { type?: MonitorType } options?: { type?: MonitorType }
): Promise<UptimeChecksResult | HardwareChecksResult | PageSpeedChecksResult>; ): Promise<UptimeChecksResult | HardwareChecksResult | PageSpeedChecksResult>;
findSummaryByTeamId(teamId: string): Promise<ChecksSummary>; findSummaryByTeamId(teamId: string, dateRange: string): Promise<ChecksSummary>;
// update // update
//delete //delete
deleteByMonitorId(monitorId: string): Promise<number>; deleteByMonitorId(monitorId: string): Promise<number>;
@@ -365,9 +365,14 @@ class MongoChecksRepository implements IChecksRepository {
return this.findUptimeDateRangeChecks(options?.type ?? "http", monitorObjectId, startDate, endDate, dateString); return this.findUptimeDateRangeChecks(options?.type ?? "http", monitorObjectId, startDate, endDate, dateString);
}; };
findSummaryByTeamId = async (teamId: string) => { findSummaryByTeamId = async (teamId: string, dateRange: string) => {
const matchStage = { const matchStage = {
"metadata.teamId": new mongoose.Types.ObjectId(teamId), "metadata.teamId": new mongoose.Types.ObjectId(teamId),
...(dateRangeLookup[dateRange] && {
createdAt: {
$gte: dateRangeLookup[dateRange],
},
}),
}; };
const checks = await CheckModel.aggregate([ const checks = await CheckModel.aggregate([
{ $match: matchStage }, { $match: matchStage },
+2 -2
View File
@@ -145,11 +145,11 @@ class CheckService {
return checkData; return checkData;
}; };
getChecksSummaryByTeamId = async ({ teamId }: { teamId: string }) => { getChecksSummaryByTeamId = async ({ teamId, dateRange }: { teamId: string; dateRange: string }) => {
if (!teamId) { if (!teamId) {
throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "getChecksSummaryByTeamId", status: 400 }); throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "getChecksSummaryByTeamId", status: 400 });
} }
const summary = await this.checksRepository.findSummaryByTeamId(teamId); const summary = await this.checksRepository.findSummaryByTeamId(teamId, dateRange);
return summary; return summary;
}; };