+4

src/modules/cards/domain/ICollectionRepository.ts

View file Reviewed

··· 12 12 authorId: CuratorId, 13 13 cardId: CardId, 14 14 ): Promise<Result<Collection[]>>; 15 15 + findContainingCardAddedBy( 16 16 + cardId: CardId, 17 17 + addedBy: CuratorId, 18 18 + ): Promise<Result<Collection[]>>; 15 19 save(collection: Collection): Promise<Result<void>>; 16 20 delete(collectionId: CollectionId): Promise<Result<void>>; 17 21 }

+3 -3

src/modules/cards/domain/services/CardLibraryService.ts

View file Reviewed

··· 359 359 return ok(card); 360 360 } 361 361 362 362 - // Get all collections owned by the curator that contain this card 362 362 + // Get all collections where this curator added this card (regardless of collection ownership) 363 363 const collectionsResult = 364 364 - await this.collectionRepository.findByCuratorIdContainingCard( 364 364 + await this.collectionRepository.findContainingCardAddedBy( 365 365 + card.cardId, 365 366 curatorId, 366 366 - card.cardId, 367 367 ); 368 368 if (collectionsResult.isErr()) { 369 369 return err(AppError.UnexpectedError.create(collectionsResult.error));

+95

src/modules/cards/infrastructure/repositories/DrizzleCollectionRepository.ts

View file Reviewed

