From 86d250ad942a01703717728143f2ef6b5e1d816e Mon Sep 17 00:00:00 2001
From: Douglas Barone <douglasvbarone@gmail.com>
Date: Mon, 26 Jun 2023 08:51:56 -0400
Subject: [PATCH] Refactor

---
 src/jobs/updatePrinterStatus.ts      |  2 +-
 src/services/PrinterStatusService.ts | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/jobs/updatePrinterStatus.ts b/src/jobs/updatePrinterStatus.ts
index 3703f81..ac2878f 100644
--- a/src/jobs/updatePrinterStatus.ts
+++ b/src/jobs/updatePrinterStatus.ts
@@ -2,7 +2,7 @@ import { prisma } from '../prisma.js'
 import { PrinterStatusService } from '../services/PrinterStatusService.js'
 
 function updatePrinterStatus() {
-  console.log(`Updating printer status ${new Date().toLocaleString()}`)
+  console.log(`Updating printers status ${new Date().toLocaleString()}`)
 
   prisma.printer.findMany().then(printers => {
     printers.forEach(async printer => {
diff --git a/src/services/PrinterStatusService.ts b/src/services/PrinterStatusService.ts
index ae6545f..891a0d5 100644
--- a/src/services/PrinterStatusService.ts
+++ b/src/services/PrinterStatusService.ts
@@ -19,7 +19,6 @@ export type Varbind = {
 }
 
 export type PrinterInfo = {
-  serialNumber: string
   counter: number
   location: string
   toners: {
@@ -44,7 +43,7 @@ export type PrinterInfo = {
 
 export class PrinterStatusService {
   constructor(private printer: Printer) {
-    this.getPrinterInfo().then(async printerStatus => {
+    this.getPrinterSnmpStatus().then(async printerStatus => {
       const lastStatus = await prisma.printerStatus.findFirst({
         where: { printerId: this.printer.id },
         orderBy: { timestamp: 'desc' }
@@ -157,7 +156,7 @@ export class PrinterStatusService {
     })
   }
 
-  async getPrinterInfo(): Promise<PrinterInfo> {
+  async getPrinterSnmpStatus(): Promise<PrinterInfo> {
     return new Promise((resolve, reject) => {
       const session = snmp.createSession(this.printer.ip, 'public')
 
@@ -167,9 +166,9 @@ export class PrinterStatusService {
         if (error) reject(error)
 
         const varbindsString = this.deBufferizeVarbinds(varbinds)
-        const info = this.objectIDsToPrinterInfo(varbindsString)
+        const snmpInfo = this.objectIDsToPrinterInfo(varbindsString)
 
-        resolve(info)
+        resolve(snmpInfo)
         session.close()
       })
     })
@@ -192,8 +191,6 @@ export class PrinterStatusService {
       objectIdsRepository.getPrinterObjectIds(this.printer.model)
 
     const printerInfo: PrinterInfo = {
-      serialNumber: snmpInfo.find(x => x.oid === objectIds.serialNumber)
-        ?.value as string,
       counter: Number(snmpInfo.find(x => x.oid === objectIds.counter)?.value),
       location: snmpInfo.find(x => x.oid === objectIds.location)
         ?.value as string,