env/env.development

@@ -43,7 +43,4 @@ GOOGLE_CALENDAR_ID="326464ac296874c7121825f5ef2e2799baa90b51da240f0045aae22beec1
 
 SUPERSET_URL=https://dashboard.weplayground.eigen.co.id
 SUPERSET_ADMIN_USERNAME=admin
-SUPERSET_ADMIN_PASSWORD=admin
-
-WHATSAPP_BUSINESS_ACCOUNT_NUMBER_ID=604883366037548
-WHATSAPP_BUSINESS_ACCESS_TOKEN=EAAINOvRRiEEBO9yQsYDnYtjHZB7q1nZCwbBpRcxIGMDWajKZBtmWxNRKvPYkS95KQZBsZBOvSFyjiEg5CcCZBZBtaSZApxyV8fiA3cEyVwf7iVZBQP2YCTPRQZArMFeeXbO0uq5TGygmjsIz3M4YxcUHxPzKO4pKxIyxnzcoUZCqCSo1NqQSLVf3a0JyZAwgDXGL55dV
+SUPERSET_ADMIN_PASSWORD=admin

env/env.production

@@ -40,7 +40,4 @@ GOOGLE_CALENDAR_ID="326464ac296874c7121825f5ef2e2799baa90b51da240f0045aae22beec1
 
 SUPERSET_URL=https://dashboard.weplayground.eigen.co.id
 SUPERSET_ADMIN_USERNAME=admin
-SUPERSET_ADMIN_PASSWORD=admin
-
-WHATSAPP_BUSINESS_ACCOUNT_NUMBER_ID=604883366037548
-WHATSAPP_BUSINESS_ACCESS_TOKEN=EAAINOvRRiEEBO9yQsYDnYtjHZB7q1nZCwbBpRcxIGMDWajKZBtmWxNRKvPYkS95KQZBsZBOvSFyjiEg5CcCZBZBtaSZApxyV8fiA3cEyVwf7iVZBQP2YCTPRQZArMFeeXbO0uq5TGygmjsIz3M4YxcUHxPzKO4pKxIyxnzcoUZCqCSo1NqQSLVf3a0JyZAwgDXGL55dV
+SUPERSET_ADMIN_PASSWORD=admin

package.json

@@ -49,7 +49,6 @@
     "exceljs": "^4.4.0",
     "fs-extra": "^11.2.0",
     "googleapis": "^140.0.0",
-    "gtts": "^0.2.1",
     "handlebars": "^4.7.8",
     "mathjs": "^13.0.2",
     "midtrans-client": "^1.3.1",

src/core/modules/infrastructure/dto/base-filter.dto.ts

