Merged
Conversation
Contributor
|
please resolve the conflicts |
Contributor
Author
|
conflicts resolved, @greatest0fallt1me |
Contributor
Resolve merge conflicts across 6 files and fix all lint, typecheck, and test errors to ensure the CI pipeline passes. Key changes: - Merge dual ApiRepository interfaces into single unified interface - Convert Jest/vitest tests to node:test format - Fix @stellar/stellar-sdk Server import (now Horizon.Server) - Make prisma client lazy to avoid crashing tests without DATABASE_URL - Fix TypeScript errors in deposit controller, app tests, and drizzle repos - Remove .idea/ and coverage/ from tracking Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- Remove case-conflicting ApiRepository.ts (uppercase) that causes TS1261 on case-sensitive Linux filesystems - Remove obsolete vitest test file for the removed pool-based repository - Add prisma generate step to CI workflow so the generated client exists before typecheck Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Replace shell glob "src/**/*.test.ts" with $(find src -name '*.test.ts') since dash (default sh on Ubuntu CI) does not support ** globstar. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
Author
|
@greatest0fallt1me, conflicts resolved |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a reusable pagination helper (src/lib/pagination.ts) that parses and clamps limit (default 20, max 100) and offset (default 0) query parameters, and wraps list responses in a consistent { data, meta: { total, limit, offset } } envelope. Refactors GET /api/admin/users from page-based to offset-based pagination using the new helper, and updates the /api/apis and /api/usage placeholder endpoints to return the same response shape. Includes unit tests for the pagination utility and integration tests verifying the new response contract across all list endpoints. Also fixes the Jest configuration for ESM compatibility (renamed jest.config.js → .cjs, added moduleNameMapper for .js extension resolution).
Closes: #56