fix(SPG-591) Pemesanan - Konfirmasi dari status pending muncul warning
parent
cafbb82af6
commit
0db0f75cb9
|
@ -0,0 +1,19 @@
|
||||||
|
import { MigrationInterface, QueryRunner } from 'typeorm';
|
||||||
|
|
||||||
|
export class UpdateDefaultColumnTransaction1720077765890
|
||||||
|
implements MigrationInterface
|
||||||
|
{
|
||||||
|
name = 'UpdateDefaultColumnTransaction1720077765890';
|
||||||
|
|
||||||
|
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(
|
||||||
|
`ALTER TABLE "transactions" ALTER COLUMN "is_recap_transaction" SET DEFAULT false`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(
|
||||||
|
`ALTER TABLE "transactions" ALTER COLUMN "is_recap_transaction" SET DEFAULT true`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
|
@ -7,6 +7,7 @@ import { BatchResult } from 'src/core/response/domain/ok-response.interface';
|
||||||
import { Injectable } from '@nestjs/common';
|
import { Injectable } from '@nestjs/common';
|
||||||
import { TransactionEntity } from 'src/modules/transaction/transaction/domain/entities/transaction.entity';
|
import { TransactionEntity } from 'src/modules/transaction/transaction/domain/entities/transaction.entity';
|
||||||
import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model';
|
import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model';
|
||||||
|
import { STATUS } from 'src/core/strings/constants/base.constants';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class BatchConfirmReconciliationManager extends BaseBatchUpdateStatusManager<TransactionEntity> {
|
export class BatchConfirmReconciliationManager extends BaseBatchUpdateStatusManager<TransactionEntity> {
|
||||||
|
@ -19,7 +20,7 @@ export class BatchConfirmReconciliationManager extends BaseBatchUpdateStatusMana
|
||||||
reconciliation_mdr: this.data.reconciliation_mdr ?? null,
|
reconciliation_mdr: this.data.reconciliation_mdr ?? null,
|
||||||
reconciliation_confirm_by: this.user.name,
|
reconciliation_confirm_by: this.user.name,
|
||||||
reconciliation_confirm_date: new Date().getTime(),
|
reconciliation_confirm_date: new Date().getTime(),
|
||||||
status: this.oldData.status,
|
status: STATUS.SETTLED,
|
||||||
reconciliation_status: this.dataStatus,
|
reconciliation_status: this.dataStatus,
|
||||||
payment_total_net_profit: net_profit,
|
payment_total_net_profit: net_profit,
|
||||||
payment_date: this.data.payment_date,
|
payment_date: this.data.payment_date,
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import { Injectable } from '@nestjs/common';
|
import { Injectable } from '@nestjs/common';
|
||||||
import { BaseUpdateStatusManager } from 'src/core/modules/domain/usecase/managers/base-update-status.manager';
|
import { BaseUpdateStatusManager } from 'src/core/modules/domain/usecase/managers/base-update-status.manager';
|
||||||
|
import { STATUS } from 'src/core/strings/constants/base.constants';
|
||||||
import {
|
import {
|
||||||
EventTopics,
|
EventTopics,
|
||||||
validateRelations,
|
validateRelations,
|
||||||
|
@ -21,7 +22,7 @@ export class ConfirmReconciliationManager extends BaseUpdateStatusManager<Transa
|
||||||
Object.assign(this.data, {
|
Object.assign(this.data, {
|
||||||
reconciliation_confirm_by: this.user.name,
|
reconciliation_confirm_by: this.user.name,
|
||||||
reconciliation_confirm_date: new Date().getTime(),
|
reconciliation_confirm_date: new Date().getTime(),
|
||||||
status: this.oldData.status,
|
status: STATUS.SETTLED,
|
||||||
reconciliation_status: this.dataStatus,
|
reconciliation_status: this.dataStatus,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ import { STATUS } from 'src/core/strings/constants/base.constants';
|
||||||
export class BatchConfirmDataTransactionManager extends BaseBatchUpdateStatusManager<TransactionEntity> {
|
export class BatchConfirmDataTransactionManager extends BaseBatchUpdateStatusManager<TransactionEntity> {
|
||||||
validateData(data: TransactionEntity): Promise<void> {
|
validateData(data: TransactionEntity): Promise<void> {
|
||||||
if (
|
if (
|
||||||
[STATUS.PENDING, STATUS.REJECTED, STATUS.EXPIRED].includes(data.status)
|
![STATUS.PENDING, STATUS.REJECTED, STATUS.EXPIRED].includes(data.status)
|
||||||
) {
|
) {
|
||||||
throw new UnprocessableEntityException({
|
throw new UnprocessableEntityException({
|
||||||
statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
|
statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
|
||||||
|
@ -27,31 +27,9 @@ export class BatchConfirmDataTransactionManager extends BaseBatchUpdateStatusMan
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (data.status) {
|
|
||||||
// jika confirm status pending
|
|
||||||
// maka akan kebuat reconsiliasi
|
|
||||||
case STATUS.PENDING:
|
|
||||||
data.reconciliation_status = STATUS.PENDING;
|
|
||||||
break;
|
|
||||||
|
|
||||||
// jika confirm status rejected
|
|
||||||
case STATUS.REJECTED:
|
|
||||||
data.reconciliation_status = STATUS.PENDING;
|
|
||||||
break;
|
|
||||||
|
|
||||||
// jika confirm status expired
|
|
||||||
case STATUS.EXPIRED:
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
data.reconciliation_status = STATUS.PENDING;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
const freeTransaction = data.payment_total < 1;
|
|
||||||
|
|
||||||
Object.assign(data, {
|
Object.assign(data, {
|
||||||
status: freeTransaction ? STATUS.ACTIVE : STATUS.PENDING,
|
status: STATUS.WAITING,
|
||||||
|
reconciliation_status: STATUS.PENDING,
|
||||||
});
|
});
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -24,6 +24,11 @@ export class BatchConfirmTransactionManager extends BaseBatchUpdateStatusManager
|
||||||
error: 'Unprocessable Entity',
|
error: 'Unprocessable Entity',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const freeTransaction = data.payment_total < 1;
|
||||||
|
Object.assign(data, {
|
||||||
|
status: freeTransaction ? STATUS.ACTIVE : STATUS.PENDING,
|
||||||
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ export class ConfirmDataTransactionManager extends BaseUpdateStatusManager<Trans
|
||||||
const old_status = this.oldData.status;
|
const old_status = this.oldData.status;
|
||||||
|
|
||||||
if (
|
if (
|
||||||
[STATUS.PENDING, STATUS.REJECTED, STATUS.EXPIRED].includes(old_status)
|
![STATUS.PENDING, STATUS.REJECTED, STATUS.EXPIRED].includes(old_status)
|
||||||
) {
|
) {
|
||||||
throw new UnprocessableEntityException({
|
throw new UnprocessableEntityException({
|
||||||
statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
|
statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
|
||||||
|
@ -36,29 +36,9 @@ export class ConfirmDataTransactionManager extends BaseUpdateStatusManager<Trans
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (old_status) {
|
|
||||||
// jika confirm status pending
|
|
||||||
// maka akan kebuat reconsiliasi
|
|
||||||
case STATUS.PENDING:
|
|
||||||
this.data.reconciliation_status = STATUS.PENDING;
|
|
||||||
break;
|
|
||||||
|
|
||||||
// jika confirm status rejected
|
|
||||||
case STATUS.REJECTED:
|
|
||||||
this.data.reconciliation_status = STATUS.PENDING;
|
|
||||||
break;
|
|
||||||
|
|
||||||
// jika confirm status expired
|
|
||||||
case STATUS.EXPIRED:
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
this.data.reconciliation_status = STATUS.PENDING;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
const freeTransaction = this.data.payment_total < 1;
|
|
||||||
Object.assign(this.data, {
|
Object.assign(this.data, {
|
||||||
status: freeTransaction ? STATUS.ACTIVE : STATUS.PENDING,
|
status: STATUS.WAITING,
|
||||||
|
reconciliation_status: STATUS.PENDING,
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue