Merge pull request 'fix/data' (#43) from fix/data into development

Reviewed-on: #43

src/core/modules/data/service/base-data.service.ts

@@ -62,6 +62,14 @@ export abstract class BaseDataService<Entity> {
     await this.repository.delete(id);
   }
 
+  async deleteByIds(
+    queryRunner: QueryRunner,
+    entityTarget: EntityTarget<Entity>,
+    ids: string[],
+  ): Promise<void> {
+    await this.repository.delete(ids);
+  }
+
   async deleteByOptions(
     queryRunner: QueryRunner,
     entityTarget: EntityTarget<Entity>,

src/core/modules/domain/entities/base-core.entity.ts

@@ -1,3 +1,3 @@
 export interface BaseCoreEntity {
-  id: string;
+  id?: string;
 }

src/core/modules/domain/usecase/managers/base-batch-update-status.manager.ts

@@ -49,14 +49,14 @@ export abstract class BaseBatchUpdateStatusManager<Entity> extends BaseManager {
           });
         }
         this.oldData = _.cloneDeep(entity);
+        await this.validateData(entity);
+
         Object.assign(entity, {
           status: this.dataStatus,
           editor_id: this.user.id,
           editor_name: this.user.name,
           updated_at: new Date().getTime(),
         });
-
-        await this.validateData(entity);
         await new ValidateRelationHelper(
           id,
           this.dataService,

src/core/strings/constants/privilege.constants.ts

@@ -147,6 +147,7 @@ export const PrivilegePOSConstant = [
       PrivilegeAction.CREATE,
       PrivilegeAction.DELETE,
       PrivilegeAction.EDIT,
+      PrivilegeAction.CANCEL,
     ],
     index: 14,
   },
@@ -174,4 +175,10 @@ export const PrivilegePOSConstant = [
     actions: [PrivilegeAction.CREATE],
     index: 18,
   },
+  {
+    menu: 'POS_DISCOUNT_CODE',
+    menu_label: 'Print Receipt',
+    actions: [PrivilegeAction.CREATE],
+    index: 18,
+  },
 ];

src/database/migrations/1722334034920-update-column-to-transaction-table.ts

