From 269ee4c72d7100cd6fca3ec7940cdec4552bce65 Mon Sep 17 00:00:00 2001 From: Wesley Finck Date: Mon, 23 Mar 2026 11:16:34 -0700 Subject: [PATCH] update connection use case can now swap source and target --- .../commands/UpdateConnectionUseCase.ts | 15 ++ src/modules/cards/domain/Connection.ts | 13 ++ .../controllers/UpdateConnectionController.ts | 8 +- .../tests/domain/Connection.swap.test.ts | 167 ++++++++++++++++++ src/types/src/api/requests.ts | 1 + src/types/src/api/responses.ts | 3 +- .../api-client/clients/ConnectionClient.ts | 1 + 7 files changed, 204 insertions(+), 4 deletions(-) create mode 100644 src/modules/cards/tests/domain/Connection.swap.test.ts diff --git a/src/modules/cards/application/useCases/commands/UpdateConnectionUseCase.ts b/src/modules/cards/application/useCases/commands/UpdateConnectionUseCase.ts index 3662612c8..5b49cd310 100644 --- a/src/modules/cards/application/useCases/commands/UpdateConnectionUseCase.ts +++ b/src/modules/cards/application/useCases/commands/UpdateConnectionUseCase.ts @@ -16,6 +16,7 @@ export interface UpdateConnectionDTO { connectionType?: string; note?: string; removeNote?: boolean; + swap?: boolean; curatorId: string; publishedRecordId?: PublishedRecordId; // For firehose events - skip republishing if provided } @@ -101,6 +102,14 @@ export class UpdateConnectionUseCase ); } + // Handle swap + if (request.swap) { + const swapResult = connection.swap(); + if (swapResult.isErr()) { + return err(new ValidationError(swapResult.error.message)); + } + } + // Handle connection type update if (request.connectionType !== undefined) { const typeResult = ConnectionType.createFromString( @@ -174,6 +183,12 @@ export class UpdateConnectionUseCase if (saveUpdatedResult.isErr()) { return err(AppError.UnexpectedError.create(saveUpdatedResult.error)); } + } else { + // Not published - just save the changes + const saveResult = await this.connectionRepository.save(connection); + if (saveResult.isErr()) { + return err(AppError.UnexpectedError.create(saveResult.error)); + } } return ok({ diff --git a/src/modules/cards/domain/Connection.ts b/src/modules/cards/domain/Connection.ts index 671e62894..3fd38ce9a 100644 --- a/src/modules/cards/domain/Connection.ts +++ b/src/modules/cards/domain/Connection.ts @@ -152,6 +152,19 @@ export class Connection extends AggregateRoot { return ok(undefined); } + public swap(): Result { + const tempSource = this.props.source; + const tempSourceMetadata = this.props.sourceUrlMetadata; + + this.props.source = this.props.target; + this.props.sourceUrlMetadata = this.props.targetUrlMetadata; + this.props.target = tempSource; + this.props.targetUrlMetadata = tempSourceMetadata; + this.props.updatedAt = new Date(); + + return ok(undefined); + } + private raiseCreatedEvent(): Result { const event = ConnectionCreatedEvent.create( this.connectionId, diff --git a/src/modules/cards/infrastructure/http/controllers/UpdateConnectionController.ts b/src/modules/cards/infrastructure/http/controllers/UpdateConnectionController.ts index c689da666..74da521ad 100644 --- a/src/modules/cards/infrastructure/http/controllers/UpdateConnectionController.ts +++ b/src/modules/cards/infrastructure/http/controllers/UpdateConnectionController.ts @@ -12,7 +12,7 @@ export class UpdateConnectionController extends Controller { async executeImpl(req: AuthenticatedRequest, res: Response): Promise { try { const { connectionId } = req.params; - const { note, removeNote, connectionType } = req.body; + const { note, removeNote, connectionType, swap } = req.body; const curatorId = req.did; if (!curatorId) { @@ -26,11 +26,12 @@ export class UpdateConnectionController extends Controller { if ( note === undefined && removeNote === undefined && - connectionType === undefined + connectionType === undefined && + swap === undefined ) { return this.badRequest( res, - 'At least one of note, removeNote, or connectionType must be provided', + 'At least one of note, removeNote, connectionType, or swap must be provided', ); } @@ -39,6 +40,7 @@ export class UpdateConnectionController extends Controller { note, removeNote, connectionType, + swap, curatorId, }); diff --git a/src/modules/cards/tests/domain/Connection.swap.test.ts b/src/modules/cards/tests/domain/Connection.swap.test.ts new file mode 100644 index 000000000..ca6ff200b --- /dev/null +++ b/src/modules/cards/tests/domain/Connection.swap.test.ts @@ -0,0 +1,167 @@ +import { Connection } from '../../domain/Connection'; +import { CuratorId } from '../../domain/value-objects/CuratorId'; +import { UrlOrCardId } from '../../domain/value-objects/UrlOrCardId'; +import { ConnectionType } from '../../domain/value-objects/ConnectionType'; +import { ConnectionNote } from '../../domain/value-objects/ConnectionNote'; +import { UrlMetadata } from '../../domain/value-objects/UrlMetadata'; +import { URL } from '../../domain/value-objects/URL'; +import { InMemoryConnectionRepository } from '../utils/InMemoryConnectionRepository'; + +describe('Connection.swap()', () => { + let repository: InMemoryConnectionRepository; + + beforeEach(() => { + repository = InMemoryConnectionRepository.getInstance(); + repository.clear(); + }); + + it('should swap source and target', () => { + const curatorId = CuratorId.create('did:plc:curator123').unwrap(); + const source = UrlOrCardId.createFromUrl( + URL.create('https://example.com/source').unwrap(), + ).unwrap(); + const target = UrlOrCardId.createFromUrl( + URL.create('https://example.com/target').unwrap(), + ).unwrap(); + const connectionType = ConnectionType.createFromString('SUPPORTS').unwrap(); + const note = ConnectionNote.create('Test note').unwrap(); + + const connection = Connection.create({ + source, + target, + type: connectionType, + note, + curatorId, + }).unwrap(); + + // Verify initial state + expect(connection.source.stringValue).toBe('https://example.com/source'); + expect(connection.target.stringValue).toBe('https://example.com/target'); + + // Swap + const swapResult = connection.swap(); + expect(swapResult.isOk()).toBe(true); + + // Verify swapped state + expect(connection.source.stringValue).toBe('https://example.com/target'); + expect(connection.target.stringValue).toBe('https://example.com/source'); + }); + + it('should swap source and target metadata', () => { + const curatorId = CuratorId.create('did:plc:curator123').unwrap(); + const source = UrlOrCardId.createFromUrl( + URL.create('https://example.com/source').unwrap(), + ).unwrap(); + const target = UrlOrCardId.createFromUrl( + URL.create('https://example.com/target').unwrap(), + ).unwrap(); + + const sourceMetadata = UrlMetadata.create({ + url: 'https://example.com/source', + title: 'Source Title', + description: 'Source Description', + }).unwrap(); + + const targetMetadata = UrlMetadata.create({ + url: 'https://example.com/target', + title: 'Target Title', + description: 'Target Description', + }).unwrap(); + + const connection = Connection.create({ + source, + target, + sourceUrlMetadata: sourceMetadata, + targetUrlMetadata: targetMetadata, + curatorId, + }).unwrap(); + + // Verify initial state + expect(connection.sourceUrlMetadata?.title).toBe('Source Title'); + expect(connection.targetUrlMetadata?.title).toBe('Target Title'); + + // Swap + connection.swap(); + + // Verify swapped metadata + expect(connection.sourceUrlMetadata?.title).toBe('Target Title'); + expect(connection.targetUrlMetadata?.title).toBe('Source Title'); + }); + + it('should persist swapped values when saved to repository', async () => { + const curatorId = CuratorId.create('did:plc:curator123').unwrap(); + const source = UrlOrCardId.createFromUrl( + URL.create('https://example.com/source').unwrap(), + ).unwrap(); + const target = UrlOrCardId.createFromUrl( + URL.create('https://example.com/target').unwrap(), + ).unwrap(); + + const sourceMetadata = UrlMetadata.create({ + url: 'https://example.com/source', + title: 'Source Title', + }).unwrap(); + + const targetMetadata = UrlMetadata.create({ + url: 'https://example.com/target', + title: 'Target Title', + }).unwrap(); + + const connection = Connection.create({ + source, + target, + sourceUrlMetadata: sourceMetadata, + targetUrlMetadata: targetMetadata, + curatorId, + }).unwrap(); + + // Save initial connection + await repository.save(connection); + + // Swap and save again + connection.swap(); + await repository.save(connection); + + // Retrieve from repository + const retrievedResult = await repository.findById(connection.connectionId); + expect(retrievedResult.isOk()).toBe(true); + + const retrieved = retrievedResult.unwrap(); + expect(retrieved).not.toBeNull(); + + // Verify persisted swapped values + expect(retrieved!.source.stringValue).toBe('https://example.com/target'); + expect(retrieved!.target.stringValue).toBe('https://example.com/source'); + expect(retrieved!.sourceUrlMetadata?.title).toBe('Target Title'); + expect(retrieved!.targetUrlMetadata?.title).toBe('Source Title'); + }); + + it('should update updatedAt timestamp when swapping', async () => { + const curatorId = CuratorId.create('did:plc:curator123').unwrap(); + const source = UrlOrCardId.createFromUrl( + URL.create('https://example.com/source').unwrap(), + ).unwrap(); + const target = UrlOrCardId.createFromUrl( + URL.create('https://example.com/target').unwrap(), + ).unwrap(); + + const connection = Connection.create({ + source, + target, + curatorId, + }).unwrap(); + + const initialUpdatedAt = connection.updatedAt; + + // Wait a bit to ensure timestamp difference + await new Promise((resolve) => setTimeout(resolve, 10)); + + // Swap + connection.swap(); + + // Verify updatedAt was updated + expect(connection.updatedAt.getTime()).toBeGreaterThan( + initialUpdatedAt.getTime(), + ); + }); +}); diff --git a/src/types/src/api/requests.ts b/src/types/src/api/requests.ts index 1fa8cd24e..f0bcd488f 100644 --- a/src/types/src/api/requests.ts +++ b/src/types/src/api/requests.ts @@ -332,6 +332,7 @@ export interface UpdateConnectionRequest { connectionType?: ConnectionType; note?: string; removeNote?: boolean; + swap?: boolean; } export interface DeleteConnectionRequest { diff --git a/src/types/src/api/responses.ts b/src/types/src/api/responses.ts index b7ad6856a..bef429f72 100644 --- a/src/types/src/api/responses.ts +++ b/src/types/src/api/responses.ts @@ -398,7 +398,8 @@ export interface FollowNotificationItem extends BaseNotificationItem { | NotificationType.USER_FOLLOWED_YOU | NotificationType.USER_FOLLOWED_YOUR_COLLECTION; followTargetType: 'USER' | 'COLLECTION'; - followTargetId?: string; // Only present for COLLECTION follows + followTargetId?: string; + collections?: Collection[]; } export interface ConnectionCreatedNotificationItem diff --git a/src/webapp/api-client/clients/ConnectionClient.ts b/src/webapp/api-client/clients/ConnectionClient.ts index 06a817608..75e064783 100644 --- a/src/webapp/api-client/clients/ConnectionClient.ts +++ b/src/webapp/api-client/clients/ConnectionClient.ts @@ -57,6 +57,7 @@ export class ConnectionClient extends BaseClient { connectionType: request.connectionType, note: request.note, removeNote: request.removeNote, + swap: request.swap, }, ); } -- knotmirror 0.0.1