Skip to content

Add DB indexes, cursor pagination, tests, and FTS migration (#880, #879, #882, #881) #983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Maryermarh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add DB indexes, cursor pagination, tests, and FTS migration (#880, #879, #882, #881) #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions prisma/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,7 @@ model PropertyView {
user User? @relation(fields: [userId], references: [id], onDelete: SetNull)

@@index([propertyId, viewedAt])
@@index([propertyId, userId, viewedAt])
@@index([userId])
@@index([ipAddress])
@@map("property_views")
Expand Down Expand Up @@ -661,6 +662,7 @@ model Transaction {
@@index([propertyId])
@@index([buyerId])
@@index([sellerId])
@@index([buyerId, sellerId])
@@index([status])
@@index([blockchainHash])
@@map("transactions")
Expand Down Expand Up @@ -1055,6 +1057,7 @@ model Dispute {
@@index([transactionId])
@@index([initiatorId])
@@index([status])
@@index([status, transactionId])
@@map("disputes")
}

Expand Down
102 changes: 85 additions & 17 deletions src/admin/admin.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// @ts-nocheck

import { Injectable, NotFoundException } from '@nestjs/common';
import { Injectable, Logger, NotFoundException } from '@nestjs/common';
import { PrismaService } from '../database/prisma.service';
import { BackupService } from '../backup/backup.service';
import { UpdateBackupScheduleDto } from '../backup/dto/backup.dto';
Expand All @@ -22,6 +20,8 @@ import { FraudService } from '../fraud/fraud.service';
import { SessionsService } from '../sessions/sessions.service';
import { TransactionsService } from '../transactions/transactions.service';

const logger = new Logger('AdminService');

@Injectable()
export class AdminService {
constructor(
Expand Down Expand Up @@ -109,9 +109,11 @@ export class AdminService {
async listUsers(query: AdminUsersQueryDto) {
const page = query.page ?? 1;
const limit = query.limit ?? 20;
const skip = (page - 1) * limit;
const skip = (query as any).cursor
? undefined
: (page - 1) * limit;

const where = {
const where: any = {
role: query.role,
OR: query.search
? [
Expand All @@ -122,10 +124,14 @@ export class AdminService {
: undefined,
};

if ((query as any).cursor) {
where.createdAt = { lt: new Date(Buffer.from((query as any).cursor, 'base64').toString()) };
}

const [items, total] = await Promise.all([
this.prisma.user.findMany({
where,
skip,
...(skip !== undefined ? { skip } : {}),
take: limit,
orderBy: { createdAt: 'desc' },
select: {
Expand All @@ -142,13 +148,17 @@ export class AdminService {
this.prisma.user.count({ where }),
]);

return { total, page, limit, items };
const nextCursor = items.length === limit
? Buffer.from((items[items.length - 1] as any).createdAt.toISOString()).toString('base64')
: null;

return { total, page, limit, items, nextCursor, previousCursor: (query as any).cursor || null };
}

async updateUser(userId: string, payload: AdminUpdateUserDto) {
async updateUser(userId: string, payload: AdminUpdateUserDto, actorId?: string) {
const existingUser = await this.prisma.user.findUnique({
where: { id: userId },
select: { role: true },
select: { role: true, email: true },
});

if (!existingUser) {
Expand All @@ -171,10 +181,48 @@ export class AdminService {
},
});

// Audit log for role changes (#886)
if (payload.role && payload.role !== existingUser.role) {
await this.prisma.activityLog
.create({
data: {
userId: actorId ?? 'system',
action: 'ROLE_CHANGE',
entityType: 'USER',
entityId: userId,
description: `Role changed from ${existingUser.role} to ${payload.role} for user ${existingUser.email}`,
metadata: {
previousRole: existingUser.role,
newRole: payload.role,
targetUserId: userId,
},
},
})
.catch((err: unknown) => {
logger.error(`Failed to audit-log role change for ${userId}: ${err}`);
});

await this.sessionsService.revokeAllSessions(userId);
}

// Audit log for block state changes
if (payload.isBlocked !== undefined) {
await this.prisma.activityLog
.create({
data: {
userId: actorId ?? 'system',
action: payload.isBlocked ? 'USER_BLOCKED' : 'USER_UNBLOCKED',
entityType: 'USER',
entityId: userId,
description: `User ${existingUser.email} ${payload.isBlocked ? 'blocked' : 'unblocked'}`,
metadata: { targetUserId: userId, isBlocked: payload.isBlocked },
},
})
.catch((err: unknown) => {
logger.error(`Failed to audit-log block state for ${userId}: ${err}`);
});
}

return updatedUser;
}

Expand All @@ -193,16 +241,22 @@ export class AdminService {
async getModerationQueue(query: ModerationQueueQueryDto) {
const page = query.page ?? 1;
const limit = query.limit ?? 20;
const skip = (page - 1) * limit;
const skip = (query as any).cursor
? undefined
: (page - 1) * limit;

const where = {
const where: any = {
status: query.status ?? PropertyStatus.PENDING,
};

if ((query as any).cursor) {
where.createdAt = { lt: new Date(Buffer.from((query as any).cursor, 'base64').toString()) };
}

const [items, total] = await Promise.all([
this.prisma.property.findMany({
where,
skip,
...(skip !== undefined ? { skip } : {}),
take: limit,
orderBy: { createdAt: 'asc' },
include: {
Expand All @@ -219,7 +273,11 @@ export class AdminService {
this.prisma.property.count({ where }),
]);

return { total, page, limit, items };
const nextCursor = items.length === limit
? Buffer.from((items[items.length - 1] as any).createdAt.toISOString()).toString('base64')
: null;

return { total, page, limit, items, nextCursor, previousCursor: (query as any).cursor || null };
}

async approveProperty(propertyId: string) {
Expand Down Expand Up @@ -292,18 +350,24 @@ export class AdminService {
async monitorTransactions(query: TransactionMonitoringQueryDto) {
const page = query.page ?? 1;
const limit = query.limit ?? 20;
const skip = (page - 1) * limit;
const skip = (query as any).cursor
? undefined
: (page - 1) * limit;

const where = {
const where: any = {
status: query.status,
type: query.type,
propertyId: query.propertyId,
};

if ((query as any).cursor) {
where.createdAt = { lt: new Date(Buffer.from((query as any).cursor, 'base64').toString()) };
}

const [items, total] = await Promise.all([
this.prisma.transaction.findMany({
where,
skip,
...(skip !== undefined ? { skip } : {}),
take: limit,
orderBy: { createdAt: 'desc' },
include: {
Expand All @@ -321,7 +385,11 @@ export class AdminService {
this.prisma.transaction.count({ where }),
]);

return { total, page, limit, items };
const nextCursor = items.length === limit
? Buffer.from((items[items.length - 1] as any).createdAt.toISOString()).toString('base64')
: null;

return { total, page, limit, items, nextCursor, previousCursor: (query as any).cursor || null };
}

async transactionMonitoringSummary() {
Expand Down
23 changes: 17 additions & 6 deletions src/search/search.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// @ts-nocheck

import { Injectable } from '@nestjs/common';
import { PrismaService } from '../database/prisma.service';
import { SearchGeographicService } from './search-geographic.service';
Expand All @@ -22,8 +20,9 @@ export interface SearchQuery {
order: 'asc' | 'desc';
};
pagination?: {
page: number;
limit: number;
page?: number;
limit?: number;
cursor?: string;
};
}

Expand Down Expand Up @@ -83,13 +82,23 @@ export class SearchService {
}

// Execute query with sorting and pagination
const { page = 1, limit = 20 } = searchQuery.pagination || {};
const { page = 1, limit = 20, cursor } = searchQuery.pagination || {};
const cursorWhere = cursor ? { createdAt: { lt: new Date(Buffer.from(cursor, 'base64').toString()) } } : {};
const { field = 'createdAt', order = 'desc' } = searchQuery.sort || {};

// Apply cursor filter
if (cursor) {
Object.assign(whereClause, cursorWhere);
}

// Mock data for now - this would typically query the database
const items: any[] = [];
const total = 0;

const nextCursor = items.length === limit && items.length > 0
? Buffer.from((items[items.length - 1] as any).createdAt.toISOString()).toString('base64')
: null;

// Generate facets
const facets = await this.facetsService.buildFacets(items, [
'propertyType',
Expand All @@ -108,11 +117,13 @@ export class SearchService {
this.historyService.record(userId, searchQuery.query);
}

const result: SearchResult<any> = {
const result: any = {
items,
total,
facets,
suggestions,
nextCursor,
previousCursor: cursor || null,
analytics: {
queryId,
took: Date.now() - startTime,
Expand Down
Loading
Loading