··· 390 390 } 391 391 } 392 392 393 393 + async findContainingCardAddedBy( 394 394 + cardId: CardId, 395 395 + addedBy: CuratorId, 396 396 + ): Promise<Result<Collection[]>> { 397 397 + try { 398 398 + const addedByString = addedBy.value; 399 399 + const cardIdString = cardId.getStringValue(); 400 400 + 401 401 + // Find collections that contain this card where it was added by the specified curator 402 402 + const collectionResults = await this.db 403 403 + .select({ 404 404 + collection: collections, 405 405 + publishedRecord: publishedRecords, 406 406 + }) 407 407 + .from(collections) 408 408 + .leftJoin( 409 409 + publishedRecords, 410 410 + eq(collections.publishedRecordId, publishedRecords.id), 411 411 + ) 412 412 + .innerJoin( 413 413 + collectionCards, 414 414 + eq(collections.id, collectionCards.collectionId), 415 415 + ) 416 416 + .where( 417 417 + and( 418 418 + eq(collectionCards.cardId, cardIdString), 419 419 + eq(collectionCards.addedBy, addedByString), 420 420 + ), 421 421 + ); 422 422 + 423 423 + const domainCollections: Collection[] = []; 424 424 + for (const result of collectionResults) { 425 425 + const collectionId = result.collection.id; 426 426 + 427 427 + // Get collaborators for this collection 428 428 + const collaboratorResults = await this.db 429 429 + .select() 430 430 + .from(collectionCollaborators) 431 431 + .where(eq(collectionCollaborators.collectionId, collectionId)); 432 432 + 433 433 + const collaborators = collaboratorResults.map((c) => c.collaboratorId); 434 434 + 435 435 + // Get card links for this collection 436 436 + const cardLinkResults = await this.db 437 437 + .select({ 438 438 + cardLink: collectionCards, 439 439 + publishedRecord: publishedRecords, 440 440 + }) 441 441 + .from(collectionCards) 442 442 + .leftJoin( 443 443 + publishedRecords, 444 444 + eq(collectionCards.publishedRecordId, publishedRecords.id), 445 445 + ) 446 446 + .where(eq(collectionCards.collectionId, collectionId)); 447 447 + 448 448 + const cardLinks = cardLinkResults.map((link) => ({ 449 449 + cardId: link.cardLink.cardId, 450 450 + addedBy: link.cardLink.addedBy, 451 451 + addedAt: link.cardLink.addedAt, 452 452 + publishedRecordId: link.publishedRecord?.id, 453 453 + publishedRecord: link.publishedRecord || undefined, 454 454 + })); 455 455 + 456 456 + const collectionDTO: CollectionDTO = { 457 457 + id: result.collection.id, 458 458 + authorId: result.collection.authorId, 459 459 + name: result.collection.name, 460 460 + description: result.collection.description || undefined, 461 461 + accessType: result.collection.accessType, 462 462 + cardCount: result.collection.cardCount, 463 463 + createdAt: result.collection.createdAt, 464 464 + updatedAt: result.collection.updatedAt, 465 465 + publishedRecordId: result.publishedRecord?.id || null, 466 466 + publishedRecord: result.publishedRecord || undefined, 467 467 + collaborators, 468 468 + cardLinks, 469 469 + }; 470 470 + 471 471 + const domainResult = CollectionMapper.toDomain(collectionDTO); 472 472 + if (domainResult.isErr()) { 473 473 + console.error( 474 474 + 'Error mapping collection to domain:', 475 475 + domainResult.error, 476 476 + ); 477 477 + continue; 478 478 + } 479 479 + domainCollections.push(domainResult.value); 480 480 + } 481 481 + 482 482 + return ok(domainCollections); 483 483 + } catch (error) { 484 484 + return err(error as Error); 485 485 + } 486 486 + } 487 487 + 393 488 async save(collection: Collection): Promise<Result<void>> { 394 489 try { 395 490 const {

+1

src/modules/cards/tests/application/GetCollectionPageUseCase.test.ts

View file Reviewed

··· 709 709 findByCuratorId: jest.fn(), 710 710 findByCardId: jest.fn(), 711 711 findByCuratorIdContainingCard: jest.fn(), 712 712 + findContainingCardAddedBy: jest.fn(), 712 713 }; 713 714 714 715 const errorUseCase = new GetCollectionPageUseCase(

+95

src/modules/cards/tests/infrastructure/DrizzleCollectionRepository.integration.test.ts

View file Reviewed

··· 570 570 expect(collection.authorId.value).toBe(curatorId.value); 571 571 }); 572 572 }); 573 573 + 574 574 + it('should find collections containing a card added by a specific user', async () => { 575 575 + // Create a card 576 576 + const cardResult = CardFactory.create({ 577 577 + curatorId: curatorId.value, 578 578 + cardInput: { 579 579 + type: CardTypeEnum.NOTE, 580 580 + text: 'Card added by different users', 581 581 + }, 582 582 + }); 583 583 + 584 584 + const card = cardResult.unwrap(); 585 585 + await cardRepository.save(card); 586 586 + 587 587 + // Collection 1: Owned by collaboratorId, card added by curatorId 588 588 + const collection1Id = new UniqueEntityID(); 589 589 + const collection1 = Collection.create( 590 590 + { 591 591 + authorId: collaboratorId, 592 592 + name: 'Collection Owned By Collaborator', 593 593 + accessType: CollectionAccessType.OPEN, 594 594 + collaboratorIds: [], 595 595 + createdAt: new Date(), 596 596 + updatedAt: new Date(), 597 597 + }, 598 598 + collection1Id, 599 599 + ).unwrap(); 600 600 + 601 601 + // curatorId adds card to collaborator's collection 602 602 + collection1.addCard(card.cardId, curatorId); 603 603 + 604 604 + // Collection 2: Owned by collaboratorId, card added by collaboratorId 605 605 + const collection2Id = new UniqueEntityID(); 606 606 + const collection2 = Collection.create( 607 607 + { 608 608 + authorId: collaboratorId, 609 609 + name: 'Collection With Card Added By Collaborator', 610 610 + accessType: CollectionAccessType.OPEN, 611 611 + collaboratorIds: [], 612 612 + createdAt: new Date(), 613 613 + updatedAt: new Date(), 614 614 + }, 615 615 + collection2Id, 616 616 + ).unwrap(); 617 617 + 618 618 + // collaboratorId adds card to their own collection 619 619 + collection2.addCard(card.cardId, collaboratorId); 620 620 + 621 621 + // Collection 3: Owned by curatorId, card added by curatorId 622 622 + const collection3Id = new UniqueEntityID(); 623 623 + const collection3 = Collection.create( 624 624 + { 625 625 + authorId: curatorId, 626 626 + name: 'Collection Owned And Added By Curator', 627 627 + accessType: CollectionAccessType.OPEN, 628 628 + collaboratorIds: [], 629 629 + createdAt: new Date(), 630 630 + updatedAt: new Date(), 631 631 + }, 632 632 + collection3Id, 633 633 + ).unwrap(); 634 634 + 635 635 + // curatorId adds card to their own collection 636 636 + collection3.addCard(card.cardId, curatorId); 637 637 + 638 638 + await collectionRepository.save(collection1); 639 639 + await collectionRepository.save(collection2); 640 640 + await collectionRepository.save(collection3); 641 641 + 642 642 + // Find collections where curatorId added the card 643 643 + const foundCollectionsResult = 644 644 + await collectionRepository.findContainingCardAddedBy( 645 645 + card.cardId, 646 646 + curatorId, 647 647 + ); 648 648 + expect(foundCollectionsResult.isOk()).toBe(true); 649 649 + 650 650 + const foundCollections = foundCollectionsResult.unwrap(); 651 651 + expect(foundCollections).toHaveLength(2); 652 652 + 653 653 + const names = foundCollections.map((c) => c.name.value); 654 654 + expect(names).toContain('Collection Owned By Collaborator'); 655 655 + expect(names).toContain('Collection Owned And Added By Curator'); 656 656 + expect(names).not.toContain('Collection With Card Added By Collaborator'); 657 657 + 658 658 + // Verify that collections where curatorId added the card are returned 659 659 + // regardless of who owns the collection 660 660 + foundCollections.forEach((collection) => { 661 661 + const cardLink = collection.cardLinks.find((link) => 662 662 + link.cardId.equals(card.cardId), 663 663 + ); 664 664 + expect(cardLink).toBeDefined(); 665 665 + expect(cardLink?.addedBy.value).toBe(curatorId.value); 666 666 + }); 667 667 + }); 573 668 });

+19

src/modules/cards/tests/utils/InMemoryCollectionRepository.ts

View file Reviewed

··· 100 100 } 101 101 } 102 102 103 103 + async findContainingCardAddedBy( 104 104 + cardId: CardId, 105 105 + addedBy: CuratorId, 106 106 + ): Promise<Result<Collection[]>> { 107 107 + try { 108 108 + const collections = Array.from(this.collections.values()).filter( 109 109 + (collection) => 110 110 + collection.cardLinks.some( 111 111 + (link) => 112 112 + link.cardId.getStringValue() === cardId.getStringValue() && 113 113 + link.addedBy.value === addedBy.value, 114 114 + ), 115 115 + ); 116 116 + return ok(collections.map((collection) => this.clone(collection))); 117 117 + } catch (error) { 118 118 + return err(error as Error); 119 119 + } 120 120 + } 121 121 + 103 122 async save(collection: Collection): Promise<Result<void>> { 104 123 try { 105 124 this.collections.set(