Deleting a SharedAttribute does not validate if it's possible to send the Notification

packages/runtime/src/useCases/common/RuntimeErrors.ts

@@ -257,7 +257,7 @@ class Attributes {
     public cannotDeleteSharedAttributeWhileRelationshipIsPending(): ApplicationError {
         return new ApplicationError(
             "error.runtime.attributes.cannotDeleteSharedAttributeWhileRelationshipIsPending",
-            "The shared Attribute cannot be deleted while the Relationship to the Peer is in status Pending."
+            "The shared Attribute cannot be deleted while the Relationship to the peer is in status 'Pending'."
         );
     }
 }

packages/runtime/src/useCases/consumption/attributes/DeleteOwnSharedAttributeAndNotifyPeer.ts

@@ -4,7 +4,6 @@ import { Notification, OwnSharedAttributeDeletedByOwnerNotificationItem } from "
 import { CoreId } from "@nmshd/core-types";
 import { AccountController, MessageController, RelationshipsController } from "@nmshd/transport";
 import { Inject } from "@nmshd/typescript-ioc";
-import { RelationshipStatus } from "../../../types";
 import { AttributeIdString, NotificationIdString, RuntimeErrors, SchemaRepository, SchemaValidator, UseCase } from "../../common";
 
 export interface DeleteOwnSharedAttributeAndNotifyPeerRequest {
@@ -41,9 +40,9 @@ export class DeleteOwnSharedAttributeAndNotifyPeerUseCase extends UseCase<Delete
             return Result.fail(RuntimeErrors.attributes.isNotOwnSharedAttribute(ownSharedAttributeId));
         }
 
-        const relationship = await this.relationshipsController.getRelationshipToIdentity(ownSharedAttribute.shareInfo.peer);
+        const canSendMessageResult = await this.relationshipsController.canSendMessage(ownSharedAttribute.shareInfo.peer);
 
