Fix/Adjust use cases to deletionInfo (#155)

* feat: add todos * fix: adjust ShareRepositoryAttributeUseCase * test: NotifyPeerAboutRepositoryAttributeSuccession with attribute deleted by peer * test: SucceedRelationshipAttributeAndNotifyPeer with attribute deleted by peer * chore: version bump * chore: remove todo comment * feat: decouple tests and rename variables * feat: allow to re-share Attributes that are ToBeDeletedByPeer * fix: adjust for mongodb and ferretdb * chore: version bump --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
nmshd · Jul 1, 2024 · ddbec99 · ddbec99
1 parent d3bc2ff
commit ddbec99
Show file tree

Hide file tree

Showing 6 changed files with 256 additions and 129 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nmshd/runtime",
-    "version": "4.13.1",
+    "version": "4.13.2",
     "description": "The enmeshed client runtime.",
     "homepage": "https://enmeshed.eu",
     "repository": {

diff --git a/packages/runtime/src/useCases/consumption/attributes/ShareRepositoryAttribute.ts b/packages/runtime/src/useCases/consumption/attributes/ShareRepositoryAttribute.ts
@@ -1,5 +1,5 @@
 import { Result } from "@js-soft/ts-utils";
-import { AttributesController, CreateOutgoingRequestParameters, LocalAttribute, OutgoingRequestsController } from "@nmshd/consumption";
+import { AttributesController, CreateOutgoingRequestParameters, DeletionStatus, LocalAttribute, OutgoingRequestsController } from "@nmshd/consumption";
 import { Request, ShareAttributeRequestItem } from "@nmshd/content";
 import { AccountController, CoreAddress, CoreId, MessageController } from "@nmshd/transport";
 import { Inject } from "typescript-ioc";
@@ -54,7 +54,8 @@ export class ShareRepositoryAttributeUseCase extends UseCase<ShareRepositoryAttr
             "content.owner": this.accountController.identity.address.toString(),
             "content.@type": "IdentityAttribute",
             "shareInfo.sourceAttribute": request.attributeId,
-            "shareInfo.peer": request.peer
+            "shareInfo.peer": request.peer,
+            "deletionInfo.deletionStatus": { $nin: [DeletionStatus.DeletedByPeer, DeletionStatus.ToBeDeletedByPeer] }
         };
         const ownSharedIdentityAttributesOfRepositoryAttribute = await this.attributeController.getLocalAttributes(query);
         if (ownSharedIdentityAttributesOfRepositoryAttribute.length > 0) {
@@ -64,13 +65,12 @@ export class ShareRepositoryAttributeUseCase extends UseCase<ShareRepositoryAttr
         }
 
         const sharedVersionsOfRepositoryAttribute = await this.attributeController.getSharedVersionsOfAttribute(repositoryAttributeId, [CoreAddress.from(request.peer)], false);
-        if (sharedVersionsOfRepositoryAttribute.length > 0) {
+        const activeSharedVersions = sharedVersionsOfRepositoryAttribute.filter(
+            (attr) => attr.deletionInfo?.deletionStatus !== DeletionStatus.DeletedByPeer && attr.deletionInfo?.deletionStatus !== DeletionStatus.ToBeDeletedByPeer
+        );
+        if (activeSharedVersions.length > 0) {
             return Result.fail(
-                RuntimeErrors.attributes.anotherVersionOfRepositoryAttributeHasAlreadyBeenSharedWithPeer(
-                    request.attributeId,
-                    request.peer,
-                    sharedVersionsOfRepositoryAttribute[0].id
-                )
+                RuntimeErrors.attributes.anotherVersionOfRepositoryAttributeHasAlreadyBeenSharedWithPeer(request.attributeId, request.peer, activeSharedVersions[0].id)
             );
         }