Skip to content

Improve spend pagination and add more comprehensive pagination test #194

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

Merged
gclaramunt merged 1 commit into from
Jul 30, 2025
Merged

Improve spend pagination and add more comprehensive pagination test #194

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
4 changes: 2 additions & 2 deletions prisma/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ model dag_spend_transactions {
destination_addr String? @db.VarChar
allow_spend_ref String? @unique @db.VarChar
snapshot_hash String @db.VarChar
currency_id String? @db.VarChar
currency_id String? @db.VarChar
dag_allow_spend dag_allow_spends? @relation(fields: [allow_spend_ref], references: [hash], onDelete: Cascade, onUpdate: NoAction, map: "dag_spend_transactions_dag_allow_spends_fk")
addresses addresses? @relation(fields: [destination_addr], references: [address], onDelete: Cascade, onUpdate: NoAction, map: "dag_spend_transactions_destination_addr_fk")

Expand Down Expand Up @@ -234,7 +234,7 @@ model dag_token_unlocks {
updated_at DateTime @default(now()) @db.Timestamp(6)
lock_reference_hash String @db.VarChar
snapshot_hash String @db.VarChar
currency_id String? @db.VarChar
currency_id String? @db.VarChar
global_snapshot global_snapshots @relation(fields: [snapshot_hash], references: [hash], onDelete: Cascade, onUpdate: NoAction, map: "dag_token_unlock_global_snapshot_fk")
dag_token_lock dag_token_locks @relation(fields: [lock_reference_hash], references: [hash], onDelete: Cascade, onUpdate: NoAction, map: "dag_token_unlocks_token_locks_fk")
addresses addresses @relation(fields: [source_addr], references: [address], onDelete: Cascade, onUpdate: NoAction, map: "ddag_token_unlocks_address_fk")
Expand Down
81 changes: 45 additions & 36 deletions src/handlers/allowSpendsHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import {
paginatedQuery,
fromCreatedAtOrdinalCursor,
toCreatedAtOrdinalCursor,
fromCreatedAtCursor,
toCreatedAtCursor,
hashCursor,
} from "../pagination";
import { respond, handleError } from "../response";
import { includes } from "lodash";
Expand Down Expand Up @@ -219,9 +222,12 @@ export const spendTransactions = async (
try {
return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
{ include: dagInclude, orderBy: { created_at: "desc" } },
hashCursor,
hashCursor,
{
include: dagInclude,
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.dag_spend_transactions.findMany,
spendTransactionResponses
);
Expand All @@ -239,14 +245,14 @@ export const globalSnapshotSpendTransactions = async (

return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: {
dag_allow_spend: { global_snapshot: filter },
},
include: dagInclude,
orderBy: { created_at: "desc" },
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.dag_spend_transactions.findMany,
spendTransactionResponses
Expand All @@ -264,14 +270,14 @@ export const addressSpendTransactions = async (

return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: {
OR: [{ source_addr: address }, { destination_addr: address }],
},
include: dagInclude,
orderBy: { created_at: "desc" },
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.dag_spend_transactions.findMany,
spendTransactionResponses
Expand All @@ -287,9 +293,12 @@ export const allowSpendExpirations = async (
try {
return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
{ include: dagInclude, orderBy: { created_at: "desc" } },
hashCursor,
hashCursor,
{
include: dagInclude,
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.dag_expired_spend_transactions.findMany,
spendExpiredResponses
);
Expand Down Expand Up @@ -324,14 +333,14 @@ export const globalSnapshotAllowSpendExpirations = async (

return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: {
dag_allow_spend: { global_snapshot: filter },
},
include: dagInclude,
orderBy: { created_at: "desc" },
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.dag_expired_spend_transactions.findMany,
spendExpiredResponses
Expand All @@ -349,8 +358,8 @@ export const addressAllowSpendExpirations = async (

return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: {
OR: [
Expand All @@ -359,7 +368,7 @@ export const addressAllowSpendExpirations = async (
],
},
include: dagInclude,
orderBy: { created_at: "desc" },
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.dag_expired_spend_transactions.findMany,
spendExpiredResponses
Expand Down Expand Up @@ -472,12 +481,12 @@ export const currencySpendTransactions = async (

return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: { metagraph_id },
include: metagraphInclude,
orderBy: { created_at: "desc" },
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.metagraph_spend_transactions.findMany,
spendTransactionResponses
Expand Down Expand Up @@ -513,8 +522,8 @@ export const currencySnapshotSpendTransactions = async (

return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: {
metagraph_id,
Expand All @@ -523,7 +532,7 @@ export const currencySnapshotSpendTransactions = async (
},
},
include: metagraphInclude,
orderBy: { created_at: "desc" },
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.metagraph_spend_transactions.findMany,
spendTransactionResponses
Expand All @@ -541,14 +550,14 @@ export const currencyAddressSpendTransactions = async (

return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: {
OR: [{ source_addr: address }, { destination_addr: address }],
},
include: metagraphInclude,
orderBy: { created_at: "desc" },
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.metagraph_spend_transactions.findMany,
spendExpiredResponses
Expand All @@ -566,12 +575,12 @@ export const currencyAllowSpendExpirations = async (

return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: { metagraph_id },
include: metagraphInclude,
orderBy: { created_at: "desc" },
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.metagraph_expired_spend_transactions.findMany,
spendExpiredResponses
Expand Down Expand Up @@ -608,8 +617,8 @@ export const currencySnapshotAllowSpendExpirations = async (

return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: {
metagraph_id,
Expand All @@ -618,7 +627,7 @@ export const currencySnapshotAllowSpendExpirations = async (
},
},
include: metagraphInclude,
orderBy: { created_at: "desc" },
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.metagraph_expired_spend_transactions.findMany,
spendExpiredResponses
Expand All @@ -636,8 +645,8 @@ export const currencyAddressAllowSpendExpirations = async (

return await paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: {
metagraph_id,
Expand All @@ -647,7 +656,7 @@ export const currencyAddressAllowSpendExpirations = async (
],
},
include: metagraphInclude,
orderBy: { created_at: "desc" },
orderBy: [{ created_at: "desc" }, { hash: "asc" }],
},
prisma.metagraph_expired_spend_transactions.findMany,
spendExpiredResponses
Expand Down
31 changes: 19 additions & 12 deletions src/handlers/tokenLocksHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
paginatedQuery,
fromCreatedAtOrdinalCursor,
toCreatedAtOrdinalCursor,
hashCursor,
} from "../pagination";
import { handleError, respond } from "../response";

Expand Down Expand Up @@ -227,13 +228,14 @@ export const tokenUnlocks = async (
): Promise<APIGatewayProxyResult> => {
return paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
include: includeDagGlobalSnapshotOrdinal,
orderBy: [
{ global_snapshot: { ordinal: "desc" } },
{ created_at: "desc" },
{ hash: "asc" },
],
},
prisma.dag_token_unlocks.findMany,
Expand Down Expand Up @@ -267,8 +269,8 @@ export const globalSnapshotTokenUnlocks = async (

return paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: {
global_snapshot: filter,
Expand All @@ -277,6 +279,7 @@ export const globalSnapshotTokenUnlocks = async (
orderBy: [
{ global_snapshot: { ordinal: "desc" } },
{ created_at: "desc" },
{ hash: "asc" },
],
},
prisma.dag_token_unlocks.findMany,
Expand All @@ -295,14 +298,15 @@ export const addressTokenUnlocks = async (

return paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: { source_addr: address },
include: includeDagGlobalSnapshotOrdinal,
orderBy: [
{ global_snapshot: { ordinal: "desc" } },
{ created_at: "desc" },
{ hash: "asc" },
],
},
prisma.dag_token_unlocks.findMany,
Expand Down Expand Up @@ -416,8 +420,8 @@ export const metagraphTokenUnlocks = async (
const { metagraph_id } = event.pathParameters || {};
return paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: { metagraph_id },
include: {
Expand All @@ -427,6 +431,7 @@ export const metagraphTokenUnlocks = async (
orderBy: [
{ metagraph_snapshot: { ordinal: "desc" } },
{ created_at: "desc" },
{ hash: "asc" },
],
},
prisma.metagraph_token_unlocks.findMany,
Expand Down Expand Up @@ -463,8 +468,8 @@ export const metagraphSnapshotTokenUnlocks = async (

return paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: {
metagraph_id,
Expand All @@ -477,6 +482,7 @@ export const metagraphSnapshotTokenUnlocks = async (
orderBy: [
{ metagraph_snapshot: { ordinal: "desc" } },
{ created_at: "desc" },
{ hash: "asc" },
],
},
prisma.metagraph_token_unlocks.findMany,
Expand All @@ -495,8 +501,8 @@ export const metagraphAddressTokenUnlocks = async (

return paginatedQuery(
extractPagination(event),
toCreatedAtOrdinalCursor,
fromCreatedAtOrdinalCursor,
hashCursor,
hashCursor,
{
where: { metagraph_id, source_addr: address },
include: {
Expand All @@ -506,6 +512,7 @@ export const metagraphAddressTokenUnlocks = async (
orderBy: [
{ metagraph_snapshot: { ordinal: "desc" } },
{ created_at: "desc" },
{ hash: "asc" },
],
},
prisma.metagraph_token_unlocks.findMany,
Expand Down
Loading