From 6bfa1582efc5c11f6a4dbf4fc9fb7934f9e39cb4 Mon Sep 17 00:00:00 2001
From: Douglas Barone <douglasvbarone@gmail.com>
Date: Tue, 4 Jul 2023 10:03:45 -0400
Subject: [PATCH] Refactor

---
 src/controllers/PrinterController.ts | 38 +++++-----------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/controllers/PrinterController.ts b/src/controllers/PrinterController.ts
index a6f9d46..00b81e2 100644
--- a/src/controllers/PrinterController.ts
+++ b/src/controllers/PrinterController.ts
@@ -23,42 +23,16 @@ class PrinterController {
       )
     }
 
-    if (campus == 'RT') {
-      const printers = await prisma.printer.findMany({
-        where: {
-          network: { OR: [{ shortName: 'RT1' }, { shortName: 'RT2' }] }
-        },
-        include: {
-          network: true,
-          status: {
-            orderBy: { timestamp: 'desc' },
-            take: 1
-          }
-        },
-        orderBy: { network: { cidr: 'asc' } }
-      })
-      return res.json(printers)
-    }
+    let networkCriteria
 
-    if (!campus) {
-      const printers = await prisma.printer.findMany({
-        include: {
-          network: true,
-          status: {
-            orderBy: { timestamp: 'desc' },
-            take: 1
-          }
-        },
-        orderBy: { network: { cidr: 'asc' } }
-      })
-      return res.json(printers)
-    }
+    if (campus == 'RT')
+      networkCriteria = { OR: [{ shortName: 'RT1' }, { shortName: 'RT2' }] }
+    else if (campus) networkCriteria = { shortName: String(campus) }
+    else networkCriteria = undefined
 
     const printers = await prisma.printer.findMany({
       where: {
-        network: {
-          shortName: String(campus)
-        }
+        network: networkCriteria
       },
       include: {
         network: true,