From 0b9e7029c5b5f8c8ec50cab0f0b4be413107af22 Mon Sep 17 00:00:00 2001
From: Michael C <michael@mchang.name>
Date: Fri, 30 Sep 2022 22:57:33 -0400
Subject: [PATCH] minor optimizations

---
 src/routes/getSearchSegments.ts | 9 +++------
 src/routes/getStatus.ts         | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/routes/getSearchSegments.ts b/src/routes/getSearchSegments.ts
index d8fc860..9dec9df 100644
--- a/src/routes/getSearchSegments.ts
+++ b/src/routes/getSearchSegments.ts
@@ -128,12 +128,7 @@ async function handleGetSegments(req: Request, res: Response): Promise<searchSeg
 
     const segments = await getSegmentsFromDBByVideoID(videoID, service);
 
-    if (segments === null || segments === undefined) {
-        res.sendStatus(500);
-        return false;
-    }
-
-    if (segments.length === 0) {
+    if (!segments?.length) {
         res.sendStatus(404);
         return false;
     }
@@ -155,6 +150,7 @@ function filterSegments(segments: DBSegment[], filters: Record<string, any>, pag
     );
 
     if (sortBy !== SortableFields.timeSubmitted) {
+        /* istanbul ignore next */
         filteredSegments.sort((a,b) => {
             const key = sortDir === "desc" ? 1 : -1;
             if (a[sortBy] < b[sortBy]) {
@@ -187,6 +183,7 @@ async function endpoint(req: Request, res: Response): Promise<Response> {
             return res.send(segmentResponse);
         }
     } catch (err) {
+        /* istanbul ignore next */
         if (err instanceof SyntaxError) {
             return res.status(400).send("Invalid array in parameters");
         } else return res.sendStatus(500);
diff --git a/src/routes/getStatus.ts b/src/routes/getStatus.ts
index d453cc4..c7413ff 100644
--- a/src/routes/getStatus.ts
+++ b/src/routes/getStatus.ts
@@ -16,7 +16,7 @@ export async function getStatus(req: Request, res: Response): Promise<Response>
                 processTime = Date.now() - startTime;
                 return e.value;
             })
-            .catch(e => {
+            .catch(e => /* istanbul ignore next */ {
                 Logger.error(`status: SQL query timed out: ${e}`);
                 return -1;
             });
@@ -25,7 +25,7 @@ export async function getStatus(req: Request, res: Response): Promise<Response>
             .then(e => {
                 redisProcessTime = Date.now() - startTime;
                 return e;
-            }).catch(e => {
+            }).catch(e => /* istanbul ignore next */ {
                 Logger.error(`status: redis increment timed out ${e}`);
                 return [-1];
             });
@@ -33,7 +33,7 @@ export async function getStatus(req: Request, res: Response): Promise<Response>
 
         const statusValues: Record<string, any> = {
             uptime: process.uptime(),
-            commit: (global as any).HEADCOMMIT || "unknown",
+            commit: (global as any)?.HEADCOMMIT ?? "unknown",
             db: Number(dbVersion),
             startTime,
             processTime,