Skip to content
Closed
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
10 changes: 2 additions & 8 deletions src/escrow/escrow.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -584,20 +584,14 @@ export class EscrowService {
recipients: Array<[string, number]>,
manager?: EntityManager,
): Promise<ContractInvocationResult> {
return this.invokeOnLockedEscrow(escrow, operation, () =>
this.soroban.invoke(
'release',
// `release(issue_id: u64, recipients)` — u64-typed on-chain (#301).
[u64(this.onChainKeyFor(escrow)), recipients],
this.contractOpts(escrow),
),
return this.invokeOnLockedEscrow(
escrow,
operation,
() =>
this.soroban.invoke(
'release',
[this.onChainKeyFor(escrow), recipients],
// `release(issue_id: u64, recipients)` — u64-typed on-chain (#301).
[u64(this.onChainKeyFor(escrow)), recipients],
this.contractOpts(escrow),
),
manager,
Expand Down
3 changes: 3 additions & 0 deletions src/github/github-webhooks.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,9 @@ describe('GithubWebhooksService', () => {

expect(bountiesService.markInReview).not.toHaveBeenCalled();
expect(bountiesService.markMergedAndRelease).not.toHaveBeenCalled();
});
});

// #308: a redelivered X-GitHub-Delivery used to hit the unique constraint
// on webhook_events.deliveryId and escape handleEvent as a 500, so every
// redelivery of that event failed forever.
Expand Down
7 changes: 4 additions & 3 deletions src/reputation/reputation.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe('ReputationService', () => {
save: jest.fn((entity) => Promise.resolve({ id: 'snap-1', ...entity })),
findOne: jest.fn(),
find: jest.fn(),
findAndCount: jest.fn(),
};

beforeEach(async () => {
Expand Down Expand Up @@ -94,14 +95,14 @@ describe('ReputationService', () => {
});

it('paginates history with a default/max limit', async () => {
mockSnapshotRepo.find.mockResolvedValue([]);
mockSnapshotRepo.findAndCount.mockResolvedValue([[], 0]);
await service.history('user-1');
expect(mockSnapshotRepo.find).toHaveBeenCalledWith(
expect(mockSnapshotRepo.findAndCount).toHaveBeenCalledWith(
expect.objectContaining({ take: 50, skip: 0 }),
);

await service.history('user-1', { limit: 1000, offset: 10 });
expect(mockSnapshotRepo.find).toHaveBeenCalledWith(
expect(mockSnapshotRepo.findAndCount).toHaveBeenCalledWith(
expect.objectContaining({ take: 100, skip: 10 }),
);
});
Expand Down
10 changes: 7 additions & 3 deletions src/reputation/reputation.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,21 @@ export class ReputationService {
async history(
userId: string,
options: ReputationHistoryOptions = {},
): Promise<ReputationSnapshot[]> {
): Promise<{ items: ReputationSnapshot[]; total: number }> {
const limit = Math.min(
Math.max(options.limit ?? REPUTATION_HISTORY_DEFAULT_LIMIT, 1),
REPUTATION_HISTORY_MAX_LIMIT,
);
const offset = Math.max(options.offset ?? 0, 0);
return this.snapshotRepo.find({
// DESC — newest first. ASC returned the OLDEST `limit` snapshots, so the
// newest only appeared on the last page and a client needed the total to
// reach them (#585). findAndCount also returns the real total.
const [items, total] = await this.snapshotRepo.findAndCount({
where: { userId },
order: { computedAt: 'ASC' },
order: { computedAt: 'DESC' },
take: limit,
skip: offset,
});
return { items, total };
}
}
21 changes: 0 additions & 21 deletions src/sponsors/sponsors.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,6 @@ function validatePage(limit?: number, offset?: number) {
throw new BadRequestException('offset must be >= 0');
}
return { limit, offset };
/**
* Parse optional limit/offset query params, rejecting NaN, negatives,
* non-integers, and limits above MAX_PAGE_LIMIT with a 400 (#280).
*/
function parsePagination(limit?: string, offset?: string) {
const parse = (name: string, raw: string | undefined, min: number, max: number) => {
if (raw === undefined || raw === '') return undefined;
const n = Number(raw);
if (!Number.isInteger(n) || n < min || n > max) {
throw new BadRequestException(
`${name} must be an integer between ${min} and ${max}`,
);
}
return n;
};
return {
limit: parse('limit', limit, 1, MAX_PAGE_LIMIT),
offset: parse('offset', offset, 0, Number.MAX_SAFE_INTEGER),
};
}

@ApiTags('sponsors')
Expand Down Expand Up @@ -73,7 +54,6 @@ export class SponsorsController {
) {
this.assertOwnsSponsor(user, id);
return this.sponsorsService.dashboard(id, validatePage(limit, offset));
return this.sponsorsService.dashboard(id, parsePagination(limit, offset));
}

@ApiBearerAuth()
Expand All @@ -91,6 +71,5 @@ export class SponsorsController {
id,
validatePage(limit, offset),
);
return this.sponsorsService.milestoneProgress(id, parsePagination(limit, offset));
}
}