eigen
/
pos-be
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 295 Wiki Activity

fix(SPG-661) Filter rekonsiliasi exclude status draft

pull/40/head
Aswin Ashar Abdullah 2024-07-26 16:28:25 +07:00
parent 66c481c9b0
commit 1f4bf80908
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/transaction/reconciliation/domain/usecases/managers/batch-cancel-reconciliation.manager.ts
View File

@ -23,7 +23,7 @@ export class BatchCancelReconciliationManager extends BaseBatchUpdateStatusManag
}, },
}); });
if (transaction.status != STATUS.SETTLED) { if ([STATUS.SETTLED, STATUS.WAITING].includes(transaction.status)) {
throw new UnprocessableEntityException({ throw new UnprocessableEntityException({
statusCode: HttpStatus.UNPROCESSABLE_ENTITY, statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
message: `Failed! cant cancel transaction not settled`, message: `Failed! cant cancel transaction not settled`,

2
src/modules/transaction/reconciliation/domain/usecases/managers/cancel-reconciliation.manager.ts
View File

@ -27,7 +27,7 @@ export class CancelReconciliationManager extends BaseUpdateStatusManager<Transac
}, },
}); });
if (transaction.status != STATUS.SETTLED) { if ([STATUS.SETTLED, STATUS.WAITING].includes(transaction.status)) {
throw new UnprocessableEntityException({ throw new UnprocessableEntityException({
statusCode: HttpStatus.UNPROCESSABLE_ENTITY, statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
message: `Failed! cant cancel transaction not settled`, message: `Failed! cant cancel transaction not settled`,

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

@ -7,6 +7,7 @@ import {
} from 'src/core/modules/domain/entities/base-filter.entity'; } from 'src/core/modules/domain/entities/base-filter.entity';
import { TransactionEntity } from 'src/modules/transaction/transaction/domain/entities/transaction.entity'; import { TransactionEntity } from 'src/modules/transaction/transaction/domain/entities/transaction.entity';
import { BetweenQueryHelper } from 'src/core/helpers/query/between-query.helper'; import { BetweenQueryHelper } from 'src/core/helpers/query/between-query.helper';
import { STATUS } from 'src/core/strings/constants/base.constants';
@Injectable() @Injectable()
export class IndexReconciliationManager extends BaseIndexManager<TransactionEntity> { export class IndexReconciliationManager extends BaseIndexManager<TransactionEntity> {
@ -145,7 +146,10 @@ export class IndexReconciliationManager extends BaseIndexManager<TransactionEnti
} }
queryBuilder.andWhere( queryBuilder.andWhere(
`${this.tableName}.reconciliation_status Is Not Null`, `${this.tableName}.reconciliation_status Not In (:...statuses)`,
{
statuses: [STATUS.DRAFT],
},
); );
return queryBuilder; return queryBuilder;
} }