Compare commits

...

59 Commits

Author SHA1 Message Date
shancheas b96d24de1a feat: add query filter for active booking items in BookingItemManager 2025-06-24 12:44:00 +07:00
shancheas 5d3f9d7bff fix(SPG-1254): ONLINE BOOKING wahana tenant tidak muncul pada catalog online booking 2025-06-24 11:51:43 +07:00
shancheas 831593e743 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development 2025-06-20 14:48:55 +07:00
shancheas 162bd0918f fix: ensure safe access to season period IDs in booking item pricing logic 2025-06-20 14:48:45 +07:00
firmanr 13b5838393 Merge pull request 'feat(SPG-1137): add time group at booking and refund detail' (#161) from feat/otp-cancel into development
Reviewed-on: #161
2025-06-19 18:43:57 +07:00
Firman Ramdhani 63bb55b04b feat(SPG-1137): add time group at booking and refund detail 2025-06-19 18:30:07 +07:00
firmanr 9d1c240b6b Merge pull request 'feat(SPG-1236): setup otp checker guard' (#160) from feat/otp-cancel into development
Reviewed-on: #160
2025-06-19 17:10:07 +07:00
Firman Ramdhani 83f3377465 feat(SPG-1236): setup otp checker guard 2025-06-19 17:09:42 +07:00
firmanr 69c2ee06cf Merge pull request 'feat(SPG-1236): implement otp checker guard on session period' (#159) from feat/otp-cancel into development
Reviewed-on: #159
2025-06-19 17:04:51 +07:00
Firman Ramdhani 42060384aa feat(SPG-1236): implement otp checker guard on session period 2025-06-19 17:04:07 +07:00
firmanr 62cfb1f1a8 Merge pull request 'feat/otp-cancel' (#158) from feat/otp-cancel into development
Reviewed-on: #158
2025-06-19 16:36:52 +07:00
Firman Ramdhani 08a35dfdf4 feat(SPG-1236): implement otp checker guard on booking transaction 2025-06-19 16:32:48 +07:00
Firman Ramdhani 8df836ff3e feat(SPG-1236): implement otp checker guard on session period 2025-06-19 16:24:20 +07:00
Firman Ramdhani 822cfe606a feat(SPG-1236): implement otp checker guard on active and confirm user 2025-06-19 15:55:19 +07:00
Firman Ramdhani de43f0f28b feat(SPG-1236): setup otp checker guard 2025-06-19 15:55:01 +07:00
shancheas 09b0133bf4 fix: update booking item pricing logic to use current rate based on season period IDs 2025-06-19 15:34:12 +07:00
shancheas a77e6b0381 feat: add usage_type field to items and item_queues with corresponding database migration 2025-06-19 14:49:09 +07:00
shancheas a5da557dd9 feat: implement booking expired notification in WhatsApp service 2025-06-19 14:40:17 +07:00
shancheas afad02ba52 fix: temporarily disable OtpAuthGuard in saveToCouch method for transaction data controller 2025-06-17 15:03:17 +07:00
shancheas 6636c596f4 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development 2025-06-17 14:26:50 +07:00
shancheas 01fb358875 feat: enhance transaction read service to include total sales calculation and item ID in quantity query 2025-06-17 14:26:40 +07:00
firmanr f9dc49f7d5 Merge pull request 'feat/otp-cancel' (#157) from feat/otp-cancel into development
Reviewed-on: #157
2025-06-17 09:10:29 +07:00
Firman Ramdhani 1d9cdfe8e6 feat(SPG-1234): add action_type at verifier 2025-06-16 12:20:47 +07:00
Firman Ramdhani ccc363f74f feat(SPG-1234): add action_type at verifier 2025-06-16 12:15:20 +07:00
Firman Ramdhani af1ee2fbee feat(SPG-1234): add action_type at verifier 2025-06-16 12:11:24 +07:00
Firman Ramdhani ec5229645f feat(SPG-1234): add action_type at verifier 2025-06-16 11:48:56 +07:00
shancheas 47d45cb65c feat: integrate CouchDB module across various services and add transaction summary endpoint 2025-06-16 11:27:12 +07:00
shancheas d6717c9c60 feat: add resend notification endpoint in BookingOrderController to send WhatsApp notifications 2025-06-16 09:26:09 +07:00
shancheas d995982203 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development 2025-06-11 19:03:26 +07:00
shancheas 56e475d61f fix: ensure time_group data is only accessed if it exists in BookingOrderController 2025-06-11 19:03:09 +07:00
shancheas 3116acd5ab feat: add image_url to booking item selection in BookingItemManager 2025-06-11 19:02:10 +07:00
firmanr 068c4ce349 Merge pull request 'feat: rename header key basic auth' (#156) from feat/otp-cancel into development
Reviewed-on: #156
2025-06-11 18:28:47 +07:00
Firman Ramdhani 79c9139c3c feat: rename header key basic auth 2025-06-11 18:28:21 +07:00
firmanr d4e8e72af0 Merge pull request 'feat: rename header key basic auth' (#155) from feat/otp-cancel into development
Reviewed-on: #155
2025-06-11 18:15:45 +07:00
Firman Ramdhani 7dd29c2a70 feat: rename header key basic auth 2025-06-11 18:15:09 +07:00
firmanr 0b5b0ce09b Merge pull request 'feat: update validation otp cancel reconciliation' (#154) from feat/otp-cancel into development
Reviewed-on: #154
2025-06-11 17:53:15 +07:00
Firman Ramdhani e1d3ee7188 feat: update validation otp cancel reconciliation 2025-06-11 17:52:18 +07:00
shancheas 838670c822 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development 2025-06-11 16:31:28 +07:00
shancheas 34d8882ec3 feat: make update price public 2025-06-11 16:31:15 +07:00
firmanr 8fb8aac0f9 Merge pull request 'feat: update validation otp cancel reconciliation' (#153) from feat/otp-cancel into development
Reviewed-on: #153
2025-06-11 16:00:02 +07:00
Firman Ramdhani 3a0efb00a9 feat: update validation otp cancel reconciliation 2025-06-11 15:55:21 +07:00
shancheas 737575176e Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development 2025-06-11 15:46:53 +07:00
shancheas f0e8fbddc9 feat: include parent transaction details in booking order retrieval 2025-06-11 15:46:43 +07:00
shancheas d8fa72ba20 feat: implement BookingItemManager for enhanced item booking functionality 2025-06-11 15:41:07 +07:00
firmanr ab9db39a5f Merge pull request 'feat: add feature basic auth request OTP' (#152) from feat/otp-cancel into development
Reviewed-on: #152
2025-06-11 14:58:12 +07:00
Firman Ramdhani 7c45a20866 feat: add feature basic auth request OTP 2025-06-11 14:56:43 +07:00
shancheas 7ff0040f9e refactor: enhance time group data structure in booking order controller 2025-06-11 13:04:32 +07:00
shancheas 9bbd37ba38 refactor: update time group handling in booking order controller 2025-06-11 13:03:48 +07:00
shancheas b476c92b70 feat: add time group information to detail booking 2025-06-11 11:04:41 +07:00
shancheas dc926d84e4 refactor: streamline rescheduling logic and enhance transaction retrieval
- Replaced direct transaction retrieval with a dedicated method for better clarity.
- Consolidated validation checks for rescheduling into the controller.
- Added booking date to the transaction data being created.
- Improved error handling for various transaction states during rescheduling.
2025-06-11 10:35:06 +07:00
shancheas 0172eea573 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development 2025-06-11 08:53:25 +07:00
shancheas 464f5cb49e feat: add booking parent relationship to transactions and implement rescheduling functionality 2025-06-11 08:53:12 +07:00
firmanr 1e395ae53f Merge pull request 'feat: sync time group to couch' (#151) from feat/otp-cancel into development
Reviewed-on: #151
2025-06-10 16:45:26 +07:00
Firman Ramdhani 2f2fc27965 feat: sync time group to couch 2025-06-10 16:44:58 +07:00
irfan 0512c51f8e Merge pull request 'feat: sync time group to couch' (#150) from feat/otp-cancel into development
Reviewed-on: #150
2025-06-10 16:42:59 +07:00
Firman Ramdhani 6da2118ab5 feat: sync time group to couch 2025-06-10 16:38:06 +07:00
shancheas 033ed0046e Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development 2025-06-10 16:34:17 +07:00
shancheas fdbd667b7d feat: enhance loginQueue method to filter orders by date range 2025-06-10 16:34:00 +07:00
shancheas baeb72fe7d feat: add filtering option for items based on time group presence 2025-06-10 16:33:36 +07:00
56 changed files with 1307 additions and 63 deletions

View File

@ -106,6 +106,7 @@ import { OtpVerificationModule } from './modules/configuration/otp-verification/
import { OtpVerificationModel } from './modules/configuration/otp-verification/data/models/otp-verification.model';
import { OtpVerifierModel } from './modules/configuration/otp-verification/data/models/otp-verifier.model';
import { RescheduleVerificationModel } from './modules/booking-online/order/data/models/reschedule-verification.model';
import { OtpCheckerGuard } from './core/guards/domain/otp-checker.guard';
@Module({
imports: [
@ -246,6 +247,8 @@ import { RescheduleVerificationModel } from './modules/booking-online/order/data
providers: [
AuthService,
PrivilegeService,
OtpCheckerGuard,
/**
* By default all request from client will protect by JWT
* if there is some endpoint/function that does'nt require authentication

View File

@ -0,0 +1,57 @@
import {
CanActivate,
ExecutionContext,
Injectable,
UnprocessableEntityException,
} from '@nestjs/common';
import { InjectDataSource } from '@nestjs/typeorm';
import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
import { OtpVerificationModel } from 'src/modules/configuration/otp-verification/data/models/otp-verification.model';
import { OtpVerificationEntity } from 'src/modules/configuration/otp-verification/domain/entities/otp-verification.entity';
import { DataSource } from 'typeorm';
@Injectable()
export class OtpCheckerGuard implements CanActivate {
constructor(
@InjectDataSource(CONNECTION_NAME.DEFAULT)
protected readonly dataSource: DataSource,
) {}
get otpRepository() {
return this.dataSource.getRepository(OtpVerificationModel);
}
async canActivate(context: ExecutionContext): Promise<boolean> {
const request = context.switchToHttp().getRequest();
const verificationCode = request.headers['x-verification-code'];
console.log({ verificationCode });
if (verificationCode) {
const decoded = Buffer.from(verificationCode, 'base64').toString('ascii');
const [dataIdentity, otpCode] = decoded.split('|');
let otpData: OtpVerificationEntity;
otpData = await this.otpRepository.findOne({
where: {
otp_code: otpCode,
target_id: dataIdentity,
},
});
if (!otpData) {
otpData = await this.otpRepository.findOne({
where: {
otp_code: otpCode,
reference: dataIdentity,
},
});
}
// console.log({ dataIdentity, otpCode, otpData });
if (otpData && otpData?.verified_at) return true;
}
throw new UnprocessableEntityException('OTP not verified.');
}
}

View File

@ -31,4 +31,6 @@ export enum MODULE_NAME {
TIME_GROUPS = 'time-groups',
OTP_VERIFICATIONS = 'otp-verification',
OTP_VERIFIER = 'otp-verifier',
}

View File

@ -0,0 +1,24 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class AddBookingParentToTransaction1749604239749
implements MigrationInterface
{
name = 'AddBookingParentToTransaction1749604239749';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "transactions" ADD "parent_id" uuid`);
await queryRunner.query(
`ALTER TABLE "transactions" ADD CONSTRAINT "FK_413e95171729ba18cabce1c31e3" FOREIGN KEY ("parent_id") REFERENCES "transactions"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "transactions" DROP CONSTRAINT "FK_413e95171729ba18cabce1c31e3"`,
);
await queryRunner.query(
`ALTER TABLE "transactions" DROP COLUMN "parent_id"`,
);
}
}

View File

@ -0,0 +1,55 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class AddEnumOtpActionTypeAndUpdateColumnOtpVerifier1750045520332
implements MigrationInterface
{
name = 'AddEnumOtpActionTypeAndUpdateColumnOtpVerifier1750045520332';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "otp_verifier" ADD "is_all_action" boolean NOT NULL DEFAULT false`,
);
await queryRunner.query(
`CREATE TYPE "public"."otp_verifier_action_types_enum" AS ENUM('CREATE_DISCOUNT', 'CANCEL_TRANSACTION', 'REJECT_RECONCILIATION', 'ACTIVATE_ITEM', 'ACTIVATE_USER', 'UPDATE_ITEM_PRICE', 'UPDATE_ITEM_DETAILS', 'CONFIRM_TRANSACTION')`,
);
await queryRunner.query(
`ALTER TABLE "otp_verifier" ADD "action_types" "public"."otp_verifier_action_types_enum" array`,
);
await queryRunner.query(
`ALTER TYPE "public"."otp_verifications_action_type_enum" RENAME TO "otp_verifications_action_type_enum_old"`,
);
await queryRunner.query(
`CREATE TYPE "public"."otp_verifications_action_type_enum" AS ENUM('CREATE_DISCOUNT', 'CANCEL_TRANSACTION', 'REJECT_RECONCILIATION', 'ACTIVATE_ITEM', 'ACTIVATE_USER', 'UPDATE_ITEM_PRICE', 'UPDATE_ITEM_DETAILS', 'CONFIRM_TRANSACTION')`,
);
await queryRunner.query(
`ALTER TABLE "otp_verifications" ALTER COLUMN "action_type" TYPE "public"."otp_verifications_action_type_enum" USING "action_type"::"text"::"public"."otp_verifications_action_type_enum"`,
);
await queryRunner.query(
`DROP TYPE "public"."otp_verifications_action_type_enum_old"`,
);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`CREATE TYPE "public"."otp_verifications_action_type_enum_old" AS ENUM('CREATE_DISCOUNT', 'CANCEL_TRANSACTION', 'REJECT_RECONCILIATION')`,
);
await queryRunner.query(
`ALTER TABLE "otp_verifications" ALTER COLUMN "action_type" TYPE "public"."otp_verifications_action_type_enum_old" USING "action_type"::"text"::"public"."otp_verifications_action_type_enum_old"`,
);
await queryRunner.query(
`DROP TYPE "public"."otp_verifications_action_type_enum"`,
);
await queryRunner.query(
`ALTER TYPE "public"."otp_verifications_action_type_enum_old" RENAME TO "otp_verifications_action_type_enum"`,
);
await queryRunner.query(
`ALTER TABLE "otp_verifier" DROP COLUMN "action_types"`,
);
await queryRunner.query(
`DROP TYPE "public"."otp_verifier_action_types_enum"`,
);
await queryRunner.query(
`ALTER TABLE "otp_verifier" DROP COLUMN "is_all_action"`,
);
}
}

View File

@ -0,0 +1,29 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class AddUsageTypeToItem1750319148269 implements MigrationInterface {
name = 'AddUsageTypeToItem1750319148269';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`CREATE TYPE "public"."item_queues_usage_type_enum" AS ENUM('one_time', 'multiple')`,
);
await queryRunner.query(
`ALTER TABLE "item_queues" ADD "usage_type" "public"."item_queues_usage_type_enum" NOT NULL DEFAULT 'one_time'`,
);
await queryRunner.query(
`CREATE TYPE "public"."items_usage_type_enum" AS ENUM('one_time', 'multiple')`,
);
await queryRunner.query(
`ALTER TABLE "items" ADD "usage_type" "public"."items_usage_type_enum" NOT NULL DEFAULT 'one_time'`,
);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "items" DROP COLUMN "usage_type"`);
await queryRunner.query(`DROP TYPE "public"."items_usage_type_enum"`);
await queryRunner.query(
`ALTER TABLE "item_queues" DROP COLUMN "usage_type"`,
);
await queryRunner.query(`DROP TYPE "public"."item_queues_usage_type_enum"`);
}
}

View File

@ -0,0 +1,67 @@
import { Injectable } from '@nestjs/common';
import { RelationParam } from 'src/core/modules/domain/entities/base-filter.entity';
import { PaginationResponse } from 'src/core/response/domain/ok-response.interface';
import { ItemEntity } from 'src/modules/item-related/item/domain/entities/item.entity';
import { IndexItemManager } from 'src/modules/item-related/item/domain/usecases/managers/index-item.manager';
import { SelectQueryBuilder } from 'typeorm';
@Injectable()
export class BookingItemManager extends IndexItemManager {
get relations(): RelationParam {
return {
// relation only join (for query purpose)
joinRelations: [],
// relation join and select (relasi yang ingin ditampilkan),
selectRelations: [
'item_category',
'bundling_items',
'tenant',
'time_group',
'item_rates',
],
// relation yang hanya ingin dihitung (akan return number)
countRelations: [],
};
}
get selects(): string[] {
const parent = super.selects;
return [
...parent,
`${this.tableName}.image_url`,
'item_rates.id',
'item_rates.price',
'item_rates.season_period_id',
];
}
getResult(): PaginationResponse<ItemEntity> {
const result = super.getResult();
const { data, total } = result;
const hasRates = (this.filterParam.season_period_ids?.length ?? 0) > 0;
const items = data.map((item) => {
const currentRate = item.item_rates.find((rate) =>
this.filterParam.season_period_ids?.includes(rate.season_period_id),
);
const { item_rates, ...rest } = item;
const rate = currentRate?.['price'] ?? rest.base_price;
return {
...rest,
base_price: hasRates ? rate : rest.base_price,
};
});
return { total, data: items };
}
setQueryFilter(
queryBuilder: SelectQueryBuilder<ItemEntity>,
): SelectQueryBuilder<ItemEntity> {
const query = super.setQueryFilter(queryBuilder);
query.andWhere(`${this.tableName}.status = 'active'`);
return query;
}
}

View File

@ -57,7 +57,7 @@ export class RescheduleVerificationManager {
phone: transaction.customer_phone,
code: otp.toString(),
});
// whatsapp.bookingReschedule({
// whatsapp.bookingRescheduleOTP({
// phone: transaction.customer_phone,
// code: otp.toString(),
// name: transaction.customer_name,
@ -76,17 +76,17 @@ export class RescheduleVerificationManager {
async verifyOtp(
booking_id: string,
code: number,
): Promise<{ success: boolean; message: string }> {
): Promise<RescheduleVerificationModel> {
const verification = await this.rescheduleVerificationRepository.findOne({
where: { booking_id, code },
order: { created_at: 'DESC' },
});
if (!verification) {
return {
throw new UnprocessableEntityException({
success: false,
message: 'No verification code found for this booking.',
};
message: 'Verification code not match',
});
}
// Optionally, you can implement OTP expiration logic here
@ -95,12 +95,15 @@ export class RescheduleVerificationManager {
// Increment tried count
verification.tried = (verification.tried || 0) + 1;
await this.rescheduleVerificationRepository.save(verification);
return { success: false, message: 'Invalid verification code.' };
throw new UnprocessableEntityException({
success: false,
message: 'Invalid verification code.',
});
}
// Optionally, you can mark the verification as used or verified here
return { success: true, message: 'Verification successful.' };
return verification;
}
async findDetailByBookingId(bookingId: string): Promise<TransactionEntity> {

View File

@ -0,0 +1,90 @@
import { Injectable, UnprocessableEntityException } from '@nestjs/common';
import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model';
import { STATUS } from 'src/core/strings/constants/base.constants';
import { v4 as uuidv4 } from 'uuid';
import { TransactionDataService } from 'src/modules/transaction/transaction/data/services/transaction-data.service';
import { generateInvoiceCodeHelper } from 'src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper';
import * as moment from 'moment';
import { TransactionItemModel } from 'src/modules/transaction/transaction/data/models/transaction-item.model';
import { RescheduleVerificationModel } from '../../../data/models/reschedule-verification.model';
import { WhatsappService } from 'src/services/whatsapp/whatsapp.service';
@Injectable()
export class RescheduleManager {
constructor(private serviceData: TransactionDataService) {}
async reschedule(data: RescheduleVerificationModel) {
const transaction = await this.serviceData.getTransactionWithReschedule(
data.booking_id,
);
const rescheduleDate = moment(data.reschedule_date, 'DD-MM-YYYY');
const id = uuidv4();
const invoiceCode = await generateInvoiceCodeHelper(
this.serviceData,
'BOOK',
);
const items = this.makeItemZeroPrice(transaction.items);
const transactionData = this.makeTransactionZeroPrice(transaction);
Object.assign(transactionData, {
parent_id: transaction.id,
id,
invoice_code: invoiceCode,
status: STATUS.SETTLED,
invoice_date: rescheduleDate.format('YYYY-MM-DD'),
booking_date: rescheduleDate.format('YYYY-MM-DD'),
created_at: moment().unix() * 1000,
updated_at: moment().unix() * 1000,
items,
});
await this.serviceData.getRepository().save(transactionData);
const whatsapp = new WhatsappService();
whatsapp.rescheduleCreated({
id: transactionData.id,
name: transactionData.customer_name,
phone: transactionData.customer_phone,
time: moment(transactionData.invoice_date).unix() * 1000,
code: transactionData.invoice_code,
});
return transactionData;
}
private makeItemZeroPrice(items: TransactionItemModel[]) {
return items.map((item) => {
return {
...item,
id: uuidv4(),
item_price: 0,
total_price: 0,
total_hpp: 0,
total_profit: 0,
total_profit_share: 0,
payment_total_dpp: 0,
payment_total_tax: 0,
total_net_price: 0,
};
});
}
private makeTransactionZeroPrice(transaction: TransactionModel) {
return {
...transaction,
payment_sub_total: 0,
payment_discount_total: 0,
payment_total: 0,
payment_total_pay: 0,
payment_total_share: 0,
payment_total_tax: 0,
payment_total_profit: 0,
payment_total_net_profit: 0,
payment_total_dpp: 0,
discount_percentage: 0,
};
}
}

View File

@ -1,19 +1,19 @@
import { Controller, Get, Query } from '@nestjs/common';
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
import { ApiTags } from '@nestjs/swagger';
import { Public } from 'src/core/guards';
import { PaginationResponse } from 'src/core/response/domain/ok-response.interface';
import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
import { ItemReadService } from 'src/modules/item-related/item/data/services/item-read.service';
import { ItemEntity } from 'src/modules/item-related/item/domain/entities/item.entity';
import { IndexItemManager } from 'src/modules/item-related/item/domain/usecases/managers/index-item.manager';
import { FilterItemDto } from 'src/modules/item-related/item/infrastructure/dto/filter-item.dto';
import { BookingItemManager } from '../domain/usecases/managers/booking-item.manager';
@ApiTags('Booking Item')
@Controller('v1/booking-item')
@Public(true)
export class ItemController {
constructor(
private indexManager: IndexItemManager,
private indexManager: BookingItemManager,
private serviceData: ItemReadService,
) {}
@ -23,6 +23,7 @@ export class ItemController {
): Promise<PaginationResponse<ItemEntity>> {
params.limit = 1000;
params.show_to_booking = true;
params.all_item = true;
this.indexManager.setFilterParam(params);
this.indexManager.setService(this.serviceData, TABLE_NAME.ITEM);
await this.indexManager.execute();

View File

@ -1,4 +1,12 @@
import { Body, Controller, Get, Param, Post, Res } from '@nestjs/common';
import {
Body,
Controller,
Get,
Param,
Post,
Res,
UnprocessableEntityException,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { Public } from 'src/core/guards';
import { TransactionDto } from './dto/booking-order.dto';
@ -15,6 +23,10 @@ import {
RescheduleVerificationOTP,
} from './dto/reschedule.dto';
import { RescheduleVerificationManager } from '../domain/usecases/managers/reschedule-verification.manager';
import { RescheduleManager } from '../domain/usecases/managers/reschedule.manager';
import { STATUS } from 'src/core/strings/constants/base.constants';
import * as moment from 'moment';
import { WhatsappService } from 'src/services/whatsapp/whatsapp.service';
@ApiTags('Booking Order')
@Controller('v1/booking')
@ -25,6 +37,7 @@ export class BookingOrderController {
private serviceData: TransactionDataService,
private midtransService: MidtransService,
private rescheduleVerification: RescheduleVerificationManager,
private rescheduleManager: RescheduleManager,
) {}
@Post()
@ -58,6 +71,38 @@ export class BookingOrderController {
@Post('reschedule')
async reschedule(@Body() data: RescheduleRequestDTO) {
const transaction = await this.serviceData.getTransactionWithReschedule(
data.booking_id,
);
const today = moment().startOf('day');
const rescheduleDate = moment(data.reschedule_date, 'DD-MM-YYYY');
const rescheduleDateStartOfDay = rescheduleDate.startOf('day');
//TODO: validate session period priority
if (rescheduleDateStartOfDay.isSameOrBefore(today)) {
throw new UnprocessableEntityException(
'Reschedule date must be in the future',
);
}
if (!transaction) {
throw new UnprocessableEntityException('Transaction not found');
}
if (transaction.status !== STATUS.SETTLED) {
throw new UnprocessableEntityException('Transaction is not settled');
}
if (transaction.children_transactions.length > 0) {
throw new UnprocessableEntityException('Transaction already rescheduled');
}
if (transaction.parent_id) {
throw new UnprocessableEntityException('Transaction is a reschedule');
}
const result = await this.rescheduleVerification.saveVerification(data);
const maskedPhoneNumber = result.phone_number.replace(/.(?=.{4})/g, '*');
result.phone_number = maskedPhoneNumber;
@ -72,19 +117,32 @@ export class BookingOrderController {
+data.code,
);
const transaction = await this.get(data.booking_id);
const reschedule = await this.rescheduleManager.reschedule(result);
const transaction = await this.get(reschedule.id);
return { ...result, transaction };
return {
id: reschedule.id,
phone_number: result.phone_number,
name: result.name,
reschedule_date: result.reschedule_date,
transaction,
};
}
@Get(':id')
async get(@Param('id') transactionId: string) {
const data = await this.serviceData.getOneByOptions({
relations: ['items'],
relations: [
'items',
'parent_transaction',
'items.item',
'items.item.time_group',
],
where: { id: transactionId },
});
const {
parent_id,
customer_name,
customer_phone,
booking_date,
@ -92,9 +150,30 @@ export class BookingOrderController {
status,
id,
items,
parent_transaction,
} = data;
let timeGroup = null;
const usageItems = items.map((item) => {
const itemData = item.item;
if (itemData.time_group) {
const timeGroupData = itemData.time_group;
const {
id: groupId,
name,
start_time,
end_time,
max_usage_time,
} = timeGroupData;
timeGroup = {
id: groupId,
name,
start_time,
end_time,
max_usage_time,
};
}
const {
id,
item_id,
@ -126,6 +205,20 @@ export class BookingOrderController {
maskedCustomerPhone = '*'.repeat(customer_phone.length - 4) + last4;
}
let parentTransaction = undefined;
if (parent_transaction) {
const {
id: parentId,
invoice_code: parentInvoiceCode,
invoice_date: parentInvoiceDate,
} = parent_transaction;
parentTransaction = {
id: parentId,
invoice_code: parentInvoiceCode,
invoice_date: parentInvoiceDate,
};
}
return {
customer_name,
customer_phone: maskedCustomerPhone,
@ -133,7 +226,10 @@ export class BookingOrderController {
invoice_code,
status,
id,
is_reschedule: !!parent_id,
items: usageItems,
time_group: timeGroup,
parent: parentTransaction,
};
}
@ -148,4 +244,31 @@ export class BookingOrderController {
const buffer = Buffer.from(base64Data, 'base64');
res.send(buffer);
}
@Post('resend-notification/:id')
async resendNotification(@Param('id') id: string) {
try {
const transaction = await this.serviceData.getOneByOptions({
where: { id },
});
const whatsappService = new WhatsappService();
const formattedDate = moment(transaction.booking_date);
const payload = {
id: transaction.id,
phone: transaction.customer_phone,
code: transaction.invoice_code,
name: transaction.customer_name,
time: formattedDate.valueOf(),
};
await whatsappService.bookingCreated(payload);
return {
message: 'Notification sent successfully',
};
} catch (error) {
throw new UnprocessableEntityException({
message: 'Failed to send notification',
});
}
}
}

View File

@ -13,6 +13,8 @@ import { MidtransModule } from 'src/modules/configuration/midtrans/midtrans.modu
import { CqrsModule } from '@nestjs/cqrs';
import { RescheduleVerificationModel } from './data/models/reschedule-verification.model';
import { RescheduleVerificationManager } from './domain/usecases/managers/reschedule-verification.manager';
import { RescheduleManager } from './domain/usecases/managers/reschedule.manager';
import { BookingItemManager } from './domain/usecases/managers/booking-item.manager';
@Module({
imports: [
ConfigModule.forRoot(),
@ -26,6 +28,11 @@ import { RescheduleVerificationManager } from './domain/usecases/managers/resche
CqrsModule,
],
controllers: [ItemController, BookingOrderController],
providers: [CreateBookingManager, RescheduleVerificationManager],
providers: [
CreateBookingManager,
RescheduleVerificationManager,
RescheduleManager,
BookingItemManager,
],
})
export class BookingOrderModule {}

View File

@ -3,4 +3,5 @@ export const DatabaseListen = [
'vip_code',
'pos_activity',
'pos_cash_activity',
'time_groups',
];

View File

@ -52,6 +52,10 @@ import { SeasonPeriodDataService } from 'src/modules/season-related/season-perio
import { SeasonPeriodModel } from 'src/modules/season-related/season-period/data/models/season-period.model';
import { TransactionDemographyModel } from 'src/modules/transaction/transaction/data/models/transaction-demography.model';
import { UserLoginModel } from 'src/modules/user-related/user/data/models/user-login.model';
import {
TimeGroupDeletedHandler,
TimeGroupUpdatedHandler,
} from './domain/managers/time-group.handle';
@Module({
imports: [
@ -83,6 +87,10 @@ import { UserLoginModel } from 'src/modules/user-related/user/data/models/user-l
VipCodeCreatedHandler,
VipCategoryDeletedHandler,
VipCategoryUpdatedHandler,
TimeGroupDeletedHandler,
TimeGroupUpdatedHandler,
SeasonPeriodDeletedHandler,
SeasonPeriodUpdatedHandler,
ItemUpdatedHandler,

View File

@ -0,0 +1,65 @@
import { EventsHandler, IEventHandler } from '@nestjs/cqrs';
import { CouchService } from '../../data/services/couch.service';
import { STATUS } from 'src/core/strings/constants/base.constants';
import { TimeGroupDeletedEvent } from 'src/modules/item-related/time-group/domain/entities/event/time-group-deleted.event';
import { TimeGroupChangeStatusEvent } from 'src/modules/item-related/time-group/domain/entities/event/time-group-change-status.event';
import { TimeGroupUpdatedEvent } from 'src/modules/item-related/time-group/domain/entities/event/time-group-updated.event';
@EventsHandler(TimeGroupDeletedEvent)
export class TimeGroupDeletedHandler
implements IEventHandler<TimeGroupDeletedEvent>
{
constructor(private couchService: CouchService) {}
async handle(event: TimeGroupDeletedEvent) {
const data = await this.couchService.deleteDoc(
{
_id: event.data.id,
...event.data.data,
},
'time_groups',
);
}
}
@EventsHandler(TimeGroupChangeStatusEvent, TimeGroupUpdatedEvent)
export class TimeGroupUpdatedHandler
implements IEventHandler<TimeGroupChangeStatusEvent>
{
constructor(private couchService: CouchService) {}
async handle(event: TimeGroupChangeStatusEvent) {
const dataOld = event.data.old;
const data = event.data.data;
// change status to active
if (dataOld?.status != data.status && data.status == STATUS.ACTIVE) {
await this.couchService.createDoc(
{
_id: data.id,
...data,
},
'time_groups',
);
} else if (dataOld?.status != data.status) {
await this.couchService.deleteDoc(
{
_id: data.id,
...data,
},
'time_groups',
);
}
// update
else {
await this.couchService.updateDoc(
{
_id: data.id,
...data,
},
'time_groups',
);
}
}
}

View File

@ -10,7 +10,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
import { TransactionItemModel } from 'src/modules/transaction/transaction/data/models/transaction-item.model';
import { TransactionTaxModel } from 'src/modules/transaction/transaction/data/models/transaction-tax.model';
import { CouchModule } from 'src/modules/configuration/couch/couch.module';
@Module({
imports: [
ConfigModule.forRoot(),
@ -19,6 +19,7 @@ import { TransactionTaxModel } from 'src/modules/transaction/transaction/data/mo
CONNECTION_NAME.DEFAULT,
),
CqrsModule,
CouchModule,
],
controllers: [GoogleCalendarController],
providers: [

View File

@ -10,7 +10,7 @@ import { TransactionDataService } from 'src/modules/transaction/transaction/data
import { PaymentTransactionHandler } from './domain/handlers/payment-transaction.handler';
import { MailTemplateController } from './infrastructure/mail.controller';
import { PdfMakeManager } from '../export/domain/managers/pdf-make.manager';
import { CouchModule } from '../couch/couch.module';
@Module({
imports: [
ConfigModule.forRoot(),
@ -19,6 +19,7 @@ import { PdfMakeManager } from '../export/domain/managers/pdf-make.manager';
CONNECTION_NAME.DEFAULT,
),
CqrsModule,
CouchModule,
],
controllers: [MailTemplateController],
providers: [

View File

@ -1,5 +1,8 @@
import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
import { OtpVerifierEntity } from '../../domain/entities/otp-verification.entity';
import {
OTP_ACTION_TYPE,
OtpVerifierEntity,
} from '../../domain/entities/otp-verification.entity';
import { Column, Entity } from 'typeorm';
import { BaseModel } from 'src/core/modules/data/model/base.model';
@ -13,4 +16,10 @@ export class OtpVerifierModel
@Column({ type: 'varchar', nullable: false })
phone_number: string;
@Column({ default: false })
is_all_action: boolean;
@Column({ type: 'enum', enum: OTP_ACTION_TYPE, array: true, nullable: true })
action_types: OTP_ACTION_TYPE[] | null;
}

View File

@ -3,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { OtpVerificationModel } from '../models/otp-verification.model';
import {
OTP_ACTION_TYPE,
OtpRequestEntity,
OtpVerificationEntity,
OtpVerifierEntity,
@ -37,14 +38,81 @@ export class OtpVerificationService {
return moment().valueOf(); // epoch millis verification time (now)
}
async requestOTP(payload: OtpRequestEntity) {
private generateHeaderTemplate(payload) {
const label = payload.action_type;
// Optional logic to override label based on action type.
// e.g., if (payload.action_type === OTP_ACTION_TYPE.CONFIRM_TRANSACTION) label = 'CONFIRM_BOOKING_TRANSACTION'
const header = label.split('_').join(' ');
const type = label
.split('_')
.map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
.join(' ');
return { header, type };
}
private generateOTPMsgTemplate(payload) {
const { userRequest, newOtp } = payload;
const { header, type } = this.generateHeaderTemplate(newOtp);
const otpCode = newOtp?.otp_code;
const username = userRequest?.username;
return {
name: 'general_flow',
language: { code: 'id' },
components: [
{
type: 'header',
parameters: [
{
type: 'text',
parameter_name: 'header',
text: header,
},
],
},
{
type: 'body',
parameters: [
{
type: 'text',
parameter_name: 'name',
text: username,
},
{
type: 'text',
parameter_name: 'code',
text: otpCode,
},
{
type: 'text',
parameter_name: 'type',
text: type,
},
],
},
{
type: 'footer',
parameters: [
{
type: 'text',
text: 'Kode berlaku selama 5 menit.',
},
],
},
],
};
}
async requestOTP(payload: OtpRequestEntity, req: any) {
const otpService = new OtpService({ length: 4 });
const otpCode = otpService.generateSecureOTP();
const dateNow = this.generateTimestamp();
const expiredAt = this.generateOtpExpiration();
//TODO implementation from auth
const creator = { id: null, name: null };
const userRequest = req?.user;
const newOtp: OtpVerificationEntity = {
otp_code: otpCode,
@ -56,13 +124,13 @@ export class OtpVerificationService {
is_replaced: false,
expired_at: expiredAt,
creator_id: creator.id,
creator_name: creator.name,
creator_id: userRequest?.id,
creator_name: userRequest?.name,
created_at: dateNow,
verified_at: null,
editor_id: creator.id,
editor_name: creator.name,
editor_id: userRequest?.id,
editor_name: userRequest?.name,
updated_at: dateNow,
};
@ -91,13 +159,15 @@ export class OtpVerificationService {
// save otp to database
await this.otpVerificationRepo.save(newOtp);
const verifiers: OtpVerifierEntity[] = await this.otpVerifierRepo.find();
const verifiers: OtpVerifierEntity[] = await this.getVerifier([
payload.action_type,
]);
const notificationService = new WhatsappService();
verifiers.map((v) => {
notificationService.sendOtpNotification({
verifiers?.map((v) => {
notificationService.sendTemplateMessage({
phone: v.phone_number,
code: otpCode,
templateMsg: this.generateOTPMsgTemplate({ userRequest, newOtp }),
});
});
@ -108,7 +178,8 @@ export class OtpVerificationService {
};
}
async verifyOTP(payload: OtpVerifyEntity) {
async verifyOTP(payload: OtpVerifyEntity, req: any) {
const userRequest = req?.user;
const { otp_code, action_type, target_id, reference, source } = payload;
const dateNow = this.generateTimestamp();
@ -154,6 +225,9 @@ export class OtpVerificationService {
otp.is_used = true;
otp.verified_at = dateNow;
otp.editor_id = userRequest?.id;
otp.editor_name = userRequest?.name;
otp.updated_at = dateNow;
// update otp to database
await this.otpVerificationRepo.save(otp);
@ -179,4 +253,14 @@ export class OtpVerificationService {
)
.getOne();
}
async getVerifier(actions: OTP_ACTION_TYPE[]) {
const tableALias = TABLE_NAME.OTP_VERIFIER;
const results = await this.otpVerifierRepo
.createQueryBuilder(tableALias)
.where(`${tableALias}.is_all_action = :isAll`, { isAll: true })
.orWhere(`${tableALias}.action_types && :actions`, { actions })
.getMany();
return results ?? [];
}
}

View File

@ -0,0 +1,24 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { OtpVerifierModel } from '../models/otp-verifier.model';
import { OtpVerifierCreateDto } from '../../infrastructure/dto/otp-verification.dto';
import * as moment from 'moment';
@Injectable()
export class OtpVerifierService {
constructor(
@InjectRepository(OtpVerifierModel)
private readonly otpVerifierRepo: Repository<OtpVerifierModel>,
) {}
async create(payload: OtpVerifierCreateDto) {
const dateNow = moment().valueOf();
return this.otpVerifierRepo.save({
...payload,
created_at: dateNow,
updated_at: dateNow,
});
}
}

View File

@ -4,6 +4,14 @@ export enum OTP_ACTION_TYPE {
CREATE_DISCOUNT = 'CREATE_DISCOUNT',
CANCEL_TRANSACTION = 'CANCEL_TRANSACTION',
REJECT_RECONCILIATION = 'REJECT_RECONCILIATION',
ACTIVATE_USER = 'ACTIVATE_USER',
ACTIVATE_ITEM = 'ACTIVATE_ITEM',
UPDATE_ITEM_PRICE = 'UPDATE_ITEM_PRICE',
UPDATE_ITEM_DETAILS = 'UPDATE_ITEM_DETAILS',
CONFIRM_TRANSACTION = 'CONFIRM_TRANSACTION',
}
export enum OTP_SOURCE {
@ -37,4 +45,6 @@ export interface OtpVerifyEntity extends OtpRequestEntity {
export interface OtpVerifierEntity {
name: string;
phone_number: string;
is_all_action?: boolean;
action_types?: OTP_ACTION_TYPE[] | null;
}

View File

@ -1,4 +1,13 @@
import { IsNotEmpty, IsString, ValidateIf } from 'class-validator';
import {
IsArray,
IsBoolean,
IsEnum,
IsNotEmpty,
IsOptional,
IsPhoneNumber,
IsString,
ValidateIf,
} from 'class-validator';
import {
OTP_ACTION_TYPE,
OTP_SOURCE,
@ -6,6 +15,7 @@ import {
OtpVerifyEntity,
} from '../../domain/entities/otp-verification.entity';
import { ApiProperty } from '@nestjs/swagger';
import { Type } from 'class-transformer';
export class OtpRequestDto implements OtpRequestEntity {
@ApiProperty({
@ -53,3 +63,50 @@ export class OtpVerifyDto extends OtpRequestDto implements OtpVerifyEntity {
@IsNotEmpty()
otp_code: string;
}
export class OtpVerifierCreateDto {
@ApiProperty({
example: 'Item Manager',
description: 'Nama verifier, opsional.',
})
@IsOptional()
@IsString()
name?: string;
@ApiProperty({
example: '6281234567890',
description: 'Nomor telepon verifier dalam format internasional (E.164).',
})
@IsString()
@IsPhoneNumber('ID')
phone_number: string;
@ApiProperty({
example: false,
description:
'True jika verifier boleh memverifikasi semua aksi tanpa batas.',
})
@IsBoolean()
is_all_action: boolean;
@ApiProperty({
isArray: true,
enum: OTP_ACTION_TYPE,
example: [
'CREATE_DISCOUNT',
'CANCEL_TRANSACTION',
'REJECT_RECONCILIATION',
'ACTIVATE_ITEM',
'ACTIVATE_USER',
'UPDATE_ITEM_PRICE',
'UPDATE_ITEM_DETAILS',
'CONFIRM_TRANSACTION',
],
description: 'Daftar tipe aksi yang boleh diverifikasi, jika bukan semua.',
})
@IsOptional()
@IsArray()
@IsEnum(OTP_ACTION_TYPE, { each: true })
@Type(() => String)
action_types?: OTP_ACTION_TYPE[];
}

View File

@ -0,0 +1,80 @@
// auth/otp-auth.guard.ts
import {
CanActivate,
ExecutionContext,
Injectable,
UnprocessableEntityException,
} from '@nestjs/common';
import { JwtService } from '@nestjs/jwt';
import { InjectDataSource } from '@nestjs/typeorm';
import { validatePassword } from 'src/core/helpers/password/bcrypt.helpers';
import {
CONNECTION_NAME,
STATUS,
} from 'src/core/strings/constants/base.constants';
import { UserRole } from 'src/modules/user-related/user/constants';
import { UserModel } from 'src/modules/user-related/user/data/models/user.model';
import { DataSource, Not } from 'typeorm';
@Injectable()
export class OtpAuthGuard implements CanActivate {
constructor(
private readonly jwtService: JwtService,
@InjectDataSource(CONNECTION_NAME.DEFAULT)
protected readonly dataSource: DataSource,
) {}
get userRepository() {
return this.dataSource.getRepository(UserModel);
}
async canActivate(context: ExecutionContext): Promise<boolean> {
const request = context.switchToHttp().getRequest();
const jwtAuth = request.headers['authorization'];
const basicAuth = request.headers['x-basic-authorization'];
// 1. Cek OTP Auth (basic_authorization header)
if (basicAuth) {
try {
const decoded = Buffer.from(basicAuth, 'base64').toString('ascii');
const [username, password] = decoded.split('|');
const userLogin = await this.userRepository.findOne({
where: {
username: username,
status: STATUS.ACTIVE,
role: Not(UserRole.QUEUE_ADMIN),
},
});
const valid = await validatePassword(password, userLogin?.password);
if (userLogin && valid) {
request.user = userLogin;
return true;
} else {
throw new UnprocessableEntityException('Invalid OTP credentials');
}
} catch (err) {
throw new UnprocessableEntityException('Invalid OTP encoding');
}
}
// 2. Cek JWT (Authorization: Bearer <token>)
if (jwtAuth && jwtAuth.startsWith('Bearer ')) {
const token = jwtAuth.split(' ')[1];
try {
const payload = await this.jwtService.verifyAsync(token);
request.user = payload;
return true;
} catch (err) {
throw new UnprocessableEntityException('Invalid JWT token');
}
}
throw new UnprocessableEntityException(
'No valid authentication method found',
);
}
}

View File

@ -1,11 +1,24 @@
import { Body, Controller, Get, Param, Post } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { Public } from 'src/core/guards';
import {
Body,
Controller,
Get,
Param,
Post,
Req,
UseGuards,
} from '@nestjs/common';
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
import { ExcludePrivilege, Public } from 'src/core/guards';
import { MODULE_NAME } from 'src/core/strings/constants/module.constants';
import { OtpVerificationService } from '../data/services/otp-verification.service';
import { OtpRequestDto, OtpVerifyDto } from './dto/otp-verification.dto';
import {
OtpRequestDto,
OtpVerifierCreateDto,
OtpVerifyDto,
} from './dto/otp-verification.dto';
import { OtpAuthGuard } from './guards/otp-auth.guard';
import { OtpVerifierService } from '../data/services/otp-verifier.service';
//TODO implementation auth
@ApiTags(`${MODULE_NAME.OTP_VERIFICATIONS.split('-').join(' ')} - data`)
@Controller(`v1/${MODULE_NAME.OTP_VERIFICATIONS}`)
@Public()
@ -15,13 +28,15 @@ export class OtpVerificationController {
) {}
@Post('request')
async request(@Body() body: OtpRequestDto) {
return await this.otpVerificationService.requestOTP(body);
@UseGuards(OtpAuthGuard)
async request(@Body() body: OtpRequestDto, @Req() req) {
return await this.otpVerificationService.requestOTP(body, req);
}
@Post('verify')
async verify(@Body() body: OtpVerifyDto) {
return await this.otpVerificationService.verifyOTP(body);
@UseGuards(OtpAuthGuard)
async verify(@Body() body: OtpVerifyDto, @Req() req) {
return await this.otpVerificationService.verifyOTP(body, req);
}
@Get(':ref_or_target_id')
@ -29,3 +44,17 @@ export class OtpVerificationController {
return this.otpVerificationService.getActiveOtp(ref_or_target_id);
}
}
@ApiTags(`${MODULE_NAME.OTP_VERIFIER.split('-').join(' ')} - data`)
@Controller(`v1/${MODULE_NAME.OTP_VERIFIER}`)
@ApiBearerAuth('JWT')
@Public(false)
export class OtpVerifierController {
constructor(private readonly otpVerifierService: OtpVerifierService) {}
@Post()
@ExcludePrivilege()
async create(@Body() body: OtpVerifierCreateDto) {
return await this.otpVerifierService.create(body);
}
}

View File

@ -4,18 +4,34 @@ import { ConfigModule } from '@nestjs/config';
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { OtpVerificationModel } from './data/models/otp-verification.model';
import { OtpVerificationController } from './infrastructure/otp-verification-data.controller';
import {
OtpVerificationController,
OtpVerifierController,
} from './infrastructure/otp-verification-data.controller';
import { OtpVerificationService } from './data/services/otp-verification.service';
import { OtpVerifierModel } from './data/models/otp-verifier.model';
import { OtpAuthGuard } from './infrastructure/guards/otp-auth.guard';
import { JwtModule } from '@nestjs/jwt';
import { JWT_EXPIRED } from 'src/core/sessions/constants';
import { JWT_SECRET } from 'src/core/sessions/constants';
import { OtpVerifierService } from './data/services/otp-verifier.service';
@Module({
imports: [
ConfigModule.forRoot(),
TypeOrmModule.forFeature(
[OtpVerificationModel, OtpVerifierModel],
CONNECTION_NAME.DEFAULT,
),
JwtModule.register({
secret: JWT_SECRET,
signOptions: { expiresIn: JWT_EXPIRED },
}),
],
controllers: [OtpVerificationController],
providers: [OtpVerificationService],
controllers: [OtpVerificationController, OtpVerifierController],
providers: [OtpAuthGuard, OtpVerificationService, OtpVerifierService],
})
export class OtpVerificationModule {}

View File

@ -5,3 +5,8 @@ export enum ItemType {
FREE_GIFT = 'free gift',
OTHER = 'other',
}
export enum UsageType {
ONE_TIME = 'one_time',
MULTIPLE = 'multiple',
}

View File

@ -2,7 +2,7 @@ import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
import { ItemQueueEntity } from '../../domain/entities/item-queue.entity';
import { Column, Entity, OneToMany } from 'typeorm';
import { BaseStatusModel } from 'src/core/modules/data/model/base-status.model';
import { ItemType } from '../../constants';
import { ItemType, UsageType } from '../../constants';
import { ItemModel } from 'src/modules/item-related/item/data/models/item.model';
@Entity(TABLE_NAME.ITEM_QUEUE)
@ -29,6 +29,13 @@ export class ItemQueueModel
})
item_type: ItemType;
@Column('enum', {
name: 'usage_type',
enum: UsageType,
default: UsageType.ONE_TIME,
})
usage_type: UsageType;
@OneToMany(() => ItemModel, (model) => model.item_queue, {
onUpdate: 'CASCADE',
})

View File

@ -1,5 +1,5 @@
import { BaseStatusEntity } from 'src/core/modules/domain/entities/base-status.entity';
import { ItemType } from '../../constants';
import { ItemType, UsageType } from '../../constants';
import { ItemEntity } from 'src/modules/item-related/item/domain/entities/item.entity';
export interface ItemQueueEntity extends BaseStatusEntity {
@ -11,4 +11,5 @@ export interface ItemQueueEntity extends BaseStatusEntity {
items: ItemEntity[];
use_notification?: boolean;
requiring_notification?: boolean;
usage_type?: UsageType;
}

View File

@ -40,6 +40,7 @@ export class DetailItemQueueManager extends BaseDetailManager<ItemQueueEntity> {
`${this.tableName}.call_preparation`,
`${this.tableName}.use_notification`,
`${this.tableName}.requiring_notification`,
`${this.tableName}.usage_type`,
`items.id`,
`items.created_at`,

View File

@ -43,7 +43,7 @@ export class IndexItemQueueManager extends BaseIndexManager<ItemQueueEntity> {
`${this.tableName}.call_preparation`,
`${this.tableName}.use_notification`,
`${this.tableName}.requiring_notification`,
`${this.tableName}.usage_type`,
`items.id`,
`items.created_at`,
`items.status`,

View File

@ -18,6 +18,7 @@ import { ItemRateModel } from 'src/modules/item-related/item-rate/data/models/it
import { GateModel } from 'src/modules/web-information/gate/data/models/gate.model';
import { ItemQueueModel } from 'src/modules/item-related/item-queue/data/models/item-queue.model';
import { TimeGroupModel } from 'src/modules/item-related/time-group/data/models/time-group.model';
import { UsageType } from 'src/modules/item-related/item-queue/constants';
@Entity(TABLE_NAME.ITEM)
export class ItemModel
@ -43,6 +44,13 @@ export class ItemModel
})
item_type: ItemType;
@Column('enum', {
name: 'usage_type',
enum: UsageType,
default: UsageType.ONE_TIME,
})
usage_type: UsageType;
@Column('bigint', { name: 'hpp', nullable: true })
hpp: number;

View File

@ -1,7 +1,8 @@
import { BaseStatusEntity } from 'src/core/modules/domain/entities/base-status.entity';
import { ItemType } from 'src/modules/item-related/item-category/constants';
import { LimitType } from '../../constants';
import { ItemRateEntity } from 'src/modules/item-related/item-rate/domain/entities/item-rate.entity';
import { UsageType } from 'src/modules/item-related/item-queue/constants';
export interface ItemEntity extends BaseStatusEntity {
name: string;
item_type: ItemType;
@ -19,4 +20,7 @@ export interface ItemEntity extends BaseStatusEntity {
show_to_booking: boolean;
breakdown_bundling?: boolean;
booking_description?: string;
usage_type?: UsageType;
item_rates?: ItemRateEntity[] | any[];
}

View File

@ -53,6 +53,7 @@ export class DetailItemManager extends BaseDetailManager<ItemEntity> {
`${this.tableName}.total_price`,
`${this.tableName}.base_price`,
`${this.tableName}.use_queue`,
`${this.tableName}.usage_type`,
`${this.tableName}.show_to_booking`,
`${this.tableName}.breakdown_bundling`,
`${this.tableName}.play_estimation`,

View File

@ -55,6 +55,7 @@ export class IndexItemManager extends BaseIndexManager<ItemEntity> {
`${this.tableName}.play_estimation`,
`${this.tableName}.show_to_booking`,
`${this.tableName}.booking_description`,
`${this.tableName}.usage_type`,
`item_category.id`,
`item_category.name`,
@ -110,7 +111,7 @@ export class IndexItemManager extends BaseIndexManager<ItemEntity> {
if (this.filterParam.time_group_ids?.length) {
queryBuilder.andWhere(
`${this.tableName}.time_group_id In (:...timeGroupIds) OR ${this.tableName}.time_group_id Is Null`,
`(${this.tableName}.time_group_id In (:...timeGroupIds) OR ${this.tableName}.time_group_id Is Null)`,
{
timeGroupIds: this.filterParam.time_group_ids,
},
@ -121,6 +122,16 @@ export class IndexItemManager extends BaseIndexManager<ItemEntity> {
queryBuilder.andWhere(`${this.tableName}.show_to_booking = true`);
}
if (this.filterParam.without_time_group != null) {
const withoutTimeGroup = this.filterParam.without_time_group
? 'Is Null'
: 'Is Not Null';
queryBuilder.andWhere(
`${this.tableName}.time_group_id ${withoutTimeGroup}`,
);
}
return queryBuilder;
}
}

View File

@ -6,6 +6,7 @@ import {
Patch,
Post,
Put,
UseGuards,
} from '@nestjs/common';
import { ItemDataOrchestrator } from '../domain/usecases/item-data.orchestrator';
import { ItemDto } from './dto/item.dto';
@ -16,6 +17,7 @@ import { BatchResult } from 'src/core/response/domain/ok-response.interface';
import { BatchIdsDto } from 'src/core/modules/infrastructure/dto/base-batch.dto';
import { Public } from 'src/core/guards';
import { UpdateItemPriceDto } from './dto/update-item-price.dto';
import { OtpCheckerGuard } from 'src/core/guards/domain/otp-checker.guard';
@ApiTags(`${MODULE_NAME.ITEM.split('-').join(' ')} - data`)
@Controller(`v1/${MODULE_NAME.ITEM}`)
@ -29,6 +31,7 @@ export class ItemDataController {
return await this.orchestrator.create(data);
}
@Public(true)
@Post('update-price')
async updatePrice(@Body() body: UpdateItemPriceDto): Promise<any> {
return await this.orchestrator.updatePrice(body);
@ -40,6 +43,7 @@ export class ItemDataController {
}
@Patch(':id/active')
@UseGuards(OtpCheckerGuard)
async active(@Param('id') dataId: string): Promise<string> {
return await this.orchestrator.active(dataId);
}
@ -50,6 +54,7 @@ export class ItemDataController {
}
@Patch(':id/confirm')
@UseGuards(OtpCheckerGuard)
async confirm(@Param('id') dataId: string): Promise<string> {
return await this.orchestrator.confirm(dataId);
}
@ -70,6 +75,7 @@ export class ItemDataController {
}
@Put(':id')
@UseGuards(OtpCheckerGuard)
async update(
@Param('id') dataId: string,
@Body() data: ItemDto,

View File

@ -40,11 +40,14 @@ export class TicketDataService extends BaseDataService<QueueTicket> {
}
async loginQueue(id: string): Promise<QueueOrder> {
const start = moment().startOf('day').valueOf();
const end = moment().endOf('day').valueOf();
const order = await this.order.findOne({
relations: ['tickets'],
where: [
{ transaction_id: id },
{ code: id, transaction_id: Not(IsNull()) },
{ transaction_id: id, date: Between(start, end) },
{ code: id, transaction_id: Not(IsNull()), date: Between(start, end) },
],
});

View File

@ -39,7 +39,7 @@ import { ItemQueueModel } from '../item-related/item-queue/data/models/item-queu
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';
import { CouchModule } from 'src/modules/configuration/couch/couch.module';
@Module({
imports: [
ConfigModule.forRoot(),
@ -57,6 +57,7 @@ import { GenerateQueueManager } from './domain/usecases/generate-queue.manager';
CONNECTION_NAME.DEFAULT,
),
CqrsModule,
CouchModule,
],
controllers: [QueueController, QueueAdminController, QueueJobController],
providers: [

View File

@ -6,6 +6,7 @@ import {
Patch,
Post,
Put,
UseGuards,
} from '@nestjs/common';
import { SeasonPeriodDataOrchestrator } from '../domain/usecases/season-period-data.orchestrator';
import { SeasonPeriodDto } from './dto/season-period.dto';
@ -18,6 +19,7 @@ import { Public } from 'src/core/guards';
import { UpdateSeasonPeriodDto } from './dto/update-season-period.dto';
import { UpdateSeasonPeriodItemDto } from './dto/update-season-period-item.dto';
import { UpdateSeasonPriceDto } from './dto/update-season-price.dto';
import { OtpCheckerGuard } from 'src/core/guards/domain/otp-checker.guard';
@ApiTags(`${MODULE_NAME.SEASON_PERIOD.split('-').join(' ')} - data`)
@Controller(`v1/${MODULE_NAME.SEASON_PERIOD}`)
@ -27,11 +29,13 @@ export class SeasonPeriodDataController {
constructor(private orchestrator: SeasonPeriodDataOrchestrator) {}
@Post()
@UseGuards(OtpCheckerGuard)
async create(@Body() data: SeasonPeriodDto): Promise<SeasonPeriodEntity> {
return await this.orchestrator.create(data);
}
@Post('/update-price')
@UseGuards(OtpCheckerGuard)
async updatePrice(@Body() body: UpdateSeasonPriceDto): Promise<BatchResult> {
return await this.orchestrator.updatePrice(body);
}
@ -80,7 +84,9 @@ export class SeasonPeriodDataController {
}
// pemisahan update data dengan update items dikarenakan payload (based on tampilan) berbeda
// TODO => simpan OTP update yang disikim dari request ini
@Put(':id/items')
@UseGuards(OtpCheckerGuard)
async updateItems(
@Param('id') dataId: string,
@Body() data: UpdateSeasonPeriodItemDto,

View File

@ -1,5 +1,5 @@
import { ApiProperty } from '@nestjs/swagger';
import { IsNotEmpty, IsString } from 'class-validator';
import { IsString, ValidateIf } from 'class-validator';
export class OtpVerifyDto {
@ApiProperty({
@ -9,6 +9,6 @@ export class OtpVerifyDto {
example: '2345',
})
@IsString()
@IsNotEmpty()
@ValidateIf((body) => body.otp_code)
otp_code: string;
}

View File

@ -19,13 +19,13 @@ import { BatchCancelReconciliationManager } from './domain/usecases/managers/bat
import { BatchConfirmReconciliationManager } from './domain/usecases/managers/batch-confirm-reconciliation.manager';
import { RecapReconciliationManager } from './domain/usecases/managers/recap-reconciliation.manager';
import { RecapPosTransactionHandler } from './domain/usecases/handlers/recap-pos-transaction.handler';
import { SalesPriceFormulaDataService } from '../sales-price-formula/data/services/sales-price-formula-data.service';
import { CouchModule } from 'src/modules/configuration/couch/couch.module';
@Module({
imports: [
ConfigModule.forRoot(),
TypeOrmModule.forFeature([TransactionModel], CONNECTION_NAME.DEFAULT),
CqrsModule,
CouchModule,
],
controllers: [ReconciliationDataController, ReconciliationReadController],
providers: [

View File

@ -31,6 +31,10 @@ export class DetailRefundManager extends BaseDetailManager<RefundEntity> {
'items.bundling_items',
'items.refunds item_refunds',
'item_refunds.refund item_refunds_refund',
'transaction.items transaction_items',
'transaction_items.item transaction_items_item',
'transaction_items_item.time_group transaction_items_item_time_group',
],
// relation yang hanya ingin dihitung (akan return number)
@ -65,6 +69,10 @@ export class DetailRefundManager extends BaseDetailManager<RefundEntity> {
'item_refunds',
'item_refunds_refund.id',
'item_refunds_refund.status',
'transaction_items',
'transaction_items_item',
'transaction_items_item_time_group',
];
}

View File

@ -23,7 +23,7 @@ import { CancelRefundManager } from './domain/usecases/managers/cancel-refund.ma
import { RefundItemModel } from './data/models/refund-item.model';
import { TransactionDataService } from '../transaction/data/services/transaction-data.service';
import { TransactionModel } from '../transaction/data/models/transaction.model';
import { CouchModule } from 'src/modules/configuration/couch/couch.module';
@Module({
imports: [
ConfigModule.forRoot(),
@ -32,6 +32,7 @@ import { TransactionModel } from '../transaction/data/models/transaction.model';
CONNECTION_NAME.DEFAULT,
),
CqrsModule,
CouchModule,
],
controllers: [RefundDataController, RefundReadController],
providers: [

View File

@ -275,6 +275,22 @@ export class TransactionModel
})
refunds: RefundModel[];
@Column('varchar', { name: 'parent_id', nullable: true })
parent_id: string;
@ManyToOne(() => TransactionModel, (model) => model.id, {
nullable: true,
})
@JoinColumn({ name: 'parent_id' })
parent_transaction: TransactionModel;
@OneToMany(() => TransactionModel, (model) => model.parent_transaction, {
cascade: true,
onDelete: 'CASCADE',
onUpdate: 'CASCADE',
})
children_transactions: TransactionModel[];
@Column('varchar', { name: 'otp_code', nullable: true })
otp_code: string;
}

View File

@ -4,13 +4,32 @@ import { InjectRepository } from '@nestjs/typeorm';
import { TransactionModel } from '../models/transaction.model';
import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
import { Repository } from 'typeorm';
import { CouchService } from 'src/modules/configuration/couch/data/services/couch.service';
@Injectable()
export class TransactionDataService extends BaseDataService<TransactionModel> {
constructor(
@InjectRepository(TransactionModel, CONNECTION_NAME.DEFAULT)
private repo: Repository<TransactionModel>,
private couchService: CouchService,
) {
super(repo);
}
async getTransactionWithReschedule(booking_id: string) {
return this.repo.findOne({
relations: ['children_transactions', 'items'],
where: { id: booking_id },
});
}
async saveTransactionToCouch(transaction) {
const id = transaction.id ?? transaction._id;
const couchData = await this.couchService.getDoc(id, 'transaction');
if (!couchData) {
await this.couchService.createDoc(transaction, 'transaction');
} else {
await this.couchService.updateDoc(transaction, 'transaction');
}
}
}

View File

@ -30,4 +30,64 @@ export class TransactionReadService extends BaseReadService<TransactionEntity> {
return transactions;
}
async getSummary(posId: string, startDate: string) {
const query = `select payment_type_counter, payment_type_method_name, sum(payment_total) payment_total, sum(payment_total_pay) payment_total_pay
from transactions t
where 1=1
and t.creator_counter_no IN (${posId})
and invoice_date = '${startDate}'
and status = 'settled'
group by payment_type_counter, payment_type_method_name;`;
const transactions = await this.repo.query(query);
const qtyQuery = `select ti.item_id, ti.item_name, sum(ti.qty) total_qty, count(ti.item_name), sum(ti.qty), string_agg(distinct ti.item_price::text, '') price,
sum(payment_total) payment_total, sum(payment_total_pay) payment_total_pay
from transactions t
inner join transaction_items ti on t.id = ti.transaction_id
where t.creator_counter_no IN (${posId})
and invoice_date = '${startDate}'
and t.status = 'settled'
group by ti.item_name, ti.item_id`;
const qtyTransactions = await this.repo.query(qtyQuery);
const totalSalesQuery = `select sum(payment_total) payment_total
from transactions t
where 1=1
and t.creator_counter_no IN (${posId})
and invoice_date = '${startDate}'
and status = 'settled'`;
const totalSales = await this.repo.query(totalSalesQuery);
return {
payment: transactions,
qty: qtyTransactions,
totalSales: totalSales?.[0]?.payment_total ?? 0,
};
}
async getLastTransactionByPos(
posId: string,
): Promise<TransactionEntity | null> {
const transaction = await this.repo.findOne({
select: [
'id',
'created_at',
'updated_at',
'status',
'invoice_code',
'creator_counter_no',
'invoice_date',
'payment_total',
],
where: {
creator_counter_no: parseInt(posId),
},
order: {
created_at: 'DESC',
},
});
return transaction;
}
}

View File

@ -86,6 +86,8 @@ export interface TransactionEntity extends BaseStatusEntity {
sending_qr_at: number;
sending_qr_status: STATUS;
parent_id?: string;
calendar_id?: string;
calendar_link?: string;

View File

@ -77,6 +77,22 @@ export class MidtransCallbackHandler
await whatsappService.bookingCreated(payload);
}
if (
transaction.status === STATUS.EXPIRED &&
transaction.type === TransactionType.ONLINE
) {
const whatsappService = new WhatsappService();
const formattedDate = moment(transaction.booking_date);
const payload = {
id: transaction.id,
phone: transaction.customer_phone,
code: transaction.invoice_code,
name: transaction.customer_name,
time: formattedDate.valueOf(),
};
await whatsappService.bookingExpired(payload);
}
this.eventBus.publish(
new TransactionChangeStatusEvent({
id: data_id,

View File

@ -31,6 +31,9 @@ export class DetailTransactionManager extends BaseDetailManager<TransactionEntit
'items.refunds item_refunds',
'item_refunds.refund item_refunds_refund',
'refunds',
'items.item items_item',
'items_item.time_group items_item_time_group',
],
// relation yang hanya ingin dihitung (akan return number)
@ -92,6 +95,8 @@ export class DetailTransactionManager extends BaseDetailManager<TransactionEntit
'item_refunds_refund.status',
'refunds',
'items_item',
'items_item_time_group',
];
}

View File

@ -43,6 +43,8 @@ export function mappingTransaction(data, refundId?: string) {
if (refundId)
refund = itemData.refunds?.find((item) => item.refund.id == refundId);
const timeGroup = itemData?.item?.time_group;
return {
item: {
id: itemData.item_id,
@ -57,6 +59,7 @@ export function mappingTransaction(data, refundId?: string) {
},
breakdown_bundling: itemData.breakdown_bundling,
bundling_items: itemData.bundling_items,
time_group: timeGroup,
},
id: itemData.id,
refund: refund,

View File

@ -141,4 +141,10 @@ export class TransactionDataOrchestrator {
await this.batchConfirmDataManager.execute();
return this.batchConfirmDataManager.getResult();
}
async saveTransactionToCouch(transaction: any[]) {
for (const t of transaction) {
await this.serviceData.saveTransactionToCouch(t);
}
}
}

View File

@ -7,6 +7,8 @@ import { BaseReadOrchestrator } from 'src/core/modules/domain/usecase/orchestrat
import { DetailTransactionManager } from './managers/detail-transaction.manager';
import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
import { PriceCalculator } from './calculator/price.calculator';
import { In } from 'typeorm';
import * as moment from 'moment';
@Injectable()
export class TransactionReadOrchestrator extends BaseReadOrchestrator<TransactionEntity> {
@ -26,6 +28,16 @@ export class TransactionReadOrchestrator extends BaseReadOrchestrator<Transactio
return this.indexManager.getResult();
}
async summary(posId: string) {
const today = moment().format('YYYY-MM-DD');
const summary = await this.serviceData.getSummary(posId, today);
const lastTransaction = await this.serviceData.getLastTransactionByPos(
posId,
);
return { summary, lastTransaction };
}
async detail(dataId: string): Promise<TransactionEntity> {
this.detailManager.setData(dataId);
this.detailManager.setService(this.serviceData, TABLE_NAME.TRANSACTION);
@ -50,17 +62,24 @@ export class TransactionReadOrchestrator extends BaseReadOrchestrator<Transactio
transaction.payment_total_dpp = price.dpp_value;
transaction.payment_total_share = price.other.total_profit_share;
transaction.payment_total_tax = price.other.payment_total_tax;
console.log({ price }, transaction.payment_total);
console.log(transaction.id);
await this.serviceData.getRepository().save(transaction);
}
ids = [];
async calculatePrice(): Promise<void> {
const transactions = await this.serviceData.getManyByOptions({
where: {
is_recap_transaction: false,
// is_recap_transaction: false,
id: In(this.ids),
},
relations: ['items', 'items.bundling_items'],
});
console.log(transactions.length);
// return;
for (const transaction of transactions) {
try {
const price = await this.calculator.calculate(transaction);

View File

@ -1,4 +1,5 @@
import {
BadRequestException,
Body,
Controller,
Delete,
@ -7,17 +8,20 @@ import {
Post,
Put,
Res,
UseGuards,
} from '@nestjs/common';
import { Response } from 'express';
import { TransactionDataOrchestrator } from '../domain/usecases/transaction-data.orchestrator';
import { TransactionDto } from './dto/transaction.dto';
import { MODULE_NAME } from 'src/core/strings/constants/module.constants';
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
import { ApiBearerAuth, ApiBody, ApiTags } from '@nestjs/swagger';
import { TransactionEntity } from '../domain/entities/transaction.entity';
import { BatchResult } from 'src/core/response/domain/ok-response.interface';
import { BatchIdsDto } from 'src/core/modules/infrastructure/dto/base-batch.dto';
import { Public } from 'src/core/guards';
import { DownloadPdfDto } from './dto/donwload-pdf.dto';
import { OtpAuthGuard } from 'src/modules/configuration/otp-verification/infrastructure/guards/otp-auth.guard';
import { OtpCheckerGuard } from 'src/core/guards/domain/otp-checker.guard';
@ApiTags(`${MODULE_NAME.TRANSACTION.split('-').join(' ')} - data`)
@Controller(`v1/${MODULE_NAME.TRANSACTION}`)
@ -50,6 +54,7 @@ export class TransactionDataController {
}
@Patch(':id/confirm-data')
@UseGuards(OtpCheckerGuard)
async confirmData(@Param('id') dataId: string): Promise<string> {
return await this.orchestrator.confirmData(dataId);
}
@ -60,6 +65,7 @@ export class TransactionDataController {
}
@Patch(':id/confirm')
@UseGuards(OtpCheckerGuard)
async confirm(@Param('id') dataId: string): Promise<string> {
return await this.orchestrator.confirm(dataId);
}
@ -91,4 +97,29 @@ export class TransactionDataController {
async delete(@Param('id') dataId: string): Promise<string> {
return await this.orchestrator.delete(dataId);
}
@Post('save-to-couch')
@ApiBody({
schema: {
type: 'array',
items: {
type: 'object',
},
},
})
@Public(true)
// @UseGuards(OtpAuthGuard)
async saveToCouch(@Body() body: any[]) {
try {
await this.orchestrator.saveTransactionToCouch(body);
return {
message: 'Success',
};
} catch (error) {
throw new BadRequestException({
message: error.message,
error: error.stack,
});
}
}
}

View File

@ -28,6 +28,12 @@ export class TransactionReadController {
return await this.orchestrator.detail(id);
}
@Public(true)
@Get('summary/:posId')
async summary(@Param('posId') posId: string) {
return await this.orchestrator.summary(posId);
}
@Public(true)
@Get('dummy/:id')
async calculate(@Param('id') id: string): Promise<string> {

View File

@ -47,6 +47,9 @@ import { TransactionDemographyModel } from './data/models/transaction-demography
import { PriceCalculator } from './domain/usecases/calculator/price.calculator';
import { ItemModel } from 'src/modules/item-related/item/data/models/item.model';
import { CouchModule } from 'src/modules/configuration/couch/couch.module';
import { JWT_EXPIRED } from 'src/core/sessions/constants';
import { JWT_SECRET } from 'src/core/sessions/constants';
import { JwtModule } from '@nestjs/jwt';
@Module({
exports: [
@ -56,6 +59,10 @@ import { CouchModule } from 'src/modules/configuration/couch/couch.module';
],
imports: [
ConfigModule.forRoot(),
JwtModule.register({
secret: JWT_SECRET,
signOptions: { expiresIn: JWT_EXPIRED },
}),
TypeOrmModule.forFeature(
[
TransactionModel,

View File

@ -6,6 +6,7 @@ import {
Patch,
Post,
Put,
UseGuards,
} from '@nestjs/common';
import { UserDataOrchestrator } from '../domain/usecases/user-data.orchestrator';
import { UserDto } from './dto/user.dto';
@ -17,6 +18,7 @@ import { BatchIdsDto } from 'src/core/modules/infrastructure/dto/base-batch.dto'
import { Public } from 'src/core/guards';
import { UpdateUserDto } from './dto/update-user.dto';
import { UpdatePasswordUserDto } from './dto/update-password-user.dto';
import { OtpCheckerGuard } from 'src/core/guards/domain/otp-checker.guard';
@ApiTags(`${MODULE_NAME.USER.split('-').join(' ')} - data`)
@Controller(`v1/${MODULE_NAME.USER}`)
@ -36,6 +38,7 @@ export class UserDataController {
}
@Patch(':id/active')
@UseGuards(OtpCheckerGuard)
async active(@Param('id') dataId: string): Promise<string> {
return await this.orchestrator.active(dataId);
}
@ -46,6 +49,7 @@ export class UserDataController {
}
@Patch(':id/confirm')
@UseGuards(OtpCheckerGuard)
async confirm(@Param('id') dataId: string): Promise<string> {
return await this.orchestrator.confirm(dataId);
}

View File

@ -124,7 +124,6 @@ export class WhatsappService {
}
async bookingCreated(data: WhatsappBookingCreate) {
const ticketUrl = `${BOOKING_TICKET_URL}${data.id}`;
const imageUrl = `${BOOKING_QR_URL}${data.id}`;
const momentDate = moment(data.time);
@ -184,7 +183,133 @@ export class WhatsappService {
parameters: [
{
type: 'text',
text: ticketUrl, // replace with dynamic URL
text: data.id, // replace with dynamic URL
},
],
},
],
},
};
const response = await this.sendMessage(payload);
if (response)
Logger.log(
`Notification register Booking for ${data.code} send to ${data.phone}`,
);
}
async bookingExpired(data: WhatsappBookingCreate) {
const momentDate = moment(data.time);
const fallbackValue = momentDate.locale('id').format('dddd, DD MMMM YYYY');
// const dayOfWeek = momentDate.day();
// const dayOfMonth = momentDate.date();
// const year = momentDate.year();
// const month = momentDate.month() + 1;
// const hour = momentDate.hour();
// const minute = momentDate.minute();
const payload = {
messaging_product: 'whatsapp',
to: phoneNumberOnly(data.phone), // recipient's phone number
type: 'template',
template: {
name: 'booking_expired',
language: {
code: 'id', // language code
},
components: [
{
type: 'body',
parameters: [
{
type: 'text',
parameter_name: 'customer',
text: data.name, // replace with name variable
},
{
type: 'text',
parameter_name: 'code',
text: data.code, // replace with queue_code variable
},
{
type: 'text',
parameter_name: 'booking_date',
text: fallbackValue,
},
],
},
],
},
};
const response = await this.sendMessage(payload);
if (response)
Logger.log(
`Notification register Booking for ${data.code} send to ${data.phone}`,
);
}
async rescheduleCreated(data: WhatsappBookingCreate) {
const imageUrl = `${BOOKING_QR_URL}${data.id}`;
const momentDate = moment(data.time);
const fallbackValue = momentDate.locale('id').format('dddd, DD MMMM YYYY');
// const dayOfWeek = momentDate.day();
// const dayOfMonth = momentDate.date();
// const year = momentDate.year();
// const month = momentDate.month() + 1;
// const hour = momentDate.hour();
// const minute = momentDate.minute();
const payload = {
messaging_product: 'whatsapp',
to: phoneNumberOnly(data.phone), // recipient's phone number
type: 'template',
template: {
name: 'reschedule_created',
language: {
code: 'id', // language code
},
components: [
{
type: 'header',
parameters: [
{
type: 'image',
image: {
link: imageUrl,
},
},
],
},
{
type: 'body',
parameters: [
{
type: 'text',
parameter_name: 'customer',
text: data.name, // replace with name variable
},
{
type: 'text',
parameter_name: 'booking_code',
text: data.code, // replace with queue_code variable
},
{
type: 'text',
parameter_name: 'booking_date',
text: fallbackValue,
},
],
},
{
type: 'button',
sub_type: 'url',
index: '0',
parameters: [
{
type: 'text',
text: data.id, // replace with dynamic URL
},
],
},
@ -250,7 +375,7 @@ export class WhatsappService {
);
}
async bookingReschedule(data: WhatsappBookingCreate) {
async bookingRescheduleOTP(data: WhatsappBookingCreate) {
const momentDate = moment(data.time);
const fallbackValue = momentDate.locale('id').format('dddd, DD MMMM YYYY');
@ -355,6 +480,22 @@ export class WhatsappService {
}
}
async sendTemplateMessage(data: { phone: string; templateMsg: any }) {
const payload = {
messaging_product: 'whatsapp',
to: data.phone,
type: 'template',
template: data?.templateMsg,
};
const response = await this.sendMessage(payload);
if (response) {
Logger.log(
`OTP notification for template ${data.templateMsg} sent to ${data.phone}`,
);
}
}
async queueProcess(data: WhatsappQueue) {
const queueUrl = `${WHATSAPP_BUSINESS_QUEUE_URL}?id=${data.id}`;
const payload = {