Refactor

src/controllers/PrinterController.ts

@@ -23,42 +23,16 @@ class PrinterController {
       )
     }
 
-    if (campus == 'RT') {
+    let networkCriteria
-      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)
-    }
 
-    if (!campus) {
+    if (campus == 'RT')
-      const printers = await prisma.printer.findMany({
+      networkCriteria = { OR: [{ shortName: 'RT1' }, { shortName: 'RT2' }] }
-        include: {
+    else if (campus) networkCriteria = { shortName: String(campus) }
-          network: true,
+    else networkCriteria = undefined
-          status: {
-            orderBy: { timestamp: 'desc' },
-            take: 1
-          }
-        },
-        orderBy: { network: { cidr: 'asc' } }
-      })
-      return res.json(printers)
-    }
 
     const printers = await prisma.printer.findMany({
       where: {
-        network: {
+        network: networkCriteria
-          shortName: String(campus)
-        }
       },
       include: {
         network: true,