feat: add query filter for active booking items in BookingItemManager

Reviewed-on: #161

src/app.module.ts

@@ -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

src/core/guards/domain/otp-checker.guard.ts

@@ -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.');
+  }
+}

src/core/strings/constants/module.constants.ts

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

src/database/migrations/1750045520332-add_enum_otp_action_type_and_update_column_otp_verifier.ts

@@ -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"`,
+    );
+  }
+}

src/database/migrations/1750319148269-add-usage-type-to-item.ts

@@ -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"`);
+  }
+}

src/modules/booking-online/order/domain/usecases/managers/booking-item.manager.ts

@@ -42,8 +42,11 @@ export class BookingItemManager extends IndexItemManager {
     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 = item_rates?.[0]?.['price'] ?? rest.base_price;
+      const rate = currentRate?.['price'] ?? rest.base_price;
       return {
         ...rest,
         base_price: hasRates ? rate : rest.base_price,
@@ -57,11 +60,8 @@ export class BookingItemManager extends IndexItemManager {
   ): SelectQueryBuilder<ItemEntity> {
     const query = super.setQueryFilter(queryBuilder);
 
-    if (this.filterParam.season_period_ids) {
-      query.andWhere(`item_rates.season_period_id In (:...seasonIds)`, {
-        seasonIds: this.filterParam.season_period_ids,
-      });
-    }
+    query.andWhere(`${this.tableName}.status = 'active'`);
+
     return query;
   }
 }

src/modules/booking-online/order/infrastructure/item.controller.ts

@@ -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();

src/modules/configuration/otp-verification/data/models/otp-verifier.model.ts

@@ -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;
 }

src/modules/configuration/otp-verification/data/services/otp-verification.service.ts

@@ -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,16 +38,28 @@ export class OtpVerificationService {
     return moment().valueOf(); // epoch millis verification time (now)
   }
 
-  private generateOTPMsgTemplate(payload) {
-    const { userRequest, newOtp } = payload;
-    const header = newOtp.action_type.split('_').join(' ');
-    const otpCode = newOtp?.otp_code;
-    const username = userRequest?.username;
-    const otpType = newOtp.action_type
+  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' },
@@ -77,7 +90,7 @@ export class OtpVerificationService {
             {
               type: 'text',
               parameter_name: 'type',
-              text: otpType,
+              text: type,
             },
           ],
         },
@@ -146,10 +159,12 @@ 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) => {
+    verifiers?.map((v) => {
       notificationService.sendTemplateMessage({
         phone: v.phone_number,
         templateMsg: this.generateOTPMsgTemplate({ userRequest, newOtp }),
@@ -238,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 ?? [];
+  }
 }

src/modules/configuration/otp-verification/data/services/otp-verifier.service.ts

@@ -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,
+    });
+  }
+}

src/modules/configuration/otp-verification/domain/entities/otp-verification.entity.ts

@@ -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;
 }

src/modules/configuration/otp-verification/infrastructure/dto/otp-verification.dto.ts

@@ -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[];
+}

src/modules/configuration/otp-verification/infrastructure/otp-verification-data.controller.ts

@@ -7,14 +7,18 @@ import {
   Req,
   UseGuards,
 } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
-import { Public } from 'src/core/guards';
+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 { OtpAuthGuard } from './guards/otp-auth-guard';
+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()
@@ -40,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);
+  }
+}

src/modules/configuration/otp-verification/otp-verification.module.ts

@@ -4,14 +4,18 @@ 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 { 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: [
@@ -27,7 +31,7 @@ import { JWT_SECRET } from 'src/core/sessions/constants';
       signOptions: { expiresIn: JWT_EXPIRED },
     }),
   ],
-  controllers: [OtpVerificationController],
-  providers: [OtpAuthGuard, OtpVerificationService],
+  controllers: [OtpVerificationController, OtpVerifierController],
+  providers: [OtpAuthGuard, OtpVerificationService, OtpVerifierService],
 })
 export class OtpVerificationModule {}

src/modules/item-related/item-queue/constants.ts

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

src/modules/item-related/item-queue/data/models/item-queue.model.ts

@@ -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',
   })

src/modules/item-related/item-queue/domain/entities/item-queue.entity.ts

@@ -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;
 }

src/modules/item-related/item-queue/domain/usecases/managers/detail-item-queue.manager.ts

@@ -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`,

src/modules/item-related/item-queue/domain/usecases/managers/index-item-queue.manager.ts

@@ -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`,

src/modules/item-related/item/data/models/item.model.ts

@@ -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;
 

src/modules/item-related/item/domain/entities/item.entity.ts

@@ -2,7 +2,7 @@ import { BaseStatusEntity } from 'src/core/modules/domain/entities/base-status.e
 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;
@@ -20,6 +20,7 @@ export interface ItemEntity extends BaseStatusEntity {
   show_to_booking: boolean;
   breakdown_bundling?: boolean;
   booking_description?: string;
+  usage_type?: UsageType;
 
   item_rates?: ItemRateEntity[] | any[];
 }

src/modules/item-related/item/domain/usecases/managers/detail-item.manager.ts

@@ -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`,

src/modules/item-related/item/domain/usecases/managers/index-item.manager.ts

@@ -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`,

src/modules/item-related/item/infrastructure/item-data.controller.ts

@@ -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}`)
@@ -41,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);
   }
@@ -51,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);
   }
@@ -71,6 +75,7 @@ export class ItemDataController {
   }
 
   @Put(':id')
+  @UseGuards(OtpCheckerGuard)
   async update(
     @Param('id') dataId: string,
     @Body() data: ItemDto,

src/modules/season-related/season-period/infrastructure/season-period-data.controller.ts

@@ -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,

src/modules/transaction/refund/domain/usecases/managers/detail-refund.manager.ts

@@ -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',
     ];
   }
 

src/modules/transaction/transaction/data/services/transaction-read.service.ts

@@ -41,17 +41,29 @@ export class TransactionReadService extends BaseReadService<TransactionEntity> {
       group by payment_type_counter, payment_type_method_name;`;
     const transactions = await this.repo.query(query);
 
-    const qtyQuery = `select ti.item_name, sum(ti.qty) total_qty, count(ti.item_name), sum(ti.qty), string_agg(distinct ti.item_price::text, '') price,
+    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`;
+      group by ti.item_name, ti.item_id`;
     const qtyTransactions = await this.repo.query(qtyQuery);
 
-    return { payment: transactions, qty: qtyTransactions };
+    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(

src/modules/transaction/transaction/domain/usecases/handlers/midtrans-transaction-callback.handler.ts

@@ -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,

src/modules/transaction/transaction/domain/usecases/managers/detail-transaction.manager.ts

@@ -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',
     ];
   }
 

src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts

@@ -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,

src/modules/transaction/transaction/infrastructure/transaction-data.controller.ts

@@ -20,7 +20,8 @@ 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 { 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}`)
@@ -53,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);
   }
@@ -63,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);
   }
@@ -105,7 +108,7 @@ export class TransactionDataController {
     },
   })
   @Public(true)
-  @UseGuards(OtpAuthGuard)
+  // @UseGuards(OtpAuthGuard)
   async saveToCouch(@Body() body: any[]) {
     try {
       await this.orchestrator.saveTransactionToCouch(body);

src/modules/user-related/user/infrastructure/user-data.controller.ts

@@ -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);
   }

src/services/whatsapp/whatsapp.service.ts

@@ -198,6 +198,57 @@ export class WhatsappService {
       );
   }
 
+  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}`;