src/core/helpers/validation/validate-relation.helper.ts

@@ -52,12 +52,10 @@ export class ValidateRelationHelper<Entity> {
         `Failed! this data already connected to ${relation.relation}`;
 
       if (relation.singleQuery) {
-        const relationObject = data[relation.relation] ?? {};
-        const isRelationExist = `${relation.singleQuery[0]}` in relationObject;
         const relationColumn =
           data[relation.relation]?.[`${relation.singleQuery[0]}`];
         if (
-          isRelationExist &&
+          // !!relationColumn &&
           this.mappingValidator(
             relationColumn,
             relation.singleQuery[1],
@@ -71,7 +69,6 @@ export class ValidateRelationHelper<Entity> {
   }
 
   mappingValidator(column, operator, value) {
-    const candidates = Array.isArray(value) ? value : [value];
     switch (operator) {
       case '!=':
         return column != value;
@@ -79,12 +76,6 @@ export class ValidateRelationHelper<Entity> {
       case '==':
         return column == value;
 
-      case 'in':
-        return candidates.includes(column);
-
-      case 'not in':
-        return !candidates.includes(column);
-
       default:
         return column == value;
     }

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

@@ -21,19 +21,6 @@ export class MidtransService {
     return diffInHours > 24;
   }
 
-  isCreatedMoreThan24HoursAgo(unixTimestamp) {
-    const date = moment.unix(unixTimestamp);
-    const now = moment();
-    const diffInHours = now.diff(date, 'hours');
-    return diffInHours > 24;
-  }
-
-  isBookingDateExpired(bookingDate) {
-    const bookingDateMoment = moment(bookingDate);
-    const today = moment().startOf('day');
-    return bookingDateMoment.isBefore(today);
-  }
-
   get midtransInstance() {
     return new Snap({
       isProduction: false,
@@ -51,17 +38,15 @@ export class MidtransService {
     const responses = [];
 
     for (const transaction of pendingIds) {
-      const { id, booking_date, created_at } = transaction;
+      const { id, invoice_date } = transaction;
       let status;
       try {
         status = await this.getStatus(id);
       } catch (error) {
         status = {
           order_id: id,
-          transaction_status:
-            this.isCreatedMoreThan24HoursAgo(created_at) ||
-            this.isBookingDateExpired(booking_date)
-              ? 'expired'
+          transaction_status: this.isMoreThan24HoursAgo(invoice_date)
+            ? 'cancel'
             : 'pending',
         };
       }

src/modules/configuration/otp-verification/infrastructure/guards/otp-auth.guard.ts

@@ -54,12 +54,10 @@ export class OtpAuthGuard implements CanActivate {
           request.user = userLogin;
           return true;
         } else {
-          throw new UnprocessableEntityException(
-            'Invalid username or password.',
-          );
+          throw new UnprocessableEntityException('Invalid OTP credentials');
         }
       } catch (err) {
-        throw new UnprocessableEntityException('Invalid username or password.');
+        throw new UnprocessableEntityException('Invalid OTP encoding');
       }
     }
 

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

@@ -32,13 +32,7 @@ export class ActiveItemManager extends BaseUpdateStatusManager<ItemEntity> {
   }
 
   get validateRelations(): validateRelations[] {
-    const timeGroupId = this.data.time_group_id ?? this.data.time_group?.id;
-    const relation =
-      this.data.bundling_items?.length > 0
-        ? 'bundling_items'
-        : 'bundling_parents';
-
-    const validateRelations: validateRelations[] = [
+    return [
       {
         relation: 'tenant',
         singleQuery: ['status', '!=', STATUS.ACTIVE],
@@ -50,16 +44,6 @@ export class ActiveItemManager extends BaseUpdateStatusManager<ItemEntity> {
         message: `Gagal! Terdapat item yang belum aktif`,
       },
     ];
-
-    if (timeGroupId != null) {
-      validateRelations.push({
-        relation: relation,
-        singleQuery: ['time_group_id', 'not in', [timeGroupId, null]],
-        message: `Gagal Update! Time group item dan bundling item tidak sama`,
-      });
-    }
-
-    return validateRelations;
   }
 
   get entityTarget(): any {

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

@@ -39,7 +39,7 @@ export class CreateItemManager extends BaseCreateManager<ItemEntity> {
       ? [
           {
             relation: relation,
-            singleQuery: ['time_group_id', 'in', [timeGroupId, null]],
+            singleQuery: ['time_group_id', '!=', timeGroupId],
             message: `Gagal Update! Time group item dan bundling item tidak sama`,
           },
         ]
@@ -52,12 +52,13 @@ export class CreateItemManager extends BaseCreateManager<ItemEntity> {
       ? [
           {
             column: 'name',
-            query: `((${this.tableName}.time_group_id Is Null OR ${this.tableName}.time_group_id = '${timeGroupId}'))`,
+            query: `(status = '${STATUS.ACTIVE}' AND (${this.tableName}.time_group_id Is Null OR ${this.tableName}.time_group_id = '${timeGroupId}'))`,
           },
         ]
       : [
           {
             column: 'name',
+            query: `(status = '${STATUS.ACTIVE}')`,
           },
         ];
   }

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

@@ -50,7 +50,7 @@ export class UpdateItemManager extends BaseUpdateManager<ItemEntity> {
       ? [
           {
             relation: relation,
-            singleQuery: ['time_group_id', 'not in', [timeGroupId, null]],
+            singleQuery: ['time_group_id', '!=', timeGroupId],
             message: `Gagal Update! Time group item dan bundling item tidak sama`,
           },
         ]
@@ -59,16 +59,10 @@ export class UpdateItemManager extends BaseUpdateManager<ItemEntity> {
 
   get uniqueColumns(): columnUniques[] {
     const timeGroupId = this.data.time_group_id ?? this.data.time_group?.id;
-    return timeGroupId != null
-      ? [
-          {
-            column: 'name',
-            query: `((${this.tableName}.time_group_id Is Null OR ${this.tableName}.time_group_id = '${timeGroupId}'))`,
-          },
-        ]
-      : [
+    return [
       {
         column: 'name',
+        query: `(status = '${STATUS.ACTIVE}' AND (${this.tableName}.time_group_id Is Null OR ${this.tableName}.time_group_id = '${timeGroupId}'))`,
       },
     ];
   }

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

@@ -6,8 +6,6 @@ import {
   Param,
   RelationParam,
 } from 'src/core/modules/domain/entities/base-filter.entity';
-import * as moment from 'moment';
-import { ORDER_TYPE } from 'src/core/strings/constants/base.constants';
 
 // TODO:
 // Implementasikan filter by start_time, end_timen, dan max_usage_time
@@ -15,10 +13,6 @@ import { ORDER_TYPE } from 'src/core/strings/constants/base.constants';
 @Injectable()
 export class IndexPublicTimeGroupManager extends BaseIndexManager<TimeGroupEntity> {
   async prepareData(): Promise<void> {
-    Object.assign(this.filterParam, {
-      order_by: `${this.tableName}.start_time`,
-      order_type: ORDER_TYPE.ASC,
-    });
     return;
   }
 
@@ -66,15 +60,6 @@ export class IndexPublicTimeGroupManager extends BaseIndexManager<TimeGroupEntit
     queryBuilder: SelectQueryBuilder<TimeGroupEntity>,
   ): SelectQueryBuilder<TimeGroupEntity> {
     queryBuilder.andWhere(`items.id is not null`);
-
-    if (!this.filterParam.date) {
-      const currentTime = moment().utcOffset('+07:00').format('HH:mm:ss');
-
-      queryBuilder.andWhere(`${this.tableName}.end_time >= :current_time`, {
-        current_time: currentTime,
-      });
-    }
-
     return queryBuilder;
   }
 }

src/modules/item-related/time-group/infrastructure/dto/filter-time-group.dto.ts

@@ -30,12 +30,4 @@ export class FilterTimeGroupDto
   @ApiProperty({ type: 'string', required: false })
   @ValidateIf((body) => body.max_usage_time_to)
   max_usage_time_to: string;
-
-  @ApiProperty({
-    type: Date,
-    required: false,
-    example: '2024-01-01',
-  })
-  @ValidateIf((body) => body.date)
-  date: Date;
 }

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

@@ -51,31 +51,27 @@ export class TicketDataService extends BaseDataService<QueueTicket> {
       ],
     });
 
-    if (!order) {
-      // Check if id is a valid UUID format
-      const uuidRegex =
-        /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-      const whereCondition = !uuidRegex.test(id)
-        ? { invoice_code: id, booking_date: new Date() }
-        : { id, booking_date: new Date() };
-      const { customer_name, customer_phone } =
-        await this.transaction.findOneOrFail({
-          where: whereCondition,
-        });
+    // 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),
-        },
-      });
+    //   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;
+    // }
 
     return order;
   }

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

@@ -27,7 +27,6 @@ export class GenerateQueueManager {
   async generate(transaction: TransactionModel) {
     const date = transaction.booking_date ?? transaction.invoice_date;
     const queue_date = moment(date, 'YYYY-MM-DD').unix();
-    const isToday = moment(date, 'YYYY-MM-DD').isSame(moment(), 'day');
 
     const { id, customer_name, customer_phone, invoice_code } = transaction;
 
@@ -41,9 +40,10 @@ export class GenerateQueueManager {
 
     const items = this.generateItems(transaction.items);
 
-    const existTicket = isToday
-      ? await this.ticketService.ticketByUser(customer_name, customer_phone)
-      : null;
+    const existTicket = await this.ticketService.ticketByUser(
+      customer_name,
+      customer_phone,
+    );
 
     const insertTickets: QueueTicket[] = [];
     if (customer_name && customer_phone && existTicket) {

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

@@ -8,7 +8,7 @@ import {
 } from 'src/core/strings/constants/base.constants';
 import { Repository } from 'typeorm';
 import { BaseReadService } from 'src/core/modules/data/service/base-read.service';
-import { TransactionPaymentType, TransactionType } from '../../constants';
+import { TransactionPaymentType } from '../../constants';
 
 @Injectable()
 export class TransactionReadService extends BaseReadService<TransactionEntity> {
@@ -24,9 +24,8 @@ export class TransactionReadService extends BaseReadService<TransactionEntity> {
       where: {
         status: STATUS.PENDING,
         payment_type: TransactionPaymentType.MIDTRANS,
-        type: TransactionType.ONLINE,
       },
-      select: ['id', 'invoice_date', 'created_at', 'booking_date'],
+      select: ['id', 'invoice_date'],
     });
 
     return transactions;

src/services/whatsapp/whatsapp.service.ts

@@ -332,8 +332,6 @@ export class WhatsappService {
     const momentDate = moment(data.time);
     const fallbackValue = momentDate.locale('id').format('dddd, DD MMMM YYYY');
 
-    const currentDate = moment().locale('id').format('DD MMMM YYYY');
-
     const formattedTotal = new Intl.NumberFormat('id-ID', {
       style: 'currency',
       currency: 'IDR',
@@ -366,11 +364,6 @@ export class WhatsappService {
                 parameter_name: 'booking_date',
                 text: fallbackValue,
               },
-              {
-                type: 'text',
-                parameter_name: 'created_date',
-                text: currentDate,
-              },
               {
                 type: 'text',
                 parameter_name: 'booking_code',