-        if (relationship && relationship.status === RelationshipStatus.Pending) {
+        if (canSendMessageResult.isError) {
             return Result.fail(RuntimeErrors.attributes.cannotDeleteSharedAttributeWhileRelationshipIsPending());
         }
 

packages/runtime/src/useCases/consumption/attributes/DeletePeerSharedAttributeAndNotifyOwner.ts

@@ -4,7 +4,6 @@ import { Notification, PeerSharedAttributeDeletedByPeerNotificationItem } from "
 import { CoreId } from "@nmshd/core-types";
 import { AccountController, MessageController, RelationshipsController } from "@nmshd/transport";
 import { Inject } from "@nmshd/typescript-ioc";
-import { RelationshipStatus } from "../../../types";
 import { AttributeIdString, NotificationIdString, RuntimeErrors, SchemaRepository, SchemaValidator, UseCase } from "../../common";
 
 export interface DeletePeerSharedAttributeAndNotifyOwnerRequest {
@@ -40,13 +39,15 @@ export class DeletePeerSharedAttributeAndNotifyOwnerUseCase extends UseCase<Dele
         if (!peerSharedAttribute.isPeerSharedAttribute(peerSharedAttribute.shareInfo?.peer)) {
             return Result.fail(RuntimeErrors.attributes.isNotPeerSharedAttribute(peerSharedAttributeId));
         }
-        const relationship = await this.relationshipsController.getRelationshipToIdentity(peerSharedAttribute.shareInfo.peer);
 
-        if (relationship && relationship.status === RelationshipStatus.Pending) {
+        const canSendMessageResult = await this.relationshipsController.canSendMessage(peerSharedAttribute.shareInfo.peer);
+
+        if (canSendMessageResult.isError) {
             return Result.fail(RuntimeErrors.attributes.cannotDeleteSharedAttributeWhileRelationshipIsPending());
         }
 
         const validationResult = await this.attributesController.validateFullAttributeDeletionProcess(peerSharedAttribute);
+
         if (validationResult.isError()) {
             return Result.fail(validationResult.error);
         }

packages/runtime/src/useCases/consumption/attributes/DeleteThirdPartyRelationshipAttributeAndNotifyPeer.ts

@@ -4,7 +4,6 @@ import { Notification, ThirdPartyRelationshipAttributeDeletedByPeerNotificationI
 import { CoreId } from "@nmshd/core-types";
 import { AccountController, MessageController, RelationshipsController } from "@nmshd/transport";
 import { Inject } from "@nmshd/typescript-ioc";
-import { RelationshipStatus } from "../../../types";
 import { AttributeIdString, NotificationIdString, RuntimeErrors, SchemaRepository, SchemaValidator, UseCase } from "../../common";
 
 export interface DeleteThirdPartyRelationshipAttributeAndNotifyPeerRequest {
@@ -46,9 +45,9 @@ export class DeleteThirdPartyRelationshipAttributeAndNotifyPeerUseCase extends U
             return Result.fail(RuntimeErrors.attributes.isNotThirdPartyRelationshipAttribute(thirdPartyRelationshipAttributeId));
         }
 
-        const relationship = await this.relationshipsController.getRelationshipToIdentity(thirdPartyRelationshipAttribute.shareInfo.peer);
+        const canSendMessageResult = await this.relationshipsController.canSendMessage(thirdPartyRelationshipAttribute.shareInfo.peer);
 
-        if (relationship && relationship.status === RelationshipStatus.Pending) {
+        if (canSendMessageResult.isError) {
             return Result.fail(RuntimeErrors.attributes.cannotDeleteSharedAttributeWhileRelationshipIsPending());
         }
 

packages/runtime/test/consumption/attributes.test.ts

@@ -2690,9 +2690,8 @@ describe("DeleteAttributeUseCases", () => {
 
             const content: CreateOwnRelationshipTemplateRequest["content"] = {
                 "@type": "RelationshipTemplateContent",
-                title: "Connect to HCM",
+                title: "aTitle",
                 onNewRelationship: {
-                    title: "Connect to HCM2",
                     items: [item],
                     "@type": "Request"
                 }
@@ -2715,7 +2714,7 @@ describe("DeleteAttributeUseCases", () => {
                 content: {
                     value: {
                         "@type": "GivenName",
-                        value: "123qwe"
+                        value: "aGivenName"
                     }
                 }
             });
@@ -2728,7 +2727,7 @@ describe("DeleteAttributeUseCases", () => {
                 }
             });
 
-            const acceptRequest = await services2.consumption.incomingRequests.accept({
+            const acceptedRequest = await services2.consumption.incomingRequests.accept({
                 requestId: requestsForRelationship.value[0].id,
                 items: [
                     {
@@ -2738,7 +2737,7 @@ describe("DeleteAttributeUseCases", () => {
                 ]
             });
 
-            expect(acceptRequest).toBeSuccessful();
+            expect(acceptedRequest).toBeSuccessful();
 
             const relationships = await syncUntilHasRelationships(services1.transport);
             expect(relationships).toHaveLength(1);
@@ -2872,7 +2871,7 @@ describe("DeleteAttributeUseCases", () => {
             expect(CoreDate.from(updatedPredecessor.deletionInfo!.deletionDate).isBetween(timeBeforeUpdate, timeAfterUpdate.add(1))).toBe(true);
         });
 
-        test("should throw an error when deleting an OwnSharedAttribute when the Relationship is in status Pending", async () => {
+        test("should throw an error when deleting an PeerSharedAttribute when the Relationship is in status Pending", async () => {
             const [services1, services2] = await runtimeServiceProvider.launch(2, {
                 enableRequestModule: true,
                 enableDeciderModule: true,
@@ -2883,7 +2882,7 @@ describe("DeleteAttributeUseCases", () => {
                 content: {
                     value: {
                         "@type": "GivenName",
-                        value: "123qwe"
+                        value: "aGivenName"
                     }
                 }
             });
@@ -2897,9 +2896,8 @@ describe("DeleteAttributeUseCases", () => {
 
             const content: CreateOwnRelationshipTemplateRequest["content"] = {
                 "@type": "RelationshipTemplateContent",
-                title: "Connect to HCM",
+                title: "aTitle",
                 onNewRelationship: {
-                    title: "Connect to HCM2",
                     items: [item],
                     "@type": "Request"
                 }
@@ -2926,7 +2924,7 @@ describe("DeleteAttributeUseCases", () => {
                 }
             });
 
-            const acceptRequest = await services2.consumption.incomingRequests.accept({
+            const acceptedRequest = await services2.consumption.incomingRequests.accept({
                 requestId: requestsForRelationship.value[0].id,
                 items: [
                     {
@@ -2935,7 +2933,7 @@ describe("DeleteAttributeUseCases", () => {
                 ]
             });
 
-            expect(acceptRequest).toBeSuccessful();
+            expect(acceptedRequest).toBeSuccessful();
 
             const relationships = await syncUntilHasRelationships(services1.transport);
             expect(relationships).toHaveLength(1);
@@ -3099,9 +3097,8 @@ describe("DeleteAttributeUseCases", () => {
 
             const content: CreateOwnRelationshipTemplateRequest["content"] = {
                 "@type": "RelationshipTemplateContent",
-                title: "Connect to HCM",
+                title: "aTitle",
                 onNewRelationship: {
-                    title: "Connect to HCM2",
                     items: [item],
                     "@type": "Request"
                 }
@@ -3126,7 +3123,7 @@ describe("DeleteAttributeUseCases", () => {
                 }
             });
 
-            const acceptRequest = await services3.consumption.incomingRequests.accept({
+            const acceptedRequest = await services3.consumption.incomingRequests.accept({
                 requestId: requestsForRelationship.value[0].id,
                 items: [
                     {
@@ -3135,7 +3132,7 @@ describe("DeleteAttributeUseCases", () => {
                 ]
             });
 
-            expect(acceptRequest).toBeSuccessful();
+            expect(acceptedRequest).toBeSuccessful();
 
             const relationships = await syncUntilHasRelationships(services2.transport);
             expect(relationships).toHaveLength(1);

packages/transport/src/modules/relationships/RelationshipsController.ts

@@ -655,4 +655,13 @@ export class RelationshipsController extends TransportController {
 
         return relationship;
     }
+
+    public async canSendMessage(recipient: CoreAddress): Promise<Result<void, CoreError>> {
+        const relationship = await this.getRelationshipToIdentity(recipient, RelationshipStatus.Pending);
+        if (relationship) {
+            Result.fail(TransportCoreErrors.messages.hasNeitherActiveNorTerminatedRelationship([recipient.address]));
+        }
+
+        return Result.ok(undefined);
+    }
 }