+5 -1

src/modules/cards/infrastructure/repositories/query-services/UrlCardQueryService.ts

View file Reviewed

··· 359 359 options: CardQueryOptions, 360 360 ): Promise<PaginatedQueryResult<LibraryForUrlDTO>> { 361 361 try { 362 362 - const { page, limit } = options; 362 362 + const { page, limit, sortBy, sortOrder } = options; 363 363 const offset = (page - 1) * limit; 364 364 + 365 365 + // Build the sort order 366 366 + const orderDirection = sortOrder === SortOrder.ASC ? asc : desc; 364 367 365 368 // Get all URL cards with this URL and their library memberships 366 369 const librariesQuery = this.db ··· 376 379 .from(libraryMemberships) 377 380 .innerJoin(cards, eq(libraryMemberships.cardId, cards.id)) 378 381 .where(and(eq(cards.url, url), eq(cards.type, CardTypeEnum.URL))) 382 382 + .orderBy(orderDirection(this.getSortColumn(sortBy))) 379 383 .limit(limit) 380 384 .offset(offset); 381 385

+259

src/modules/cards/tests/infrastructure/DrizzleCardQueryRepository.getLibrariesForUrl.integration.test.ts

View file Reviewed

··· 284 284 }); 285 285 }); 286 286 287 287 + describe('sorting', () => { 288 288 + it('should sort by createdAt in descending order by default', async () => { 289 289 + const testUrl = 'https://example.com/sort-test'; 290 290 + const url = URL.create(testUrl).unwrap(); 291 291 + 292 292 + // Create cards with different creation times 293 293 + const card1 = new CardBuilder() 294 294 + .withCuratorId(curator1.value) 295 295 + .withType(CardTypeEnum.URL) 296 296 + .withUrl(url) 297 297 + .buildOrThrow(); 298 298 + 299 299 + const card2 = new CardBuilder() 300 300 + .withCuratorId(curator2.value) 301 301 + .withType(CardTypeEnum.URL) 302 302 + .withUrl(url) 303 303 + .buildOrThrow(); 304 304 + 305 305 + const card3 = new CardBuilder() 306 306 + .withCuratorId(curator3.value) 307 307 + .withType(CardTypeEnum.URL) 308 308 + .withUrl(url) 309 309 + .buildOrThrow(); 310 310 + 311 311 + card1.addToLibrary(curator1); 312 312 + card2.addToLibrary(curator2); 313 313 + card3.addToLibrary(curator3); 314 314 + 315 315 + // Save cards with slight delays to ensure different timestamps 316 316 + await cardRepository.save(card1); 317 317 + await new Promise(resolve => setTimeout(resolve, 10)); 318 318 + await cardRepository.save(card2); 319 319 + await new Promise(resolve => setTimeout(resolve, 10)); 320 320 + await cardRepository.save(card3); 321 321 + 322 322 + const result = await queryRepository.getLibrariesForUrl(testUrl, { 323 323 + page: 1, 324 324 + limit: 10, 325 325 + sortBy: CardSortField.CREATED_AT, 326 326 + sortOrder: SortOrder.DESC, 327 327 + }); 328 328 + 329 329 + expect(result.items).toHaveLength(3); 330 330 + 331 331 + // Should be sorted by creation time, newest first 332 332 + const cardIds = result.items.map(lib => lib.card.id); 333 333 + expect(cardIds[0]).toBe(card3.cardId.getStringValue()); // Most recent 334 334 + expect(cardIds[1]).toBe(card2.cardId.getStringValue()); // Middle 335 335 + expect(cardIds[2]).toBe(card1.cardId.getStringValue()); // Oldest 336 336 + }); 337 337 + 338 338 + it('should sort by createdAt in ascending order when specified', async () => { 339 339 + const testUrl = 'https://example.com/sort-asc-test'; 340 340 + const url = URL.create(testUrl).unwrap(); 341 341 + 342 342 + // Create cards with different creation times 343 343 + const card1 = new CardBuilder() 344 344 + .withCuratorId(curator1.value) 345 345 + .withType(CardTypeEnum.URL) 346 346 + .withUrl(url) 347 347 + .buildOrThrow(); 348 348 + 349 349 + const card2 = new CardBuilder() 350 350 + .withCuratorId(curator2.value) 351 351 + .withType(CardTypeEnum.URL) 352 352 + .withUrl(url) 353 353 + .buildOrThrow(); 354 354 + 355 355 + card1.addToLibrary(curator1); 356 356 + card2.addToLibrary(curator2); 357 357 + 358 358 + // Save cards with slight delay to ensure different timestamps 359 359 + await cardRepository.save(card1); 360 360 + await new Promise(resolve => setTimeout(resolve, 10)); 361 361 + await cardRepository.save(card2); 362 362 + 363 363 + const result = await queryRepository.getLibrariesForUrl(testUrl, { 364 364 + page: 1, 365 365 + limit: 10, 366 366 + sortBy: CardSortField.CREATED_AT, 367 367 + sortOrder: SortOrder.ASC, 368 368 + }); 369 369 + 370 370 + expect(result.items).toHaveLength(2); 371 371 + 372 372 + // Should be sorted by creation time, oldest first 373 373 + const cardIds = result.items.map(lib => lib.card.id); 374 374 + expect(cardIds[0]).toBe(card1.cardId.getStringValue()); // Oldest 375 375 + expect(cardIds[1]).toBe(card2.cardId.getStringValue()); // Newest 376 376 + }); 377 377 + 378 378 + it('should sort by updatedAt in descending order', async () => { 379 379 + const testUrl = 'https://example.com/sort-updated-test'; 380 380 + const url = URL.create(testUrl).unwrap(); 381 381 + 382 382 + // Create cards 383 383 + const card1 = new CardBuilder() 384 384 + .withCuratorId(curator1.value) 385 385 + .withType(CardTypeEnum.URL) 386 386 + .withUrl(url) 387 387 + .buildOrThrow(); 388 388 + 389 389 + const card2 = new CardBuilder() 390 390 + .withCuratorId(curator2.value) 391 391 + .withType(CardTypeEnum.URL) 392 392 + .withUrl(url) 393 393 + .buildOrThrow(); 394 394 + 395 395 + card1.addToLibrary(curator1); 396 396 + card2.addToLibrary(curator2); 397 397 + 398 398 + // Save cards 399 399 + await cardRepository.save(card1); 400 400 + await cardRepository.save(card2); 401 401 + 402 402 + // Update card1 to have a more recent updatedAt 403 403 + await new Promise(resolve => setTimeout(resolve, 10)); 404 404 + await cardRepository.save(card1); // This should update the updatedAt timestamp 405 405 + 406 406 + const result = await queryRepository.getLibrariesForUrl(testUrl, { 407 407 + page: 1, 408 408 + limit: 10, 409 409 + sortBy: CardSortField.UPDATED_AT, 410 410 + sortOrder: SortOrder.DESC, 411 411 + }); 412 412 + 413 413 + expect(result.items).toHaveLength(2); 414 414 + 415 415 + // card1 should be first since it was updated more recently 416 416 + const cardIds = result.items.map(lib => lib.card.id); 417 417 + expect(cardIds[0]).toBe(card1.cardId.getStringValue()); // Most recently updated 418 418 + expect(cardIds[1]).toBe(card2.cardId.getStringValue()); // Less recently updated 419 419 + }); 420 420 + 421 421 + it('should sort by libraryCount in descending order', async () => { 422 422 + const testUrl = 'https://example.com/sort-library-count-test'; 423 423 + const url = URL.create(testUrl).unwrap(); 424 424 + 425 425 + // Create cards 426 426 + const card1 = new CardBuilder() 427 427 + .withCuratorId(curator1.value) 428 428 + .withType(CardTypeEnum.URL) 429 429 + .withUrl(url) 430 430 + .buildOrThrow(); 431 431 + 432 432 + const card2 = new CardBuilder() 433 433 + .withCuratorId(curator2.value) 434 434 + .withType(CardTypeEnum.URL) 435 435 + .withUrl(url) 436 436 + .buildOrThrow(); 437 437 + 438 438 + const card3 = new CardBuilder() 439 439 + .withCuratorId(curator3.value) 440 440 + .withType(CardTypeEnum.URL) 441 441 + .withUrl(url) 442 442 + .buildOrThrow(); 443 443 + 444 444 + // Add cards to libraries with different counts 445 445 + card1.addToLibrary(curator1); 446 446 + 447 447 + card2.addToLibrary(curator2); 448 448 + card2.addToLibrary(curator1); // card2 has 2 library memberships 449 449 + 450 450 + card3.addToLibrary(curator3); 451 451 + card3.addToLibrary(curator1); // card3 has 3 library memberships 452 452 + card3.addToLibrary(curator2); 453 453 + 454 454 + await cardRepository.save(card1); 455 455 + await cardRepository.save(card2); 456 456 + await cardRepository.save(card3); 457 457 + 458 458 + const result = await queryRepository.getLibrariesForUrl(testUrl, { 459 459 + page: 1, 460 460 + limit: 10, 461 461 + sortBy: CardSortField.LIBRARY_COUNT, 462 462 + sortOrder: SortOrder.DESC, 463 463 + }); 464 464 + 465 465 + // Should return all library memberships, but sorted by the card's library count 466 466 + expect(result.items.length).toBeGreaterThan(0); 467 467 + 468 468 + // Group by card ID to check sorting 469 469 + const cardGroups = new Map<string, any[]>(); 470 470 + result.items.forEach(item => { 471 471 + const cardId = item.card.id; 472 472 + if (!cardGroups.has(cardId)) { 473 473 + cardGroups.set(cardId, []); 474 474 + } 475 475 + cardGroups.get(cardId)!.push(item); 476 476 + }); 477 477 + 478 478 + // Get the first occurrence of each card to check library count ordering 479 479 + const uniqueCards = Array.from(cardGroups.entries()).map(([cardId, items]) => ({ 480 480 + cardId, 481 481 + libraryCount: items[0]!.card.libraryCount 482 482 + })); 483 483 + 484 484 + // Should be sorted by library count descending 485 485 + for (let i = 0; i < uniqueCards.length - 1; i++) { 486 486 + expect(uniqueCards[i]!.libraryCount).toBeGreaterThanOrEqual(uniqueCards[i + 1]!.libraryCount); 487 487 + } 488 488 + }); 489 489 + 490 490 + it('should sort by libraryCount in ascending order when specified', async () => { 491 491 + const testUrl = 'https://example.com/sort-library-count-asc-test'; 492 492 + const url = URL.create(testUrl).unwrap(); 493 493 + 494 494 + // Create cards with different library counts 495 495 + const card1 = new CardBuilder() 496 496 + .withCuratorId(curator1.value) 497 497 + .withType(CardTypeEnum.URL) 498 498 + .withUrl(url) 499 499 + .buildOrThrow(); 500 500 + 501 501 + const card2 = new CardBuilder() 502 502 + .withCuratorId(curator2.value) 503 503 + .withType(CardTypeEnum.URL) 504 504 + .withUrl(url) 505 505 + .buildOrThrow(); 506 506 + 507 507 + // card1 has 1 library membership, card2 has 2 508 508 + card1.addToLibrary(curator1); 509 509 + card2.addToLibrary(curator2); 510 510 + card2.addToLibrary(curator1); 511 511 + 512 512 + await cardRepository.save(card1); 513 513 + await cardRepository.save(card2); 514 514 + 515 515 + const result = await queryRepository.getLibrariesForUrl(testUrl, { 516 516 + page: 1, 517 517 + limit: 10, 518 518 + sortBy: CardSortField.LIBRARY_COUNT, 519 519 + sortOrder: SortOrder.ASC, 520 520 + }); 521 521 + 522 522 + expect(result.items.length).toBeGreaterThan(0); 523 523 + 524 524 + // Group by card ID and check ascending order 525 525 + const cardGroups = new Map<string, any[]>(); 526 526 + result.items.forEach(item => { 527 527 + const cardId = item.card.id; 528 528 + if (!cardGroups.has(cardId)) { 529 529 + cardGroups.set(cardId, []); 530 530 + } 531 531 + cardGroups.get(cardId)!.push(item); 532 532 + }); 533 533 + 534 534 + const uniqueCards = Array.from(cardGroups.entries()).map(([cardId, items]) => ({ 535 535 + cardId, 536 536 + libraryCount: items[0]!.card.libraryCount 537 537 + })); 538 538 + 539 539 + // Should be sorted by library count ascending 540 540 + for (let i = 0; i < uniqueCards.length - 1; i++) { 541 541 + expect(uniqueCards[i]!.libraryCount).toBeLessThanOrEqual(uniqueCards[i + 1]!.libraryCount); 542 542 + } 543 543 + }); 544 544 + }); 545 545 + 287 546 describe('pagination', () => { 288 547 it('should paginate results correctly', async () => { 289 548 const testUrl = 'https://example.com/popular-article';