From 325b87dd8716aa72128d98fdc65602b3b73423ff Mon Sep 17 00:00:00 2001 From: Britta Stallknecht Date: Thu, 8 May 2025 12:13:38 +0200 Subject: [PATCH] fix: misleading error code used --- .../TransferFileOwnershipRequestItemProcessor.ts | 10 +++++----- .../TransferFileOwnershipRequestItemProcessor.test.ts | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/consumption/src/modules/requests/itemProcessors/transferFileOwnership/TransferFileOwnershipRequestItemProcessor.ts b/packages/consumption/src/modules/requests/itemProcessors/transferFileOwnership/TransferFileOwnershipRequestItemProcessor.ts index d633f19ce..7b2d59bde 100644 --- a/packages/consumption/src/modules/requests/itemProcessors/transferFileOwnership/TransferFileOwnershipRequestItemProcessor.ts +++ b/packages/consumption/src/modules/requests/itemProcessors/transferFileOwnership/TransferFileOwnershipRequestItemProcessor.ts @@ -66,7 +66,7 @@ export class TransferFileOwnershipRequestItemProcessor extends GenericRequestIte file = await this.accountController.files.getOrLoadFileByTruncated(requestItem.fileReference.truncate()); } catch (_) { return ValidationResult.error( - ConsumptionCoreErrors.requests.invalidAcceptParameters( + ConsumptionCoreErrors.requests.invalidRequestItem( `You cannot accept this RequestItem since the File with the given ID '${requestItem.fileReference.id.toString()}' could not be found.` ) ); @@ -74,7 +74,7 @@ export class TransferFileOwnershipRequestItemProcessor extends GenericRequestIte if (file.cache!.expiresAt.isExpired()) { return ValidationResult.error( - ConsumptionCoreErrors.requests.invalidAcceptParameters( + ConsumptionCoreErrors.requests.invalidRequestItem( `You cannot accept this RequestItem since the File with the given ID '${requestItem.fileReference.id.toString()}' is already expired.` ) ); @@ -82,7 +82,7 @@ export class TransferFileOwnershipRequestItemProcessor extends GenericRequestIte if (file.isOwn) { return ValidationResult.error( - ConsumptionCoreErrors.requests.invalidAcceptParameters( + ConsumptionCoreErrors.requests.invalidRequestItem( `You cannot accept this RequestItem since the File with the given fileReference '${requestItem.fileReference.id.toString()}' is already owned by you.` ) ); @@ -90,7 +90,7 @@ export class TransferFileOwnershipRequestItemProcessor extends GenericRequestIte if (file.cache!.owner.toString() !== requestInfo.peer.toString()) { return ValidationResult.error( - ConsumptionCoreErrors.requests.invalidAcceptParameters( + ConsumptionCoreErrors.requests.invalidRequestItem( `You cannot accept this RequestItem since the File with the given fileReference '${requestItem.fileReference.id.toString()}' is not owned by the peer.` ) ); @@ -100,7 +100,7 @@ export class TransferFileOwnershipRequestItemProcessor extends GenericRequestIte const tagValidationResult = await this.consumptionController.attributes.validateTagsForType(file.cache!.tags, "IdentityFileReference"); if (tagValidationResult.isError()) { return ValidationResult.error( - ConsumptionCoreErrors.requests.invalidAcceptParameters( + ConsumptionCoreErrors.requests.invalidRequestItem( `You cannot accept this RequestItem since the File with the given fileReference '${requestItem.fileReference.id.toString()}' has invalid tags. ${tagValidationResult.error.message}` ) ); diff --git a/packages/consumption/test/modules/requests/itemProcessors/transferFileOwnership/TransferFileOwnershipRequestItemProcessor.test.ts b/packages/consumption/test/modules/requests/itemProcessors/transferFileOwnership/TransferFileOwnershipRequestItemProcessor.test.ts index 0bee09b9b..a330431fe 100644 --- a/packages/consumption/test/modules/requests/itemProcessors/transferFileOwnership/TransferFileOwnershipRequestItemProcessor.test.ts +++ b/packages/consumption/test/modules/requests/itemProcessors/transferFileOwnership/TransferFileOwnershipRequestItemProcessor.test.ts @@ -168,7 +168,7 @@ describe("TransferFileOwnershipRequestItemProcessor", function () { const result = await recipientProcessor.canAccept(requestItem, { accept: true }, incomingRequest); expect(result).errorValidationResult({ - code: "error.consumption.requests.invalidAcceptParameters", + code: "error.consumption.requests.invalidRequestItem", message: `You cannot accept this RequestItem since the File with the given ID '${requestItem.fileReference.id.toString()}' could not be found.` }); }); @@ -191,7 +191,7 @@ describe("TransferFileOwnershipRequestItemProcessor", function () { const result = await recipientProcessor.canAccept(requestItem, { accept: true }, incomingRequest); expect(result).errorValidationResult({ - code: "error.consumption.requests.invalidAcceptParameters", + code: "error.consumption.requests.invalidRequestItem", message: `You cannot accept this RequestItem since the File with the given fileReference '${requestItem.fileReference.id.toString()}' is already owned by you.` }); }); @@ -214,7 +214,7 @@ describe("TransferFileOwnershipRequestItemProcessor", function () { const result = await recipientProcessor.canAccept(requestItem, { accept: true }, incomingRequest); expect(result).errorValidationResult({ - code: "error.consumption.requests.invalidAcceptParameters", + code: "error.consumption.requests.invalidRequestItem", message: `You cannot accept this RequestItem since the File with the given fileReference '${requestItem.fileReference.id.toString()}' is not owned by the peer.` }); });