@nmshd/runtime 7.0.0-alpha.7 → 7.0.0-alpha.71

package/dist/dataViews/DataViewExpander.js

@@ -20,11 +20,11 @@ const ts_serval_1 = require("@js-soft/ts-serval");
 const consumption_1 = require("@nmshd/consumption");
 const content_1 = require("@nmshd/content");
 const core_types_1 = require("@nmshd/core-types");
+const runtime_types_1 = require("@nmshd/runtime-types");
 const transport_1 = require("@nmshd/transport");
 const typescript_ioc_1 = require("@nmshd/typescript-ioc");
 const lodash_1 = __importDefault(require("lodash"));
 const extensibility_1 = require("../extensibility");
-const types_1 = require("../types");
 const useCases_1 = require("../useCases");
 const DataViewTranslateable_1 = require("./DataViewTranslateable");
 const transport_2 = require("./transport");
@@ -308,7 +308,6 @@ let DataViewExpander = class DataViewExpander {
                     const processedQuery = await this.processAttributeQuery(readAttributeRequestItem.query);
                     // ThirdPartyAttributeQueries without results cannot be changed.
                     if (processedQuery.type === "ProcessedThirdPartyRelationshipAttributeQueryDVO" && processedQuery.results.length === 0) {
-                        isDecidable = false;
                         error = {
                             code: "dvo.requestItem.error.noResultsForThirdPartyRelationshipAttributeQuery",
                             message: "There are no matching Attributes for this ThirdPartyRelationshipAttributeQuery."
@@ -318,7 +317,6 @@ let DataViewExpander = class DataViewExpander {
                     if (processedQuery.type === "ProcessedIQLQueryDVO" &&
                         processedQuery.results.length === 0 &&
                         !readAttributeRequestItem.query.attributeCreationHints) {
-                        isDecidable = false;
                         error = {
                             code: "dvo.requestItem.error.noResultsForIQLQueryDVO",
                             message: "There are no matching Attributes for this IQLQuery and no attributeCreationHint is set."
@@ -326,9 +324,9 @@ let DataViewExpander = class DataViewExpander {
                     }
                     return {
                         ...readAttributeRequestItem,
-                        type: "DecidableReadAttributeRequestItemDVO",
+                        type: "ReadAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ?? "i18n://dvo.requestItem.DecidableReadAttributeRequestItem.name",
+                        name: this.generateRequestItemName(requestItem["@type"], isDecidable),
                         query: processedQuery,
                         isDecidable,
                         error,
@@ -339,7 +337,7 @@ let DataViewExpander = class DataViewExpander {
                     ...readAttributeRequestItem,
                     type: "ReadAttributeRequestItemDVO",
                     id: "",
-                    name: requestItem.title ?? "i18n://dvo.requestItem.ReadAttributeRequestItem.name",
+                    name: this.generateRequestItemName(requestItem["@type"], isDecidable),
                     query: await this.expandAttributeQuery(readAttributeRequestItem.query),
                     isDecidable,
                     response: responseItemDVO
@@ -347,39 +345,11 @@ let DataViewExpander = class DataViewExpander {
             case "CreateAttributeRequestItem":
                 const createAttributeRequestItem = requestItem;
                 const attribute = await this.expandAttribute(createAttributeRequestItem.attribute);
-                let isIdentityAttribute = false;
-                if (attribute.type === "DraftIdentityAttributeDVO") {
-                    isIdentityAttribute = true;
-                }
-                const name = requestItem.title;
-                const description = requestItem.description;
-                let fallbackName;
-                if (isDecidable) {
-                    fallbackName = "i18n://dvo.requestItem.DecidableCreateRelationshipAttributeRequestItem.name";
-                    if (isIdentityAttribute) {
-                        fallbackName = "i18n://dvo.requestItem.DecidableCreateIdentityAttributeRequestItem.name";
-                    }
-                    return {
-                        ...createAttributeRequestItem,
-                        type: "DecidableCreateAttributeRequestItemDVO",
-                        id: "",
-                        name: name ?? fallbackName,
-                        description: description ?? fallbackName,
-                        attribute,
-                        isDecidable,
-                        response: responseItemDVO
-                    };
-                }
-                fallbackName = "i18n://dvo.requestItem.CreateRelationshipAttributeRequestItem.name";
-                if (isIdentityAttribute) {
-                    fallbackName = "i18n://dvo.requestItem.CreateIdentityAttributeRequestItem.name";
-                }
                 return {
                     ...createAttributeRequestItem,
                     type: "CreateAttributeRequestItemDVO",
                     id: "",
-                    name: name ?? fallbackName,
-                    description: description ?? fallbackName,
+                    name: this.generateRequestItemName(requestItem["@type"], isDecidable),
                     attribute,
                     isDecidable,
                     response: responseItemDVO
@@ -388,22 +358,11 @@ let DataViewExpander = class DataViewExpander {
                 const deleteAttributeRequestItem = requestItem;
                 const localAttributeResultForDelete = await this.consumption.attributes.getAttribute({ id: deleteAttributeRequestItem.attributeId });
                 const localAttributeDVOForDelete = await this.expandLocalAttributeDTO(localAttributeResultForDelete.value);
-                if (isDecidable) {
-                    return {
-                        ...deleteAttributeRequestItem,
-                        type: "DecidableDeleteAttributeRequestItemDVO",
-                        id: "",
-                        name: requestItem.title ?? "i18n://dvo.requestItem.DecidableDeleteAttributeRequestItem.name",
-                        isDecidable,
-                        response: responseItemDVO,
-                        attribute: localAttributeDVOForDelete
-                    };
-                }
                 return {
                     ...deleteAttributeRequestItem,
                     type: "DeleteAttributeRequestItemDVO",
                     id: "",
-                    name: requestItem.title ?? "i18n://dvo.requestItem.DeleteAttributeRequestItem.name",
+                    name: this.generateRequestItemName(requestItem["@type"], isDecidable),
                     isDecidable,
                     response: responseItemDVO,
                     attribute: localAttributeDVOForDelete
@@ -428,25 +387,13 @@ let DataViewExpander = class DataViewExpander {
                         proposedValueOverruled = !lodash_1.default.isEqual(proposeAttributeResponseItem.attribute.content.value, proposeAttributeRequestItem.attribute.value);
                     }
                 }
-                if (isDecidable) {
-                    return {
-                        ...proposeAttributeRequestItem,
-                        type: "DecidableProposeAttributeRequestItemDVO",
-                        id: "",
-                        name: requestItem.title ?? "i18n://dvo.requestItem.DecidableProposeAttributeRequestItem.name",
-                        attribute: await this.expandAttribute(proposeAttributeRequestItem.attribute),
-                        query: await this.processAttributeQuery(proposeAttributeRequestItem.query),
-                        isDecidable,
-                        response: responseItemDVO
-                    };
-                }
                 return {
                     ...proposeAttributeRequestItem,
                     type: "ProposeAttributeRequestItemDVO",
                     id: "",
-                    name: requestItem.title ?? "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                    name: this.generateRequestItemName(requestItem["@type"], isDecidable),
                     attribute: await this.expandAttribute(proposeAttributeRequestItem.attribute),
-                    query: await this.expandAttributeQuery(proposeAttributeRequestItem.query),
+                    query: isDecidable ? await this.processAttributeQuery(proposeAttributeRequestItem.query) : await this.expandAttributeQuery(proposeAttributeRequestItem.query),
                     isDecidable,
                     response: responseItemDVO,
                     proposedValueOverruled
@@ -454,136 +401,56 @@ let DataViewExpander = class DataViewExpander {
             case "ShareAttributeRequestItem":
                 const shareAttributeRequestItem = requestItem;
                 const attributeDVO = await this.expandAttribute(shareAttributeRequestItem.attribute);
-                if (isDecidable) {
-                    return {
-                        ...shareAttributeRequestItem,
-                        type: "DecidableShareAttributeRequestItemDVO",
-                        id: "",
-                        name: requestItem.title ?? "i18n://dvo.requestItem.DecidableProposeAttributeRequestItem.name",
-                        attribute: attributeDVO,
-                        isDecidable,
-                        response: responseItemDVO
-                    };
-                }
-                if (responseItemDVO?.result === content_1.ResponseItemResult.Accepted) {
-                    // We have to manually copy the attribute id here, otherwise we could not link to the local attribute
-                    const shareAttributeResponseItem = responseItemDVO;
-                    if (shareAttributeResponseItem)
-                        attributeDVO.id = shareAttributeResponseItem.attributeId;
-                }
+                // We have to manually copy the attribute id here, otherwise we could not link to the local attribute
+                attributeDVO.id = shareAttributeRequestItem.attributeId;
                 return {
                     ...shareAttributeRequestItem,
                     type: "ShareAttributeRequestItemDVO",
                     id: "",
-                    name: requestItem.title ?? "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                    name: this.generateRequestItemName(requestItem["@type"], isDecidable),
                     attribute: attributeDVO,
                     isDecidable,
                     response: responseItemDVO
                 };
             case "AuthenticationRequestItem":
                 const authenticationRequestItem = requestItem;
-                if (isDecidable) {
-                    return {
-                        ...authenticationRequestItem,
-                        type: "DecidableAuthenticationRequestItemDVO",
-                        id: "",
-                        name: requestItem.title ?? "i18n://dvo.requestItem.DecidableAuthenticationRequestItem.name",
-                        isDecidable,
-                        response: responseItemDVO
-                    };
-                }
                 return {
                     ...authenticationRequestItem,
                     type: "AuthenticationRequestItemDVO",
                     id: "",
-                    name: requestItem.title ?? "i18n://dvo.requestItem.AuthenticationRequestItem.name",
+                    name: authenticationRequestItem.title,
                     isDecidable,
                     response: responseItemDVO
                 };
             case "ConsentRequestItem":
                 const consentRequestItem = requestItem;
-                if (isDecidable) {
-                    return {
-                        ...consentRequestItem,
-                        type: "DecidableConsentRequestItemDVO",
-                        id: "",
-                        name: requestItem.title ?? "i18n://dvo.requestItem.DecidableConsentRequestItem.name",
-                        isDecidable,
-                        response: responseItemDVO
-                    };
-                }
                 return {
                     ...consentRequestItem,
                     type: "ConsentRequestItemDVO",
                     id: "",
-                    name: requestItem.title ?? "i18n://dvo.requestItem.ConsentRequestItem.name",
-                    isDecidable,
-                    response: responseItemDVO
-                };
-            case "FreeTextRequestItem":
-                const freeTextRequestItem = requestItem;
-                if (isDecidable) {
-                    return {
-                        ...freeTextRequestItem,
-                        type: "DecidableFreeTextRequestItemDVO",
-                        id: "",
-                        name: requestItem.title ?? "i18n://dvo.requestItem.DecidableFreeTextRequestItem.name",
-                        isDecidable,
-                        response: responseItemDVO
-                    };
-                }
-                return {
-                    ...freeTextRequestItem,
-                    type: "FreeTextRequestItemDVO",
-                    id: "",
-                    name: requestItem.title ?? "i18n://dvo.requestItem.FreeTextRequestItem.name",
+                    name: this.generateRequestItemName(requestItem["@type"], isDecidable),
                     isDecidable,
                     response: responseItemDVO
                 };
-            case "RegisterAttributeListenerRequestItem":
-                const registerAttributeListenerRequestItem = requestItem;
-                const queryDVO = (await this.expandAttributeQuery(registerAttributeListenerRequestItem.query));
-                if (isDecidable) {
-                    return {
-                        ...registerAttributeListenerRequestItem,
-                        type: "DecidableRegisterAttributeListenerRequestItemDVO",
-                        id: "",
-                        query: queryDVO,
-                        name: requestItem.title ?? "i18n://dvo.requestItem.DecidableRegisterAttributeListenerRequestItem.name",
-                        isDecidable,
-                        response: responseItemDVO
-                    };
-                }
+            case "FormFieldRequestItem":
+                const formFieldRequestItem = requestItem;
                 return {
-                    ...registerAttributeListenerRequestItem,
-                    type: "RegisterAttributeListenerRequestItemDVO",
+                    ...formFieldRequestItem,
+                    type: "FormFieldRequestItemDVO",
                     id: "",
-                    query: queryDVO,
-                    name: requestItem.title ?? "i18n://dvo.requestItem.RegisterAttributeListenerRequestItem.name",
+                    name: formFieldRequestItem.title,
                     isDecidable,
                     response: responseItemDVO
                 };
             case "TransferFileOwnershipRequestItem":
                 const transferFileOwnershipRequestItem = requestItem;
-                await this.transport.files.getOrLoadFile({ reference: transferFileOwnershipRequestItem.fileReference });
                 const fileReference = core_types_1.FileReference.from(transferFileOwnershipRequestItem.fileReference);
-                const file = await this.expandFileId(fileReference.id.toString());
-                if (isDecidable) {
-                    return {
-                        ...transferFileOwnershipRequestItem,
-                        type: "DecidableTransferFileOwnershipRequestItemDVO",
-                        id: "",
-                        name: requestItem.title ?? "i18n://dvo.requestItem.DecidableTransferFileOwnershipRequestItem.name",
-                        isDecidable,
-                        response: responseItemDVO,
-                        file
-                    };
-                }
+                const file = await this.expandFileReference(fileReference);
                 return {
                     ...transferFileOwnershipRequestItem,
                     type: "TransferFileOwnershipRequestItemDVO",
                     id: "",
-                    name: requestItem.title ?? "i18n://dvo.requestItem.TransferFileOwnershipRequestItem.name",
+                    name: this.generateRequestItemName(requestItem["@type"], isDecidable),
                     isDecidable,
                     response: responseItemDVO,
                     file
@@ -593,33 +460,38 @@ let DataViewExpander = class DataViewExpander {
                     ...requestItem,
                     type: "RequestItemDVO",
                     id: "",
-                    name: requestItem.title ?? "i18n://dvo.requestItem.name",
+                    name: "i18n://dvo.requestItem.name",
                     isDecidable,
                     response: responseItemDVO
                 };
         }
     }
+    generateRequestItemName(atType, isDecidable) {
+        if (isDecidable)
+            return `i18n://dvo.requestItem.Decidable${atType}.name`;
+        return `i18n://dvo.requestItem.${atType}.name`;
+    }
     async expandRequestGroupOrItem(requestGroupOrItem, localRequestDTO, responseGroupOrItemDVO) {
         if (requestGroupOrItem["@type"] === "RequestItemGroup") {
             let isDecidable = false;
             if (localRequestDTO && !localRequestDTO.isOwn && (localRequestDTO.status === "DecisionRequired" || localRequestDTO.status === "ManualDecisionRequired")) {
                 isDecidable = true;
             }
-            const requestGroup = requestGroupOrItem;
-            const responseGroup = responseGroupOrItemDVO;
+            const requestItemGroup = requestGroupOrItem;
+            const responseItemGroup = responseGroupOrItemDVO;
             const itemDVOs = [];
-            for (let i = 0; i < requestGroup.items.length; i++) {
-                const requestItem = requestGroup.items[i];
-                const responseItem = responseGroup?.items[i];
+            for (let i = 0; i < requestItemGroup.items.length; i++) {
+                const requestItem = requestItemGroup.items[i];
+                const responseItem = responseItemGroup?.items[i];
                 itemDVOs.push(await this.expandRequestItem(requestItem, localRequestDTO, responseItem));
             }
             return {
                 type: "RequestItemGroupDVO",
                 items: itemDVOs,
                 isDecidable,
-                title: requestGroupOrItem.title,
-                description: requestGroupOrItem.description,
-                response: responseGroup
+                title: requestItemGroup.title,
+                description: requestItemGroup.description,
+                response: responseItemGroup
             };
         }
         if (!(0, content_1.isRequestItemDerivation)(requestGroupOrItem)) {
@@ -634,6 +506,15 @@ let DataViewExpander = class DataViewExpander {
                 case "ReadAttributeAcceptResponseItem":
                     const readAttributeResponseItem = responseItem;
                     const localAttributeResultForRead = await this.consumption.attributes.getAttribute({ id: readAttributeResponseItem.attributeId });
+                    if (localAttributeResultForRead.isError) {
+                        if (!localAttributeResultForRead.error.equals(useCases_1.RuntimeErrors.general.recordNotFound()))
+                            throw localAttributeResultForRead.error;
+                        return {
+                            type: "AttributeAlreadyDeletedAcceptResponseItemDVO",
+                            id: readAttributeResponseItem.attributeId,
+                            name: name
+                        };
+                    }
                     const localAttributeDVOForRead = await this.expandLocalAttributeDTO(localAttributeResultForRead.value);
                     return {
                         ...readAttributeResponseItem,
@@ -645,6 +526,15 @@ let DataViewExpander = class DataViewExpander {
                 case "CreateAttributeAcceptResponseItem":
                     const createAttributeResponseItem = responseItem;
                     const localAttributeResultForCreate = await this.consumption.attributes.getAttribute({ id: createAttributeResponseItem.attributeId });
+                    if (localAttributeResultForCreate.isError) {
+                        if (!localAttributeResultForCreate.error.equals(useCases_1.RuntimeErrors.general.recordNotFound()))
+                            throw localAttributeResultForCreate.error;
+                        return {
+                            type: "AttributeAlreadyDeletedAcceptResponseItemDVO",
+                            id: createAttributeResponseItem.attributeId,
+                            name: name
+                        };
+                    }
                     const localAttributeDVOForCreate = await this.expandLocalAttributeDTO(localAttributeResultForCreate.value);
                     return {
                         ...createAttributeResponseItem,
@@ -664,6 +554,15 @@ let DataViewExpander = class DataViewExpander {
                 case "ProposeAttributeAcceptResponseItem":
                     const proposeAttributeResponseItem = responseItem;
                     const localAttributeResultForPropose = await this.consumption.attributes.getAttribute({ id: proposeAttributeResponseItem.attributeId });
+                    if (localAttributeResultForPropose.isError) {
+                        if (!localAttributeResultForPropose.error.equals(useCases_1.RuntimeErrors.general.recordNotFound()))
+                            throw localAttributeResultForPropose.error;
+                        return {
+                            type: "AttributeAlreadyDeletedAcceptResponseItemDVO",
+                            id: proposeAttributeResponseItem.attributeId,
+                            name: name
+                        };
+                    }
                     const localAttributeDVOForPropose = await this.expandLocalAttributeDTO(localAttributeResultForPropose.value);
                     return {
                         ...proposeAttributeResponseItem,
@@ -672,80 +571,79 @@ let DataViewExpander = class DataViewExpander {
                         name: name,
                         attribute: localAttributeDVOForPropose
                     };
-                case "ShareAttributeAcceptResponseItem":
-                    const shareAttributeResponseItem = responseItem;
-                    const localAttributeResultForShare = await this.consumption.attributes.getAttribute({ id: shareAttributeResponseItem.attributeId });
-                    const localAttributeDVOForShare = await this.expandLocalAttributeDTO(localAttributeResultForShare.value);
+                case "FormFieldAcceptResponseItem":
+                    const formFieldResponseItem = responseItem;
                     return {
-                        ...shareAttributeResponseItem,
-                        type: "ShareAttributeAcceptResponseItemDVO",
-                        id: shareAttributeResponseItem.attributeId,
-                        name: name,
-                        attribute: localAttributeDVOForShare
-                    };
-                case "FreeTextAcceptResponseItem":
-                    const freeTextResponseItem = responseItem;
-                    return {
-                        ...freeTextResponseItem,
-                        type: "FreeTextAcceptResponseItemDVO",
+                        ...formFieldResponseItem,
+                        type: "FormFieldAcceptResponseItemDVO",
                         id: "",
                         name: name
                     };
-                case "RegisterAttributeListenerAcceptResponseItem":
-                    const registerAttributeListenerResponseItem = responseItem;
-                    const localAttributeListenerResult = await this.consumption.attributeListeners.getAttributeListener({ id: registerAttributeListenerResponseItem.listenerId });
-                    const localAttributeListener = await this.expandLocalAttributeListenerDTO(localAttributeListenerResult.value);
-                    return {
-                        ...registerAttributeListenerResponseItem,
-                        type: "RegisterAttributeListenerAcceptResponseItemDVO",
-                        id: registerAttributeListenerResponseItem.listenerId,
-                        name: name,
-                        listener: localAttributeListener
-                    };
                 case "TransferFileOwnershipAcceptResponseItem":
                     const transferFileOwnershipResponseItem = responseItem;
-                    const sharedAttributeResultForTransfer = await this.consumption.attributes.getAttribute({ id: transferFileOwnershipResponseItem.attributeId });
-                    const sharedAttributeDVOForTransfer = await this.expandLocalAttributeDTO(sharedAttributeResultForTransfer.value);
-                    const repositoryAttributeResultForTransfer = await this.consumption.attributes.getAttribute({
-                        id: sharedAttributeResultForTransfer.value.shareInfo.sourceAttribute
-                    });
-                    let repositoryAttributeDVOForTransfer;
-                    if (repositoryAttributeResultForTransfer.isSuccess) {
-                        repositoryAttributeDVOForTransfer = await this.expandLocalAttributeDTO(repositoryAttributeResultForTransfer.value);
+                    const attributeResultForTransfer = await this.consumption.attributes.getAttribute({ id: transferFileOwnershipResponseItem.attributeId });
+                    if (attributeResultForTransfer.isError) {
+                        if (!attributeResultForTransfer.error.equals(useCases_1.RuntimeErrors.general.recordNotFound()))
+                            throw attributeResultForTransfer.error;
+                        return {
+                            type: "AttributeAlreadyDeletedAcceptResponseItemDVO",
+                            id: transferFileOwnershipResponseItem.attributeId,
+                            name: name
+                        };
                     }
+                    const attributeDVOForTransfer = (await this.expandLocalAttributeDTO(attributeResultForTransfer.value));
                     return {
                         ...transferFileOwnershipResponseItem,
                         type: "TransferFileOwnershipAcceptResponseItemDVO",
-                        id: repositoryAttributeDVOForTransfer?.id ?? transferFileOwnershipResponseItem.attributeId,
+                        id: transferFileOwnershipResponseItem.attributeId,
                         name: name,
-                        repositoryAttribute: repositoryAttributeDVOForTransfer,
-                        sharedAttributeId: transferFileOwnershipResponseItem.attributeId,
-                        sharedAttribute: sharedAttributeDVOForTransfer
+                        attributeId: transferFileOwnershipResponseItem.attributeId,
+                        attribute: attributeDVOForTransfer
                     };
                 case "AttributeSuccessionAcceptResponseItem":
                     const attributeSuccessionResponseItem = responseItem;
-                    const localPredecessorResult = await this.consumption.attributes.getAttribute({ id: attributeSuccessionResponseItem.predecessorId });
-                    const localPredecessorDVOResult = await this.expandLocalAttributeDTO(localPredecessorResult.value);
                     const localSuccessorResult = await this.consumption.attributes.getAttribute({ id: attributeSuccessionResponseItem.successorId });
-                    const localSuccessorDVOResult = await this.expandLocalAttributeDTO(localSuccessorResult.value);
+                    if (localSuccessorResult.isError) {
+                        if (!localSuccessorResult.error.equals(useCases_1.RuntimeErrors.general.recordNotFound()))
+                            throw localSuccessorResult.error;
+                        return {
+                            type: "AttributeAlreadyDeletedAcceptResponseItemDVO",
+                            id: attributeSuccessionResponseItem.successorId,
+                            name: name
+                        };
+                    }
+                    const localSuccessorDVO = await this.expandLocalAttributeDTO(localSuccessorResult.value);
+                    const localPredecessorResult = await this.consumption.attributes.getAttribute({ id: attributeSuccessionResponseItem.predecessorId });
+                    if (localPredecessorResult.isError && !localPredecessorResult.error.equals(useCases_1.RuntimeErrors.general.recordNotFound()))
+                        throw localPredecessorResult.error;
+                    const localPredecessorDVO = localPredecessorResult.isSuccess ? await this.expandLocalAttributeDTO(localPredecessorResult.value) : undefined;
                     return {
                         ...attributeSuccessionResponseItem,
                         type: "AttributeSuccessionAcceptResponseItemDVO",
                         id: "",
                         name: name,
-                        predecessor: localPredecessorDVOResult,
-                        successor: localSuccessorDVOResult
+                        predecessor: localPredecessorDVO,
+                        successor: localSuccessorDVO
                     };
                 case "AttributeAlreadySharedAcceptResponseItem":
                     const attributeAlreadySharedResponseItem = responseItem;
                     const localAttributeResult = await this.consumption.attributes.getAttribute({ id: attributeAlreadySharedResponseItem.attributeId });
-                    const localAttributeDVOResult = await this.expandLocalAttributeDTO(localAttributeResult.value);
+                    if (localAttributeResult.isError) {
+                        if (!localAttributeResult.error.equals(useCases_1.RuntimeErrors.general.recordNotFound()))
+                            throw localAttributeResult.error;
+                        return {
+                            type: "AttributeAlreadyDeletedAcceptResponseItemDVO",
+                            id: attributeAlreadySharedResponseItem.attributeId,
+                            name: name
+                        };
+                    }
+                    const localAttributeDVO = await this.expandLocalAttributeDTO(localAttributeResult.value);
                     return {
                         ...attributeAlreadySharedResponseItem,
                         type: "AttributeAlreadySharedAcceptResponseItemDVO",
                         id: "",
                         name: name,
-                        attribute: localAttributeDVOResult
+                        attribute: localAttributeDVO
                     };
                 default:
                     return {
@@ -775,18 +673,6 @@ let DataViewExpander = class DataViewExpander {
             };
         }
     }
-    async expandLocalAttributeListenerDTO(attributeListener) {
-        const query = (await this.expandAttributeQuery(attributeListener.query));
-        const peer = await this.expandAddress(attributeListener.peer);
-        return {
-            type: "LocalAttributeListenerDVO",
-            name: "dvo.localAttributeListener.name",
-            description: "dvo.localAttributeListener.description",
-            ...attributeListener,
-            query,
-            peer
-        };
-    }
     async expandResponseGroupOrItem(responseGroupOrItem) {
         if (responseGroupOrItem["@type"] === "ResponseItemGroup") {
             const group = responseGroupOrItem;
@@ -866,163 +752,190 @@ let DataViewExpander = class DataViewExpander {
         const localAttribute = await this.consumptionController.attributes.getLocalAttribute(core_types_1.CoreId.from(attribute.id));
         if (!localAttribute)
             throw new Error("Attribute not found");
+        if (!(localAttribute instanceof consumption_1.OwnIdentityAttribute ||
+            localAttribute instanceof consumption_1.PeerIdentityAttribute ||
+            localAttribute instanceof consumption_1.OwnRelationshipAttribute ||
+            localAttribute instanceof consumption_1.PeerRelationshipAttribute ||
+            localAttribute instanceof consumption_1.ThirdPartyRelationshipAttribute)) {
+            throw new Error("Attribute has unknown type");
+        }
         const owner = attribute.content.owner;
-        let name = `i18n://dvo.attribute.name.${valueType}`;
-        let description = `i18n://dvo.attribute.description.${valueType}`;
+        const name = `i18n://dvo.attribute.name.${valueType}`;
+        const description = `i18n://dvo.attribute.description.${valueType}`;
         const renderHints = localAttribute.content.value.renderHints.toJSON();
         const valueHints = localAttribute.content.value.valueHints.toJSON();
-        if (localAttribute.shareInfo) {
-            const peer = localAttribute.shareInfo.peer.toString();
-            if (localAttribute.content instanceof content_1.RelationshipAttribute) {
-                const relationshipAttribute = localAttribute.content;
-                const value = relationshipAttribute.value;
-                if ("title" in value) {
-                    name = value.title;
-                }
-                if ("description" in value && !!value.description) {
-                    description = value.description;
-                }
-                // Peer shared RelationshipAttribute
-                if (relationshipAttribute.owner.toString() === peer) {
-                    return {
-                        type: "PeerRelationshipAttributeDVO",
-                        id: attribute.id,
-                        name,
-                        key: relationshipAttribute.key,
-                        confidentiality: relationshipAttribute.confidentiality,
-                        description,
-                        content: attribute.content,
-                        value: attribute.content.value,
-                        date: attribute.createdAt,
-                        owner,
-                        renderHints,
-                        valueHints,
-                        isValid: true,
-                        createdAt: attribute.createdAt,
-                        isOwn: false,
-                        peer: peer,
-                        isDraft: false,
-                        requestReference: localAttribute.shareInfo.requestReference?.toString(),
-                        notificationReference: localAttribute.shareInfo.notificationReference?.toString(),
-                        sourceAttribute: localAttribute.shareInfo.sourceAttribute?.toString(),
-                        thirdPartyAddress: localAttribute.shareInfo.thirdPartyAddress?.toString(),
-                        valueType,
-                        isTechnical: relationshipAttribute.isTechnical,
-                        deletionStatus: localAttribute.deletionInfo?.deletionStatus,
-                        deletionDate: localAttribute.deletionInfo?.deletionDate.toString()
-                    };
-                }
-                // Own shared RelationshipAttribute
-                return {
-                    type: "OwnRelationshipAttributeDVO",
-                    id: attribute.id,
-                    name,
-                    key: relationshipAttribute.key,
-                    confidentiality: relationshipAttribute.confidentiality,
-                    description,
-                    content: attribute.content,
-                    value: attribute.content.value,
-                    date: attribute.createdAt,
-                    owner,
-                    renderHints,
-                    valueHints,
-                    isValid: true,
-                    createdAt: attribute.createdAt,
-                    isOwn: true,
-                    peer: peer,
-                    isDraft: false,
-                    requestReference: localAttribute.shareInfo.requestReference?.toString(),
-                    notificationReference: localAttribute.shareInfo.notificationReference?.toString(),
-                    sourceAttribute: localAttribute.shareInfo.sourceAttribute?.toString(),
-                    thirdPartyAddress: localAttribute.shareInfo.thirdPartyAddress?.toString(),
-                    valueType,
-                    isTechnical: relationshipAttribute.isTechnical,
-                    deletionStatus: localAttribute.deletionInfo?.deletionStatus,
-                    deletionDate: localAttribute.deletionInfo?.deletionDate.toString()
-                };
-            }
-            const identityAttribute = localAttribute.content;
-            if (identityAttribute.owner.toString() === peer) {
-                // Peer shared IdentityAttribute
-                return {
-                    type: "PeerAttributeDVO",
-                    id: attribute.id,
-                    name,
-                    description,
-                    content: attribute.content,
-                    value: attribute.content.value,
-                    date: attribute.createdAt,
-                    owner: owner,
-                    renderHints,
-                    valueHints,
-                    isValid: true,
-                    createdAt: attribute.createdAt,
-                    isOwn: false,
-                    peer: peer,
-                    isDraft: false,
-                    requestReference: localAttribute.shareInfo.requestReference?.toString(),
-                    notificationReference: localAttribute.shareInfo.notificationReference?.toString(),
-                    tags: identityAttribute.tags,
-                    valueType,
-                    deletionStatus: localAttribute.deletionInfo?.deletionStatus,
-                    deletionDate: localAttribute.deletionInfo?.deletionDate.toString()
-                };
-            }
-            // Own Shared IdentityAttribute
+        if (localAttribute instanceof consumption_1.OwnIdentityAttribute) {
+            const forwardingDetailsResult = await this.consumption.attributes.getForwardingDetailsForAttribute({ attributeId: localAttribute.id.toString() });
+            const forwardingDetails = forwardingDetailsResult.value;
             return {
-                type: "SharedToPeerAttributeDVO",
+                type: "OwnIdentityAttributeDVO",
                 id: attribute.id,
                 name,
                 description,
+                date: attribute.createdAt,
                 content: attribute.content,
+                owner: owner,
                 value: attribute.content.value,
+                valueType,
+                renderHints,
+                valueHints,
+                isDraft: false,
+                isOwn: true,
+                createdAt: attribute.createdAt,
+                wasViewedAt: attribute.wasViewedAt,
+                succeeds: attribute.succeeds,
+                succeededBy: attribute.succeededBy,
+                tags: localAttribute.content.tags,
+                isDefault: attribute.isDefault,
+                forwardingPeers: await this.expandForwardingPeers(forwardingDetails),
+                forwardingDetails: this.expandForwardingDetails(forwardingDetails)
+            };
+        }
+        if (localAttribute instanceof consumption_1.PeerIdentityAttribute) {
+            return {
+                type: "PeerIdentityAttributeDVO",
+                id: attribute.id,
+                name,
+                description,
                 date: attribute.createdAt,
+                content: attribute.content,
                 owner: owner,
+                value: attribute.content.value,
+                valueType,
                 renderHints,
                 valueHints,
-                isValid: true,
+                isDraft: false,
+                isOwn: false,
                 createdAt: attribute.createdAt,
-                isOwn: true,
-                peer: peer,
+                wasViewedAt: attribute.wasViewedAt,
+                succeeds: attribute.succeeds,
+                succeededBy: attribute.succeededBy,
+                tags: localAttribute.content.tags,
+                peer: localAttribute.peer.toString(),
+                sourceReference: localAttribute.sourceReference.toString(),
+                deletionDate: localAttribute.deletionInfo?.deletionDate.toString(),
+                deletionStatus: localAttribute.deletionInfo?.deletionStatus
+            };
+        }
+        if (localAttribute instanceof consumption_1.OwnRelationshipAttribute) {
+            const forwardingDetailsResult = await this.consumption.attributes.getForwardingDetailsForAttribute({ attributeId: localAttribute.id.toString() });
+            const forwardingDetails = forwardingDetailsResult.value;
+            return {
+                type: "OwnRelationshipAttributeDVO",
+                id: attribute.id,
+                name: "title" in attribute.content.value ? attribute.content.value.title : name,
+                description: "description" in attribute.content.value ? attribute.content.value.description : description,
+                date: attribute.createdAt,
+                content: attribute.content,
+                owner,
+                value: attribute.content.value,
+                valueType,
+                renderHints,
+                valueHints,
                 isDraft: false,
-                requestReference: localAttribute.shareInfo.requestReference?.toString(),
-                notificationReference: localAttribute.shareInfo.notificationReference?.toString(),
-                sourceAttribute: localAttribute.shareInfo.sourceAttribute?.toString(),
-                tags: identityAttribute.tags,
+                isOwn: true,
+                createdAt: attribute.createdAt,
+                wasViewedAt: attribute.wasViewedAt,
+                succeeds: attribute.succeeds,
+                succeededBy: attribute.succeededBy,
+                key: localAttribute.content.key,
+                confidentiality: localAttribute.content.confidentiality,
+                isTechnical: localAttribute.content.isTechnical,
+                peer: localAttribute.peer.toString(),
+                sourceReference: localAttribute.sourceReference.toString(),
+                deletionStatus: localAttribute.deletionInfo?.deletionStatus,
+                deletionDate: localAttribute.deletionInfo?.deletionDate.toString(),
+                forwardingPeers: await this.expandForwardingPeers(forwardingDetails),
+                forwardingDetails: this.expandForwardingDetails(forwardingDetails)
+            };
+        }
+        if (localAttribute instanceof consumption_1.PeerRelationshipAttribute) {
+            const forwardingDetailsResult = await this.consumption.attributes.getForwardingDetailsForAttribute({ attributeId: localAttribute.id.toString() });
+            const forwardingDetails = forwardingDetailsResult.value;
+            return {
+                type: "PeerRelationshipAttributeDVO",
+                id: attribute.id,
+                name: "title" in attribute.content.value ? attribute.content.value.title : name,
+                description: "description" in attribute.content.value ? attribute.content.value.description : description,
+                date: attribute.createdAt,
+                content: attribute.content,
+                owner,
+                value: attribute.content.value,
                 valueType,
+                renderHints,
+                valueHints,
+                isDraft: false,
+                isOwn: false,
+                createdAt: attribute.createdAt,
+                wasViewedAt: attribute.wasViewedAt,
+                succeeds: attribute.succeeds,
+                succeededBy: attribute.succeededBy,
+                key: localAttribute.content.key,
+                confidentiality: localAttribute.content.confidentiality,
+                isTechnical: localAttribute.content.isTechnical,
+                peer: localAttribute.peer.toString(),
+                sourceReference: localAttribute.sourceReference.toString(),
                 deletionStatus: localAttribute.deletionInfo?.deletionStatus,
-                deletionDate: localAttribute.deletionInfo?.deletionDate.toString()
+                deletionDate: localAttribute.deletionInfo?.deletionDate.toString(),
+                forwardingPeers: await this.expandForwardingPeers(forwardingDetails),
+                forwardingDetails: this.expandForwardingDetails(forwardingDetails)
             };
         }
-        const identityAttribute = localAttribute.content;
-        const sharedToPeerAttributes = await this.consumption.attributes.getAttributes({ query: { "shareInfo.sourceAttribute": attribute.id } });
-        const sharedToPeerDVOs = await this.expandLocalAttributeDTOs(sharedToPeerAttributes.value);
-        // RepositoryAttribute
         return {
-            type: "RepositoryAttributeDVO",
+            type: "ThirdPartyRelationshipAttributeDVO",
             id: attribute.id,
-            name,
-            description,
+            name: "title" in attribute.content.value ? attribute.content.value.title : name,
+            description: "description" in attribute.content.value ? attribute.content.value.description : description,
+            date: attribute.createdAt,
             content: attribute.content,
+            owner,
             value: attribute.content.value,
-            date: attribute.createdAt,
-            owner: owner,
+            valueType,
             renderHints,
             valueHints,
-            isValid: true,
-            createdAt: attribute.createdAt,
-            isOwn: true,
             isDraft: false,
-            sharedWith: sharedToPeerDVOs,
-            tags: identityAttribute.tags,
-            valueType,
-            isDefault: attribute.isDefault
+            isOwn: false,
+            createdAt: attribute.createdAt,
+            wasViewedAt: attribute.wasViewedAt,
+            succeeds: attribute.succeeds,
+            succeededBy: attribute.succeededBy,
+            key: localAttribute.content.key,
+            confidentiality: localAttribute.content.confidentiality,
+            isTechnical: localAttribute.content.isTechnical,
+            peer: localAttribute.peer.toString(),
+            initialAttributePeer: localAttribute.initialAttributePeer.toString(),
+            sourceReference: localAttribute.sourceReference.toString(),
+            deletionStatus: localAttribute.deletionInfo?.deletionStatus,
+            deletionDate: localAttribute.deletionInfo?.deletionDate.toString()
         };
     }
     async expandLocalAttributeDTOs(attributes) {
         const attributesPromise = attributes.map((attribute) => this.expandLocalAttributeDTO(attribute));
         return await Promise.all(attributesPromise);
     }
+    async expandForwardingPeers(forwardingDetails) {
+        if (forwardingDetails.length === 0)
+            return;
+        const addresses = [...new Set(forwardingDetails.map((detail) => detail.peer.toString()))];
+        const promises = addresses.map((address) => this.expandAddress(address));
+        return await Promise.all(promises);
+    }
+    expandForwardingDetails(forwardingDetails) {
+        if (forwardingDetails.length === 0)
+            return;
+        return forwardingDetails.map((details) => {
+            const result = {
+                peer: details.peer.toString(),
+                sourceReference: details.sourceReference.toString(),
+                sharedAt: details.sharedAt.toString()
+            };
+            if (details.deletionInfo) {
+                result.deletionDate = details.deletionInfo.deletionDate.toString();
+                result.deletionStatus = details.deletionInfo.deletionStatus;
+            }
+            return result;
+        });
+    }
     async expandAttributeQuery(query) {
         switch (query["@type"]) {
             case "IdentityAttributeQuery":
@@ -1340,7 +1253,7 @@ let DataViewExpander = class DataViewExpander {
         }
         const result = await this.transport.relationships.getRelationshipByAddress({ address });
         // revoked relationships should be treated as non-existent as they will never have attributes attached
-        if (result.isSuccess && result.value.status !== types_1.RelationshipStatus.Rejected && result.value.status !== types_1.RelationshipStatus.Revoked) {
+        if (result.isSuccess && result.value.status !== runtime_types_1.RelationshipStatus.Rejected && result.value.status !== runtime_types_1.RelationshipStatus.Revoked) {
             return await this.expandRelationshipDTO(result.value);
         }
         const requestResult = (await this.consumption.incomingRequests.getRequests({
@@ -1430,7 +1343,7 @@ let DataViewExpander = class DataViewExpander {
     async createRelationshipDVO(relationship) {
         const relationshipSetting = await this.getRelationshipSettingDVO(relationship);
         const stringByType = {};
-        const relationshipAttributesResult = await this.consumption.attributes.getPeerSharedAttributes({ peer: relationship.peer });
+        const relationshipAttributesResult = await this.consumption.attributes.getPeerAttributes({ peer: relationship.peer });
         const expandedAttributes = await this.expandLocalAttributeDTOs(relationshipAttributesResult.value);
         const attributesByType = {};
         for (const attribute of expandedAttributes) {
@@ -1453,26 +1366,31 @@ let DataViewExpander = class DataViewExpander {
                 }
             }
         }
+        const sendMailDisabledResult = await this.consumption.attributes.getPeerAttributes({
+            peer: relationship.peer,
+            query: { "content.value.@type": "Consent", "content.key": "__App_Contact_sendMailDisabled" }
+        });
+        const sendMailDisabled = sendMailDisabledResult.value.length > 0;
         const direction = this.identityController.isMe(core_types_1.CoreAddress.from(relationship.auditLog[0].createdBy)) ? transport_2.RelationshipDirection.Outgoing : transport_2.RelationshipDirection.Incoming;
         let statusText = "";
         switch (relationship.status) {
-            case types_1.RelationshipStatus.Pending:
+            case runtime_types_1.RelationshipStatus.Pending:
                 statusText =
                     direction === transport_2.RelationshipDirection.Outgoing ? DataViewTranslateable_1.DataViewTranslateable.transport.relationshipOutgoing : DataViewTranslateable_1.DataViewTranslateable.transport.relationshipIncoming;
                 break;
-            case types_1.RelationshipStatus.Rejected:
+            case runtime_types_1.RelationshipStatus.Rejected:
                 statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipRejected;
                 break;
-            case types_1.RelationshipStatus.Revoked:
+            case runtime_types_1.RelationshipStatus.Revoked:
                 statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipRevoked;
                 break;
-            case types_1.RelationshipStatus.Active:
+            case runtime_types_1.RelationshipStatus.Active:
                 statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipActive;
                 break;
-            case types_1.RelationshipStatus.Terminated:
+            case runtime_types_1.RelationshipStatus.Terminated:
                 statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipTerminated;
                 break;
-            case types_1.RelationshipStatus.DeletionProposed:
+            case runtime_types_1.RelationshipStatus.DeletionProposed:
                 statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipDeletionProposed;
                 break;
         }
@@ -1515,7 +1433,8 @@ let DataViewExpander = class DataViewExpander {
             nameMap: stringByType,
             templateId: relationship.templateId,
             auditLog: relationship.auditLog,
-            creationContent: relationship.creationContent
+            creationContent: relationship.creationContent,
+            sendMailDisabled
         };
     }
     async getRelationshipSettingDVO(relationship) {
@@ -1570,6 +1489,17 @@ let DataViewExpander = class DataViewExpander {
         const filePromises = ids.map((id) => this.expandFileId(id));
         return await Promise.all(filePromises);
     }
+    async expandFileReference(fileReference) {
+        const existingFileResult = await this.transport.files.getFile({ id: fileReference.id.toString() });
+        if (existingFileResult.isSuccess) {
+            return await this.expandFileDTO(existingFileResult.value);
+        }
+        if (existingFileResult.isError && !existingFileResult.error.equals(useCases_1.RuntimeErrors.general.recordNotFound())) {
+            throw existingFileResult.error;
+        }
+        const loadedFileResult = await this.transport.files.getOrLoadFile({ reference: fileReference.truncate() });
+        return await this.expandFileDTO(loadedFileResult.value);
+    }
     async expandFileDTO(file) {
         return {
             ...file,
@@ -1582,7 +1512,8 @@ let DataViewExpander = class DataViewExpander {
             filename: file.filename,
             filesize: file.filesize,
             createdBy: await this.expandAddress(file.createdBy),
-            truncatedReference: file.truncatedReference
+            owner: await this.expandAddress(file.owner),
+            reference: file.reference
         };
     }
     async expandFileDTOs(files) {