From e09190df42944672b39349e808ee62a347e4cbac Mon Sep 17 00:00:00 2001 From: shancheas Date: Thu, 21 Nov 2024 18:48:49 +0700 Subject: [PATCH] fix: time empty when no queue --- .../usecases/queue/customer-queue-item-list.manager.ts | 6 +++--- src/modules/queue/domain/usecases/register-queue.manager.ts | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/queue/domain/usecases/queue/customer-queue-item-list.manager.ts b/src/modules/queue/domain/usecases/queue/customer-queue-item-list.manager.ts index 9c03ab3..56c6a39 100644 --- a/src/modules/queue/domain/usecases/queue/customer-queue-item-list.manager.ts +++ b/src/modules/queue/domain/usecases/queue/customer-queue-item-list.manager.ts @@ -17,15 +17,15 @@ export class CustomerQueueItemListManager extends CustomerQueueManager { const ticketItems = {}; tickets.forEach((ticket) => { - const ticketItems = []; + const itemsInTicket = []; ticket.items.forEach((item) => { const item_id = item.item.item_queue?.id ?? item.item.id; const currentItem = ticketItems[item_id]; ticketItems[item_id] = currentItem ? [...currentItem, item] : [item]; - ticketItems.push(item_id); + itemsInTicket.push(item_id); }); - const uniqueTicket = Array.from(new Set(ticketItems)); + const uniqueTicket = Array.from(new Set(itemsInTicket)); uniqueTicket.forEach((item_id) => { ticketCount[item_id] = ticketCount[item_id] diff --git a/src/modules/queue/domain/usecases/register-queue.manager.ts b/src/modules/queue/domain/usecases/register-queue.manager.ts index 3b5679b..19e8204 100644 --- a/src/modules/queue/domain/usecases/register-queue.manager.ts +++ b/src/modules/queue/domain/usecases/register-queue.manager.ts @@ -11,6 +11,7 @@ import { padCode } from 'src/modules/transaction/vip-code/domain/usecases/manage import { QueueBucketReadService } from '../../data/services/queue-bucket'; import { ItemModel } from 'src/modules/item-related/item/data/models/item.model'; import { QueueTimeFormula } from './formula/queue-time.formula'; +import * as moment from 'moment'; @Injectable() export class RegisterQueueManager extends BaseCreateManager { @@ -31,7 +32,7 @@ export class RegisterQueueManager extends BaseCreateManager { const queues = Object.values(queueTimes); const first = queues[0]; - const last = queues[queues.length - 1]; + const last = queues[queues.length - 1] ?? moment().valueOf(); return [first, last]; }