Compare commits
11 Commits
1.4.4-alph
...
developmen
Author | SHA1 | Date |
---|---|---|
|
064112e731 | |
|
d6a238a224 | |
|
dc5e938f75 | |
|
eb4da7ccc4 | |
|
46caaba6bd | |
|
7953c7dbbd | |
|
6911f6f0a2 | |
|
762340a72b | |
|
61cbbf81ef | |
|
4ea53f7088 | |
|
0548141e5f |
|
@ -49,6 +49,7 @@
|
|||
"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,13 +73,14 @@ 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,6 +19,7 @@ export class CouchService {
|
|||
}
|
||||
|
||||
async onModuleInit() {
|
||||
// return;
|
||||
const nano = this.nanoInstance;
|
||||
for (const database of DatabaseListen) {
|
||||
const db = nano.db.use(database);
|
||||
|
@ -95,4 +96,41 @@ 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,13 +5,17 @@ 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) {}
|
||||
constructor(
|
||||
private configService: ConfigService,
|
||||
private couchService: CouchService,
|
||||
) {}
|
||||
|
||||
get nanoInstance() {
|
||||
const couchConfiguration = this.configService.get<string>('COUCHDB_CONFIG');
|
||||
|
@ -64,4 +68,11 @@ export class CouchDataController {
|
|||
// return people.get();
|
||||
} catch (error) {}
|
||||
}
|
||||
|
||||
@Public(true)
|
||||
@Get('clear-transactions')
|
||||
async clearTransactions(): Promise<string> {
|
||||
await this.couchService.clearTransactions();
|
||||
return 'OK';
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,10 @@
|
|||
import { Controller, Get, Param, Query } from '@nestjs/common';
|
||||
import {
|
||||
Controller,
|
||||
Get,
|
||||
Param,
|
||||
Query,
|
||||
UnauthorizedException,
|
||||
} 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';
|
||||
|
@ -7,6 +13,7 @@ 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}`)
|
||||
|
@ -44,6 +51,7 @@ 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,7 +87,10 @@ export class QueueAdminOrchestrator {
|
|||
// },
|
||||
// ]);
|
||||
|
||||
if (queueTicket.last_notification < currentTime - call_preparation) {
|
||||
if (
|
||||
queueTicket.item.ticket.phone != null &&
|
||||
queueTicket.last_notification < currentTime - call_preparation
|
||||
) {
|
||||
await notification.queueProcess(payload);
|
||||
this.service.updateLastNotification(queueId, currentTime);
|
||||
}
|
||||
|
|
|
@ -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 = average;
|
||||
this.average = Math.floor(average);
|
||||
|
||||
const calledQueue = await this.queueDataService.lastQueue(item_queue_id);
|
||||
|
||||
|
|
|
@ -153,6 +153,9 @@ export class GenerateQueueManager {
|
|||
registerQueueManager.setService(this.queueService, TABLE_NAME.QUEUE);
|
||||
await registerQueueManager.execute();
|
||||
|
||||
return registerQueueManager.getResult();
|
||||
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 [first, last + average];
|
||||
return [Math.floor(first), Math.floor(last + average)];
|
||||
}
|
||||
|
||||
async beforeProcess(): Promise<void> {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { Body, Controller, Get, Param, Post } from '@nestjs/common';
|
||||
import { Body, Controller, Get, Param, Post, Query, Res } from '@nestjs/common';
|
||||
|
||||
import { MODULE_NAME } from 'src/core/strings/constants/module.constants';
|
||||
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
|
||||
|
@ -15,6 +15,9 @@ import { mappingRevertTransaction } from 'src/modules/transaction/transaction/do
|
|||
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}`)
|
||||
@Public(true)
|
||||
|
@ -105,6 +108,15 @@ 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,
|
||||
|
|
|
@ -116,7 +116,7 @@ export function mappingRevertTransaction(data, type) {
|
|||
}
|
||||
|
||||
Object.assign(data, {
|
||||
id: data.booking_id ?? data._id,
|
||||
id: data.booking_id ?? data._id ?? data.id,
|
||||
creator_counter_no: Number(data.pos_number),
|
||||
creator_counter_name: data.pos_name,
|
||||
settlement_date: new Date(data.created_at),
|
||||
|
|
|
@ -12,6 +12,7 @@ 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) {
|
||||
|
@ -25,8 +26,14 @@ export class WhatsappService {
|
|||
data: data,
|
||||
};
|
||||
|
||||
try {
|
||||
const response = await axios(config);
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
Logger.error(error);
|
||||
apm?.captureError(error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async queueRegister(data: WhatsappQueue) {
|
||||
|
@ -91,8 +98,11 @@ export class WhatsappService {
|
|||
},
|
||||
};
|
||||
|
||||
await this.sendMessage(payload);
|
||||
Logger.log(`Notification register for ${data.code} send to ${data.phone}`);
|
||||
const response = await this.sendMessage(payload);
|
||||
if (response)
|
||||
Logger.log(
|
||||
`Notification register for ${data.code} send to ${data.phone}`,
|
||||
);
|
||||
}
|
||||
|
||||
async queueProcess(data: WhatsappQueue) {
|
||||
|
@ -152,7 +162,8 @@ export class WhatsappService {
|
|||
},
|
||||
};
|
||||
|
||||
await this.sendMessage(payload);
|
||||
const response = await this.sendMessage(payload);
|
||||
if (response)
|
||||
Logger.log(`Notification process for ${data.code} send to ${data.phone}`);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue