Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
UPDATE "transactions"
SET "status" = 'CANCELLED'
WHERE "status" = 'FAILED';

ALTER TYPE "TransactionStatus" RENAME TO "TransactionStatus_old";

CREATE TYPE "TransactionStatus" AS ENUM ('PENDING', 'COMPLETED', 'CANCELLED');

ALTER TABLE "transactions"
ALTER COLUMN "status" DROP DEFAULT,
ALTER COLUMN "status" TYPE "TransactionStatus"
USING ("status"::text::"TransactionStatus"),
ALTER COLUMN "status" SET DEFAULT 'PENDING';

DROP TYPE "TransactionStatus_old";
1 change: 0 additions & 1 deletion prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ enum TransactionStatus {
PENDING
COMPLETED
CANCELLED
FAILED
}

// Document types
Expand Down
9 changes: 9 additions & 0 deletions src/admin/admin.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
ModerationQueueQueryDto,
ReviewFraudAlertDto,
TransactionMonitoringQueryDto,
UpdateTransactionStatusDto,
} from './dto/admin.dto';
import { RestoreBackupDto, UpdateBackupScheduleDto } from '../backup/dto/backup.dto';

Expand Down Expand Up @@ -127,6 +128,14 @@ export class AdminController {
return this.adminService.transactionMonitoringSummary();
}

@Patch('transactions/:id/status')
updateTransactionStatus(
@Param('id') transactionId: string,
@Body() payload: UpdateTransactionStatusDto,
) {
return this.adminService.updateTransactionStatus(transactionId, payload);
}

