@nmshd/runtime 2.0.0-beta.9 → 2.0.0

package/dist/dataViews/DataViewExpander.js

@@ -88,7 +88,7 @@ let DataViewExpander = class DataViewExpander {
                 }
                 return await this.expandLocalAttributeDTO(content);
             default:
-                throw useCases_1.RuntimeErrors.general.notImplemented();
+                throw useCases_1.RuntimeErrors.general.notSupported(`No expander is defined for the @type '${type}'.`);
         }
     }
     async expandMessageDTO(message) {
@@ -236,40 +236,54 @@ let DataViewExpander = class DataViewExpander {
     async expandRelationshipTemplateDTO(template) {
         let onNewRelationship;
         let onExistingRelationship;
-        let name = "i18n://dvo.template.name";
-        if (template.content["@type"] === "RelationshipTemplateBody") {
-            const templateBody = content_1.RelationshipTemplateBody.from(template.content).toJSON();
-            if (templateBody.title) {
-                name = templateBody.title;
+        const createdBy = await this.expandAddress(template.createdBy);
+        const type = template.isOwn ? "RelationshipTemplateDVO" : "PeerRelationshipTemplateDVO";
+        let name = template.isOwn ? "i18n://dvo.template.outgoing.name" : "i18n://dvo.template.incoming.name";
+        const description = template.isOwn ? "i18n://dvo.template.outgoing.description" : "i18n://dvo.template.incoming.description";
+        let expandedLocalRequest;
+        if (template.content["@type"] === "RelationshipTemplateContent") {
+            const templateContent = content_1.RelationshipTemplateContent.from(template.content).toJSON();
+            if (templateContent.title) {
+                name = templateContent.title;
             }
             let localRequest;
             if (!template.isOwn) {
-                const onNewRelationshipRequest = await this.consumption.incomingRequests.getRequests({
+                const incomingRequestResult = await this.consumption.incomingRequests.getRequests({
                     query: {
-                        "source.reference": template.id
+                        "source.reference": template.id,
+                        status: consumption_1.LocalRequestStatus.ManualDecisionRequired
                     }
                 });
-                localRequest = onNewRelationshipRequest.value[0];
-                return {
-                    name,
-                    type: "PeerRelationshipTemplateDVO",
-                    date: template.createdAt,
-                    ...template,
-                    createdBy: await this.expandAddress(template.createdBy),
-                    onNewRelationship: await this.expandLocalRequestDTO(localRequest)
-                };
+                if (incomingRequestResult.value.length > 0) {
+                    localRequest = incomingRequestResult.value[0];
+                    expandedLocalRequest = await this.expandLocalRequestDTO(localRequest);
+                }
+                else {
+                    const completedRequestResult = await this.consumption.incomingRequests.getRequests({
+                        query: {
+                            "source.reference": template.id,
+                            status: [consumption_1.LocalRequestStatus.Decided, consumption_1.LocalRequestStatus.Completed]
+                        }
+                    });
+                    if (completedRequestResult.value.length > 0) {
+                        localRequest = completedRequestResult.value[0];
+                        expandedLocalRequest = await this.expandLocalRequestDTO(localRequest);
+                    }
+                }
             }
-            onNewRelationship = await this.expandRequest(templateBody.onNewRelationship);
-            if (templateBody.onExistingRelationship) {
-                onExistingRelationship = await this.expandRequest(templateBody.onExistingRelationship);
+            onNewRelationship = await this.expandRequest(templateContent.onNewRelationship);
+            if (templateContent.onExistingRelationship) {
+                onExistingRelationship = await this.expandRequest(templateContent.onExistingRelationship);
             }
         }
         return {
             name,
-            type: "RelationshipTemplateDVO",
+            description,
+            type,
             date: template.createdAt,
             ...template,
-            createdBy: await this.expandAddress(template.createdBy),
+            createdBy,
+            request: expandedLocalRequest,
             onNewRelationship,
             onExistingRelationship
         };
@@ -278,11 +292,13 @@ let DataViewExpander = class DataViewExpander {
         const templatePromises = templates.map((template) => this.expandRelationshipTemplateDTO(template));
         return await Promise.all(templatePromises);
     }
-    async expandRequest(request, localRequestDTO) {
+    async expandRequest(request, localRequestDTO, localResponseDVO) {
         const id = request.id ? request.id : "";
         const itemDVOs = [];
-        for (const requestItem of request.items) {
-            itemDVOs.push(await this.expandRequestGroupOrItem(requestItem, localRequestDTO));
+        for (let i = 0; i < request.items.length; i++) {
+            const requestItem = request.items[i];
+            const responseItem = localResponseDVO?.content.items[i];
+            itemDVOs.push(await this.expandRequestGroupOrItem(requestItem, localRequestDTO, responseItem));
         }
         return {
             id: id,
@@ -290,16 +306,16 @@ let DataViewExpander = class DataViewExpander {
             type: "RequestDVO",
             date: request.expiresAt,
             ...request,
-            items: itemDVOs
+            items: itemDVOs,
+            response: localResponseDVO?.content
         };
     }
-    /*
-    public async expandRequests(requests: RequestJSON[]): Promise<RequestDVO[]> {
+    async expandRequests(requests) {
         const requestPromises = requests.map((request) => this.expandRequest(request));
         return await Promise.all(requestPromises);
     }
-    */
-    async expandRequestItem(requestItem, localRequestDTO) {
+    async expandRequestItem(requestItem, localRequestDTO, responseItemDVO) {
+        let error;
         let isDecidable = false;
         if (localRequestDTO && !localRequestDTO.isOwn && (localRequestDTO.status === "DecisionRequired" || localRequestDTO.status === "ManualDecisionRequired")) {
             isDecidable = true;
@@ -308,13 +324,24 @@ let DataViewExpander = class DataViewExpander {
             case "ReadAttributeRequestItem":
                 const readAttributeRequestItem = requestItem;
                 if (isDecidable) {
+                    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. You cannot set any"
+                        };
+                    }
                     return {
                         ...readAttributeRequestItem,
                         type: "DecidableReadAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ReadAttributeRequestItem.name",
-                        query: await this.processIdentityAttributeQuery(readAttributeRequestItem.query),
-                        isDecidable
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.DecidableReadAttributeRequestItem.name",
+                        query: processedQuery,
+                        isDecidable,
+                        error,
+                        response: responseItemDVO
                     };
                 }
                 return {
@@ -322,28 +349,49 @@ let DataViewExpander = class DataViewExpander {
                     type: "ReadAttributeRequestItemDVO",
                     id: "",
                     name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ReadAttributeRequestItem.name",
-                    query: this.expandIdentityAttributeQuery(readAttributeRequestItem.query),
-                    isDecidable
+                    query: await this.expandAttributeQuery(readAttributeRequestItem.query),
+                    isDecidable,
+                    response: responseItemDVO
                 };
             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: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.CreateAttributeRequestItem.name",
-                        attribute: await this.expandAttribute(createAttributeRequestItem.attribute),
-                        isDecidable
+                        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: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.CreateAttributeRequestItem.name",
-                    attribute: await this.expandAttribute(createAttributeRequestItem.attribute),
-                    isDecidable
+                    name: name ?? fallbackName,
+                    description: description ?? fallbackName,
+                    attribute,
+                    isDecidable,
+                    response: responseItemDVO
                 };
             case "ProposeAttributeRequestItem":
                 const proposeAttributeRequestItem = requestItem;
@@ -355,10 +403,11 @@ let DataViewExpander = class DataViewExpander {
                         ...proposeAttributeRequestItem,
                         type: "DecidableProposeAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.DecidableProposeAttributeRequestItem.name",
                         attribute: await this.expandAttribute(proposeAttributeRequestItem.attribute),
-                        query: await this.processIdentityAttributeQuery(proposeAttributeRequestItem.query),
-                        isDecidable
+                        query: await this.processAttributeQuery(proposeAttributeRequestItem.query),
+                        isDecidable,
+                        response: responseItemDVO
                     };
                 }
                 return {
@@ -367,34 +416,100 @@ let DataViewExpander = class DataViewExpander {
                     id: "",
                     name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
                     attribute: await this.expandAttribute(proposeAttributeRequestItem.attribute),
-                    query: this.expandIdentityAttributeQuery(proposeAttributeRequestItem.query),
-                    isDecidable
+                    query: await this.expandAttributeQuery(proposeAttributeRequestItem.query),
+                    isDecidable,
+                    response: responseItemDVO
                 };
             case "ShareAttributeRequestItem":
                 const shareAttributeRequestItem = requestItem;
-                const attributeResult = await this.consumption.attributes.getAttribute({ id: shareAttributeRequestItem.attributeId });
-                const attribute = attributeResult.value;
-                const attributeDVO = await this.expandLocalAttributeDTO(attribute);
-                const shareWith = await this.expandAddress(shareAttributeRequestItem.shareWith);
+                const attributeDVO = await this.expandAttribute(shareAttributeRequestItem.attribute);
                 if (isDecidable) {
                     return {
                         ...shareAttributeRequestItem,
                         type: "DecidableShareAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.DecidableProposeAttributeRequestItem.name",
                         attribute: attributeDVO,
-                        shareWith,
-                        isDecidable
+                        isDecidable,
+                        response: responseItemDVO
                     };
                 }
+                // 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;
+                }
                 return {
                     ...shareAttributeRequestItem,
                     type: "ShareAttributeRequestItemDVO",
                     id: "",
                     name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
                     attribute: attributeDVO,
-                    shareWith,
-                    isDecidable
+                    isDecidable,
+                    response: responseItemDVO
+                };
+            case "AuthenticationRequestItem":
+                const authenticationRequestItem = requestItem;
+                if (isDecidable) {
+                    return {
+                        ...authenticationRequestItem,
+                        type: "DecidableAuthenticationRequestItemDVO",
+                        id: "",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.DecidableAuthenticationRequestItem.name",
+                        isDecidable,
+                        response: responseItemDVO
+                    };
+                }
+                return {
+                    ...authenticationRequestItem,
+                    type: "AuthenticationRequestItemDVO",
+                    id: "",
+                    name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.AuthenticationRequestItem.name",
+                    isDecidable,
+                    response: responseItemDVO
+                };
+            case "ConsentRequestItem":
+                const consentRequestItem = requestItem;
+                if (isDecidable) {
+                    return {
+                        ...consentRequestItem,
+                        type: "DecidableConsentRequestItemDVO",
+                        id: "",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.DecidableConsentRequestItem.name",
+                        isDecidable,
+                        response: responseItemDVO
+                    };
+                }
+                return {
+                    ...consentRequestItem,
+                    type: "ConsentRequestItemDVO",
+                    id: "",
+                    name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ConsentRequestItem.name",
+                    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 ? requestItem.title : "i18n://dvo.requestItem.DecidableRegisterAttributeListenerRequestItem.name",
+                        isDecidable,
+                        response: responseItemDVO
+                    };
+                }
+                return {
+                    ...registerAttributeListenerRequestItem,
+                    type: "RegisterAttributeListenerRequestItemDVO",
+                    id: "",
+                    query: queryDVO,
+                    name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.RegisterAttributeListenerRequestItem.name",
+                    isDecidable,
+                    response: responseItemDVO
                 };
             default:
                 return {
@@ -402,20 +517,24 @@ let DataViewExpander = class DataViewExpander {
                     type: "RequestItemDVO",
                     id: "",
                     name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.name",
-                    isDecidable
+                    isDecidable,
+                    response: responseItemDVO
                 };
         }
     }
-    async expandRequestGroupOrItem(requestGroupOrItem, localRequestDTO) {
+    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 group = requestGroupOrItem;
+            const requestGroup = requestGroupOrItem;
+            const responseGroup = responseGroupOrItemDVO;
             const itemDVOs = [];
-            for (const requestItem of group.items) {
-                itemDVOs.push(await this.expandRequestItem(requestItem, localRequestDTO));
+            for (let i = 0; i < requestGroup.items.length; i++) {
+                const requestItem = requestGroup.items[i];
+                const responseItem = responseGroup?.items[i];
+                itemDVOs.push(await this.expandRequestItem(requestItem, localRequestDTO, responseItem));
             }
             return {
                 type: "RequestItemGroupDVO",
@@ -423,41 +542,183 @@ let DataViewExpander = class DataViewExpander {
                 isDecidable,
                 title: requestGroupOrItem.title,
                 description: requestGroupOrItem.description,
-                mustBeAccepted: requestGroupOrItem.mustBeAccepted
+                mustBeAccepted: requestGroupOrItem.mustBeAccepted,
+                response: responseGroup
             };
         }
-        return await this.expandRequestItem(requestGroupOrItem, localRequestDTO);
+        return await this.expandRequestItem(requestGroupOrItem, localRequestDTO, responseGroupOrItemDVO);
+    }
+    async expandResponseItem(responseItem) {
+        if (responseItem.result === "Accepted") {
+            const name = `i18n://dvo.responseItem.${responseItem["@type"]}.acceptedName`;
+            switch (responseItem["@type"]) {
+                case "ReadAttributeAcceptResponseItem":
+                    const readAttributeResponseItem = responseItem;
+                    const localAttributeResultForRead = await this.consumption.attributes.getAttribute({ id: readAttributeResponseItem.attributeId });
+                    const localAttributeDVOForRead = await this.expandLocalAttributeDTO(localAttributeResultForRead.value);
+                    return {
+                        ...readAttributeResponseItem,
+                        type: "ReadAttributeAcceptResponseItemDVO",
+                        id: readAttributeResponseItem.attributeId,
+                        name: name,
+                        attribute: localAttributeDVOForRead
+                    };
+                case "CreateAttributeAcceptResponseItem":
+                    const createAttributeResponseItem = responseItem;
+                    const localAttributeResultForCreate = await this.consumption.attributes.getAttribute({ id: createAttributeResponseItem.attributeId });
+                    const localAttributeDVOForCreate = await this.expandLocalAttributeDTO(localAttributeResultForCreate.value);
+                    return {
+                        ...createAttributeResponseItem,
+                        type: "CreateAttributeAcceptResponseItemDVO",
+                        id: createAttributeResponseItem.attributeId,
+                        name: name,
+                        attribute: localAttributeDVOForCreate
+                    };
+                case "ProposeAttributeAcceptResponseItem":
+                    const proposeAttributeResponseItem = responseItem;
+                    const localAttributeResultForPropose = await this.consumption.attributes.getAttribute({ id: proposeAttributeResponseItem.attributeId });
+                    const localAttributeDVOForPropose = await this.expandLocalAttributeDTO(localAttributeResultForPropose.value);
+                    return {
+                        ...proposeAttributeResponseItem,
+                        type: "ProposeAttributeAcceptResponseItemDVO",
+                        id: proposeAttributeResponseItem.attributeId,
+                        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);
+                    return {
+                        ...shareAttributeResponseItem,
+                        type: "ShareAttributeAcceptResponseItemDVO",
+                        id: shareAttributeResponseItem.attributeId,
+                        name: name,
+                        attribute: localAttributeDVOForShare
+                    };
+                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
+                    };
+                default:
+                    return {
+                        ...responseItem,
+                        type: "AcceptResponseItemDVO",
+                        id: "",
+                        name: name
+                    };
+            }
+        }
+        else if (responseItem.result === "Rejected") {
+            const rejectResponseItem = responseItem;
+            return {
+                ...rejectResponseItem,
+                type: "RejectResponseItemDVO",
+                id: "",
+                name: "i18n://dvo.responseItem.rejected"
+            };
+        }
+        else {
+            const errorResponseItem = responseItem;
+            return {
+                ...errorResponseItem,
+                type: "ErrorResponseItemDVO",
+                id: "",
+                name: "i18n://dvo.responseItem.error"
+            };
+        }
+    }
+    async expandLocalAttributeListenerDTO(attributeListener) {
+        const query = (await this.expandAttributeQuery(attributeListener.query));
+        const peer = await this.expandIdentityForAddress(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;
+            const itemDVOs = [];
+            for (const requestItem of group.items) {
+                itemDVOs.push(await this.expandResponseItem(requestItem));
+            }
+            return {
+                type: "ResponseItemGroupDVO",
+                items: itemDVOs
+            };
+        }
+        return await this.expandResponseItem(responseGroupOrItem);
     }
     async expandLocalRequestDTO(request) {
-        const requestDVO = await this.expandRequest(request.content, request);
+        const response = request.response ? await this.expandLocalResponseDTO(request.response, request) : undefined;
+        const requestDVO = await this.expandRequest(request.content, request, response);
         const peerDVO = await this.expandAddress(request.peer);
         let isDecidable = false;
         if (!request.isOwn && (request.status === "DecisionRequired" || request.status === "ManualDecisionRequired")) {
             isDecidable = true;
         }
+        const directionLabel = request.isOwn ? "outgoing" : "incoming";
+        const statusText = `i18n://dvo.localRequest.status.${request.status}`;
+        const sourceType = request.source?.type ?? "unknown";
+        const requestIdOutOfResponse = request.response ? request.response.content.requestId : "";
         return {
             ...request,
-            id: request.id,
+            id: request.id ? request.id : requestIdOutOfResponse,
             content: requestDVO,
             items: requestDVO.items,
-            name: "i18n://dvo.localRequest.name",
+            name: `i18n://dvo.localRequest.${sourceType}.${directionLabel}.${request.status}.name`,
+            directionText: `i18n://dvo.localRequest.direction.${directionLabel}`,
+            description: `i18n://dvo.localRequest.${sourceType}.${directionLabel}.${request.status}.description`,
+            sourceTypeText: `i18n://dvo.localRequest.sourceType.${sourceType}`,
             type: "LocalRequestDVO",
             date: request.createdAt,
             createdBy: request.isOwn ? this.expandSelf() : peerDVO,
             decider: request.isOwn ? peerDVO : this.expandSelf(),
             peer: peerDVO,
-            response: request.response ? this.expandLocalResponseDTO(request.response) : undefined,
-            statusText: `i18n://dvo.localRequest.status.${request.status}`,
+            response,
+            statusText: statusText,
             isDecidable
         };
     }
-    expandLocalResponseDTO(response) {
+    async expandLocalRequestDTOs(localRequests) {
+        const localRequestPromises = localRequests.map((localRequest) => this.expandLocalRequestDTO(localRequest));
+        return await Promise.all(localRequestPromises);
+    }
+    async expandResponse(response, request) {
+        const itemDVOs = [];
+        for (const responseItem of response.items) {
+            itemDVOs.push(await this.expandResponseGroupOrItem(responseItem));
+        }
         return {
+            id: request.id,
+            name: "i18n://dvo.response.name",
+            type: "ResponseDVO",
             ...response,
-            id: "",
+            items: itemDVOs
+        };
+    }
+    async expandLocalResponseDTO(response, request) {
+        const responseDVO = await this.expandResponse(response.content, request);
+        return {
+            ...response,
+            id: request.id,
             name: "i18n://dvo.localResponse.name",
             type: "LocalResponseDVO",
-            date: response.createdAt
+            date: response.createdAt,
+            content: responseDVO,
+            items: response.content.items
         };
     }
     async expandLocalAttributeDTO(attribute) {
@@ -469,14 +730,69 @@ let DataViewExpander = class DataViewExpander {
         const owner = attribute.content.owner;
         let name = `i18n://dvo.attribute.name.${valueType}`;
         let description = `i18n://dvo.attribute.description.${valueType}`;
-        if (localAttribute.content instanceof content_1.RelationshipAttribute) {
-            name = "";
-            description = "";
-        }
         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 Relationship Attribute
+                if (relationshipAttribute.owner === localAttribute.shareInfo.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(),
+                        valueType,
+                        isTechnical: relationshipAttribute.isTechnical
+                    };
+                }
+                // Own Relationship Attribute
+                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(),
+                    valueType,
+                    isTechnical: relationshipAttribute.isTechnical
+                };
+            }
+            const identityAttribute = localAttribute.content;
             if (localAttribute.shareInfo.sourceAttribute) {
                 // Own Shared Attribute
                 return {
@@ -497,7 +813,8 @@ let DataViewExpander = class DataViewExpander {
                     isDraft: false,
                     requestReference: localAttribute.shareInfo.requestReference.toString(),
                     sourceAttribute: localAttribute.shareInfo.sourceAttribute.toString(),
-                    tags: []
+                    tags: identityAttribute.tags ? identityAttribute.tags : [],
+                    valueType
                 };
             }
             // Peer Attribute
@@ -518,9 +835,11 @@ let DataViewExpander = class DataViewExpander {
                 peer: peer,
                 isDraft: false,
                 requestReference: localAttribute.shareInfo.requestReference.toString(),
-                tags: []
+                tags: identityAttribute.tags ? identityAttribute.tags : [],
+                valueType
             };
         }
+        const identityAttribute = localAttribute.content;
         const sharedToPeerAttributes = await this.consumption.attributes.getAttributes({ query: { "shareInfo.sourceAttribute": attribute.id } });
         const sharedToPeerDVOs = await this.expandLocalAttributeDTOs(sharedToPeerAttributes.value);
         // Own Source Attribute
@@ -540,57 +859,91 @@ let DataViewExpander = class DataViewExpander {
             isOwn: true,
             isDraft: false,
             sharedWith: sharedToPeerDVOs,
-            tags: []
+            tags: identityAttribute.tags ? identityAttribute.tags : [],
+            valueType
         };
     }
     async expandLocalAttributeDTOs(attributes) {
         const attributesPromise = attributes.map((attribute) => this.expandLocalAttributeDTO(attribute));
         return await Promise.all(attributesPromise);
     }
+    async expandAttributeQuery(query) {
+        switch (query["@type"]) {
+            case "IdentityAttributeQuery":
+                return this.expandIdentityAttributeQuery(query);
+            case "RelationshipAttributeQuery":
+                return await this.expandRelationshipAttributeQuery(query);
+            case "ThirdPartyRelationshipAttributeQuery":
+                return await this.expandThirdPartyRelationshipAttributeQuery(query);
+            default:
+                throw new Error("Wrong attribute query");
+        }
+    }
     expandIdentityAttributeQuery(query) {
         const valueType = query.valueType;
         const name = `i18n://dvo.attribute.name.${valueType}`;
         const description = `i18n://dvo.attribute.description.${valueType}`;
-        const valueTypeClass = ts_serval_1.SerializableBase.getModule(valueType, 1);
-        if (!valueTypeClass) {
-            throw new Error(`No class implementation found for ${valueType}`);
-        }
-        let renderHints = {
-            "@type": "RenderHints",
-            editType: content_1.RenderHintsEditType.InputLike,
-            technicalType: content_1.RenderHintsTechnicalType.String
-        };
-        let valueHints = {
-            "@type": "ValueHints",
-            max: 200
+        const hints = this.getHintsForValueType(valueType);
+        return {
+            type: "IdentityAttributeQueryDVO",
+            id: "",
+            name,
+            description,
+            valueType,
+            validFrom: query.validFrom,
+            validTo: query.validTo,
+            renderHints: hints.renderHints,
+            valueHints: hints.valueHints,
+            isProcessed: false
         };
-        if (valueTypeClass.renderHints && valueTypeClass.renderHints instanceof content_1.RenderHints) {
-            renderHints = valueTypeClass.renderHints.toJSON();
+    }
+    async expandRelationshipAttributeQuery(query) {
+        const valueType = query.attributeCreationHints.valueType;
+        let name = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        let description = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        if (query.attributeCreationHints.title) {
+            name = query.attributeCreationHints.title;
         }
-        if (valueTypeClass.valueHints && valueTypeClass.valueHints instanceof content_1.ValueHints) {
-            valueHints = valueTypeClass.valueHints.toJSON();
+        if (query.attributeCreationHints.description) {
+            description = query.attributeCreationHints.description;
+        }
+        const hints = this.getHintsForValueType(valueType);
+        if (query.attributeCreationHints.valueHints) {
+            hints.valueHints = query.attributeCreationHints.valueHints;
         }
         return {
-            type: "IdentityAttributeQueryDVO",
+            type: "RelationshipAttributeQueryDVO",
             id: "",
             name,
             description,
-            valueType,
             validFrom: query.validFrom,
             validTo: query.validTo,
-            renderHints,
-            valueHints,
+            owner: await this.expandAddress(query.owner),
+            key: query.key,
+            attributeCreationHints: query.attributeCreationHints,
+            renderHints: hints.renderHints,
+            valueHints: hints.valueHints,
+            isProcessed: false,
+            valueType
+        };
+    }
+    async expandThirdPartyRelationshipAttributeQuery(query) {
+        const name = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        const description = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        return {
+            type: "ThirdPartyRelationshipAttributeQueryDVO",
+            id: "",
+            name,
+            description,
+            validFrom: query.validFrom,
+            validTo: query.validTo,
+            owner: await this.expandAddress(query.owner),
+            thirdParty: await this.expandAddress(query.thirdParty),
+            key: query.key,
             isProcessed: false
         };
     }
-    async processIdentityAttributeQuery(query) {
-        const matchedAttributeDTOs = await this.consumption.attributes.executeIdentityAttributeQuery({
-            query
-        });
-        const matchedAttributeDVOs = await this.expandLocalAttributeDTOs(matchedAttributeDTOs.value);
-        const valueType = query.valueType;
-        const name = `i18n://dvo.attribute.name.${valueType}`;
-        const description = `i18n://dvo.attribute.description.${valueType}`;
+    getHintsForValueType(valueType) {
         const valueTypeClass = ts_serval_1.SerializableBase.getModule(valueType, 1);
         if (!valueTypeClass) {
             throw new Error(`No class implementation found for ${valueType}`);
@@ -610,46 +963,147 @@ let DataViewExpander = class DataViewExpander {
         if (valueTypeClass.valueHints && valueTypeClass.valueHints instanceof content_1.ValueHints) {
             valueHints = valueTypeClass.valueHints.toJSON();
         }
+        return { renderHints, valueHints };
+    }
+    async processAttributeQuery(attributeQuery) {
+        switch (attributeQuery["@type"]) {
+            case "IdentityAttributeQuery":
+                return await this.processIdentityAttributeQuery(attributeQuery);
+            case "RelationshipAttributeQuery":
+                return await this.processRelationshipAttributeQuery(attributeQuery);
+            case "ThirdPartyRelationshipAttributeQuery":
+                return await this.processThirdPartyRelationshipAttributeQuery(attributeQuery);
+            default:
+                throw new Error("Wrong attribute query");
+        }
+    }
+    async processIdentityAttributeQuery(query) {
+        const matchedAttributeDTOs = await this.consumption.attributes.executeIdentityAttributeQuery({
+            query
+        });
+        const matchedAttributeDVOs = await this.expandLocalAttributeDTOs(matchedAttributeDTOs.value);
         return {
+            ...this.expandIdentityAttributeQuery(query),
             type: "ProcessedIdentityAttributeQueryDVO",
-            id: "",
+            results: matchedAttributeDVOs,
+            isProcessed: true
+        };
+    }
+    async processRelationshipAttributeQuery(query) {
+        const matchedAttributeDTOResult = await this.consumption.attributes.executeRelationshipAttributeQuery({
+            query
+        });
+        if (matchedAttributeDTOResult.isError) {
+            if (matchedAttributeDTOResult.error.code !== "error.runtime.recordNotFound") {
+                throw matchedAttributeDTOResult.error;
+            }
+            return {
+                ...(await this.expandRelationshipAttributeQuery(query)),
+                type: "ProcessedRelationshipAttributeQueryDVO",
+                results: [],
+                isProcessed: true
+            };
+        }
+        const matchedAttributeDVOs = await this.expandLocalAttributeDTO(matchedAttributeDTOResult.value);
+        return {
+            ...(await this.expandRelationshipAttributeQuery(query)),
+            type: "ProcessedRelationshipAttributeQueryDVO",
+            results: [matchedAttributeDVOs],
+            isProcessed: true
+        };
+    }
+    async processThirdPartyRelationshipAttributeQuery(query) {
+        const matchedAttributeDTOResult = await this.consumption.attributes.executeThirdPartyRelationshipAttributeQuery({
+            query
+        });
+        if (matchedAttributeDTOResult.isError) {
+            if (matchedAttributeDTOResult.error.code !== "error.runtime.recordNotFound") {
+                throw matchedAttributeDTOResult.error;
+            }
+            return {
+                ...(await this.expandThirdPartyRelationshipAttributeQuery(query)),
+                type: "ProcessedThirdPartyRelationshipAttributeQueryDVO",
+                results: [],
+                isProcessed: true
+            };
+        }
+        const matchedAttributeDVO = await this.expandLocalAttributeDTO(matchedAttributeDTOResult.value);
+        const correctlyTypedAttribute = matchedAttributeDVO;
+        return {
+            ...(await this.expandThirdPartyRelationshipAttributeQuery(query)),
+            type: "ProcessedThirdPartyRelationshipAttributeQueryDVO",
+            results: [correctlyTypedAttribute],
+            renderHints: correctlyTypedAttribute.renderHints,
+            valueHints: correctlyTypedAttribute.valueHints,
+            valueType: correctlyTypedAttribute.valueType,
+            isProcessed: true
+        };
+    }
+    async expandIdentityAttribute(attribute, attributeInstance) {
+        const valueType = attribute.value["@type"];
+        const name = `i18n://dvo.attribute.name.${valueType}`;
+        const description = `i18n://dvo.attribute.description.${valueType}`;
+        const renderHints = attributeInstance.value.renderHints.toJSON();
+        const valueHints = attributeInstance.value.valueHints.toJSON();
+        const owner = await this.expandAddress(attribute.owner);
+        return {
+            type: "DraftIdentityAttributeDVO",
+            content: attribute,
             name,
             description,
-            valueType,
-            validFrom: query.validFrom,
-            validTo: query.validTo,
-            results: matchedAttributeDVOs,
+            id: "",
+            owner: owner,
             renderHints,
             valueHints,
-            isProcessed: true
+            value: attribute.value,
+            isDraft: true,
+            isOwn: owner.isSelf,
+            valueType,
+            tags: attributeInstance.tags ? attributeInstance.tags : []
         };
     }
-    async expandAttribute(attribute) {
-        const attributeInstance = ts_serval_1.Serializable.fromAny(attribute);
+    async expandRelationshipAttribute(attribute, attributeInstance) {
         const valueType = attribute.value["@type"];
         let name = `i18n://dvo.attribute.name.${valueType}`;
         let description = `i18n://dvo.attribute.description.${valueType}`;
         const renderHints = attributeInstance.value.renderHints.toJSON();
         const valueHints = attributeInstance.value.valueHints.toJSON();
-        if (attributeInstance instanceof content_1.RelationshipAttribute) {
-            name = ""; // attributeInstance.value.title;
-            description = ""; // attributeInstance.value.description;
+        const value = attributeInstance.value;
+        if ("title" in value) {
+            name = value.title;
+        }
+        if ("description" in value && !!value.description) {
+            description = value.description;
         }
         const owner = await this.expandAddress(attribute.owner);
         return {
-            type: "DraftAttributeDVO",
+            type: "DraftRelationshipAttributeDVO",
             content: attribute,
             name,
             description,
+            key: attribute.key,
+            confidentiality: attribute.confidentiality,
+            isTechnical: !!attribute.isTechnical,
             id: "",
             owner: owner,
             renderHints,
             valueHints,
             value: attribute.value,
             isDraft: true,
-            isOwn: owner.isSelf
+            isOwn: owner.isSelf,
+            valueType
         };
     }
+    async expandAttribute(attribute) {
+        const attributeInstance = ts_serval_1.Serializable.fromUnknown(attribute);
+        if (attributeInstance instanceof content_1.IdentityAttribute) {
+            return await this.expandIdentityAttribute(attribute, attributeInstance);
+        }
+        else if (attributeInstance instanceof content_1.RelationshipAttribute) {
+            return await this.expandRelationshipAttribute(attribute, attributeInstance);
+        }
+        throw new Error("Wrong attribute instance");
+    }
     async expandAttributes(attributes) {
         const attributesPromise = attributes.map((attribute) => this.expandAttribute(attribute));
         return await Promise.all(attributesPromise);
@@ -686,7 +1140,7 @@ let DataViewExpander = class DataViewExpander {
         if (this.identityController.isMe(transport_1.CoreAddress.from(address))) {
             return this.expandSelf();
         }
-        const result = await this.transport.relationships.getRelationshipByAddress({ address: address });
+        const result = await this.transport.relationships.getRelationshipByAddress({ address });
         if (result.isError) {
             return this.expandUnknown(address);
         }
@@ -758,7 +1212,6 @@ let DataViewExpander = class DataViewExpander {
                 isPinned: false
             };
         }
-        const nameRelevantAttributeTypes = ["DisplayName", "GivenName", "MiddleName", "Surname", "Sex"];
         const stringByType = {};
         const relationshipAttributesResult = await this.consumption.attributes.getPeerAttributes({ onlyValid: true, peer: relationship.peer });
         const expandedAttributes = await this.expandLocalAttributeDTOs(relationshipAttributesResult.value);
@@ -772,12 +1225,14 @@ let DataViewExpander = class DataViewExpander {
             else {
                 attributesByType[valueType] = [attribute];
             }
+            const nameRelevantAttributeTypes = ["DisplayName", "GivenName", "MiddleName", "Surname", "Sex"];
             if (nameRelevantAttributeTypes.includes(valueType)) {
-                if (stringByType[valueType]) {
-                    stringByType[valueType] += ` ${attribute.content.value.value}`;
+                const attributeValue = attribute.content.value;
+                if (stringByType[valueType] && valueType === "GivenName") {
+                    stringByType[valueType] += ` ${attributeValue.value}`;
                 }
                 else {
-                    stringByType[valueType] = `${attribute.content.value.value}`;
+                    stringByType[valueType] = attributeValue.value;
                 }
             }
         }
@@ -806,12 +1261,18 @@ let DataViewExpander = class DataViewExpander {
         if (stringByType["DisplayName"]) {
             name = stringByType["DisplayName"];
         }
+        else if (stringByType["MiddleName"] && stringByType["GivenName"] && stringByType["Surname"]) {
+            name = `${stringByType["GivenName"]} ${stringByType["MiddleName"]} ${stringByType["Surname"]}`;
+        }
         else if (stringByType["GivenName"] && stringByType["Surname"]) {
             name = `${stringByType["GivenName"]} ${stringByType["Surname"]}`;
         }
         else if (stringByType["Sex"] && stringByType["Surname"]) {
             name = `i18n://dvo.identity.Salutation.${stringByType["Sex"]} ${stringByType["Surname"]}`;
         }
+        else if (stringByType["Surname"]) {
+            name = `${stringByType["Surname"]}`;
+        }
         else {
             name = relationship.peer.substring(3, 9);
         }
@@ -830,7 +1291,8 @@ let DataViewExpander = class DataViewExpander {
             items: expandedAttributes,
             nameMap: stringByType,
             changes: changes,
-            changeCount: changes.length
+            changeCount: changes.length,
+            templateId: relationship.template.id
         };
     }
     async expandRelationshipDTO(relationship) {
@@ -886,7 +1348,7 @@ let DataViewExpander = class DataViewExpander {
         return await Promise.all(relationshipPromises);
     }
     async expandFileId(id) {
-        const result = await this.transport.files.getFile({ id: id });
+        const result = await this.transport.files.getFile({ id });
         if (result.isError) {
             throw result.error;
         }