Compare commits
No commits in common. "development" and "1.4.3-alpha.1" have entirely different histories.
developmen
...
1.4.3-alph
|
|
@ -49,7 +49,6 @@
|
|||
"exceljs": "^4.4.0",
|
||||
"fs-extra": "^11.2.0",
|
||||
"googleapis": "^140.0.0",
|
||||
"gtts": "^0.2.1",
|
||||
"handlebars": "^4.7.8",
|
||||
"mathjs": "^13.0.2",
|
||||
"midtrans-client": "^1.3.1",
|
||||
|
|
|
|||
|
|
@ -73,14 +73,13 @@ export class LoginAdminQueueManager extends BaseCustomManager<UserEntity> {
|
|||
message: `Akun anda sudah login di item "${hasLoginAsQueue?.item_name}"`,
|
||||
error: 'Unauthorized',
|
||||
});
|
||||
} else if (itemLogin && itemLogin.user_id !== this.userLogin.id) {
|
||||
throw new UnauthorizedException({
|
||||
statusCode: HttpStatus.UNAUTHORIZED,
|
||||
message: `"${userLoginItem.name}" masih login sebagai admin antrian `,
|
||||
error: 'Unauthorized',
|
||||
});
|
||||
}
|
||||
// else if (itemLogin && itemLogin.user_id !== this.userLogin.id) {
|
||||
// throw new UnauthorizedException({
|
||||
// statusCode: HttpStatus.UNAUTHORIZED,
|
||||
// message: `"${userLoginItem.name}" masih login sebagai admin antrian `,
|
||||
// error: 'Unauthorized',
|
||||
// });
|
||||
// }
|
||||
|
||||
// * Disini untuk isi token
|
||||
const tokenData = {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ export class CouchService {
|
|||
}
|
||||
|
||||
async onModuleInit() {
|
||||
// return;
|
||||
const nano = this.nanoInstance;
|
||||
for (const database of DatabaseListen) {
|
||||
const db = nano.db.use(database);
|
||||
|
|
@ -96,41 +95,4 @@ export class CouchService {
|
|||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
getUnixTimestampLast7Days() {
|
||||
const date = new Date();
|
||||
date.setDate(date.getDate() - 4);
|
||||
date.setHours(0, 0, 0, 0);
|
||||
return date.getTime();
|
||||
}
|
||||
|
||||
public async clearTransactions() {
|
||||
const nano = this.nanoInstance;
|
||||
const transaction = nano.use('transaction');
|
||||
|
||||
const expiredDate = this.getUnixTimestampLast7Days();
|
||||
|
||||
const selectorPayment = {
|
||||
created_at: {
|
||||
$lt: expiredDate,
|
||||
},
|
||||
};
|
||||
|
||||
const transactions = await transaction.find({
|
||||
selector: selectorPayment,
|
||||
fields: ['_id', '_rev'],
|
||||
limit: 100000,
|
||||
});
|
||||
|
||||
const { docs } = transactions;
|
||||
console.log(docs.length);
|
||||
const deletedDocs = {
|
||||
docs: docs.map((doc) => ({
|
||||
_id: doc._id,
|
||||
_rev: doc._rev,
|
||||
_deleted: true,
|
||||
})),
|
||||
};
|
||||
await transaction.bulk(deletedDocs);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,17 +5,13 @@ import { Public } from 'src/core/guards';
|
|||
import * as Nano from 'nano';
|
||||
import { CreateUserPrivilegeDto } from 'src/modules/user-related/user-privilege/infrastructure/dto/create-user-privilege.dto';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import { CouchService } from '../data/services/couch.service';
|
||||
|
||||
@ApiTags(`couch`)
|
||||
@Controller('v1/couch')
|
||||
@Public()
|
||||
@Injectable()
|
||||
export class CouchDataController {
|
||||
constructor(
|
||||
private configService: ConfigService,
|
||||
private couchService: CouchService,
|
||||
) {}
|
||||
constructor(private configService: ConfigService) {}
|
||||
|
||||
get nanoInstance() {
|
||||
const couchConfiguration = this.configService.get<string>('COUCHDB_CONFIG');
|
||||
|
|
@ -68,11 +64,4 @@ export class CouchDataController {
|
|||
// return people.get();
|
||||
} catch (error) {}
|
||||
}
|
||||
|
||||
@Public(true)
|
||||
@Get('clear-transactions')
|
||||
async clearTransactions(): Promise<string> {
|
||||
await this.couchService.clearTransactions();
|
||||
return 'OK';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
import {
|
||||
Controller,
|
||||
Get,
|
||||
Param,
|
||||
Query,
|
||||
UnauthorizedException,
|
||||
} from '@nestjs/common';
|
||||
import { Controller, Get, Param, Query } from '@nestjs/common';
|
||||
import { FilterItemQueueDto } from './dto/filter-item-queue.dto';
|
||||
import { Pagination } from 'src/core/response';
|
||||
import { PaginationResponse } from 'src/core/response/domain/ok-response.interface';
|
||||
|
|
@ -13,7 +7,6 @@ import { ItemQueueReadOrchestrator } from '../domain/usecases/item-queue-read.or
|
|||
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
|
||||
import { MODULE_NAME } from 'src/core/strings/constants/module.constants';
|
||||
import { Public } from 'src/core/guards';
|
||||
import { validate as isValidUUID } from 'uuid';
|
||||
|
||||
@ApiTags(`${MODULE_NAME.ITEM_QUEUE.split('-').join(' ')} - read`)
|
||||
@Controller(`v1/${MODULE_NAME.ITEM_QUEUE}`)
|
||||
|
|
@ -51,7 +44,6 @@ export class ItemQueueReadController {
|
|||
@Get('display/:id')
|
||||
@Public(true)
|
||||
async detailPublic(@Param('id') id: string): Promise<ItemQueueEntity> {
|
||||
if (!isValidUUID(id)) throw new UnauthorizedException('id is required');
|
||||
return await this.orchestrator.detail(id);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,10 +87,7 @@ export class QueueAdminOrchestrator {
|
|||
// },
|
||||
// ]);
|
||||
|
||||
if (
|
||||
queueTicket.item.ticket.phone != null &&
|
||||
queueTicket.last_notification < currentTime - call_preparation
|
||||
) {
|
||||
if (queueTicket.last_notification < currentTime - call_preparation) {
|
||||
await notification.queueProcess(payload);
|
||||
this.service.updateLastNotification(queueId, currentTime);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,13 +22,8 @@ import * as moment from 'moment';
|
|||
import { CustomerQueueTicketSummaryManager } from './usecases/queue/customer-queue-ticket.manager';
|
||||
import { TransactionDataService } from 'src/modules/transaction/transaction/data/services/transaction-data.service';
|
||||
import { CustomerQueuePosItemManager } from './usecases/queue/customer-queue-pos-item.manager';
|
||||
import {
|
||||
QueueModel,
|
||||
QueueOrderModel,
|
||||
QueueTicketModel,
|
||||
} from '../data/models/queue.model';
|
||||
import { QueueOrderModel, QueueTicketModel } from '../data/models/queue.model';
|
||||
import { CustomerQueueRecommendManager } from './usecases/queue/customer-queue-recommend.manager';
|
||||
import { GenerateQueueManager } from './usecases/generate-queue.manager';
|
||||
|
||||
@Injectable()
|
||||
export class QueueOrchestrator {
|
||||
|
|
@ -40,13 +35,8 @@ export class QueueOrchestrator {
|
|||
private readonly registerQueueManager: RegisterQueueManager,
|
||||
private readonly splitQueueManager: SplitQueueManager,
|
||||
private readonly queueDataService: QueueDataService,
|
||||
private readonly generateQueueManager: GenerateQueueManager,
|
||||
) {}
|
||||
|
||||
async generate(data: any): Promise<QueueModel[]> {
|
||||
return await this.generateQueueManager.generate(data);
|
||||
}
|
||||
|
||||
async loginCustomer(id: string): Promise<QueueOrder> {
|
||||
try {
|
||||
const order = await this.dataService.loginQueue(id);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ export class QueueTimeFormula {
|
|||
|
||||
const times = itemQueue.items.map((item) => item.play_estimation ?? 0);
|
||||
const average = times.length > 0 ? math.mean(times) * 60 * 1000 : 0; // change average minute to milliseconds
|
||||
this.average = Math.floor(average);
|
||||
this.average = average;
|
||||
|
||||
const calledQueue = await this.queueDataService.lastQueue(item_queue_id);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,161 +0,0 @@
|
|||
import { Injectable } from '@nestjs/common';
|
||||
import * as moment from 'moment';
|
||||
import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
|
||||
import { TransactionUserType } from 'src/modules/transaction/transaction/constants';
|
||||
import { TransactionItemModel } from 'src/modules/transaction/transaction/data/models/transaction-item.model';
|
||||
import { QueueBucketReadService } from '../../data/services/queue-bucket';
|
||||
import { QueueService } from '../../data/services/queue.service';
|
||||
import { TicketDataService } from '../../data/services/ticket.service';
|
||||
import { RegisterQueueDto } from '../../infrastructure/controllers/dto/register-queue.dto';
|
||||
import { QueueOrder } from '../entities/order.entity';
|
||||
import { QueueItem } from '../entities/queue-item.entity';
|
||||
import { QueueTicket } from '../entities/ticket.entity';
|
||||
import { QueueTimeFormula } from './formula/queue-time.formula';
|
||||
import { RegisterQueueManager } from './register-queue.manager';
|
||||
import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model';
|
||||
import { QueueModel } from '../../data/models/queue.model';
|
||||
|
||||
@Injectable()
|
||||
export class GenerateQueueManager {
|
||||
constructor(
|
||||
private readonly ticketService: TicketDataService,
|
||||
private readonly queueService: QueueService,
|
||||
private readonly bucketService: QueueBucketReadService,
|
||||
private readonly queueTimeFormula: QueueTimeFormula,
|
||||
) {}
|
||||
|
||||
async generate(transaction: TransactionModel) {
|
||||
const date = transaction.booking_date ?? transaction.invoice_date;
|
||||
const queue_date = moment(date, 'YYYY-MM-DD').unix();
|
||||
|
||||
const { id, customer_name, customer_phone, invoice_code } = transaction;
|
||||
|
||||
const customerOrder = {
|
||||
code: invoice_code,
|
||||
customer: customer_name,
|
||||
phone: customer_phone,
|
||||
date: queue_date * 1000,
|
||||
transaction_id: id,
|
||||
};
|
||||
|
||||
const items = this.generateItems(transaction.items);
|
||||
|
||||
const existTicket = await this.ticketService.ticketByUser(
|
||||
customer_name,
|
||||
customer_phone,
|
||||
);
|
||||
|
||||
const insertTickets: QueueTicket[] = [];
|
||||
if (customer_name && customer_phone && existTicket) {
|
||||
existTicket.items.push(...items);
|
||||
await this.ticketService.updateQueueTicket(existTicket);
|
||||
|
||||
existTicket.items = items;
|
||||
insertTickets.push(existTicket);
|
||||
} else {
|
||||
const ticket: QueueTicket = { ...customerOrder, items };
|
||||
const order: QueueOrder = { ...customerOrder, tickets: [ticket] };
|
||||
|
||||
const queueOrder = await this.ticketService.createQueueOrder(order);
|
||||
insertTickets.push(...queueOrder.tickets);
|
||||
}
|
||||
|
||||
const results: QueueModel[] = [];
|
||||
const vipCustomer =
|
||||
transaction.customer_category?.has_vip_pass ||
|
||||
transaction.customer_type === TransactionUserType.VIP;
|
||||
if (vipCustomer || transaction.creator_counter_no != null) {
|
||||
for (const ticket of insertTickets) {
|
||||
const ticket_id = ticket.id;
|
||||
const items = {};
|
||||
|
||||
ticket.items.forEach((item) => {
|
||||
const item_id = item['item_queue_id'];
|
||||
const currentItem = items[item_id];
|
||||
|
||||
if (currentItem) {
|
||||
currentItem.qty += item.qty;
|
||||
}
|
||||
items[item_id] = currentItem
|
||||
? currentItem
|
||||
: {
|
||||
item_id,
|
||||
ticket_id,
|
||||
qty: item.qty,
|
||||
};
|
||||
});
|
||||
|
||||
for (const payload of Object.values(items)) {
|
||||
const isVip = vipCustomer || transaction.creator_counter_no == null;
|
||||
const result = await this.create(payload as any, isVip);
|
||||
results.push(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
return results;
|
||||
}
|
||||
|
||||
generateItems(items: TransactionItemModel[]): QueueItem[] {
|
||||
const transactionItems = [];
|
||||
|
||||
items.forEach((item) => {
|
||||
if (item.item.use_queue) {
|
||||
transactionItems.push({
|
||||
item_queue_id: item.item.item_queue_id,
|
||||
item_id: item.item_id,
|
||||
qty: item.qty,
|
||||
});
|
||||
}
|
||||
|
||||
if (item.item.bundling_items.length > 0) {
|
||||
item.item.bundling_items.forEach((bundling_item) => {
|
||||
if (bundling_item.use_queue) {
|
||||
transactionItems.push({
|
||||
item_queue_id: bundling_item.item_queue_id,
|
||||
item_id: bundling_item.id,
|
||||
qty: item.qty,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
return this.mergeQueueItems(transactionItems);
|
||||
}
|
||||
|
||||
mergeQueueItems(arr) {
|
||||
const result = {};
|
||||
arr.forEach((item) => {
|
||||
if (result[item.item_id]) {
|
||||
result[item.item_id].qty += item.qty;
|
||||
} else {
|
||||
result[item.item_id] = { ...item };
|
||||
}
|
||||
});
|
||||
return Object.values<QueueItem>(result);
|
||||
}
|
||||
|
||||
async create(data: RegisterQueueDto, isVip = false): Promise<QueueModel> {
|
||||
const queue = await this.queueService.getTicketItems(
|
||||
data.ticket_id,
|
||||
data.item_id,
|
||||
);
|
||||
const queueRequest: any = {
|
||||
qty: data.qty,
|
||||
item_id: queue.id,
|
||||
vip: isVip,
|
||||
};
|
||||
const registerQueueManager = new RegisterQueueManager(
|
||||
this.bucketService,
|
||||
this.queueTimeFormula,
|
||||
);
|
||||
registerQueueManager.setData(queueRequest);
|
||||
registerQueueManager.setService(this.queueService, TABLE_NAME.QUEUE);
|
||||
await registerQueueManager.execute();
|
||||
|
||||
const result = await registerQueueManager.getResult();
|
||||
result.time = null;
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
|
@ -38,7 +38,7 @@ export class RegisterQueueManager extends BaseCreateManager<QueueModel> {
|
|||
const first = queues[0];
|
||||
const last = queues[queues.length - 1] ?? moment().valueOf();
|
||||
const average = this.queueTimeFormula.average;
|
||||
return [Math.floor(first), Math.floor(last + average)];
|
||||
return [first, last + average];
|
||||
}
|
||||
|
||||
async beforeProcess(): Promise<void> {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { Body, Controller, Get, Param, Post, Query, Res } from '@nestjs/common';
|
||||
import { Body, Controller, Get, Param, Post } from '@nestjs/common';
|
||||
|
||||
import { MODULE_NAME } from 'src/core/strings/constants/module.constants';
|
||||
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
|
||||
|
|
@ -11,12 +11,6 @@ import { RegisterQueueDto } from './dto/register-queue.dto';
|
|||
import { SplitQueueDto } from './dto/split-queue.dto';
|
||||
import { LoginQueueDto } from './dto/login-queue.dto';
|
||||
import { LoginReceiptDto } from './dto/login-receipt.dto';
|
||||
import { mappingRevertTransaction } from 'src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper';
|
||||
import { TransactionType } from 'src/modules/transaction/transaction/constants';
|
||||
import { QueueModel } from '../../data/models/queue.model';
|
||||
|
||||
import * as Gtts from 'gtts';
|
||||
import { Response } from 'express';
|
||||
|
||||
@ApiTags(`Queue`)
|
||||
@Controller(`v1/${MODULE_NAME.QUEUE}`)
|
||||
|
|
@ -25,12 +19,6 @@ import { Response } from 'express';
|
|||
export class QueueController {
|
||||
constructor(private orchestrator: QueueOrchestrator) {}
|
||||
|
||||
@Post('generate')
|
||||
async generateQueue(@Body() data: any): Promise<QueueModel[]> {
|
||||
mappingRevertTransaction(data, TransactionType.COUNTER);
|
||||
return await this.orchestrator.generate(data);
|
||||
}
|
||||
|
||||
@Post('register')
|
||||
async registerQueue(@Body() data: RegisterQueueDto): Promise<Queue> {
|
||||
return await this.orchestrator.create(data);
|
||||
|
|
@ -108,15 +96,6 @@ export class QueueController {
|
|||
return await this.orchestrator.queueOrderItems(id);
|
||||
}
|
||||
|
||||
@Get('speech')
|
||||
async speech(
|
||||
@Query('text') text: string,
|
||||
@Res() response: Response,
|
||||
): Promise<void> {
|
||||
const gtts = new Gtts(text, 'id');
|
||||
gtts.stream().pipe(response);
|
||||
}
|
||||
|
||||
@Get(':id/items/:item_id')
|
||||
async queueItemTickets(
|
||||
@Param('id') id: string,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,19 @@ import {
|
|||
TransactionChangeStatusEvent,
|
||||
TransactionCreateQueueEvent,
|
||||
} from 'src/modules/transaction/transaction/domain/entities/event/transaction-change-status.event';
|
||||
import { GenerateQueueManager } from '../../domain/usecases/generate-queue.manager';
|
||||
import { TicketDataService } from '../../data/services/ticket.service';
|
||||
import { QueueOrder } from '../../domain/entities/order.entity';
|
||||
import { QueueTicket } from '../../domain/entities/ticket.entity';
|
||||
import { QueueItem } from '../../domain/entities/queue-item.entity';
|
||||
import * as moment from 'moment';
|
||||
import { TransactionUserType } from 'src/modules/transaction/transaction/constants';
|
||||
import { RegisterQueueManager } from '../../domain/usecases/register-queue.manager';
|
||||
import { RegisterQueueDto } from '../controllers/dto/register-queue.dto';
|
||||
import { QueueService } from '../../data/services/queue.service';
|
||||
import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
|
||||
import { QueueBucketReadService } from '../../data/services/queue-bucket';
|
||||
import { QueueTimeFormula } from '../../domain/usecases/formula/queue-time.formula';
|
||||
import { TransactionItemModel } from 'src/modules/transaction/transaction/data/models/transaction-item.model';
|
||||
|
||||
@EventsHandler(TransactionChangeStatusEvent, TransactionCreateQueueEvent)
|
||||
export class QueueTransactionHandler
|
||||
|
|
@ -12,7 +24,10 @@ export class QueueTransactionHandler
|
|||
{
|
||||
constructor(
|
||||
private readonly dataService: TransactionDataService,
|
||||
private readonly queueGenerateManager: GenerateQueueManager,
|
||||
private readonly ticketService: TicketDataService,
|
||||
private readonly queueService: QueueService,
|
||||
private readonly bucketService: QueueBucketReadService,
|
||||
private readonly queueTimeFormula: QueueTimeFormula,
|
||||
) {}
|
||||
|
||||
async handle(event: TransactionChangeStatusEvent) {
|
||||
|
|
@ -21,8 +36,7 @@ export class QueueTransactionHandler
|
|||
/**
|
||||
* If data still in process (not settled) then don't create the queue order
|
||||
*/
|
||||
if (process_data?.status != 'settled' || process_data?.pos_number != null)
|
||||
return;
|
||||
if (process_data?.status != 'settled') return;
|
||||
|
||||
const transaction = await this.dataService.getOneByOptions({
|
||||
where: {
|
||||
|
|
@ -36,6 +50,127 @@ export class QueueTransactionHandler
|
|||
],
|
||||
});
|
||||
|
||||
await this.queueGenerateManager.generate(transaction);
|
||||
const date = transaction.booking_date ?? transaction.invoice_date;
|
||||
const queue_date = moment(date, 'YYYY-MM-DD').unix();
|
||||
|
||||
const { id, customer_name, customer_phone, invoice_code } = transaction;
|
||||
|
||||
const customerOrder = {
|
||||
code: invoice_code,
|
||||
customer: customer_name,
|
||||
phone: customer_phone,
|
||||
date: queue_date * 1000,
|
||||
transaction_id: id,
|
||||
};
|
||||
|
||||
const items = this.generateItems(transaction.items);
|
||||
|
||||
const existTicket = await this.ticketService.ticketByUser(
|
||||
customer_name,
|
||||
customer_phone,
|
||||
);
|
||||
|
||||
const insertTickets: QueueTicket[] = [];
|
||||
if (customer_name && customer_phone && existTicket) {
|
||||
existTicket.items.push(...items);
|
||||
await this.ticketService.updateQueueTicket(existTicket);
|
||||
|
||||
existTicket.items = items;
|
||||
insertTickets.push(existTicket);
|
||||
} else {
|
||||
const ticket: QueueTicket = { ...customerOrder, items };
|
||||
const order: QueueOrder = { ...customerOrder, tickets: [ticket] };
|
||||
|
||||
const queueOrder = await this.ticketService.createQueueOrder(order);
|
||||
insertTickets.push(...queueOrder.tickets);
|
||||
}
|
||||
|
||||
if (
|
||||
transaction.customer_category?.has_vip_pass ||
|
||||
transaction.customer_type === TransactionUserType.VIP
|
||||
) {
|
||||
insertTickets.forEach((ticket) => {
|
||||
const ticket_id = ticket.id;
|
||||
const items = {};
|
||||
ticket.items.forEach((item) => {
|
||||
const item_id = item['item_queue_id'];
|
||||
const currentItem = items[item_id];
|
||||
|
||||
if (currentItem) {
|
||||
currentItem.qty += item.qty;
|
||||
}
|
||||
items[item_id] = currentItem
|
||||
? currentItem
|
||||
: {
|
||||
item_id,
|
||||
ticket_id,
|
||||
qty: item.qty,
|
||||
};
|
||||
});
|
||||
|
||||
Object.values(items).forEach((payload: any) => {
|
||||
this.create(payload);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
generateItems(items: TransactionItemModel[]): QueueItem[] {
|
||||
const transactionItems = [];
|
||||
|
||||
items.forEach((item) => {
|
||||
if (item.item.use_queue) {
|
||||
transactionItems.push({
|
||||
item_queue_id: item.item.item_queue_id,
|
||||
item_id: item.item_id,
|
||||
qty: item.qty,
|
||||
});
|
||||
}
|
||||
|
||||
if (item.item.bundling_items.length > 0) {
|
||||
item.item.bundling_items.forEach((bundling_item) => {
|
||||
if (bundling_item.use_queue) {
|
||||
transactionItems.push({
|
||||
item_queue_id: bundling_item.item_queue_id,
|
||||
item_id: bundling_item.id,
|
||||
qty: item.qty,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
return this.mergeQueueItems(transactionItems);
|
||||
}
|
||||
|
||||
mergeQueueItems(arr) {
|
||||
const result = {};
|
||||
arr.forEach((item) => {
|
||||
if (result[item.item_id]) {
|
||||
result[item.item_id].qty += item.qty;
|
||||
} else {
|
||||
result[item.item_id] = { ...item };
|
||||
}
|
||||
});
|
||||
return Object.values<QueueItem>(result);
|
||||
}
|
||||
|
||||
async create(data: RegisterQueueDto): Promise<void> {
|
||||
const queue = await this.queueService.getTicketItems(
|
||||
data.ticket_id,
|
||||
data.item_id,
|
||||
);
|
||||
const queueRequest: any = {
|
||||
qty: data.qty,
|
||||
item_id: queue.id,
|
||||
vip: true,
|
||||
};
|
||||
const registerQueueManager = new RegisterQueueManager(
|
||||
this.bucketService,
|
||||
this.queueTimeFormula,
|
||||
);
|
||||
registerQueueManager.setData(queueRequest);
|
||||
registerQueueManager.setService(this.queueService, TABLE_NAME.QUEUE);
|
||||
await registerQueueManager.execute();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ import { QueueTransactionCancelHandler } from './infrastructure/handlers/cancel-
|
|||
import { ItemQueueModel } from '../item-related/item-queue/data/models/item-queue.model';
|
||||
import { QueueTimeFormula } from './domain/usecases/formula/queue-time.formula';
|
||||
import { QueueJobController } from './infrastructure/controllers/queue-job.controller';
|
||||
import { GenerateQueueManager } from './domain/usecases/generate-queue.manager';
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
|
|
@ -80,7 +79,6 @@ import { GenerateQueueManager } from './domain/usecases/generate-queue.manager';
|
|||
SplitQueueManager,
|
||||
|
||||
QueueTimeFormula,
|
||||
GenerateQueueManager,
|
||||
],
|
||||
})
|
||||
export class QueueModule {}
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ export function mappingRevertTransaction(data, type) {
|
|||
}
|
||||
|
||||
Object.assign(data, {
|
||||
id: data.booking_id ?? data._id ?? data.id,
|
||||
id: data.booking_id ?? data._id,
|
||||
creator_counter_no: Number(data.pos_number),
|
||||
creator_counter_name: data.pos_name,
|
||||
settlement_date: new Date(data.created_at),
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import {
|
|||
} from './whatsapp.constant';
|
||||
import axios from 'axios';
|
||||
import { Logger } from '@nestjs/common';
|
||||
import { apm } from 'src/core/apm';
|
||||
|
||||
export class WhatsappService {
|
||||
async sendMessage(data) {
|
||||
|
|
@ -26,14 +25,8 @@ export class WhatsappService {
|
|||
data: data,
|
||||
};
|
||||
|
||||
try {
|
||||
const response = await axios(config);
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
Logger.error(error);
|
||||
apm?.captureError(error);
|
||||
return null;
|
||||
}
|
||||
const response = await axios(config);
|
||||
return response.data;
|
||||
}
|
||||
|
||||
async queueRegister(data: WhatsappQueue) {
|
||||
|
|
@ -98,11 +91,8 @@ export class WhatsappService {
|
|||
},
|
||||
};
|
||||
|
||||
const response = await this.sendMessage(payload);
|
||||
if (response)
|
||||
Logger.log(
|
||||
`Notification register for ${data.code} send to ${data.phone}`,
|
||||
);
|
||||
await this.sendMessage(payload);
|
||||
Logger.log(`Notification register for ${data.code} send to ${data.phone}`);
|
||||
}
|
||||
|
||||
async queueProcess(data: WhatsappQueue) {
|
||||
|
|
@ -162,8 +152,7 @@ export class WhatsappService {
|
|||
},
|
||||
};
|
||||
|
||||
const response = await this.sendMessage(payload);
|
||||
if (response)
|
||||
Logger.log(`Notification process for ${data.code} send to ${data.phone}`);
|
||||
await this.sendMessage(payload);
|
||||
Logger.log(`Notification process for ${data.code} send to ${data.phone}`);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue