fix: close documented platform polish gaps

This commit is contained in:
hectorzhao
2026-07-11 18:20:38 +08:00
parent 6236547871
commit 2ecbb920a6
25 changed files with 193 additions and 110 deletions
@@ -18,10 +18,10 @@ export class DictionariesController {
@Get('phone-segments')
listPhoneSegments(
@Query('keyword') keyword?: string,
@Query('cursor') cursor?: string,
@Query('page') page?: string,
@Query('pageSize') pageSize?: string,
) {
return this.dictionaries.listPhoneSegments({ keyword, cursor, pageSize: Number(pageSize) || undefined });
return this.dictionaries.listPhoneSegments({ keyword, page: Number(page) || undefined, pageSize: Number(pageSize) || undefined });
}
@Post('phone-segments')
@@ -4,6 +4,7 @@ function createPrismaMock() {
return {
phoneSegment: {
findMany: jest.fn(),
count: jest.fn().mockResolvedValue(3),
},
phoneCarrierRule: {
findMany: jest.fn().mockResolvedValue([]),
@@ -34,7 +35,7 @@ function createPrismaMock() {
}
describe('DictionariesService', () => {
it('paginates phone segments without counting the full table', async () => {
it('paginates phone segments with a real database count', async () => {
const prisma = createPrismaMock();
prisma.phoneSegment.findMany.mockResolvedValue([
{ id: 'segment-1', prefix: '1300001', carrier: '中国联通', province: '江苏', city: '常州' },
@@ -43,25 +44,24 @@ describe('DictionariesService', () => {
]);
const service = new DictionariesService(prisma as never);
await expect(service.listPhoneSegments({ keyword: '中国联通', cursor: '1300000', pageSize: 2 })).resolves.toEqual({
await expect(service.listPhoneSegments({ keyword: '中国联通', page: 2, pageSize: 2 })).resolves.toEqual({
items: expect.arrayContaining([
expect.objectContaining({ prefix: '1300001' }),
expect.objectContaining({ prefix: '1300002' }),
]),
pageSize: 2,
hasMore: true,
nextCursor: '1300002',
page: 2,
total: 3,
});
expect(prisma.phoneSegment.findMany).toHaveBeenCalledWith({
where: {
AND: [
{ prefix: { gt: '1300000' } },
{ OR: expect.any(Array) },
],
OR: expect.any(Array),
},
orderBy: { prefix: 'asc' },
take: 3,
skip: 2,
take: 2,
});
expect(prisma.phoneSegment.count).toHaveBeenCalledWith({ where: { OR: expect.any(Array) } });
});
it('searches security control dictionaries with keyword and status filters', async () => {
+16 -27
View File
@@ -11,7 +11,7 @@ export interface CreatePhoneSegmentDto {
export interface PhoneSegmentListQuery {
keyword?: string;
cursor?: string;
page?: number;
pageSize?: number;
}
@@ -71,33 +71,22 @@ export class DictionariesService {
constructor(private readonly prisma: PrismaService) {}
async listPhoneSegments(query: PhoneSegmentListQuery = {}) {
const pageSize = Math.min(100, Math.max(1, Number(query.pageSize ?? 20)));
const page = Math.max(1, Number(query.page ?? 1));
const pageSize = Math.min(100, Math.max(1, Number(query.pageSize ?? 25)));
const keyword = query.keyword?.trim();
const items = await this.prisma.phoneSegment.findMany({
where: {
AND: [
query.cursor ? { prefix: { gt: query.cursor } } : {},
keyword ? {
OR: [
{ prefix: { startsWith: keyword } },
{ carrier: { contains: keyword } },
{ province: { contains: keyword } },
{ city: { contains: keyword } },
],
} : {},
],
},
orderBy: { prefix: 'asc' },
take: pageSize + 1,
});
const hasMore = items.length > pageSize;
const pageItems = hasMore ? items.slice(0, pageSize) : items;
return {
items: pageItems,
pageSize,
hasMore,
nextCursor: hasMore ? pageItems.at(-1)?.prefix ?? null : null,
};
const where = keyword ? {
OR: [
{ prefix: { startsWith: keyword } },
{ carrier: { contains: keyword } },
{ province: { contains: keyword } },
{ city: { contains: keyword } },
],
} : undefined;
const [items, total] = await Promise.all([
this.prisma.phoneSegment.findMany({ where, orderBy: { prefix: 'asc' }, skip: (page - 1) * pageSize, take: pageSize }),
this.prisma.phoneSegment.count({ where }),
]);
return { items, total, page, pageSize };
}
createPhoneSegment(data: CreatePhoneSegmentDto) {