@oneuptime/common 11.7.1 → 11.7.2

package/build/dist/Server/API/StatusPageAPI.js

@@ -17,7 +17,6 @@ import IncidentPublicNoteService from "../Services/IncidentPublicNoteService";
 import IncidentService from "../Services/IncidentService";
 import IncidentStateService from "../Services/IncidentStateService";
 import IncidentStateTimelineService from "../Services/IncidentStateTimelineService";
-import MonitorGroupResourceService from "../Services/MonitorGroupResourceService";
 import MonitorGroupService from "../Services/MonitorGroupService";
 import MonitorStatusService from "../Services/MonitorStatusService";
 import ScheduledMaintenancePublicNoteService from "../Services/ScheduledMaintenancePublicNoteService";
@@ -97,38 +96,16 @@ import StatusPageSubscriberNotificationEventType from "../../Types/StatusPage/St
 import StatusPageSubscriberNotificationMethod from "../../Types/StatusPage/StatusPageSubscriberNotificationMethod";
 import StatusPageSubscriberNotificationTemplateService, { Service as StatusPageSubscriberNotificationTemplateServiceClass, } from "../Services/StatusPageSubscriberNotificationTemplateService";
 const resolveStatusPageIdOrThrow = async (statusPageIdOrDomain) => {
-    if (!statusPageIdOrDomain) {
-        throw new NotFoundException("Status Page not found");
-    }
-    if (statusPageIdOrDomain.includes(".")) {
-        const statusPageDomain = await StatusPageDomainService.findOneBy({
-            query: {
-                fullDomain: statusPageIdOrDomain,
-                domain: {
-                    isVerified: true,
-                },
-            },
-            select: {
-                statusPageId: true,
-            },
-            props: {
-                isRoot: true,
-            },
-        });
-        if (!statusPageDomain || !statusPageDomain.statusPageId) {
-            throw new NotFoundException("Status Page not found");
-        }
-        return statusPageDomain.statusPageId;
-    }
-    try {
-        ObjectID.validateUUID(statusPageIdOrDomain);
-        return new ObjectID(statusPageIdOrDomain);
-    }
-    catch (err) {
-        logger.error(`Error converting statusPageIdOrDomain to ObjectID: ${statusPageIdOrDomain}`);
-        logger.error(err);
+    /*
+     * Delegates to the service resolver so every endpoint shares its
+     * custom-domain -> statusPageId cache (one Postgres lookup per domain per
+     * TTL instead of one per request).
+     */
+    const statusPageId = await StatusPageService.resolveStatusPageIdOrNull(statusPageIdOrDomain);
+    if (!statusPageId) {
         throw new NotFoundException("Status Page not found");
     }
+    return statusPageId;
 };
 export default class StatusPageAPI extends BaseAPI {
     constructor() {
@@ -138,38 +115,10 @@ export default class StatusPageAPI extends BaseAPI {
         this.router.get(`${(_a = new this.entityType().getCrudApiPath()) === null || _a === void 0 ? void 0 : _a.toString()}/seo/:statusPageIdOrDomain`, UserMiddleware.getUserMiddleware, async (req, res) => {
             var _a;
             const statusPageIdOrDomain = req.params["statusPageIdOrDomain"];
-            let statusPageId = null;
-            if (statusPageIdOrDomain && statusPageIdOrDomain.includes(".")) {
-                // then this is a domain and not the status page id. We need to get the status page id from the domain.
-                const statusPageDomain = await StatusPageDomainService.findOneBy({
-                    query: {
-                        fullDomain: statusPageIdOrDomain,
-                        domain: {
-                            isVerified: true,
-                        },
-                    },
-                    select: {
-                        statusPageId: true,
-                    },
-                    props: {
-                        isRoot: true,
-                    },
-                });
-                if (!statusPageDomain || !statusPageDomain.statusPageId) {
-                    return Response.sendErrorResponse(req, res, new NotFoundException("Status Page not found"));
-                }
-                statusPageId = statusPageDomain.statusPageId;
-            }
-            else {
-                // then this is a status page id. We need to get the status page id from the id.
-                try {
-                    statusPageId = new ObjectID(statusPageIdOrDomain);
-                }
-                catch (err) {
-                    logger.error(`Error converting statusPageIdOrDomain to ObjectID: ${statusPageIdOrDomain}`, getLogAttributesFromRequest(req));
-                    logger.error(err, getLogAttributesFromRequest(req));
-                    return Response.sendErrorResponse(req, res, new NotFoundException("Status Page not found"));
-                }
+            // Shares the service resolver's custom-domain -> statusPageId cache.
+            const statusPageId = await StatusPageService.resolveStatusPageIdOrNull(statusPageIdOrDomain);
+            if (!statusPageId) {
+                return Response.sendErrorResponse(req, res, new NotFoundException("Status Page not found"));
             }
             const statusPage = await StatusPageService.findOneBy({
                 query: {
@@ -1045,31 +994,15 @@ export default class StatusPageAPI extends BaseAPI {
                     statusPageId: statusPageId,
                     req: req,
                 });
-                // First fetch the status page to get the configured uptime history days
-                const statusPageForDays = await StatusPageService.findOneBy({
-                    query: {
-                        _id: statusPageId.toString(),
-                    },
-                    select: {
-                        showUptimeHistoryInDays: true,
-                    },
-                    props: {
-                        isRoot: true,
-                    },
-                });
-                let uptimeHistoryDays = (statusPageForDays === null || statusPageForDays === void 0 ? void 0 : statusPageForDays.showUptimeHistoryInDays) || 90;
-                if (uptimeHistoryDays > 90) {
-                    uptimeHistoryDays = 90;
-                }
-                if (uptimeHistoryDays < 1) {
-                    uptimeHistoryDays = 1;
-                }
-                const startDate = OneUptimeDate.getSomeDaysAgo(uptimeHistoryDays);
-                const endDate = OneUptimeDate.getCurrentDate();
-                const { monitorStatuses, monitorGroupCurrentStatuses, statusPageResources, statusPage, monitorsOnStatusPage, monitorStatusTimelines, statusPageGroups, monitorsInGroup, } = await this.getStatusPageResourcesAndTimelines({
+                /*
+                 * The timeline window comes from the status page's configured
+                 * showUptimeHistoryInDays. getStatusPageResourcesAndTimelines
+                 * fetches the status page row anyway, so let it compute the window
+                 * (clamped to 1..90 days, ending now) instead of issuing a separate
+                 * StatusPage query here just to read that one column.
+                 */
+                const { monitorStatuses, monitorGroupCurrentStatuses, statusPageResources, statusPage, monitorsOnStatusPage, monitorStatusTimelines, statusPageGroups, monitorsInGroup, startDateForMonitorTimeline: startDate, endDateForMonitorTimeline: endDate, } = await this.getStatusPageResourcesAndTimelines({
                     statusPageId: statusPageId,
-                    startDateForMonitorTimeline: startDate,
-                    endDateForMonitorTimeline: endDate,
                 });
                 // check if status page has active incident.
                 let activeIncidents = [];
@@ -1200,8 +1133,38 @@ export default class StatusPageAPI extends BaseAPI {
                 let activeEpisodesJson = [];
                 let episodePublicNotes = [];
                 let episodeStateTimelines = [];
+                /*
+                 * Cheap guard before the expensive part: the block below scans every
+                 * incident ever attached to this page's monitors (a many-to-many
+                 * join, up to LIMIT_PER_PROJECT rows) just to discover episode
+                 * membership — on every overview view, even though most pages have
+                 * zero active episodes most of the time. One indexed COUNT of the
+                 * project's unresolved, visible episodes lets us skip all of it in
+                 * the common case. Behavior-preserving: the final activeEpisodes
+                 * query applies exactly these three constraints, so count == 0
+                 * implies the block's outputs stay empty.
+                 */
+                let unresolvedIncidentStateIds = [];
+                let hasActiveEpisodes = false;
                 if (statusPage.showEpisodesOnStatusPage &&
                     monitorsOnStatusPage.length > 0) {
+                    const unresolvedIncidentStates = await IncidentStateService.getUnresolvedIncidentStates(statusPage.projectId, { isRoot: true });
+                    unresolvedIncidentStateIds = unresolvedIncidentStates.map((state) => {
+                        return state.id;
+                    });
+                    const activeEpisodeCount = await IncidentEpisodeService.countBy({
+                        query: {
+                            projectId: statusPage.projectId,
+                            isVisibleOnStatusPage: true,
+                            currentIncidentStateId: QueryHelper.any(unresolvedIncidentStateIds),
+                        },
+                        props: {
+                            isRoot: true,
+                        },
+                    });
+                    hasActiveEpisodes = activeEpisodeCount.toNumber() > 0;
+                }
+                if (hasActiveEpisodes) {
                     // First, get incidents that have monitors on status page
                     const incidentsForEpisodes = await IncidentService.findBy({
                         query: {
@@ -1249,10 +1212,7 @@ export default class StatusPageAPI extends BaseAPI {
                     }
                     // Fetch active (unresolved) episodes
                     if (episodeIdsFromMembers.size > 0) {
-                        const unresolvedIncidentStates = await IncidentStateService.getUnresolvedIncidentStates(statusPage.projectId, { isRoot: true });
-                        const unresolvedIncidentStateIds = unresolvedIncidentStates.map((state) => {
-                            return state.id;
-                        });
+                        // unresolvedIncidentStateIds was fetched by the guard above.
                         let selectEpisodes = {
                             createdAt: true,
                             declaredAt: true,
@@ -2074,28 +2034,11 @@ export default class StatusPageAPI extends BaseAPI {
             .filter((id) => {
             return Boolean(id); // remove nulls
         });
+        // Batched: one query for all monitor groups instead of one per group.
+        const monitorIdsByGroupId = await MonitorGroupService.getMonitorIdsInMonitorGroups(monitorGroupIds);
         for (const monitorGroupId of monitorGroupIds) {
             // get monitors in the group.
-            const groupResources = await MonitorGroupResourceService.findBy({
-                query: {
-                    monitorGroupId: monitorGroupId,
-                },
-                select: {
-                    monitorId: true,
-                },
-                props: {
-                    isRoot: true,
-                },
-                limit: LIMIT_PER_PROJECT,
-                skip: 0,
-            });
-            const monitorsInGroupIds = groupResources
-                .map((resource) => {
-                return resource.monitorId;
-            })
-                .filter((id) => {
-                return Boolean(id); // remove nulls
-            });
+            const monitorsInGroupIds = monitorIdsByGroupId[monitorGroupId.toString()] || [];
             for (const monitorId of monitorsInGroupIds) {
                 if (!monitorsOnStatusPage.find((item) => {
                     return item.toString() === monitorId.toString();
@@ -2245,28 +2188,11 @@ export default class StatusPageAPI extends BaseAPI {
             .filter((id) => {
             return Boolean(id); // remove nulls
         });
+        // Batched: one query for all monitor groups instead of one per group.
+        const monitorIdsByGroupId = await MonitorGroupService.getMonitorIdsInMonitorGroups(monitorGroupIds);
         for (const monitorGroupId of monitorGroupIds) {
             // get monitors in the group.
-            const groupResources = await MonitorGroupResourceService.findBy({
-                query: {
-                    monitorGroupId: monitorGroupId,
-                },
-                select: {
-                    monitorId: true,
-                },
-                props: {
-                    isRoot: true,
-                },
-                limit: LIMIT_PER_PROJECT,
-                skip: 0,
-            });
-            const monitorsInGroupIds = groupResources
-                .map((resource) => {
-                return resource.monitorId;
-            })
-                .filter((id) => {
-                return Boolean(id); // remove nulls
-            });
+            const monitorsInGroupIds = monitorIdsByGroupId[monitorGroupId.toString()] || [];
             for (const monitorId of monitorsInGroupIds) {
                 if (!monitorsOnStatusPage.find((item) => {
                     return item.toString() === monitorId.toString();
@@ -2811,6 +2737,8 @@ export default class StatusPageAPI extends BaseAPI {
         });
         const { monitorsOnStatusPage, monitorsInGroup } = await StatusPageService.getMonitorIdsOnStatusPage({
             statusPageId: statusPageId,
+            // reuse the resources fetched above instead of re-querying them
+            statusPageResources: statusPageResources,
         });
         const today = OneUptimeDate.getCurrentDate();
         const historyDays = OneUptimeDate.getSomeDaysAgo(statusPage.showIncidentHistoryInDays || 14);
@@ -3024,6 +2952,8 @@ export default class StatusPageAPI extends BaseAPI {
         });
         const { monitorsOnStatusPage, monitorsInGroup } = await StatusPageService.getMonitorIdsOnStatusPage({
             statusPageId: statusPageId,
+            // reuse the resources fetched above instead of re-querying them
+            statusPageResources: statusPageResources,
         });
         const today = OneUptimeDate.getCurrentDate();
         const historyDays = OneUptimeDate.getSomeDaysAgo(statusPage.showEpisodeHistoryInDays || 14);
@@ -3399,6 +3329,20 @@ export default class StatusPageAPI extends BaseAPI {
         if (!statusPage) {
             throw new BadDataException("Status Page not found");
         }
+        let startDateForMonitorTimeline = data.startDateForMonitorTimeline;
+        let endDateForMonitorTimeline = data.endDateForMonitorTimeline;
+        if (!startDateForMonitorTimeline || !endDateForMonitorTimeline) {
+            let uptimeHistoryDays = statusPage.showUptimeHistoryInDays || 90;
+            if (uptimeHistoryDays > 90) {
+                uptimeHistoryDays = 90;
+            }
+            if (uptimeHistoryDays < 1) {
+                uptimeHistoryDays = 1;
+            }
+            startDateForMonitorTimeline =
+                OneUptimeDate.getSomeDaysAgo(uptimeHistoryDays);
+            endDateForMonitorTimeline = OneUptimeDate.getCurrentDate();
+        }
         //get monitor statuses
         const monitorStatuses = await MonitorStatusService.findBy({
             query: {
@@ -3514,28 +3458,28 @@ export default class StatusPageAPI extends BaseAPI {
             .filter((id) => {
             return Boolean(id); // remove nulls
         });
+        /*
+         * Batched: this loop used to issue 4 queries per monitor group per page
+         * view (3 inside MonitorGroupService.getCurrentStatus + one duplicate
+         * group-resource fetch), on the hottest public endpoint in the product.
+         * One shared fetch + the already-loaded `monitorStatuses` now serve every
+         * group.
+         */
+        const monitorGroupResourcesByGroupId = await MonitorGroupService.getMonitorGroupResourcesByGroupIds(monitorGroupIds);
+        const monitorGroupStatuses = await MonitorGroupService.getCurrentStatusesForMonitorGroups({
+            monitorGroupIds: monitorGroupIds,
+            monitorStatuses: monitorStatuses,
+            monitorGroupResources: monitorGroupResourcesByGroupId,
+        });
         for (const monitorGroupId of monitorGroupIds) {
             // get current status of monitors in the group.
-            const currentStatus = await MonitorGroupService.getCurrentStatus(monitorGroupId, {
-                isRoot: true,
-            });
-            monitorGroupCurrentStatuses[monitorGroupId.toString()] =
-                currentStatus.id;
+            const currentStatus = monitorGroupStatuses[monitorGroupId.toString()];
+            if (currentStatus) {
+                monitorGroupCurrentStatuses[monitorGroupId.toString()] =
+                    currentStatus.id;
+            }
             // get monitors in the group.
-            const groupResources = await MonitorGroupResourceService.findBy({
-                query: {
-                    monitorGroupId: monitorGroupId,
-                },
-                select: {
-                    monitorId: true,
-                },
-                props: {
-                    isRoot: true,
-                },
-                limit: LIMIT_PER_PROJECT,
-                skip: 0,
-            });
-            const monitorsInGroupIds = groupResources
+            const monitorsInGroupIds = (monitorGroupResourcesByGroupId[monitorGroupId.toString()] || [])
                 .map((resource) => {
                 return resource.monitorId;
             })
@@ -3568,8 +3512,8 @@ export default class StatusPageAPI extends BaseAPI {
         }
         const monitorStatusTimelines = await StatusPageService.getMonitorStatusTimelineForStatusPage({
             monitorIds: monitorsOnStatusPageForTimeline,
-            startDate: data.startDateForMonitorTimeline,
-            endDate: data.endDateForMonitorTimeline,
+            startDate: startDateForMonitorTimeline,
+            endDate: endDateForMonitorTimeline,
         });
         // return everything.
         return {
@@ -3581,6 +3525,8 @@ export default class StatusPageAPI extends BaseAPI {
             statusPage,
             monitorsOnStatusPage,
             monitorsInGroup,
+            startDateForMonitorTimeline,
+            endDateForMonitorTimeline,
         };
     }
     async getStatusPageAnnouncementAttachment(req, res) {