@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateColumnToTransactionTable1722334034920
+  implements MigrationInterface
+{
+  name = 'UpdateColumnToTransactionTable1722334034920';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "transaction_items" ADD "qr_image_url" character varying`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "transactions" ADD "payment_code" character varying`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "transactions" DROP COLUMN "payment_code"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "transaction_items" DROP COLUMN "qr_image_url"`,
+    );
+  }
+}

src/modules/transaction/reconciliation/domain/usecases/managers/batch-confirm-reconciliation.manager.ts

@@ -19,10 +19,7 @@ export class BatchConfirmReconciliationManager extends BaseBatchUpdateStatusMana
       reconciliation_confirm_date: new Date().getTime(),
       status: STATUS.SETTLED,
       reconciliation_status: this.dataStatus,
-      payment_code_reference: await generateInvoiceCodeHelper(
+      payment_code: await generateInvoiceCodeHelper(this.dataService, 'PMY'),
-        this.dataService,
-        'PMY',
-      ),
     });
     return;
   }

src/modules/transaction/reconciliation/domain/usecases/managers/confirm-reconciliation.manager.ts

@@ -26,10 +26,7 @@ export class ConfirmReconciliationManager extends BaseUpdateStatusManager<Transa
       reconciliation_confirm_date: new Date().getTime(),
       status: STATUS.SETTLED,
       reconciliation_status: this.dataStatus,
-      payment_code_reference: await generateInvoiceCodeHelper(
+      payment_code: await generateInvoiceCodeHelper(this.dataService, 'PMY'),
-        this.dataService,
-        'PMY',
-      ),
     });
 
     return;

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

@@ -40,6 +40,7 @@ export class DetailReconciliationManager extends BaseDetailManager<TransactionEn
       `${this.tableName}.payment_type_method_name`,
       `${this.tableName}.payment_type_method_number`,
       `${this.tableName}.payment_code_reference`,
+      `${this.tableName}.payment_code`,
       `${this.tableName}.payment_date`,
 
       `${this.tableName}.payment_total`,

src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts

@@ -53,6 +53,7 @@ export class IndexReconciliationManager extends BaseIndexManager<TransactionEnti
       `${this.tableName}.payment_type_method_name`,
       `${this.tableName}.payment_type_method_number`,
       `${this.tableName}.payment_code_reference`,
+      `${this.tableName}.payment_code`,
       `${this.tableName}.payment_date`,
 
       `${this.tableName}.payment_total`,

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

@@ -17,10 +17,17 @@ import { STATUS } from 'src/core/strings/constants/base.constants';
 @Injectable()
 export class BatchCancelRefundManager extends BaseBatchUpdateStatusManager<RefundEntity> {
   validateData(data: RefundEntity): Promise<void> {
-    if (![STATUS.REFUNDED, STATUS.PENDING].includes(data.status)) {
+    if (
+      ![
+        STATUS.REFUNDED,
+        STATUS.PENDING,
+        STATUS.PROCESS_REFUND,
+        STATUS.PARTIAL_REFUND,
+      ].includes(data.status)
+    ) {
       throw new UnprocessableEntityException({
         statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
-        message: `Failed! only data with status ${STATUS.REFUNDED} and ${STATUS.PENDING} can be cancelled`,
+        message: `Gagal! hanya data dengan status ${STATUS.REFUNDED}, ${STATUS.PROCESS_REFUND} , ${STATUS.PARTIAL_REFUND} dan ${STATUS.PENDING} yang dapat dicancel`,
         error: 'Unprocessable Entity',
       });
     }

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

@@ -20,10 +20,17 @@ export class CancelRefundManager extends BaseUpdateStatusManager<RefundEntity> {
   }
 
   async validateProcess(): Promise<void> {
-    if (![STATUS.REFUNDED, STATUS.PENDING].includes(this.data.status)) {
+    if (
+      ![
+        STATUS.REFUNDED,
+        STATUS.PENDING,
+        STATUS.PROCESS_REFUND,
+        STATUS.PARTIAL_REFUND,
+      ].includes(this.oldData.status)
+    ) {
       throw new UnprocessableEntityException({
         statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
-        message: `Failed! only data with status ${STATUS.REFUNDED} and ${STATUS.PENDING} can be cancelled`,
+        message: `Gagal! hanya data dengan status ${STATUS.REFUNDED}, ${STATUS.PROCESS_REFUND} , ${STATUS.PARTIAL_REFUND} dan ${STATUS.PENDING} yang dapat dicancel`,
         error: 'Unprocessable Entity',
       });
     }

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

@@ -14,6 +14,9 @@ export class TransactionItemModel
   @Column('varchar', { name: 'item_id', nullable: true })
   item_id: string;
 
+  @Column('varchar', { name: 'qr_image_url', nullable: true })
+  qr_image_url: string;
+
   @Column('varchar', { name: 'item_name', nullable: true })
   item_name: string;
 

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

@@ -107,6 +107,9 @@ export class TransactionModel
   })
   payment_type: TransactionPaymentType;
 
+  @Column('varchar', { name: 'payment_code', nullable: true })
+  payment_code: string;
+
   @Column('varchar', { name: 'payment_type_method_id', nullable: true })
   payment_type_method_id: string;
 

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

@@ -10,6 +10,7 @@ export interface TransactionItemEntity extends BaseCoreEntity {
   item_category_id: string;
   item_category_name: string;
   item_bundlings: string;
+  qr_image_url: string;
 
   // item tenant data
   item_tenant_id: string;

src/modules/transaction/transaction/domain/entities/transaction.entity.ts

@@ -47,6 +47,7 @@ export interface TransactionEntity extends BaseStatusEntity {
   payment_type_method_qr: string;
   payment_card_information: string;
   payment_code_reference: string;
+  payment_code: string;
   payment_midtrans_token: string;
   payment_midtrans_url: string;
   payment_date: Date;

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

@@ -10,6 +10,7 @@ import {
 import { TransactionChangeStatusEvent } from '../../entities/event/transaction-change-status.event';
 import * as _ from 'lodash';
 import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
+import { generateInvoiceCodeHelper } from '../managers/helpers/generate-invoice-code.helper';
 
 @EventsHandler(MidtransCallbackEvent)
 export class MidtransCallbackHandler
@@ -36,6 +37,7 @@ export class MidtransCallbackHandler
       Object.assign(transaction, {
         status: STATUS.SETTLED,
         settlement_date: new Date(data.settlement_time),
+        payment_code: await generateInvoiceCodeHelper(this.dataService, 'PMY'),
         payment_code_reference: data.approval_code,
       });
     } else if (['pending'].includes(data['transaction_status'])) {

src/modules/transaction/transaction/domain/usecases/managers/batch-cancel-transaction.manager.ts

@@ -20,7 +20,7 @@ export class BatchCancelTransactionManager extends BaseBatchUpdateStatusManager<
     if (![STATUS.EXPIRED, STATUS.PENDING].includes(data.status)) {
       throw new UnprocessableEntityException({
         statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
-        message: `Failed! only data booking with status ${STATUS.ACTIVE} can be confirm`,
+        message: `Gagal! hanya tranksaksi dengan status ${STATUS.PENDING} dan ${STATUS.EXPIRED} yang dapat di${this.dataStatus}`,
         error: 'Unprocessable Entity',
       });
     }

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

@@ -56,10 +56,7 @@ export class ConfirmTransactionManager extends BaseUpdateStatusManager<Transacti
     }
 
     Object.assign(this.data, {
-      invoice_code:
+      invoice_code: await generateInvoiceCodeHelper(this.dataService, 'INV'),
-        this.data.payment_type == TransactionPaymentType.COUNTER
-          ? null
-          : await generateInvoiceCodeHelper(this.dataService, 'INV'),
       status: freeTransaction ? STATUS.ACTIVE : STATUS.PENDING,
       invoice_date: new Date(),
     });

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

@@ -69,6 +69,7 @@ export class DetailTransactionManager extends BaseDetailManager<TransactionEntit
       `${this.tableName}.payment_type_method_number`,
       `${this.tableName}.payment_card_information`,
       `${this.tableName}.payment_code_reference`,
+      `${this.tableName}.payment_code`,
 
       `${this.tableName}.payment_sub_total`,
       `${this.tableName}.payment_discount_total`,

src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper.ts

@@ -14,7 +14,7 @@ export async function generateInvoiceCodeHelper(dataService, code) {
 
   if (code == 'PYM') {
     query = {
-      payment_code_reference: ILike(`%${month_year}%`),
+      payment_code: ILike(`%${month_year}%`),
     };
   }
 

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

@@ -61,7 +61,6 @@ export function mappingTransaction(data) {
     season_period: season_period,
     items: items,
     payment_type_bank: payment_type_bank,
-    payment_code: data.payment_code_reference,
   });
 
   delete data.season_period_id;
@@ -82,17 +81,18 @@ export function mappingRevertTransaction(data, type) {
         editor_id: data.pos_admin?.id,
         editor_name: data.pos_admin?.name,
         edited_at: new Date(data.created_at),
+        payment_code: data.code,
       });
     } else {
       Object.assign(data, {
         creator_id: data.pos_admin?.id,
         creator_name: data.pos_admin?.name,
+        invoice_code: data.code,
       });
     }
 
     Object.assign(data, {
       id: data.booking_id ?? data._id,
-      invoice_code: data.code,
       creator_counter_no: Number(data.pos_number),
       status: STATUS.SETTLED,
       settlement_date: new Date(data.created_at),

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

@@ -67,6 +67,8 @@ export class IndexTransactionManager extends BaseIndexManager<TransactionEntity>
       `${this.tableName}.editor_id`,
       `${this.tableName}.editor_name`,
 
+      `${this.tableName}.payment_code`,
+      `${this.tableName}.payment_card_information`,
       `${this.tableName}.payment_type`,
       `${this.tableName}.payment_date`,
       `${this.tableName}.payment_total_pay`,

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

@@ -42,7 +42,6 @@ export class UpdateTransactionManager extends BaseUpdateManager<TransactionEntit
     return [
       {
         topic: TransactionUpdatedEvent,
-        data: this.data,
       },
     ];
   }

src/modules/transaction/transaction/domain/usecases/transaction-data.orchestrator.ts

@@ -15,6 +15,7 @@ import { BatchCancelTransactionManager } from './managers/batch-cancel-transacti
 import { ConfirmDataTransactionManager } from './managers/confirm-data-transaction.manager';
 import { BatchConfirmDataTransactionManager } from './managers/batch-confirm-data-transaction.manager';
 import { MidtransService } from 'src/modules/configuration/midtrans/data/services/midtrans.service';
+import { InvoiceTransactionManager } from './managers/download-invoice-transaction.manager';
 
 @Injectable()
 export class TransactionDataOrchestrator {
@@ -29,6 +30,7 @@ export class TransactionDataOrchestrator {
     private batchDeleteManager: BatchDeleteTransactionManager,
     private cancelManager: CancelTransactionManager,
     private batchCancelManager: BatchCancelTransactionManager,
+    private invoiceManager: InvoiceTransactionManager,
     private serviceData: TransactionDataService,
     private midtransService: MidtransService,
   ) {}
@@ -47,6 +49,15 @@ export class TransactionDataOrchestrator {
     return this.updateManager.getResult();
   }
 
+  async invoice(dataId): Promise<any> {
+    this.invoiceManager.setData({
+      id: dataId,
+    });
+    this.invoiceManager.setService(this.serviceData, TABLE_NAME.TRANSACTION);
+    await this.invoiceManager.execute();
+    return this.invoiceManager.getResult();
+  }
+
   async delete(dataId): Promise<string> {
     this.deleteManager.setData(dataId);
     this.deleteManager.setService(this.serviceData, TABLE_NAME.TRANSACTION);

src/modules/user-related/user-privilege/domain/entities/user-privilege-configuration.entity.ts

@@ -5,13 +5,13 @@ export interface UserPrivilegeConfigurationEntity extends BaseCoreEntity {
   module_label: string;
   menu: string;
   menu_label: string;
-  sub_menu: string;
+  sub_menu?: string;
-  sub_menu_label: string;
+  sub_menu_label?: string;
-  view: boolean;
+  view?: boolean;
-  create: boolean;
+  create?: boolean;
-  edit: boolean;
+  edit?: boolean;
-  delete: boolean;
+  delete?: boolean;
-  cancel: boolean;
+  cancel?: boolean;
-  confirm: boolean;
+  confirm?: boolean;
-  index: number;
+  index?: number;
 }

src/modules/user-related/user-privilege/domain/usecases/user-privilege-configuration/handlers/update-user-privilege-configuration.helper.ts

@@ -0,0 +1,66 @@
+import { EventsHandler, IEventHandler } from '@nestjs/cqrs';
+import { UserPrivilegeConfigUpdatedEvent } from '../../../entities/event/user-privilege-configuration-updated.event';
+import { UserPrivilegeConfigurationService } from 'src/modules/user-related/user-privilege/data/service/user-privilege-configuration.service';
+import { UserPrivilegeConfigurationHelper } from '../helpers/generate-user-privilege-configuration.helper';
+import { UserPrivilegeConfigurationModel } from 'src/modules/user-related/user-privilege/data/models/user-privilege-configuration.model';
+
+@EventsHandler(UserPrivilegeConfigUpdatedEvent)
+export class UserPrivilegeConfigUpdateHandler
+  implements IEventHandler<UserPrivilegeConfigUpdatedEvent>
+{
+  constructor(private dataService: UserPrivilegeConfigurationService) {}
+
+  async handle(event: UserPrivilegeConfigUpdatedEvent) {
+    const data = event.data.data;
+    console.log(data.user_privilege_id);
+    const configurations = await this.dataService.getManyByOptions({
+      where: {
+        user_privilege_id: data.user_privilege_id,
+      },
+    });
+    const configs = UserPrivilegeConfigurationHelper.createConfigurations();
+
+    const createdConfig = configs
+      .filter(
+        (base) =>
+          !configurations.some((data) => {
+            return base.menu_label == data.menu_label;
+          }),
+      )
+      .map((item) => {
+        return {
+          ...item,
+          user_privilege_id: data.user_privilege_id,
+        };
+      });
+
+    const deletedConfig = configurations
+      .filter(
+        (base) =>
+          !configs.some((data) => {
+            return base.menu_label == data.menu_label;
+          }),
+      )
+      ?.map((item) => item.id);
+
+    const queryRunner = this.dataService
+      .getRepository()
+      .manager.connection.createQueryRunner();
+
+    if (createdConfig.length) {
+      await this.dataService.createBatch(
+        queryRunner,
+        UserPrivilegeConfigurationModel,
+        createdConfig,
+      );
+    }
+
+    if (deletedConfig.length) {
+      await this.dataService.deleteByIds(
+        queryRunner,
+        UserPrivilegeConfigurationModel,
+        deletedConfig,
+      );
+    }
+  }
+}

src/modules/user-related/user-privilege/user-privilege.module.ts

@@ -28,6 +28,7 @@ import { UserPrivilegeConfigurationDataOrchestrator } from './domain/usecases/us
 import { IndexUserPrivilegeConfigurationManager } from './domain/usecases/user-privilege-configuration/managers/index-user-privilege-configuration.manager';
 import { UserPrivilegeModels } from './constants';
 import { MenuUserPrivilegeConfigurationManager } from './domain/usecases/user-privilege-configuration/managers/menu-user-privilege-configuration.manager';
+import { UserPrivilegeConfigUpdateHandler } from './domain/usecases/user-privilege-configuration/handlers/update-user-privilege-configuration.helper';
 
 @Module({
   imports: [
@@ -41,6 +42,8 @@ import { MenuUserPrivilegeConfigurationManager } from './domain/usecases/user-pr
     UserPrivilegeConfigurationController,
   ],
   providers: [
+    UserPrivilegeConfigUpdateHandler,
+
     IndexUserPrivilegeManager,
     DetailUserPrivilegeManager,
     CreateUserPrivilegeManager,