@@ -23,7 +23,6 @@ export class BaseFilterDto implements BaseFilterEntity {
   @IsNumber()
   limit = 10;
 
-  @ApiProperty({ type: String, required: false })
   q: string;
 
   @ApiProperty({ type: ['string'], required: false })

src/database/migrations/1723801180604-add-estimation-to-item.ts

@@ -5,7 +5,7 @@ export class AddEstimationToItem1723801180604 implements MigrationInterface {
 
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(
-      `ALTER TABLE "items" ADD "play_estimation" numeric`,
+      `ALTER TABLE "items" ADD "play_estimation" integer`,
     );
   }
 

src/database/migrations/1729151429165-queue-table.ts

@@ -15,7 +15,7 @@ export class QueueTable1729151429165 implements MigrationInterface {
     );
 
     await queryRunner.query(
-      `ALTER TABLE "queue_tickets" ADD CONSTRAINT "FK_0e9823b8b7ca9523b3be73878e5" FOREIGN KEY ("order_id") REFERENCES "queue_orders"("id") ON DELETE SET NULL ON UPDATE CASCADE`,
+      `ALTER TABLE "queue_tickets" ADD CONSTRAINT "FK_0e9823b8b7ca9523b3be73878e5" FOREIGN KEY ("order_id") REFERENCES "queue_orders"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
     );
     await queryRunner.query(
       `ALTER TABLE "queue_items" ADD CONSTRAINT "FK_25352739034765f6917757df74b" FOREIGN KEY ("ticket_id") REFERENCES "queue_tickets"("id") ON DELETE CASCADE ON UPDATE CASCADE`,

src/database/migrations/1733199330134-item-queue-add-time-and-peak-level.ts

@@ -1,25 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class ItemQueueAddTimeAndPeakLevel1733199330134
-  implements MigrationInterface
-{
-  name = 'ItemQueueAddTimeAndPeakLevel1733199330134';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "item_queues" ADD "max_peak_level" integer NOT NULL DEFAULT '100'`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "item_queues" ADD "call_preparation" integer NOT NULL DEFAULT '5'`,
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "item_queues" DROP COLUMN "call_preparation"`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "item_queues" DROP COLUMN "max_peak_level"`,
-    );
-  }
-}

src/database/migrations/1734717058658-add-notification-config-to-item-queue.ts

@@ -1,25 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class AddNotificationConfigToItemQueue1734717058658
-  implements MigrationInterface
-{
-  name = 'AddNotificationConfigToItemQueue1734717058658';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "item_queues" ADD "use_notification" boolean NOT NULL DEFAULT true`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "item_queues" ADD "requiring_notification" boolean NOT NULL DEFAULT false`,
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "item_queues" DROP COLUMN "requiring_notification"`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "item_queues" DROP COLUMN "use_notification"`,
-    );
-  }
-}

src/database/migrations/1734718462106-add-last-notification-to-queue.ts

@@ -1,19 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class AddLastNotificationToQueue1734718462106
-  implements MigrationInterface
-{
-  name = 'AddLastNotificationToQueue1734718462106';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "queues" ADD "last_notification" bigint NULL`,
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "queues" DROP COLUMN "last_notification"`,
-    );
-  }
-}

src/modules/configuration/auth/domain/managers/admin-queue/login-admin-queue.manager.ts

@@ -73,14 +73,13 @@ export class LoginAdminQueueManager extends BaseCustomManager<UserEntity> {
         message: `Akun anda sudah login di item "${hasLoginAsQueue?.item_name}"`,
         error: 'Unauthorized',
       });
+    } else if (itemLogin && itemLogin.user_id !== this.userLogin.id) {
+      throw new UnauthorizedException({
+        statusCode: HttpStatus.UNAUTHORIZED,
+        message: `"${userLoginItem.name}" masih login sebagai admin antrian `,
+        error: 'Unauthorized',
+      });
     }
-    // else if (itemLogin && itemLogin.user_id !== this.userLogin.id) {
-    //   throw new UnauthorizedException({
-    //     statusCode: HttpStatus.UNAUTHORIZED,
-    //     message: `"${userLoginItem.name}" masih login sebagai admin antrian `,
-    //     error: 'Unauthorized',
-    //   });
-    // }
 
     // * Disini untuk isi token
     const tokenData = {

src/modules/configuration/couch/data/services/couch.service.ts

@@ -19,7 +19,6 @@ export class CouchService {
   }
 
   async onModuleInit() {
-    // return;
     const nano = this.nanoInstance;
     for (const database of DatabaseListen) {
       const db = nano.db.use(database);
@@ -96,41 +95,4 @@ export class CouchService {
       return null;
     }
   }
-
-  getUnixTimestampLast7Days() {
-    const date = new Date();
-    date.setDate(date.getDate() - 4);
-    date.setHours(0, 0, 0, 0);
-    return date.getTime();
-  }
-
-  public async clearTransactions() {
-    const nano = this.nanoInstance;
-    const transaction = nano.use('transaction');
-
-    const expiredDate = this.getUnixTimestampLast7Days();
-
-    const selectorPayment = {
-      created_at: {
-        $lt: expiredDate,
-      },
-    };
-
-    const transactions = await transaction.find({
-      selector: selectorPayment,
-      fields: ['_id', '_rev'],
-      limit: 100000,
-    });
-
-    const { docs } = transactions;
-    console.log(docs.length);
-    const deletedDocs = {
-      docs: docs.map((doc) => ({
-        _id: doc._id,
-        _rev: doc._rev,
-        _deleted: true,
-      })),
-    };
-    await transaction.bulk(deletedDocs);
-  }
 }

src/modules/configuration/couch/infrastructure/couch.controller.ts

@@ -5,17 +5,13 @@ import { Public } from 'src/core/guards';
 import * as Nano from 'nano';
 import { CreateUserPrivilegeDto } from 'src/modules/user-related/user-privilege/infrastructure/dto/create-user-privilege.dto';
 import { ConfigService } from '@nestjs/config';
-import { CouchService } from '../data/services/couch.service';
 
 @ApiTags(`couch`)
 @Controller('v1/couch')
 @Public()
 @Injectable()
 export class CouchDataController {
-  constructor(
-    private configService: ConfigService,
-    private couchService: CouchService,
-  ) {}
+  constructor(private configService: ConfigService) {}
 
   get nanoInstance() {
     const couchConfiguration = this.configService.get<string>('COUCHDB_CONFIG');
@@ -68,11 +64,4 @@ export class CouchDataController {
       // return people.get();
     } catch (error) {}
   }
-
-  @Public(true)
-  @Get('clear-transactions')
-  async clearTransactions(): Promise<string> {
-    await this.couchService.clearTransactions();
-    return 'OK';
-  }
 }

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

@@ -10,12 +10,6 @@ export class ItemQueueModel
   extends BaseStatusModel<ItemQueueEntity>
   implements ItemQueueEntity
 {
-  @Column('int', { default: 100 })
-  max_peak_level: number;
-
-  @Column('int', { default: 5 })
-  call_preparation: number;
-
   @Column('varchar', { name: 'name' })
   name: string;
 
@@ -33,10 +27,4 @@ export class ItemQueueModel
     onUpdate: 'CASCADE',
   })
   items: ItemModel[];
-
-  @Column('boolean', { default: true })
-  use_notification: boolean;
-
-  @Column('boolean', { default: false })
-  requiring_notification: boolean;
 }

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

@@ -6,9 +6,5 @@ export interface ItemQueueEntity extends BaseStatusEntity {
   name: string;
   item_type: ItemType;
   information?: string;
-  max_peak_level: number;
-  call_preparation: number;
   items: ItemEntity[];
-  use_notification?: boolean;
-  requiring_notification?: boolean;
 }

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

@@ -36,10 +36,6 @@ export class DetailItemQueueManager extends BaseDetailManager<ItemQueueEntity> {
       `${this.tableName}.creator_name`,
       `${this.tableName}.updated_at`,
       `${this.tableName}.editor_name`,
-      `${this.tableName}.max_peak_level`,
-      `${this.tableName}.call_preparation`,
-      `${this.tableName}.use_notification`,
-      `${this.tableName}.requiring_notification`,
 
       `items.id`,
       `items.created_at`,

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

@@ -39,10 +39,6 @@ export class IndexItemQueueManager extends BaseIndexManager<ItemQueueEntity> {
       `${this.tableName}.creator_name`,
       `${this.tableName}.updated_at`,
       `${this.tableName}.editor_name`,
-      `${this.tableName}.max_peak_level`,
-      `${this.tableName}.call_preparation`,
-      `${this.tableName}.use_notification`,
-      `${this.tableName}.requiring_notification`,
 
       `items.id`,
       `items.created_at`,

src/modules/item-related/item-queue/infrastructure/dto/item-queue.dto.ts

@@ -1,30 +1,12 @@
 import { BaseStatusDto } from 'src/core/modules/infrastructure/dto/base-status.dto';
 import { ItemQueueEntity } from '../../domain/entities/item-queue.entity';
-import { IsArray, IsNumber, IsString } from 'class-validator';
+import { IsArray, IsString } from 'class-validator';
 import { ItemType } from '../../constants';
 import { ApiProperty } from '@nestjs/swagger';
 import { ItemEntity } from 'src/modules/item-related/item/domain/entities/item.entity';
 import { Exclude, Transform } from 'class-transformer';
 
 export class ItemQueueDto extends BaseStatusDto implements ItemQueueEntity {
-  @ApiProperty({
-    name: 'max_peak_level',
-    required: false,
-    example: 'Menentukan level peak maksimal penuhnya wahana',
-    default: 100,
-  })
-  @IsNumber()
-  max_peak_level: number;
-
-  @ApiProperty({
-    name: 'call_preparation',
-    required: false,
-    example: 'Waktu persiapan untuk memanggil antrian dalam menit',
-    default: 5,
-  })
-  @IsNumber()
-  call_preparation: number;
-
   @Exclude()
   items: ItemEntity[];
 

src/modules/item-related/item-queue/infrastructure/item-queue-read.controller.ts

@@ -1,10 +1,4 @@
-import {
-  Controller,
-  Get,
-  Param,
-  Query,
-  UnauthorizedException,
-} from '@nestjs/common';
+import { Controller, Get, Param, Query } from '@nestjs/common';
 import { FilterItemQueueDto } from './dto/filter-item-queue.dto';
 import { Pagination } from 'src/core/response';
 import { PaginationResponse } from 'src/core/response/domain/ok-response.interface';
@@ -13,7 +7,6 @@ import { ItemQueueReadOrchestrator } from '../domain/usecases/item-queue-read.or
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { MODULE_NAME } from 'src/core/strings/constants/module.constants';
 import { Public } from 'src/core/guards';
-import { validate as isValidUUID } from 'uuid';
 
 @ApiTags(`${MODULE_NAME.ITEM_QUEUE.split('-').join(' ')} - read`)
 @Controller(`v1/${MODULE_NAME.ITEM_QUEUE}`)
@@ -51,7 +44,6 @@ export class ItemQueueReadController {
   @Get('display/:id')
   @Public(true)
   async detailPublic(@Param('id') id: string): Promise<ItemQueueEntity> {
-    if (!isValidUUID(id)) throw new UnauthorizedException('id is required');
     return await this.orchestrator.detail(id);
   }
 }

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

@@ -54,7 +54,7 @@ export class ItemModel
   @Column('bigint', { name: 'base_price', nullable: true })
   base_price: number;
 
-  @Column('decimal', { name: 'play_estimation', nullable: true })
+  @Column('int', { name: 'play_estimation', nullable: true })
   play_estimation: number;
 
   @Column('boolean', { name: 'use_queue', default: false })

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

@@ -84,12 +84,6 @@ export class IndexItemManager extends BaseIndexManager<ItemEntity> {
   setQueryFilter(
     queryBuilder: SelectQueryBuilder<ItemEntity>,
   ): SelectQueryBuilder<ItemEntity> {
-    if (this.filterParam.q) {
-      queryBuilder.andWhere(
-        `${this.tableName}.name ILIKE '%${this.filterParam.q}%'`,
-      );
-    }
-
     if (this.filterParam.tenant_ids?.length) {
       queryBuilder.andWhere(`${this.tableName}.tenant_id In (:...tenantIds)`, {
         tenantIds: this.filterParam.tenant_ids,

src/modules/queue/data/models/queue.model.ts

@@ -115,9 +115,6 @@ export class QueueModel extends BaseModel<Queue> implements Queue {
   @Column({ type: 'bigint' })
   time: number;
 
-  @Column({ type: 'bigint', nullable: true })
-  last_notification: number;
-
   @Column({ type: 'bigint' })
   call_time: number;
 
@@ -141,5 +138,4 @@ export class QueueModel extends BaseModel<Queue> implements Queue {
   qty: number;
 
   average = 0;
-  peak_level = 100;
 }

src/modules/queue/data/services/queue.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
 import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
-import { Between, DataSource, In, Not, Repository } from 'typeorm';
+import { Between, DataSource, In, Repository } from 'typeorm';
 import {
   QueueItemModel,
   QueueModel,
@@ -57,25 +57,6 @@ export class QueueDataService extends BaseReadService<QueueModel> {
     });
   }
 
-  async exclude(item_queue_id: string[]) {
-    const queues = await this.itemQueueRepo.find({
-      relations: ['items'],
-      where: {
-        id: Not(In(item_queue_id)),
-      },
-    });
-
-    return queues.filter((q) => q.items.length > 0);
-  }
-
-  async allQueue() {
-    const queues = await this.itemQueueRepo.find({
-      relations: ['items'],
-    });
-
-    return queues.filter((q) => q.items.length > 0);
-  }
-
   async lastQueue(item_queue_id: string) {
     const start = moment().startOf('day').valueOf();
     const end = moment().endOf('day').valueOf();
@@ -165,25 +146,13 @@ export class QueueService extends BaseDataService<QueueModel> {
     super(repo);
   }
 
-  async queueTicket(queueId: string) {
-    return this.repo.findOne({
-      relations: ['item', 'item.ticket'],
-      where: {
-        id: queueId,
-      },
-    });
-  }
-
   async queues(ids: string[]) {
     const start = moment().startOf('day').valueOf();
     const end = moment().endOf('day').valueOf();
     const playEstimations = {};
-    const queuePeakLevel = {};
 
     for (const id of ids) {
-      const est = await this.itemAverageTimeEstimation(id);
-      playEstimations[id] = est.average;
-      queuePeakLevel[id] = est.peakLevel;
+      playEstimations[id] = await this.itemAverageTimeEstimation(id);
     }
 
     const queues = await this.repo.find({
@@ -198,7 +167,6 @@ export class QueueService extends BaseDataService<QueueModel> {
 
     queues.forEach((queue) => {
       queue.average = playEstimations[queue.item_queue_id];
-      queue.peak_level = queuePeakLevel[queue.item_queue_id];
     });
 
     return queues;
@@ -206,16 +174,14 @@ export class QueueService extends BaseDataService<QueueModel> {
 
   async itemAverageTimeEstimation(item_queue_id: string) {
     const items = await this.itemMaster.find({
-      relations: ['item_queue'],
       where: {
         item_queue_id,
       },
     });
 
     const times = items.map((item) => item.play_estimation ?? 0);
-    const average = times.length > 0 ? math.mean(times) * 60 * 1000 : 0; // change average minute to milliseconds
-    const peakLevel = items[0]?.item_queue?.max_peak_level ?? 100;
-    return { average, peakLevel };
+    const average = math.mean(times) * 60 * 1000; // change average minute to milliseconds
+    return average;
   }
 
   async getTicketItems(ticket_id: string, item_id: string) {
@@ -234,11 +200,6 @@ export class QueueService extends BaseDataService<QueueModel> {
     });
   }
 
-  async updateLastNotification(queue_id: string, time: number) {
-    const query = `UPDATE queues SET last_notification = ${time} WHERE id = '${queue_id}'`;
-    this.dataSource.query(query);
-  }
-
   async updateItemQty(item_id: string, qty: number): Promise<void> {
     const query = `UPDATE queue_items SET qty = qty - ${qty} WHERE id = '${item_id}'`;
     this.dataSource.query(query);

src/modules/queue/data/services/ticket.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, UnprocessableEntityException } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { BaseDataService } from 'src/core/modules/data/service/base-data.service';
 import { InjectRepository } from '@nestjs/typeorm';
 import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
@@ -11,7 +11,6 @@ import {
 } from '../models/queue.model';
 import { QueueOrder } from '../../domain/entities/order.entity';
 import * as moment from 'moment';
-import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model';
 
 @Injectable()
 export class TicketDataService extends BaseDataService<QueueTicket> {
@@ -24,9 +23,6 @@ export class TicketDataService extends BaseDataService<QueueTicket> {
 
     @InjectRepository(QueueItemModel, CONNECTION_NAME.DEFAULT)
     private item: Repository<QueueItemModel>,
-
-    @InjectRepository(TransactionModel, CONNECTION_NAME.DEFAULT)
-    private transaction: Repository<TransactionModel>,
   ) {
     super(repo);
   }
@@ -40,37 +36,13 @@ export class TicketDataService extends BaseDataService<QueueTicket> {
   }
 
   async loginQueue(id: string): Promise<QueueOrder> {
-    const order = await this.order.findOne({
+    return this.order.findOneOrFail({
       relations: ['tickets'],
       where: [
         { transaction_id: id },
         { code: id, transaction_id: Not(IsNull()) },
       ],
     });
-
-    if (!order) {
-      const { customer_name, customer_phone } =
-        await this.transaction.findOneOrFail({
-          where: {
-            id,
-          },
-        });
-
-      const start = moment().startOf('day').valueOf();
-      const end = moment().endOf('day').valueOf();
-      const order = this.order.findOneOrFail({
-        relations: ['tickets'],
-        where: {
-          customer: customer_name,
-          phone: customer_phone,
-          date: Between(start, end),
-        },
-      });
-
-      return order;
-    }
-
-    return order;
   }
 
   async ticketByCode(code: string): Promise<QueueTicketModel[]> {
@@ -165,23 +137,17 @@ export class TicketDataService extends BaseDataService<QueueTicket> {
     item_ids: string[],
   ): Promise<QueueOrderModel> {
     const order = await this.orderIds(order_id);
-    try {
-      const ticket = await this.order.findOneOrFail({
-        relations: ['tickets', 'tickets.items'],
-        where: {
-          tickets: {
-            order_id: In(order),
-            items: {
-              id: In(item_ids),
-            },
+    return this.order.findOneOrFail({
+      relations: ['tickets', 'tickets.items'],
+      where: {
+        tickets: {
+          order_id: In(order),
+          items: {
+            id: In(item_ids),
           },
         },
-      });
-
-      return ticket;
-    } catch (error) {
-      throw new UnprocessableEntityException('Ticket tidak dapat ditemukan');
-    }
+      },
+    });
   }
 
   async queuePosTickets(order_id: string): Promise<QueueTicketModel[]> {

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

@@ -13,7 +13,6 @@ export interface QueueItem extends BaseCoreEntity {
 export interface MergedItemQueue extends BaseCoreEntity {
   id: string;
   queue_item_id: string;
-  item_id: string;
   title: string;
   image_url: string;
   qty: number;

src/modules/queue/domain/helpers/time.helper.ts

@@ -9,15 +9,3 @@ export function toTime(timestamp: number): string {
     minutes < 10 ? '0' : ''
   }${minutes}`;
 }
-
-export function phoneNumberOnly(phone: string): string {
-  return phone.replace(/[^0-9]/g, '');
-}
-
-export function timeIsBefore(
-  currentTime: number,
-  time: number,
-  diffInMilliseconds: number,
-): boolean {
-  return time < currentTime + diffInMilliseconds;
-}

src/modules/queue/domain/queue-admin.orchestrator.ts

@@ -4,19 +4,11 @@ import { IndexQueueManager } from './usecases/index-queue.manager';
 import { PaginationResponse } from 'src/core/response/domain/ok-response.interface';
 import { Queue } from './entities/queue.entity';
 import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
-import {
-  CallQueueManager,
-  DoneQueueManager,
-} from './usecases/call-queue.manager';
+import { CallQueueManager } from './usecases/call-queue.manager';
 import {
   ORDER_TYPE,
   QUEUE_STATUS,
 } from 'src/core/strings/constants/base.constants';
-import { QueueTimeFormula } from './usecases/formula/queue-time.formula';
-import * as moment from 'moment';
-import { timeIsBefore } from './helpers/time.helper';
-import { WhatsappService } from 'src/services/whatsapp/whatsapp.service';
-import { WhatsappQueue } from 'src/services/whatsapp/entity/whatsapp-queue.entity';
 
 @Injectable()
 export class QueueAdminOrchestrator {
@@ -25,8 +17,6 @@ export class QueueAdminOrchestrator {
     private readonly service: QueueService,
     private indexManager: IndexQueueManager,
     private callManager: CallQueueManager,
-    private doneManager: DoneQueueManager,
-    private readonly queueTimeFormula: QueueTimeFormula,
   ) {}
 
   async index(params): Promise<PaginationResponse<Queue>> {
@@ -44,58 +34,9 @@ export class QueueAdminOrchestrator {
   }
 
   async done(dataId): Promise<string> {
-    this.doneManager.setData(dataId, QUEUE_STATUS.DONE);
-    this.doneManager.setService(this.service, TABLE_NAME.QUEUE);
-    await this.doneManager.execute();
-    return this.doneManager.getResult();
-  }
-
-  async job(): Promise<void> {
-    const notification = new WhatsappService();
-    const itemMasters = await this.dataService.allQueue();
-    const currentTime = moment().valueOf();
-
-    for (const queueItem of itemMasters) {
-      const queueTimes = await this.queueTimeFormula.items(queueItem.id);
-      const call_preparation = queueItem.call_preparation * 60 * 1000;
-      if (!queueItem.use_notification) continue;
-
-      for (const queueId in queueTimes) {
-        const callTime = queueTimes[queueId];
-
-        const queueTicket = await this.service.queueTicket(queueId);
-        if (
-          queueItem.requiring_notification ||
-          (timeIsBefore(currentTime, callTime, call_preparation) &&
-            queueTicket.time > currentTime)
-        ) {
-          const payload: WhatsappQueue = {
-            id: queueId,
-            phone: queueTicket.item.ticket.phone,
-            code: queueTicket.code,
-            name: queueTicket.item.ticket.customer,
-            item_name: queueItem.name,
-            time: callTime,
-          };
-
-          // console.table([
-          //   {
-          //     code: queueTicket.code,
-          //     currentTime: toTime(currentTime),
-          //     callTime: toTime(callTime),
-          //     lastNotification: toTime(queueTicket.last_notification),
-          //   },
-          // ]);
-
-          if (
-            queueTicket.item.ticket.phone != null &&
-            queueTicket.last_notification < currentTime - call_preparation
-          ) {
-            await notification.queueProcess(payload);
-            this.service.updateLastNotification(queueId, currentTime);
-          }
-        }
-      }
-    }
+    this.callManager.setData(dataId, QUEUE_STATUS.DONE);
+    this.callManager.setService(this.service, TABLE_NAME.QUEUE);
+    await this.callManager.execute();
+    return this.callManager.getResult();
   }
 }

src/modules/queue/domain/queue.orchestrator.ts

@@ -3,7 +3,6 @@ import { TicketDataService } from '../data/services/ticket.service';
 import { QueueOrder } from './entities/order.entity';
 import { Queue } from './entities/queue.entity';
 import {
-  QueueDataService,
   QueueOrderService,
   QueueService,
 } from '../data/services/queue.service';
@@ -22,13 +21,7 @@ import * as moment from 'moment';
 import { CustomerQueueTicketSummaryManager } from './usecases/queue/customer-queue-ticket.manager';
 import { TransactionDataService } from 'src/modules/transaction/transaction/data/services/transaction-data.service';
 import { CustomerQueuePosItemManager } from './usecases/queue/customer-queue-pos-item.manager';
-import {
-  QueueModel,
-  QueueOrderModel,
-  QueueTicketModel,
-} from '../data/models/queue.model';
-import { CustomerQueueRecommendManager } from './usecases/queue/customer-queue-recommend.manager';
-import { GenerateQueueManager } from './usecases/generate-queue.manager';
+import { QueueOrderModel, QueueTicketModel } from '../data/models/queue.model';
 
 @Injectable()
 export class QueueOrchestrator {
@@ -39,14 +32,8 @@ export class QueueOrchestrator {
     private readonly queueOrderService: QueueOrderService,
     private readonly registerQueueManager: RegisterQueueManager,
     private readonly splitQueueManager: SplitQueueManager,
-    private readonly queueDataService: QueueDataService,
-    private readonly generateQueueManager: GenerateQueueManager,
   ) {}
 
-  async generate(data: any): Promise<QueueModel[]> {
-    return await this.generateQueueManager.generate(data);
-  }
-
   async loginCustomer(id: string): Promise<QueueOrder> {
     try {
       const order = await this.dataService.loginQueue(id);
@@ -117,10 +104,6 @@ export class QueueOrchestrator {
       existTicket.items.push(...items);
       await this.dataService.updateQueueTicket(existTicket);
 
-      data.items.forEach((item) => {
-        this.queueService.updateItemQty(item.queue_item_id, item.qty);
-      });
-
       return queue;
     }
 
@@ -186,26 +169,6 @@ export class QueueOrchestrator {
     return manager.data;
   }
 
-  async queueItemRecommendation(order_id: string): Promise<any> {
-    const tickets = await this.dataService.queueTickets(order_id);
-    const queueItemIds = this.getQueueItemFromTickets(tickets);
-    const recommendItems = await this.queueDataService.exclude(queueItemIds);
-    const recommendIds = recommendItems.map((item) => item.id);
-    const queues = await this.queueService.queues(recommendIds);
-    const manager = new CustomerQueueRecommendManager(tickets);
-    manager.currentQueues(queues);
-    return manager.recommend(recommendItems);
-  }
-
-  async queueItemSummary(): Promise<any> {
-    const recommendItems = await this.queueDataService.allQueue();
-    const recommendIds = recommendItems.map((item) => item.id);
-    const queues = await this.queueService.queues(recommendIds);
-    const manager = new CustomerQueueRecommendManager(null);
-    manager.currentQueues(queues);
-    return manager.recommend(recommendItems);
-  }
-
   async queueItems(order_id: string): Promise<any> {
     const tickets = await this.dataService.queueTickets(order_id);
     const queueItemIds = this.getQueueItemFromTickets(tickets);

src/modules/queue/domain/usecases/call-queue.manager.ts

@@ -38,10 +38,3 @@ export class CallQueueManager extends BaseUpdateStatusManager<Queue> {
     return [];
   }
 }
-
-@Injectable()
-export class DoneQueueManager extends CallQueueManager {
-  async beforeProcess(): Promise<void> {
-    return;
-  }
-}

src/modules/queue/domain/usecases/formula/queue-condition.formula.ts

@@ -17,12 +17,11 @@ export class QueueCondition {
   condition(item_id: string) {
     const queues: QueueModel[] = this.ticketItems[item_id] ?? [];
     const playEstimation = queues[0]?.average ?? 0;
-    const peakLevel = queues[0]?.peak_level ?? 100;
     const [time, last] = this.queueTime(queues, playEstimation);
     const nearest = time ? toTime(time) : 0;
     const lastTime = last ? toTime(last + playEstimation) : 0;
 
-    const queuePeople = this.queuePeople(queues, peakLevel);
+    const queuePeople = this.queuePeople(queues);
 
     return {
       available: queuePeople == 0,
@@ -33,13 +32,12 @@ export class QueueCondition {
     };
   }
 
-  queuePeople(queues: QueueModel[], peakLevel): number {
+  queuePeople(queues: QueueModel[]): number {
     const queue = this.activeQueue(queues);
-    const level = peakLevel / 100;
     const queuePeople = queue.reduce((acc, q) => {
       return acc + q.qty;
     }, 0);
-    return queuePeople * level;
+    return queuePeople;
   }
 
   activeQueue(queues: QueueModel[]) {
@@ -78,7 +76,6 @@ export class QueueCondition {
       return (queue.call_time - queue.time) / 1000;
     });
 
-    const avg = Math.ceil(math.mean(times));
-    return Math.max(0, avg);
+    return Math.ceil(math.mean(times));
   }
 }

src/modules/queue/domain/usecases/formula/queue-time.formula.ts

@@ -14,8 +14,6 @@ export class QueueTimeFormula {
     private itemQueueRepo: Repository<ItemQueueModel>,
   ) {}
 
-  public average = 0;
-
   async items(item_queue_id: string) {
     const queues = await this.queueDataService.waitingQueue(item_queue_id);
     if (queues.length == 0) {
@@ -30,8 +28,7 @@ export class QueueTimeFormula {
     });
 
     const times = itemQueue.items.map((item) => item.play_estimation ?? 0);
-    const average = times.length > 0 ? math.mean(times) * 60 * 1000 : 0; // change average minute to milliseconds
-    this.average = Math.floor(average);
+    const average = math.mean(times) * 60 * 1000; // change average minute to milliseconds
 
     const calledQueue = await this.queueDataService.lastQueue(item_queue_id);
 

src/modules/queue/domain/usecases/generate-queue.manager.ts

@@ -1,161 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import * as moment from 'moment';
-import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
-import { TransactionUserType } from 'src/modules/transaction/transaction/constants';
-import { TransactionItemModel } from 'src/modules/transaction/transaction/data/models/transaction-item.model';
-import { QueueBucketReadService } from '../../data/services/queue-bucket';
-import { QueueService } from '../../data/services/queue.service';
-import { TicketDataService } from '../../data/services/ticket.service';
-import { RegisterQueueDto } from '../../infrastructure/controllers/dto/register-queue.dto';
-import { QueueOrder } from '../entities/order.entity';
-import { QueueItem } from '../entities/queue-item.entity';
-import { QueueTicket } from '../entities/ticket.entity';
-import { QueueTimeFormula } from './formula/queue-time.formula';
-import { RegisterQueueManager } from './register-queue.manager';
-import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model';
-import { QueueModel } from '../../data/models/queue.model';
-
-@Injectable()
-export class GenerateQueueManager {
-  constructor(
-    private readonly ticketService: TicketDataService,
-    private readonly queueService: QueueService,
-    private readonly bucketService: QueueBucketReadService,
-    private readonly queueTimeFormula: QueueTimeFormula,
-  ) {}
-
-  async generate(transaction: TransactionModel) {
-    const date = transaction.booking_date ?? transaction.invoice_date;
-    const queue_date = moment(date, 'YYYY-MM-DD').unix();
-
-    const { id, customer_name, customer_phone, invoice_code } = transaction;
-
-    const customerOrder = {
-      code: invoice_code,
-      customer: customer_name,
-      phone: customer_phone,
-      date: queue_date * 1000,
-      transaction_id: id,
-    };
-
-    const items = this.generateItems(transaction.items);
-
-    const existTicket = await this.ticketService.ticketByUser(
-      customer_name,
-      customer_phone,
-    );
-
-    const insertTickets: QueueTicket[] = [];
-    if (customer_name && customer_phone && existTicket) {
-      existTicket.items.push(...items);
-      await this.ticketService.updateQueueTicket(existTicket);
-
-      existTicket.items = items;
-      insertTickets.push(existTicket);
-    } else {
-      const ticket: QueueTicket = { ...customerOrder, items };
-      const order: QueueOrder = { ...customerOrder, tickets: [ticket] };
-
-      const queueOrder = await this.ticketService.createQueueOrder(order);
-      insertTickets.push(...queueOrder.tickets);
-    }
-
-    const results: QueueModel[] = [];
-    const vipCustomer =
-      transaction.customer_category?.has_vip_pass ||
-      transaction.customer_type === TransactionUserType.VIP;
-    if (vipCustomer || transaction.creator_counter_no != null) {
-      for (const ticket of insertTickets) {
-        const ticket_id = ticket.id;
-        const items = {};
-
-        ticket.items.forEach((item) => {
-          const item_id = item['item_queue_id'];
-          const currentItem = items[item_id];
-
-          if (currentItem) {
-            currentItem.qty += item.qty;
-          }
-          items[item_id] = currentItem
-            ? currentItem
-            : {
-                item_id,
-                ticket_id,
-                qty: item.qty,
-              };
-        });
-
-        for (const payload of Object.values(items)) {
-          const isVip = vipCustomer || transaction.creator_counter_no == null;
-          const result = await this.create(payload as any, isVip);
-          results.push(result);
-        }
-      }
-    }
-    return results;
-  }
-
-  generateItems(items: TransactionItemModel[]): QueueItem[] {
-    const transactionItems = [];
-
-    items.forEach((item) => {
-      if (item.item.use_queue) {
-        transactionItems.push({
-          item_queue_id: item.item.item_queue_id,
-          item_id: item.item_id,
-          qty: item.qty,
-        });
-      }
-
-      if (item.item.bundling_items.length > 0) {
-        item.item.bundling_items.forEach((bundling_item) => {
-          if (bundling_item.use_queue) {
-            transactionItems.push({
-              item_queue_id: bundling_item.item_queue_id,
-              item_id: bundling_item.id,
-              qty: item.qty,
-            });
-          }
-        });
-      }
-    });
-
-    return this.mergeQueueItems(transactionItems);
-  }
-
-  mergeQueueItems(arr) {
-    const result = {};
-    arr.forEach((item) => {
-      if (result[item.item_id]) {
-        result[item.item_id].qty += item.qty;
-      } else {
-        result[item.item_id] = { ...item };
-      }
-    });
-    return Object.values<QueueItem>(result);
-  }
-
-  async create(data: RegisterQueueDto, isVip = false): Promise<QueueModel> {
-    const queue = await this.queueService.getTicketItems(
-      data.ticket_id,
-      data.item_id,
-    );
-    const queueRequest: any = {
-      qty: data.qty,
-      item_id: queue.id,
-      vip: isVip,
-    };
-    const registerQueueManager = new RegisterQueueManager(
-      this.bucketService,
-      this.queueTimeFormula,
-    );
-    registerQueueManager.setData(queueRequest);
-    registerQueueManager.setService(this.queueService, TABLE_NAME.QUEUE);
-    await registerQueueManager.execute();
-
-    const result = await registerQueueManager.getResult();
-    result.time = null;
-
-    return result;
-  }
-}

src/modules/queue/domain/usecases/index-queue.manager.ts

@@ -89,13 +89,10 @@ export class IndexQueueManager extends BaseIndexManager<Queue> {
 
     console.log({ start, end, item_queue_id: this.filterParam.queue_id });
 
-    queryBuilder.andWhere(
-      `${this.tableName}.created_at BETWEEN :start AND :end`,
-      {
-        start,
-        end,
-      },
-    );
+    queryBuilder.andWhere(`${this.tableName}.time BETWEEN :start AND :end`, {
+      start,
+      end,
+    });
 
     queryBuilder.andWhere(`${this.tableName}.item_queue_id = :item_queue_id`, {
       item_queue_id: this.filterParam.queue_id,

src/modules/queue/domain/usecases/queue/customer-queue-item-list.manager.ts

@@ -6,7 +6,7 @@ import { CustomerQueueManager } from './customer-queue.manager';
 import { QueueCondition } from '../formula/queue-condition.formula';
 
 export class CustomerQueueItemListManager extends CustomerQueueManager {
-  protected queues: QueueModel[] = [];
+  private queues: QueueModel[] = [];
   currentQueues(queues: QueueModel[]) {
     this.queues = queues;
   }
@@ -53,7 +53,7 @@ export class CustomerQueueItemListManager extends CustomerQueueManager {
     });
   }
 
-  protected queueItemQty(queues: QueueItemModel[]) {
+  private queueItemQty(queues: QueueItemModel[]) {
     return queues.reduce(
       (acc, item) => acc + item.queue.reduce((acc, q) => acc + q.qty, 0),
       0,

src/modules/queue/domain/usecases/queue/customer-queue-pos-item.manager.ts

@@ -14,7 +14,7 @@ export class CustomerQueuePosItemManager extends CustomerQueueManager {
       items: queueItems.map((item) => {
         return {
           id: item.id,
-          item_queue_id: item.item_id,
+          item_queue_id: item.queue_item_id,
           title: item.title,
           image_url: item.image_url,
           summary: {

src/modules/queue/domain/usecases/queue/customer-queue-recommend.manager.ts

@@ -1,21 +0,0 @@
-import { QueueCondition } from '../formula/queue-condition.formula';
-import { CustomerQueueItemListManager } from './customer-queue-item-list.manager';
-import { ItemQueueModel } from 'src/modules/item-related/item-queue/data/models/item-queue.model';
-
-export class CustomerQueueRecommendManager extends CustomerQueueItemListManager {
-  recommend(items: ItemQueueModel[]) {
-    const queueCondition = new QueueCondition(this.queues);
-
-    return items.map((queueItem) => {
-      const item = queueItem.items[0];
-      return {
-        id: item.id,
-        queue_item_id: queueItem.id,
-        title: queueItem.name,
-        image_url: item.image_url,
-
-        queue_condition: queueCondition.condition(queueItem.id),
-      };
-    });
-  }
-}

src/modules/queue/domain/usecases/queue/customer-queue.manager.ts

@@ -107,7 +107,6 @@ export class CustomerQueueManager {
       return {
         id: item.item_id,
         queue_item_id: queueItem.id,
-        item_id: item.id,
         title: queueItem.name,
         image_url: item.item.image_url,
         qty: item_qty,

src/modules/queue/domain/usecases/register-queue.manager.ts

@@ -11,8 +11,6 @@ import { padCode } from 'src/modules/transaction/vip-code/domain/usecases/manage
 import { QueueBucketReadService } from '../../data/services/queue-bucket';
 import { ItemModel } from 'src/modules/item-related/item/data/models/item.model';
 import { QueueTimeFormula } from './formula/queue-time.formula';
-import { WhatsappService } from 'src/services/whatsapp/whatsapp.service';
-import { WhatsappQueue } from 'src/services/whatsapp/entity/whatsapp-queue.entity';
 import * as moment from 'moment';
 
 @Injectable()
@@ -24,8 +22,6 @@ export class RegisterQueueManager extends BaseCreateManager<QueueModel> {
     super();
   }
 
-  private currentItemMaster: ItemModel;
-
   async averageTime(): Promise<number> {
     const item = await this.getItemMaster();
     return item.play_estimation;
@@ -37,14 +33,12 @@ export class RegisterQueueManager extends BaseCreateManager<QueueModel> {
 
     const first = queues[0];
     const last = queues[queues.length - 1] ?? moment().valueOf();
-    const average = this.queueTimeFormula.average;
-    return [Math.floor(first), Math.floor(last + average)];
+    return [first, last];
   }
 
   async beforeProcess(): Promise<void> {
     const vip = this.data.vip ?? false;
     const item = await this.getItemMaster();
-    this.currentItemMaster = item;
     const [, end] = await this.queueTime(item.item_queue_id);
 
     const queueNumber = await this.bucketService.getQueue(
@@ -66,7 +60,7 @@ export class RegisterQueueManager extends BaseCreateManager<QueueModel> {
 
   async getItemMaster(): Promise<ItemModel> {
     const queueItem: QueueItemModel = await this.dataService.item.findOne({
-      relations: ['item', 'item.item_queue'],
+      relations: ['item'],
       where: {
         id: this.data.item_id,
       },
@@ -76,27 +70,6 @@ export class RegisterQueueManager extends BaseCreateManager<QueueModel> {
   }
 
   async afterProcess(): Promise<void> {
-    const notificationService = new WhatsappService();
-    const item = this.currentItemMaster ?? (await this.getItemMaster());
-
-    if (!item.item_queue.use_notification) return;
-
-    const queueTicket = await this.dataService.queueTicket(this.result.id);
-
-    const payload: WhatsappQueue = {
-      id: this.result.id,
-      phone: queueTicket.item.ticket.phone,
-      code: this.result.code,
-      name: queueTicket.item.ticket.customer,
-      item_name: item.name,
-      time: this.result.time,
-    };
-
-    if (payload.phone) {
-      notificationService.queueRegister(payload);
-      const currentTime = moment().valueOf();
-      this.dataService.updateLastNotification(this.result.id, currentTime);
-    }
     return;
   }
 

src/modules/queue/infrastructure/controllers/queue-job.controller.ts

@@ -1,23 +0,0 @@
-import { Controller, Logger, Post } from '@nestjs/common';
-
-import { MODULE_NAME } from 'src/core/strings/constants/module.constants';
-import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
-
-import { QueueAdminOrchestrator } from '../../domain/queue-admin.orchestrator';
-import { Public } from 'src/core/guards';
-// import { Cron } from '@nestjs/schedule';
-
-@ApiTags(`Queue Admin`)
-@Controller(`v1/${MODULE_NAME.QUEUE}-job`)
-@ApiBearerAuth('JWT')
-@Public(true)
-export class QueueJobController {
-  constructor(private orchestrator: QueueAdminOrchestrator) {}
-
-  // @Cron('*/1 * * * *')
-  @Post('queues/notification')
-  async call() {
-    Logger.log('call preparation');
-    return this.orchestrator.job();
-  }
-}

src/modules/queue/infrastructure/controllers/queue.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Param, Post, Query, Res } from '@nestjs/common';
+import { Body, Controller, Get, Param, Post } from '@nestjs/common';
 
 import { MODULE_NAME } from 'src/core/strings/constants/module.constants';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
@@ -11,12 +11,6 @@ import { RegisterQueueDto } from './dto/register-queue.dto';
 import { SplitQueueDto } from './dto/split-queue.dto';
 import { LoginQueueDto } from './dto/login-queue.dto';
 import { LoginReceiptDto } from './dto/login-receipt.dto';
-import { mappingRevertTransaction } from 'src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper';
-import { TransactionType } from 'src/modules/transaction/transaction/constants';
-import { QueueModel } from '../../data/models/queue.model';
-
-import * as Gtts from 'gtts';
-import { Response } from 'express';
 
 @ApiTags(`Queue`)
 @Controller(`v1/${MODULE_NAME.QUEUE}`)
@@ -25,12 +19,6 @@ import { Response } from 'express';
 export class QueueController {
   constructor(private orchestrator: QueueOrchestrator) {}
 
-  @Post('generate')
-  async generateQueue(@Body() data: any): Promise<QueueModel[]> {
-    mappingRevertTransaction(data, TransactionType.COUNTER);
-    return await this.orchestrator.generate(data);
-  }
-
   @Post('register')
   async registerQueue(@Body() data: RegisterQueueDto): Promise<Queue> {
     return await this.orchestrator.create(data);
@@ -78,16 +66,6 @@ export class QueueController {
     return await this.orchestrator.queueTicketSummary(id, ticket_id);
   }
 
-  @Get(':id/recommendations')
-  async queueItemRecommends(@Param('id') id: string): Promise<void> {
-    return await this.orchestrator.queueItemRecommendation(id);
-  }
-
-  @Get(':id/queue-summary')
-  async queueItemSummary(): Promise<void> {
-    return await this.orchestrator.queueItemSummary();
-  }
-
   @Get(':id/items')
   async queueItems(@Param('id') id: string): Promise<void> {
     return await this.orchestrator.queueItems(id);
@@ -108,15 +86,6 @@ export class QueueController {
     return await this.orchestrator.queueOrderItems(id);
   }
 
-  @Get('speech')
-  async speech(
-    @Query('text') text: string,
-    @Res() response: Response,
-  ): Promise<void> {
-    const gtts = new Gtts(text, 'id');
-    gtts.stream().pipe(response);
-  }
-
   @Get(':id/items/:item_id')
   async queueItemTickets(
     @Param('id') id: string,

src/modules/queue/infrastructure/handlers/transaction.handler.ts

@@ -4,7 +4,18 @@ import {
   TransactionChangeStatusEvent,
   TransactionCreateQueueEvent,
 } from 'src/modules/transaction/transaction/domain/entities/event/transaction-change-status.event';
-import { GenerateQueueManager } from '../../domain/usecases/generate-queue.manager';
+import { TicketDataService } from '../../data/services/ticket.service';
+import { QueueOrder } from '../../domain/entities/order.entity';
+import { QueueTicket } from '../../domain/entities/ticket.entity';
+import { QueueItem } from '../../domain/entities/queue-item.entity';
+import * as moment from 'moment';
+import { TransactionUserType } from 'src/modules/transaction/transaction/constants';
+import { RegisterQueueManager } from '../../domain/usecases/register-queue.manager';
+import { RegisterQueueDto } from '../controllers/dto/register-queue.dto';
+import { QueueService } from '../../data/services/queue.service';
+import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
+import { QueueBucketReadService } from '../../data/services/queue-bucket';
+import { QueueTimeFormula } from '../../domain/usecases/formula/queue-time.formula';
 
 @EventsHandler(TransactionChangeStatusEvent, TransactionCreateQueueEvent)
 export class QueueTransactionHandler
@@ -12,7 +23,10 @@ export class QueueTransactionHandler
 {
   constructor(
     private readonly dataService: TransactionDataService,
-    private readonly queueGenerateManager: GenerateQueueManager,
+    private readonly ticketService: TicketDataService,
+    private readonly queueService: QueueService,
+    private readonly bucketService: QueueBucketReadService,
+    private readonly queueTimeFormula: QueueTimeFormula,
   ) {}
 
   async handle(event: TransactionChangeStatusEvent) {
@@ -21,21 +35,104 @@ export class QueueTransactionHandler
     /**
      * If data still in process (not settled) then don't create the queue order
      */
-    if (process_data?.status != 'settled' || process_data?.pos_number != null)
-      return;
+    if (process_data?.status != 'settled') return;
 
     const transaction = await this.dataService.getOneByOptions({
       where: {
         id: event.data.id,
       },
-      relations: [
-        'customer_category',
-        'items',
-        'items.item',
-        'items.item.bundling_items',
-      ],
+      relations: ['customer_category', 'items', 'items.item'],
     });
 
-    await this.queueGenerateManager.generate(transaction);
+    const date = transaction.booking_date ?? transaction.invoice_date;
+    const queue_date = moment(date, 'YYYY-MM-DD').unix();
+
+    const { id, customer_name, customer_phone, invoice_code } = transaction;
+
+    const customerOrder = {
+      code: invoice_code,
+      customer: customer_name,
+      phone: customer_phone,
+      date: queue_date * 1000,
+      transaction_id: id,
+    };
+
+    const items = transaction.items
+      .filter((item) => item.item.use_queue)
+      .map<QueueItem>((item) => {
+        return {
+          item_queue_id: item.item.item_queue_id,
+          item_id: item.item_id,
+          qty: item.qty,
+        };
+      });
+
+    const existTicket = await this.ticketService.ticketByUser(
+      customer_name,
+      customer_phone,
+    );
+
+    const insertTickets: QueueTicket[] = [];
+    if (customer_name && customer_phone && existTicket) {
+      existTicket.items.push(...items);
+      await this.ticketService.updateQueueTicket(existTicket);
+
+      existTicket.items = items;
+      insertTickets.push(existTicket);
+    } else {
+      const ticket: QueueTicket = { ...customerOrder, items };
+      const order: QueueOrder = { ...customerOrder, tickets: [ticket] };
+
+      const queueOrder = await this.ticketService.createQueueOrder(order);
+      insertTickets.push(...queueOrder.tickets);
+    }
+
+    if (
+      transaction.customer_category?.has_vip_pass ||
+      transaction.customer_type === TransactionUserType.VIP
+    ) {
+      insertTickets.forEach((ticket) => {
+        const ticket_id = ticket.id;
+        const items = {};
+        ticket.items.forEach((item) => {
+          const item_id = item['item_queue_id'];
+          const currentItem = items[item_id];
+
+          if (currentItem) {
+            currentItem.qty += item.qty;
+          }
+          items[item_id] = currentItem
+            ? currentItem
+            : {
+                item_id,
+                ticket_id,
+                qty: item.qty,
+              };
+        });
+
+        Object.values(items).forEach((payload: any) => {
+          this.create(payload);
+        });
+      });
+    }
+  }
+
+  async create(data: RegisterQueueDto): Promise<void> {
+    const queue = await this.queueService.getTicketItems(
+      data.ticket_id,
+      data.item_id,
+    );
+    const queueRequest: any = {
+      qty: data.qty,
+      item_id: queue.id,
+      vip: true,
+    };
+    const registerQueueManager = new RegisterQueueManager(
+      this.bucketService,
+      this.queueTimeFormula,
+    );
+    registerQueueManager.setData(queueRequest);
+    registerQueueManager.setService(this.queueService, TABLE_NAME.QUEUE);
+    await registerQueueManager.execute();
   }
 }

src/modules/queue/queue.module.ts

@@ -26,10 +26,7 @@ import {
 import { QueueAdminController } from './infrastructure/controllers/queue-admin.controller';
 import { QueueAdminOrchestrator } from './domain/queue-admin.orchestrator';
 import { IndexQueueManager } from './domain/usecases/index-queue.manager';
-import {
-  CallQueueManager,
-  DoneQueueManager,
-} from './domain/usecases/call-queue.manager';
+import { CallQueueManager } from './domain/usecases/call-queue.manager';
 import { RegisterQueueManager } from './domain/usecases/register-queue.manager';
 import { QueueBucketModel } from './data/models/queue-bucket.model';
 import { QueueBucketReadService } from './data/services/queue-bucket';
@@ -37,8 +34,6 @@ import { SplitQueueManager } from './domain/usecases/split-queue.manager';
 import { QueueTransactionCancelHandler } from './infrastructure/handlers/cancel-transaction.handler';
 import { ItemQueueModel } from '../item-related/item-queue/data/models/item-queue.model';
 import { QueueTimeFormula } from './domain/usecases/formula/queue-time.formula';
-import { QueueJobController } from './infrastructure/controllers/queue-job.controller';
-import { GenerateQueueManager } from './domain/usecases/generate-queue.manager';
 
 @Module({
   imports: [
@@ -58,7 +53,7 @@ import { GenerateQueueManager } from './domain/usecases/generate-queue.manager';
     ),
     CqrsModule,
   ],
-  controllers: [QueueController, QueueAdminController, QueueJobController],
+  controllers: [QueueController, QueueAdminController],
   providers: [
     QueueOrchestrator,
     QueueAdminOrchestrator,
@@ -75,12 +70,10 @@ import { GenerateQueueManager } from './domain/usecases/generate-queue.manager';
 
     IndexQueueManager,
     CallQueueManager,
-    DoneQueueManager,
     RegisterQueueManager,
     SplitQueueManager,
 
     QueueTimeFormula,
-    GenerateQueueManager,
   ],
 })
 export class QueueModule {}

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

@@ -116,7 +116,7 @@ export function mappingRevertTransaction(data, type) {
     }
 
     Object.assign(data, {
-      id: data.booking_id ?? data._id ?? data.id,
+      id: data.booking_id ?? data._id,
       creator_counter_no: Number(data.pos_number),
       creator_counter_name: data.pos_name,
       settlement_date: new Date(data.created_at),

src/services/whatsapp/entity/whatsapp-queue.entity.ts

@@ -1,8 +0,0 @@
-export interface WhatsappQueue {
-  id: string;
-  phone: string;
-  code: string;
-  name: string;
-  item_name: string;
-  time: number;
-}

src/services/whatsapp/whatsapp.constant.ts

@@ -1,14 +0,0 @@
-export const WHATSAPP_BUSINESS_API_URL =
-  process.env.WHATSAPP_BUSINESS_API_URL ?? 'https://graph.facebook.com/';
-
-export const WHATSAPP_BUSINESS_VERSION =
-  process.env.WHATSAPP_BUSINESS_VERSION ?? 'v21.0';
-
-export const WHATSAPP_BUSINESS_QUEUE_URL =
-  process.env.WHATSAPP_BUSINESS_QUEUE_URL ?? 'auth/login';
-
-export const WHATSAPP_BUSINESS_ACCOUNT_NUMBER_ID =
-  process.env.WHATSAPP_BUSINESS_ACCOUNT_NUMBER_ID ?? '';
-
-export const WHATSAPP_BUSINESS_ACCESS_TOKEN =
-  process.env.WHATSAPP_BUSINESS_ACCESS_TOKEN ?? '';

src/services/whatsapp/whatsapp.helper.ts

@@ -1,62 +0,0 @@
-export function getTextMessageInput(recipient, text) {
-  return JSON.stringify({
-    messaging_product: 'whatsapp',
-    preview_url: false,
-    recipient_type: 'individual',
-    to: recipient,
-    type: 'text',
-    text: {
-      body: text,
-    },
-  });
-}
-
-export function getTemplatedMessageInput(recipient, movie, seats) {
-  return JSON.stringify({
-    messaging_product: 'whatsapp',
-    to: recipient,
-    type: 'template',
-    template: {
-      name: 'sample_movie_ticket_confirmation',
-      language: {
-        code: 'en_US',
-      },
-      components: [
-        {
-          type: 'header',
-          parameters: [
-            {
-              type: 'image',
-              image: {
-                link: movie.thumbnail,
-              },
-            },
-          ],
-        },
-        {
-          type: 'body',
-          parameters: [
-            {
-              type: 'text',
-              text: movie.title,
-            },
-            {
-              type: 'date_time',
-              date_time: {
-                fallback_value: movie.time,
-              },
-            },
-            {
-              type: 'text',
-              text: movie.venue,
-            },
-            {
-              type: 'text',
-              text: seats,
-            },
-          ],
-        },
-      ],
-    },
-  });
-}

src/services/whatsapp/whatsapp.service.ts

@@ -1,169 +0,0 @@
-import {
-  phoneNumberOnly,
-  toTime,
-} from 'src/modules/queue/domain/helpers/time.helper';
-import { WhatsappQueue } from './entity/whatsapp-queue.entity';
-import {
-  WHATSAPP_BUSINESS_ACCESS_TOKEN,
-  WHATSAPP_BUSINESS_ACCOUNT_NUMBER_ID,
-  WHATSAPP_BUSINESS_API_URL,
-  WHATSAPP_BUSINESS_QUEUE_URL,
-  WHATSAPP_BUSINESS_VERSION,
-} from './whatsapp.constant';
-import axios from 'axios';
-import { Logger } from '@nestjs/common';
-import { apm } from 'src/core/apm';
-
-export class WhatsappService {
-  async sendMessage(data) {
-    const config = {
-      method: 'post',
-      url: `${WHATSAPP_BUSINESS_API_URL}/${WHATSAPP_BUSINESS_VERSION}/${WHATSAPP_BUSINESS_ACCOUNT_NUMBER_ID}/messages`,
-      headers: {
-        Authorization: `Bearer ${WHATSAPP_BUSINESS_ACCESS_TOKEN}`,
-        'Content-Type': 'application/json',
-      },
-      data: data,
-    };
-
-    try {
-      const response = await axios(config);
-      return response.data;
-    } catch (error) {
-      Logger.error(error);
-      apm?.captureError(error);
-      return null;
-    }
-  }
-
-  async queueRegister(data: WhatsappQueue) {
-    const queueUrl = `${WHATSAPP_BUSINESS_QUEUE_URL}?id=${data.id}`;
-    const payload = {
-      messaging_product: 'whatsapp',
-      to: phoneNumberOnly(data.phone), // recipient's phone number
-      type: 'template',
-      template: {
-        name: 'queue_created',
-        language: {
-          code: 'id', // language code
-        },
-        components: [
-          {
-            type: 'header',
-            parameters: [
-              {
-                parameter_name: 'queue_code',
-                type: 'text',
-                text: data.code, // replace with queue_code variable
-              },
-            ],
-          },
-          {
-            type: 'body',
-            parameters: [
-              {
-                parameter_name: 'name',
-                type: 'text',
-                text: data.name, // replace with name variable
-              },
-              {
-                parameter_name: 'item_name',
-                type: 'text',
-                text: data.item_name, // replace with item_name variable
-              },
-              {
-                parameter_name: 'queue_code',
-                type: 'text',
-                text: data.code, // replace with queue_code variable
-              },
-              {
-                parameter_name: 'queue_time',
-                type: 'text',
-                text: toTime(data.time), // replace with queue_time variable
-              },
-            ],
-          },
-          {
-            type: 'button',
-            sub_type: 'url',
-            index: '0',
-            parameters: [
-              {
-                type: 'text',
-                text: queueUrl, // replace with dynamic URL
-              },
-            ],
-          },
-        ],
-      },
-    };
-
-    const response = await this.sendMessage(payload);
-    if (response)
-      Logger.log(
-        `Notification register for ${data.code} send to ${data.phone}`,
-      );
-  }
-
-  async queueProcess(data: WhatsappQueue) {
-    const queueUrl = `${WHATSAPP_BUSINESS_QUEUE_URL}?id=${data.id}`;
-    const payload = {
-      messaging_product: 'whatsapp',
-      to: data.phone, // recipient's phone number
-      type: 'template',
-      template: {
-        name: 'queue_process',
-        language: {
-          code: 'id', // language code
-        },
-        components: [
-          {
-            type: 'header',
-            parameters: [
-              {
-                parameter_name: 'queue_code',
-                type: 'text',
-                text: data.item_name, // replace with queue_code variable
-              },
-            ],
-          },
-          {
-            type: 'body',
-            parameters: [
-              {
-                parameter_name: 'name',
-                type: 'text',
-                text: data.name, // replace with name variable
-              },
-              {
-                parameter_name: 'queue_code',
-                type: 'text',
-                text: data.code, // replace with queue_code variable
-              },
-              {
-                parameter_name: 'queue_time',
-                type: 'text',
-                text: toTime(data.time), // replace with queue_time variable
-              },
-            ],
-          },
-          {
-            type: 'button',
-            sub_type: 'url',
-            index: '0',
-            parameters: [
-              {
-                type: 'text',
-                text: queueUrl, // replace with dynamic URL
-              },
-            ],
-          },
-        ],
-      },
-    };
-
-    const response = await this.sendMessage(payload);
-    if (response)
-      Logger.log(`Notification process for ${data.code} send to ${data.phone}`);
-  }
-}