From b856c62616c9d7d0d488dad83df15d0c56264f08 Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Fri, 4 Aug 2023 10:39:12 -0400 Subject: [PATCH] Do not distribute --- src/controllers/PrinterController.ts | 5 ++--- src/controllers/PrinterStatusController.ts | 7 ++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/controllers/PrinterController.ts b/src/controllers/PrinterController.ts index 5553bb4..bca48e5 100644 --- a/src/controllers/PrinterController.ts +++ b/src/controllers/PrinterController.ts @@ -3,7 +3,6 @@ import { Request, Response, Router } from 'express' import { hasRolesMiddleware } from '../middlewares/hasRolesMiddleware.js' import { prisma } from '../prisma.js' -import { distributedCopy } from '../utils/distributedCopy.js' import { PrinterStatusService } from '../services/PrinterStatusService.js' import log from '../log.js' @@ -52,7 +51,7 @@ class PrinterController { static async show(req: Request, res: Response) { const { serialNumber } = req.params - const { take = 32, days = 60 } = req.query + const { days = 60 } = req.query const gte = new Date(Date.now() - 1000 * 60 * 60 * 24 * Number(days)) @@ -82,7 +81,7 @@ class PrinterController { res.json({ ...printer, avgMonthPrint, - status: distributedCopy(printer.status, Number(take)) + status: printer.status }) } else res.status(400).json({ error: 'Printer not found' }) } diff --git a/src/controllers/PrinterStatusController.ts b/src/controllers/PrinterStatusController.ts index b88d805..2ea81ec 100644 --- a/src/controllers/PrinterStatusController.ts +++ b/src/controllers/PrinterStatusController.ts @@ -2,7 +2,6 @@ import { Router, Request, Response } from 'express' import { prisma } from '../prisma.js' import { PrinterStatusService } from '../services/PrinterStatusService.js' import { hasRolesMiddleware } from '../middlewares/hasRolesMiddleware.js' -import { distributedCopy } from '../utils/distributedCopy.js' const router = Router() @@ -20,7 +19,7 @@ class PrinterStatusController { static async status(req: Request, res: Response) { const { printerId } = req.params - const { take = 32, days = 60 } = req.query + const { days = 60 } = req.query const gte = new Date(Date.now() - 1000 * 60 * 60 * 24 * Number(days)) @@ -34,9 +33,7 @@ class PrinterStatusController { orderBy: { timestamp: 'desc' } }) - const distributedStatus = distributedCopy(status, Number(take)) - - res.json(distributedStatus) + res.json(status) } }