fix: badges

Author: hanayashiki

src/pages/api/badge/[id].ts

@@ -1,22 +1,15 @@
 import { createContext } from 'app/graphql/context';
 import { RequestHandler } from 'app/utils/types';
 
-import { TraceStatus } from '.prisma/client';
-
 export default (async (req, res) => {
   const context = await createContext({ req, res });
   context.exemptAuth = true;
 
   const { id, rangeTime = '24h' } = req.query as { id: string; rangeTime?: string };
 
-  const result = await context.traceService.findTraces({ websiteId: parseInt(id), rangeTime });
-
-  const oks = result.results.filter((r) => r.status === TraceStatus.OK);
+  const { allTraces, oks } = await context.traceService.getBadgeStatistics(rangeTime, parseInt(id));
 
-  const percent =
-    result.results.length === 0
-      ? 'unknown'
-      : (Math.floor((oks.length / result.results.length) * 1000) / 1000) * 100;
+  const percent = allTraces === 0 ? 'unknown' : (Math.floor((oks / allTraces) * 1000) / 1000) * 100;
 
   const color =
     percent === 'unknown'
@@ -27,5 +20,7 @@ export default (async (req, res) => {
       ? 'important'
       : 'critical';
 
-  res.redirect(`https://img.shields.io/badge/uptime-${encodeURIComponent(percent + '%')}-${color}`);
+  res.redirect(
+    `https://img.shields.io/badge/${rangeTime}-${encodeURIComponent(percent + '%')}-${color}`,
+  );
 }) as RequestHandler;

src/pages/monitoring/websiteStatus/[id].tsx

@@ -90,6 +90,8 @@ export default function Page() {
   };
 
   const renderWebsiteInfo = () => {
+    const badgeUrl = `${location.origin}/api/badge/${website.data?.website?.id}?rangeTime=${rangeTime}`;
+
     return (
       <div className={classNames(gStyles.paper, descriptionsStyles.descriptions, 'mb-8')}>
         <Descriptions title="Website">
@@ -120,12 +122,12 @@ export default function Page() {
 
           <Descriptions.Item label="Badge">
             <img
-              src={`/api/badge/${website.data?.website?.id}`}
+              src={badgeUrl}
               alt="The shield"
               className="cursor-pointer"
               onClick={async () => {
                 await navigator.clipboard.writeText(
-                  `[![uptime-monitor](${location.origin}/api/badge/${website.data?.website?.id})](${location.origin}/monitoring/websiteStatus/${website.data?.website?.id})`,
+                  `[![uptime-monitor](${badgeUrl})](${location.origin}/monitoring/websiteStatus/${website.data?.website?.id})`,
                 );
                 alert('Markdown copied!');
               }}

src/services/TraceService.ts

@@ -199,6 +199,32 @@ export class TraceService extends BaseService {
     return result;
   }
 
+  async getBadgeStatistics(rangeTime: string, websiteId: number) {
+    const oks = await this.ctx.prisma.trace.count({
+      where: {
+        websiteId,
+        createdAt: {
+          gt: getStartFromRangeTime(rangeTime),
+        },
+        status: TraceStatus.OK,
+      },
+    });
+
+    const allTraces = await this.ctx.prisma.trace.count({
+      where: {
+        websiteId,
+        createdAt: {
+          gt: getStartFromRangeTime(rangeTime),
+        },
+      },
+    });
+
+    return {
+      oks,
+      allTraces,
+    };
+  }
+
   async findTraces(query: TraceQuery) {
     const { isError, websiteId, websiteIds, rangeTime, timeAfter, timeBefore, status } = query;