diff --git a/src/modules/item-related/item/data/models/item.model.ts b/src/modules/item-related/item/data/models/item.model.ts index 52f5f9f..90634a6 100644 --- a/src/modules/item-related/item/data/models/item.model.ts +++ b/src/modules/item-related/item/data/models/item.model.ts @@ -93,6 +93,9 @@ export class ItemModel @JoinColumn({ name: 'item_queue_id' }) item_queue: ItemQueueModel; + @Column('varchar', { name: 'item_queue_id', nullable: true }) + item_queue_id: string; + // relation ke tenant // ? karena item bisajadi merupakan item dari tenant @Column('varchar', { name: 'tenant_id', nullable: true }) diff --git a/src/modules/queue/data/services/queue-bucket.ts b/src/modules/queue/data/services/queue-bucket.ts index b4c69de..c261739 100644 --- a/src/modules/queue/data/services/queue-bucket.ts +++ b/src/modules/queue/data/services/queue-bucket.ts @@ -6,12 +6,16 @@ import { Between, Repository } from 'typeorm'; import { BaseReadService } from 'src/core/modules/data/service/base-read.service'; import { QueueBucketModel } from '../models/queue-bucket.model'; import * as moment from 'moment'; +import { QueueItemModel } from '../models/queue.model'; @Injectable() export class QueueBucketReadService extends BaseReadService { constructor( @InjectRepository(QueueBucketModel, CONNECTION_NAME.DEFAULT) private repo: Repository, + + @InjectRepository(QueueItemModel, CONNECTION_NAME.DEFAULT) + private item: Repository, ) { super(repo); } @@ -20,9 +24,16 @@ export class QueueBucketReadService extends BaseReadService { const start = moment().startOf('day').valueOf(); const end = moment().endOf('day').valueOf(); + const queueItem = await this.item.findOne({ + relations: ['item'], + where: { + id: item_id, + }, + }); + const queue = await this.repo.findOne({ where: { - queue_item_id: item_id, + queue_item_id: queueItem.item.item_queue_id ?? queueItem.item.id, date: Between(start, end), }, }); @@ -31,7 +42,7 @@ export class QueueBucketReadService extends BaseReadService { const regularNumber = vip ? 0 : 1; const vipNumber = vip ? 1 : 0; this.repo.save({ - queue_item_id: item_id, + queue_item_id: queueItem.item.item_queue_id ?? queueItem.item.id, date: start, regular: regularNumber, vip: vipNumber,