@Get('fraud/alerts')
listFraudAlerts(@Query() query: FraudAlertsQueryDto) {
return this.adminService.listFraudAlerts(query);
Expand Down
3 changes: 2 additions & 1 deletion src/admin/admin.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import { AdminService } from './admin.service';
import { PrismaModule } from '../database/prisma.module';
import { FraudModule } from '../fraud/fraud.module';
import { BackupModule } from '../backup/backup.module';
import { TransactionsModule } from '../transactions/transactions.module';

@Module({
imports: [PrismaModule, FraudModule, BackupModule],
imports: [PrismaModule, FraudModule, BackupModule, TransactionsModule],
controllers: [AdminController],
providers: [AdminService],
exports: [AdminService],
Expand Down
40 changes: 19 additions & 21 deletions src/admin/admin.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,19 @@ import {
ModerationQueueQueryDto,
ReviewFraudAlertDto,
TransactionMonitoringQueryDto,
UpdateTransactionStatusDto,
} from './dto/admin.dto';
import { PropertyStatus } from '../types/prisma.types';
import { PropertyStatus, TransactionStatus, TransactionType } from '../types/prisma.types';
import { FraudService } from '../fraud/fraud.service';
import { TransactionsService } from '../transactions/transactions.service';

@Injectable()
export class AdminService {
constructor(
private readonly prisma: PrismaService,
private readonly fraudService: FraudService,
private readonly backupService: BackupService,
private readonly transactionsService: TransactionsService,
) {}

async listBackups() {
Expand Down Expand Up @@ -63,22 +66,16 @@ export class AdminService {
this.prisma.property.count({ where: { status: PropertyStatus.ACTIVE } }),
]);

const [
completedTransactions,
pendingTransactions,
failedTransactions,
salesAggregate,
rentAggregate,
] = await Promise.all([
this.prisma.transaction.count({ where: { status: 'COMPLETED' } }),
this.prisma.transaction.count({ where: { status: 'PENDING' } }),
this.prisma.transaction.count({ where: { status: 'FAILED' } }),
const [completedTransactions, pendingTransactions, salesAggregate, rentAggregate] =
await Promise.all([
this.prisma.transaction.count({ where: { status: TransactionStatus.COMPLETED } }),
this.prisma.transaction.count({ where: { status: TransactionStatus.PENDING } }),
this.prisma.transaction.aggregate({
where: { status: 'COMPLETED', type: 'SALE' },
where: { status: TransactionStatus.COMPLETED, type: TransactionType.SALE },
_sum: { amount: true },
}),
this.prisma.transaction.aggregate({
where: { status: 'COMPLETED', type: 'TRANSFER' },
where: { status: TransactionStatus.COMPLETED, type: TransactionType.TRANSFER },
_sum: { amount: true },
}),
]);
Expand All @@ -101,7 +98,6 @@ export class AdminService {
systemHealth: {
completedTransactions,
pendingTransactions,
failedTransactions,
},
};
}
Expand Down Expand Up @@ -310,13 +306,12 @@ export class AdminService {
}

async transactionMonitoringSummary() {
const [pending, completed, cancelled, failed, aggregateValue] = await Promise.all([
this.prisma.transaction.count({ where: { status: 'PENDING' } }),
this.prisma.transaction.count({ where: { status: 'COMPLETED' } }),
this.prisma.transaction.count({ where: { status: 'CANCELLED' } }),
this.prisma.transaction.count({ where: { status: 'FAILED' } }),
const [pending, completed, cancelled, aggregateValue] = await Promise.all([
this.prisma.transaction.count({ where: { status: TransactionStatus.PENDING } }),
this.prisma.transaction.count({ where: { status: TransactionStatus.COMPLETED } }),
this.prisma.transaction.count({ where: { status: TransactionStatus.CANCELLED } }),
this.prisma.transaction.aggregate({
where: { status: 'COMPLETED' },
where: { status: TransactionStatus.COMPLETED },
_sum: { amount: true },
}),
]);
Expand All @@ -325,11 +320,14 @@ export class AdminService {
pending,
completed,
cancelled,
failed,
totalCompletedValue: aggregateValue._sum.amount ?? 0,
};
}

async updateTransactionStatus(transactionId: string, payload: UpdateTransactionStatusDto) {
return this.transactionsService.updateTransactionStatus(transactionId, payload.status);
}

async listFraudAlerts(query: FraudAlertsQueryDto) {
return this.fraudService.listAlerts(query);
}
Expand Down
5 changes: 5 additions & 0 deletions src/admin/dto/admin.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@ export class TransactionMonitoringQueryDto {
limit: number = 20;
}

export class UpdateTransactionStatusDto {
@IsEnum(TransactionStatus)
status!: TransactionStatus;
}

export {
AddFraudInvestigationNoteDto,
BlockFraudUserDto,
Expand Down
20 changes: 20 additions & 0 deletions src/transactions/transaction-status.constants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { TransactionStatus } from '../types/prisma.types';

export const DEFAULT_TRANSACTION_STATUS = TransactionStatus.PENDING;

const ALLOWED_TRANSACTION_STATUS_TRANSITIONS: Record<TransactionStatus, readonly TransactionStatus[]> = {
[TransactionStatus.PENDING]: [TransactionStatus.COMPLETED, TransactionStatus.CANCELLED],
[TransactionStatus.COMPLETED]: [],
[TransactionStatus.CANCELLED]: [],
};

export function canTransitionTransactionStatus(
currentStatus: TransactionStatus,
nextStatus: TransactionStatus,
): boolean {
if (currentStatus === nextStatus) {
return true;
}

return ALLOWED_TRANSACTION_STATUS_TRANSITIONS[currentStatus].includes(nextStatus);
}
10 changes: 10 additions & 0 deletions src/transactions/transactions.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Module } from '@nestjs/common';
import { PrismaModule } from '../database/prisma.module';
import { TransactionsService } from './transactions.service';

@Module({
imports: [PrismaModule],
providers: [TransactionsService],
exports: [TransactionsService],
})
export class TransactionsModule {}
59 changes: 59 additions & 0 deletions src/transactions/transactions.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
import { Decimal } from '@prisma/client/runtime/library';
import { PrismaService } from '../database/prisma.service';
import { TransactionStatus, TransactionType } from '../types/prisma.types';
import {
canTransitionTransactionStatus,
DEFAULT_TRANSACTION_STATUS,
} from './transaction-status.constants';

export interface CreateTransactionInput {
propertyId: string;
buyerId: string;
sellerId: string;
amount: Decimal | number | string;
type: TransactionType;
status?: TransactionStatus;
blockchainHash?: string | null;
contractAddress?: string | null;
notes?: string | null;
}

@Injectable()
export class TransactionsService {
constructor(private readonly prisma: PrismaService) {}

async createTransaction(input: CreateTransactionInput) {
return this.prisma.transaction.create({
data: {
...input,
status: input.status ?? DEFAULT_TRANSACTION_STATUS,
},
});
}

async updateTransactionStatus(transactionId: string, status: TransactionStatus) {
const transaction = await this.prisma.transaction.findUnique({
where: { id: transactionId },
});

if (!transaction) {
throw new NotFoundException(`Transaction ${transactionId} not found`);
}

if (!canTransitionTransactionStatus(transaction.status as TransactionStatus, status)) {
throw new BadRequestException(
`Transaction status cannot transition from ${transaction.status} to ${status}`,
);
}

if (transaction.status === status) {
return transaction;
}

return this.prisma.transaction.update({
where: { id: transactionId },
data: { status },
});
}
}
1 change: 0 additions & 1 deletion src/types/prisma.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ export enum TransactionStatus {
PENDING = 'PENDING',
COMPLETED = 'COMPLETED',
CANCELLED = 'CANCELLED',
FAILED = 'FAILED',
}

export enum FraudSeverity {
Expand Down
23 changes: 23 additions & 0 deletions test/admin/transaction-status.dto.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { BadRequestException, ValidationPipe } from '@nestjs/common';
import { ArgumentMetadata } from '@nestjs/common/interfaces';
import { UpdateTransactionStatusDto } from '../../src/admin/dto/admin.dto';

describe('UpdateTransactionStatusDto', () => {
const pipe = new ValidationPipe({
whitelist: true,
forbidNonWhitelisted: true,
transform: true,
});

const metadata: ArgumentMetadata = {
type: 'body',
metatype: UpdateTransactionStatusDto,
data: '',
};

it('rejects invalid transaction status values', async () => {
await expect(pipe.transform({ status: 'FAILED' }, metadata)).rejects.toBeInstanceOf(
BadRequestException,
);
});
});
Loading
Loading