@nmshd/runtime 2.0.0-alpha.8 → 2.0.0-beta.2

package/dist/useCases/consumption/attributes/GetSharedToPeerAttributes.d.ts

@@ -0,0 +1,30 @@
+import { Result } from "@js-soft/ts-utils";
+import { LocalAttributesController } from "@nmshd/consumption";
+import { IdentityController } from "@nmshd/transport";
+import { LocalAttributeDTO } from "../../../types";
+import { UseCase } from "../../common";
+export interface GetSharedToPeerAttributesRequest {
+    peer: string;
+    onlyValid?: boolean;
+    query?: GetSharedToPeerAttributesRequestQuery;
+}
+export interface GetSharedToPeerAttributesRequestQuery {
+    createdAt?: string;
+    "content.@type"?: string | string[];
+    "content.tags"?: string | string[];
+    "content.validFrom"?: string | string[];
+    "content.validTo"?: string | string[];
+    "content.key"?: string | string[];
+    "content.isTechnical"?: string | string[];
+    "content.confidentiality"?: string | string[];
+    "content.value.@type"?: string | string[];
+    shareInfo?: string | string[];
+    "shareInfo.requestReference"?: string | string[];
+    "shareInfo.sourceAttribute"?: string | string[];
+}
+export declare class GetSharedToPeerAttributesUseCase extends UseCase<GetSharedToPeerAttributesRequest, LocalAttributeDTO[]> {
+    private readonly attributeController;
+    private readonly identityController;
+    constructor(attributeController: LocalAttributesController, identityController: IdentityController);
+    protected executeInternal(request: GetSharedToPeerAttributesRequest): Promise<Result<LocalAttributeDTO[]>>;
+}

package/dist/useCases/consumption/attributes/GetSharedToPeerAttributes.js

@@ -0,0 +1,52 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetSharedToPeerAttributesUseCase = void 0;
+const ts_utils_1 = require("@js-soft/ts-utils");
+const consumption_1 = require("@nmshd/consumption");
+const transport_1 = require("@nmshd/transport");
+const typescript_ioc_1 = require("typescript-ioc");
+const common_1 = require("../../common");
+const flattenObject_1 = require("../requests/flattenObject");
+const AttributeMapper_1 = require("./AttributeMapper");
+const GetAttributes_1 = require("./GetAttributes");
+let GetSharedToPeerAttributesUseCase = class GetSharedToPeerAttributesUseCase extends common_1.UseCase {
+    constructor(attributeController, identityController) {
+        super();
+        this.attributeController = attributeController;
+        this.identityController = identityController;
+    }
+    async executeInternal(request) {
+        const query = request.query ?? {};
+        query["content.owner"] = this.identityController.address.toString();
+        query["shareInfo.peer"] = request.peer;
+        const flattenedQuery = (0, flattenObject_1.flattenObject)(query);
+        const dbQuery = GetAttributes_1.GetAttributesUseCase.queryTranslator.parse(flattenedQuery);
+        let attributes;
+        if (request.onlyValid) {
+            attributes = await this.attributeController.getValidLocalAttributes(dbQuery);
+        }
+        else {
+            attributes = await this.attributeController.getLocalAttributes(dbQuery);
+        }
+        return ts_utils_1.Result.ok(AttributeMapper_1.AttributeMapper.toAttributeDTOList(attributes));
+    }
+};
+GetSharedToPeerAttributesUseCase = __decorate([
+    __param(0, typescript_ioc_1.Inject),
+    __param(1, typescript_ioc_1.Inject),
+    __metadata("design:paramtypes", [consumption_1.LocalAttributesController, transport_1.IdentityController])
+], GetSharedToPeerAttributesUseCase);
+exports.GetSharedToPeerAttributesUseCase = GetSharedToPeerAttributesUseCase;
+//# sourceMappingURL=GetSharedToPeerAttributes.js.map

package/dist/useCases/consumption/attributes/GetSharedToPeerAttributes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetSharedToPeerAttributes.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/attributes/GetSharedToPeerAttributes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAA2C;AAC3C,oDAA+D;AAC/D,gDAAsD;AACtD,mDAAwC;AAExC,yCAAuC;AACvC,6DAA0D;AAC1D,uDAAoD;AACpD,mDAAkF;AAuBlF,IAAa,gCAAgC,GAA7C,MAAa,gCAAiC,SAAQ,gBAA8D;IAChH,YAA4C,mBAA8C,EAA2B,kBAAsC;QACvJ,KAAK,EAAE,CAAC;QADgC,wBAAmB,GAAnB,mBAAmB,CAA2B;QAA2B,uBAAkB,GAAlB,kBAAkB,CAAoB;IAE3J,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAyC;QACrE,MAAM,KAAK,GAA8B,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAC7D,KAAK,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAEpE,KAAK,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;QAEvC,MAAM,cAAc,GAAG,IAAA,6BAAa,EAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,oCAAoB,CAAC,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC3E,IAAI,UAAU,CAAC;QACf,IAAI,OAAO,CAAC,SAAS,EAAE;YACnB,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;SAChF;aAAM;YACH,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;SAC3E;QACD,OAAO,iBAAM,CAAC,EAAE,CAAC,iCAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;IACrE,CAAC;CACJ,CAAA;AArBY,gCAAgC;IACrB,WAAA,uBAAM,CAAA;IAAmE,WAAA,uBAAM,CAAA;qCAAlC,uCAAyB,EAA+C,8BAAkB;GADlJ,gCAAgC,CAqB5C;AArBY,4EAAgC"}

package/dist/useCases/consumption/attributes/SucceedAttribute.d.ts

@@ -1,20 +1,25 @@
-import { Result } from "@js-soft/ts-utils";
-import { ConsumptionAttributesController } from "@nmshd/consumption";
-import { IAttribute } from "@nmshd/content";
-import { AccountController } from "@nmshd/transport";
-import { ConsumptionAttributeDTO } from "../../../types";
-import { RuntimeValidator, UseCase } from "../../common";
+import { EventBus, Result } from "@js-soft/ts-utils";
+import { LocalAttributesController } from "@nmshd/consumption";
+import { AccountController, IdentityController } from "@nmshd/transport";
+import { LocalAttributeDTO } from "../../../types";
+import { SchemaRepository, SchemaValidator, UseCase } from "../../common";
+import { ExtendedIdentityAttributeJSON, ExtendedRelationshipAttributeJSON } from "./ExtendedAttributeValue";
 export interface SucceedAttributeRequest {
-    attribute: IAttribute;
-    validFrom?: string;
+    successorContent: ExtendedIdentityAttributeJSON | ExtendedRelationshipAttributeJSON;
+    /**
+     * @pattern ATT[A-Za-z0-9]{17}
+     */
+    succeeds: string;
 }
-declare class SucceedAttributeRequestValidator extends RuntimeValidator<SucceedAttributeRequest> {
-    constructor();
+declare class Validator extends SchemaValidator<SucceedAttributeRequest> {
+    constructor(schemaRepository: SchemaRepository);
 }
-export declare class SucceedAttributeUseCase extends UseCase<SucceedAttributeRequest, ConsumptionAttributeDTO> {
+export declare class SucceedAttributeUseCase extends UseCase<SucceedAttributeRequest, LocalAttributeDTO> {
     private readonly attributeController;
     private readonly accountController;
-    constructor(attributeController: ConsumptionAttributesController, accountController: AccountController, validator: SucceedAttributeRequestValidator);
-    protected executeInternal(request: SucceedAttributeRequest): Promise<Result<ConsumptionAttributeDTO>>;
+    private readonly identityController;
+    private readonly eventBus;
+    constructor(attributeController: LocalAttributesController, accountController: AccountController, identityController: IdentityController, eventBus: EventBus, validator: Validator);
+    protected executeInternal(request: SucceedAttributeRequest): Promise<Result<LocalAttributeDTO>>;
 }
 export {};

package/dist/useCases/consumption/attributes/SucceedAttribute.js

@@ -17,36 +17,49 @@ const ts_utils_1 = require("@js-soft/ts-utils");
 const consumption_1 = require("@nmshd/consumption");
 const transport_1 = require("@nmshd/transport");
 const typescript_ioc_1 = require("typescript-ioc");
+const events_1 = require("../../../events");
 const common_1 = require("../../common");
 const AttributeMapper_1 = require("./AttributeMapper");
-class SucceedAttributeRequestValidator extends common_1.RuntimeValidator {
-    constructor() {
-        super();
-        this.validateIf((x) => x.validFrom).fulfills(common_1.DateValidator.optional());
-        this.validateIf((x) => x.attribute).isDefined();
-        this.validateIf((x) => x.attribute.name).isNotEmpty();
+let Validator = class Validator extends common_1.SchemaValidator {
+    constructor(schemaRepository) {
+        super(schemaRepository.getSchema("SucceedAttributeRequest"));
     }
-}
+};
+Validator = __decorate([
+    __param(0, typescript_ioc_1.Inject),
+    __metadata("design:paramtypes", [common_1.SchemaRepository])
+], Validator);
 let SucceedAttributeUseCase = class SucceedAttributeUseCase extends common_1.UseCase {
-    constructor(attributeController, accountController, validator) {
+    constructor(attributeController, accountController, identityController, eventBus, validator) {
         super(validator);
         this.attributeController = attributeController;
         this.accountController = accountController;
+        this.identityController = identityController;
+        this.eventBus = eventBus;
     }
     async executeInternal(request) {
-        const attribute = await consumption_1.ConsumptionAttribute.fromAttribute(request.attribute);
-        const successor = await this.attributeController.succeedAttribute(attribute, request.validFrom ? transport_1.CoreDate.from(request.validFrom) : undefined);
+        const params = consumption_1.SucceedLocalAttributeParams.from({
+            successorContent: request.successorContent,
+            succeeds: request.succeeds
+        });
+        const successor = await this.attributeController.succeedLocalAttribute(params);
         await this.accountController.syncDatawallet();
-        return ts_utils_1.Result.ok(AttributeMapper_1.AttributeMapper.toAttributeDTO(successor));
+        const attributeDTO = AttributeMapper_1.AttributeMapper.toAttributeDTO(successor);
+        this.eventBus.publish(new events_1.AttributeSucceededEvent(this.identityController.identity.address.toString(), attributeDTO));
+        return ts_utils_1.Result.ok(attributeDTO);
     }
 };
 SucceedAttributeUseCase = __decorate([
     __param(0, typescript_ioc_1.Inject),
     __param(1, typescript_ioc_1.Inject),
     __param(2, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [consumption_1.ConsumptionAttributesController,
+    __param(3, typescript_ioc_1.Inject),
+    __param(4, typescript_ioc_1.Inject),
+    __metadata("design:paramtypes", [consumption_1.LocalAttributesController,
         transport_1.AccountController,
-        SucceedAttributeRequestValidator])
+        transport_1.IdentityController,
+        ts_utils_1.EventBus,
+        Validator])
 ], SucceedAttributeUseCase);
 exports.SucceedAttributeUseCase = SucceedAttributeUseCase;
 //# sourceMappingURL=SucceedAttribute.js.map

package/dist/useCases/consumption/attributes/SucceedAttribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"SucceedAttribute.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/attributes/SucceedAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAA2C;AAC3C,oDAA2F;AAE3F,gDAA+D;AAC/D,mDAAwC;AAExC,yCAAwE;AACxE,uDAAoD;AAOpD,MAAM,gCAAiC,SAAQ,yBAAyC;IACpF;QACI,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,sBAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAC;QAChD,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;IAC1D,CAAC;CACJ;AAED,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,gBAAyD;IAClG,YAC6B,mBAAoD,EACpD,iBAAoC,EACrD,SAA2C;QAEnD,KAAK,CAAC,SAAS,CAAC,CAAC;QAJQ,wBAAmB,GAAnB,mBAAmB,CAAiC;QACpD,sBAAiB,GAAjB,iBAAiB,CAAmB;IAIjE,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAgC;QAC5D,MAAM,SAAS,GAAG,MAAM,kCAAoB,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9E,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAE/I,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC;QAE9C,OAAO,iBAAM,CAAC,EAAE,CAAC,iCAAe,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;IAChE,CAAC;CACJ,CAAA;AAjBY,uBAAuB;IAE3B,WAAA,uBAAM,CAAA;IACN,WAAA,uBAAM,CAAA;IACN,WAAA,uBAAM,CAAA;qCAFuC,6CAA+B;QACjC,6BAAiB;QAC1C,gCAAgC;GAJ9C,uBAAuB,CAiBnC;AAjBY,0DAAuB"}
+{"version":3,"file":"SucceedAttribute.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/attributes/SucceedAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAqD;AACrD,oDAA4F;AAC5F,gDAAyE;AACzE,mDAAwC;AACxC,4CAA0D;AAE1D,yCAA0E;AAC1E,uDAAoD;AAWpD,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,wBAAwC;IAC5D,YAA2B,gBAAkC;QACzD,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC,CAAC;IACjE,CAAC;CACJ,CAAA;AAJK,SAAS;IACS,WAAA,uBAAM,CAAA;qCAAmB,yBAAgB;GAD3D,SAAS,CAId;AACD,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,gBAAmD;IAC5F,YAC6B,mBAA8C,EAC9C,iBAAoC,EAEpC,kBAAsC,EACtC,QAAkB,EAEnC,SAAoB;QAE5B,KAAK,CAAC,SAAS,CAAC,CAAC;QARQ,wBAAmB,GAAnB,mBAAmB,CAA2B;QAC9C,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,aAAQ,GAAR,QAAQ,CAAU;IAK/C,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAgC;QAC5D,MAAM,MAAM,GAAG,yCAA2B,CAAC,IAAI,CAAC;YAC5C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAE/E,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC;QAE9C,MAAM,YAAY,GAAG,iCAAe,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,gCAAuB,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC;QACtH,OAAO,iBAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;IACnC,CAAC;CACJ,CAAA;AA1BY,uBAAuB;IAE3B,WAAA,uBAAM,CAAA;IACN,WAAA,uBAAM,CAAA;IAEN,WAAA,uBAAM,CAAA;IACN,WAAA,uBAAM,CAAA;IAEN,WAAA,uBAAM,CAAA;qCANuC,uCAAyB;QAC3B,6BAAiB;QAEhB,8BAAkB;QAC5B,mBAAQ;QAExB,SAAS;GARvB,uBAAuB,CA0BnC;AA1BY,0DAAuB"}

package/dist/useCases/consumption/attributes/UpdateAttribute.d.ts

@@ -1,20 +1,25 @@
-import { Result } from "@js-soft/ts-utils";
-import { ConsumptionAttributesController } from "@nmshd/consumption";
-import { IAttribute } from "@nmshd/content";
-import { AccountController } from "@nmshd/transport";
-import { ConsumptionAttributeDTO } from "../../../types";
-import { RuntimeValidator, UseCase } from "../../common";
+import { EventBus, Result } from "@js-soft/ts-utils";
+import { LocalAttributesController } from "@nmshd/consumption";
+import { AccountController, IdentityController } from "@nmshd/transport";
+import { LocalAttributeDTO } from "../../../types";
+import { SchemaRepository, SchemaValidator, UseCase } from "../../common";
+import { ExtendedIdentityAttributeJSON, ExtendedRelationshipAttributeJSON } from "./ExtendedAttributeValue";
 export interface UpdateAttributeRequest {
+    /**
+     * @pattern ATT[A-Za-z0-9]{17}
+     */
     id: string;
-    attribute: IAttribute;
+    content: ExtendedIdentityAttributeJSON | ExtendedRelationshipAttributeJSON;
 }
-declare class UpdateAttributeRequestValidator extends RuntimeValidator<UpdateAttributeRequest> {
-    constructor();
+declare class Validator extends SchemaValidator<UpdateAttributeRequest> {
+    constructor(schemaRepository: SchemaRepository);
 }
-export declare class UpdateAttributeUseCase extends UseCase<UpdateAttributeRequest, ConsumptionAttributeDTO> {
+export declare class UpdateAttributeUseCase extends UseCase<UpdateAttributeRequest, LocalAttributeDTO> {
     private readonly attributeController;
     private readonly accountController;
-    constructor(attributeController: ConsumptionAttributesController, accountController: AccountController, validator: UpdateAttributeRequestValidator);
-    protected executeInternal(request: UpdateAttributeRequest): Promise<Result<ConsumptionAttributeDTO>>;
+    private readonly identityController;
+    private readonly eventBus;
+    constructor(attributeController: LocalAttributesController, accountController: AccountController, identityController: IdentityController, eventBus: EventBus, validator: Validator);
+    protected executeInternal(request: UpdateAttributeRequest): Promise<Result<LocalAttributeDTO>>;
 }
 export {};

package/dist/useCases/consumption/attributes/UpdateAttribute.js

@@ -15,43 +15,51 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateAttributeUseCase = void 0;
 const ts_utils_1 = require("@js-soft/ts-utils");
 const consumption_1 = require("@nmshd/consumption");
-const content_1 = require("@nmshd/content");
 const transport_1 = require("@nmshd/transport");
 const typescript_ioc_1 = require("typescript-ioc");
+const events_1 = require("../../../events");
 const common_1 = require("../../common");
 const AttributeMapper_1 = require("./AttributeMapper");
-class UpdateAttributeRequestValidator extends common_1.RuntimeValidator {
-    constructor() {
-        super();
-        this.validateIfString((x) => x.id).fulfills(common_1.IdValidator.required(consumption_1.ConsumptionIds.attribute));
-        this.validateIf((x) => x.attribute).isDefined();
-        this.validateIf((x) => x.attribute.name).isNotEmpty();
+let Validator = class Validator extends common_1.SchemaValidator {
+    constructor(schemaRepository) {
+        super(schemaRepository.getSchema("UpdateAttributeRequest"));
     }
-}
+};
+Validator = __decorate([
+    __param(0, typescript_ioc_1.Inject),
+    __metadata("design:paramtypes", [common_1.SchemaRepository])
+], Validator);
 let UpdateAttributeUseCase = class UpdateAttributeUseCase extends common_1.UseCase {
-    constructor(attributeController, accountController, validator) {
+    constructor(attributeController, accountController, identityController, eventBus, validator) {
         super(validator);
         this.attributeController = attributeController;
         this.accountController = accountController;
+        this.identityController = identityController;
+        this.eventBus = eventBus;
     }
     async executeInternal(request) {
-        const attribute = await this.attributeController.getAttribute(transport_1.CoreId.from(request.id));
-        if (!attribute) {
-            return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound(consumption_1.ConsumptionAttribute));
-        }
-        attribute.content = content_1.Attribute.from(request.attribute);
-        const updated = await this.attributeController.updateAttribute(attribute);
+        const params = consumption_1.UpdateLocalAttributeParams.from({
+            id: request.id,
+            content: request.content
+        });
+        const updated = await this.attributeController.updateLocalAttribute(params);
         await this.accountController.syncDatawallet();
-        return ts_utils_1.Result.ok(AttributeMapper_1.AttributeMapper.toAttributeDTO(updated));
+        const attributeDTO = AttributeMapper_1.AttributeMapper.toAttributeDTO(updated);
+        this.eventBus.publish(new events_1.AttributeUpdatedEvent(this.identityController.identity.address.toString(), attributeDTO));
+        return ts_utils_1.Result.ok(attributeDTO);
     }
 };
 UpdateAttributeUseCase = __decorate([
     __param(0, typescript_ioc_1.Inject),
     __param(1, typescript_ioc_1.Inject),
     __param(2, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [consumption_1.ConsumptionAttributesController,
+    __param(3, typescript_ioc_1.Inject),
+    __param(4, typescript_ioc_1.Inject),
+    __metadata("design:paramtypes", [consumption_1.LocalAttributesController,
         transport_1.AccountController,
-        UpdateAttributeRequestValidator])
+        transport_1.IdentityController,
+        ts_utils_1.EventBus,
+        Validator])
 ], UpdateAttributeUseCase);
 exports.UpdateAttributeUseCase = UpdateAttributeUseCase;
 //# sourceMappingURL=UpdateAttribute.js.map

package/dist/useCases/consumption/attributes/UpdateAttribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateAttribute.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/attributes/UpdateAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAA2C;AAC3C,oDAA2G;AAC3G,4CAAuD;AACvD,gDAA6D;AAC7D,mDAAwC;AAExC,yCAAqF;AACrF,uDAAoD;AAOpD,MAAM,+BAAgC,SAAQ,yBAAwC;IAClF;QACI,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,oBAAW,CAAC,QAAQ,CAAC,4BAAc,CAAC,SAAS,CAAC,CAAC,CAAC;QAC5F,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAC;QAChD,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;IAC1D,CAAC;CACJ;AAED,IAAa,sBAAsB,GAAnC,MAAa,sBAAuB,SAAQ,gBAAwD;IAChG,YAC6B,mBAAoD,EACpD,iBAAoC,EACrD,SAA0C;QAElD,KAAK,CAAC,SAAS,CAAC,CAAC;QAJQ,wBAAmB,GAAnB,mBAAmB,CAAiC;QACpD,sBAAiB,GAAjB,iBAAiB,CAAmB;IAIjE,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAA+B;QAC3D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,kBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,iBAAM,CAAC,IAAI,CAAC,sBAAa,CAAC,OAAO,CAAC,cAAc,CAAC,kCAAoB,CAAC,CAAC,CAAC;SAClF;QAED,SAAS,CAAC,OAAO,GAAG,mBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1E,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC;QAE9C,OAAO,iBAAM,CAAC,EAAE,CAAC,iCAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9D,CAAC;CACJ,CAAA;AAtBY,sBAAsB;IAE1B,WAAA,uBAAM,CAAA;IACN,WAAA,uBAAM,CAAA;IACN,WAAA,uBAAM,CAAA;qCAFuC,6CAA+B;QACjC,6BAAiB;QAC1C,+BAA+B;GAJ7C,sBAAsB,CAsBlC;AAtBY,wDAAsB"}
+{"version":3,"file":"UpdateAttribute.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/attributes/UpdateAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAqD;AACrD,oDAA2F;AAC3F,gDAAyE;AACzE,mDAAwC;AACxC,4CAAwD;AAExD,yCAA0E;AAC1E,uDAAoD;AAWpD,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,wBAAuC;IAC3D,YAA2B,gBAAkC;QACzD,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAChE,CAAC;CACJ,CAAA;AAJK,SAAS;IACS,WAAA,uBAAM,CAAA;qCAAmB,yBAAgB;GAD3D,SAAS,CAId;AAED,IAAa,sBAAsB,GAAnC,MAAa,sBAAuB,SAAQ,gBAAkD;IAC1F,YAC6B,mBAA8C,EAC9C,iBAAoC,EAEpC,kBAAsC,EACtC,QAAkB,EAEnC,SAAoB;QAE5B,KAAK,CAAC,SAAS,CAAC,CAAC;QARQ,wBAAmB,GAAnB,mBAAmB,CAA2B;QAC9C,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,aAAQ,GAAR,QAAQ,CAAU;IAK/C,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAA+B;QAC3D,MAAM,MAAM,GAAG,wCAA0B,CAAC,IAAI,CAAC;YAC3C,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,OAAO,EAAE,OAAO,CAAC,OAAO;SAC3B,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC5E,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC;QAE9C,MAAM,YAAY,GAAG,iCAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,8BAAqB,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC;QACpH,OAAO,iBAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;IACnC,CAAC;CACJ,CAAA;AAzBY,sBAAsB;IAE1B,WAAA,uBAAM,CAAA;IACN,WAAA,uBAAM,CAAA;IAEN,WAAA,uBAAM,CAAA;IACN,WAAA,uBAAM,CAAA;IAEN,WAAA,uBAAM,CAAA;qCANuC,uCAAyB;QAC3B,6BAAiB;QAEhB,8BAAkB;QAC5B,mBAAQ;QAExB,SAAS;GARvB,sBAAsB,CAyBlC;AAzBY,wDAAsB"}

package/dist/useCases/consumption/attributes/index.d.ts

@@ -1,12 +1,12 @@
 export * from "./AttributeMapper";
 export * from "./CreateAttribute";
+export * from "./CreateSharedAttributeCopy";
 export * from "./DeleteAttribute";
-export * from "./DeleteAttributeByName";
-export * from "./GetAllValid";
+export * from "./ExecuteIdentityAttributeQuery";
+export * from "./ExecuteRelationshipAttributeQuery";
 export * from "./GetAttribute";
-export * from "./GetAttributeByName";
 export * from "./GetAttributes";
-export * from "./GetAttributesByNames";
-export * from "./GetHistoryByName";
+export * from "./GetPeerAttributes";
+export * from "./GetSharedToPeerAttributes";
 export * from "./SucceedAttribute";
 export * from "./UpdateAttribute";

package/dist/useCases/consumption/attributes/index.js

@@ -16,14 +16,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AttributeMapper"), exports);
 __exportStar(require("./CreateAttribute"), exports);
+__exportStar(require("./CreateSharedAttributeCopy"), exports);
 __exportStar(require("./DeleteAttribute"), exports);
-__exportStar(require("./DeleteAttributeByName"), exports);
-__exportStar(require("./GetAllValid"), exports);
+__exportStar(require("./ExecuteIdentityAttributeQuery"), exports);
+__exportStar(require("./ExecuteRelationshipAttributeQuery"), exports);
 __exportStar(require("./GetAttribute"), exports);
-__exportStar(require("./GetAttributeByName"), exports);
 __exportStar(require("./GetAttributes"), exports);
-__exportStar(require("./GetAttributesByNames"), exports);
-__exportStar(require("./GetHistoryByName"), exports);
+__exportStar(require("./GetPeerAttributes"), exports);
+__exportStar(require("./GetSharedToPeerAttributes"), exports);
 __exportStar(require("./SucceedAttribute"), exports);
 __exportStar(require("./UpdateAttribute"), exports);
 //# sourceMappingURL=index.js.map

package/dist/useCases/consumption/attributes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/attributes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,oDAAkC;AAClC,oDAAkC;AAClC,0DAAwC;AACxC,gDAA8B;AAC9B,iDAA+B;AAC/B,uDAAqC;AACrC,kDAAgC;AAChC,yDAAuC;AACvC,qDAAmC;AACnC,qDAAmC;AACnC,oDAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/attributes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,oDAAkC;AAClC,8DAA4C;AAC5C,oDAAkC;AAClC,kEAAgD;AAChD,sEAAoD;AACpD,iDAA+B;AAC/B,kDAAgC;AAChC,sDAAoC;AACpC,8DAA4C;AAC5C,qDAAmC;AACnC,oDAAkC"}

package/dist/useCases/consumption/drafts/GetDrafts.d.ts

@@ -2,8 +2,13 @@ import { Result } from "@js-soft/ts-utils";
 import { DraftsController } from "@nmshd/consumption";
 import { DraftDTO } from "../../../types";
 import { RuntimeValidator, UseCase } from "../../common";
+export interface GetDraftsQuery {
+    type?: string | string[];
+    createdAt?: string | string[];
+    lastModifiedAt?: string | string[];
+}
 export interface GetDraftsRequest {
-    query?: any;
+    query?: GetDraftsQuery;
 }
 export declare class GetDraftsUseCase extends UseCase<GetDraftsRequest, DraftDTO[]> {
     private readonly draftController;

package/dist/useCases/consumption/drafts/GetDrafts.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetDrafts.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/drafts/GetDrafts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0EAAiE;AACjE,gDAA2C;AAC3C,oDAAsD;AACtD,uDAA0C;AAC1C,mDAAwC;AAExC,yCAAyD;AACzD,+CAA4C;AAM5C,IAAa,gBAAgB,GAA7B,MAAa,gBAAiB,SAAQ,gBAAqC;IASvE,YAA4C,eAAiC,EAAU,SAA2B;QAC9G,KAAK,CAAC,SAAS,CAAC,CAAC;QADuB,oBAAe,GAAf,eAAe,CAAkB;IAE7E,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAyB;QACrD,MAAM,KAAK,GAAG,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC3D,OAAO,iBAAM,CAAC,EAAE,CAAC,yBAAW,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,CAAC;CACJ,CAAA;AAjB2B,gCAAe,GAAG,IAAI,uCAAe,CAAC;IAC1D,SAAS,EAAE;QACP,CAAC,IAAA,yBAAM,EAAW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI;QACvC,CAAC,IAAA,yBAAM,EAAW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI;QAC5C,CAAC,IAAA,yBAAM,EAAW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI;KACpD;CACJ,CAAE,CAAA;AAPM,gBAAgB;IASL,WAAA,uBAAM,CAAA;IAAsD,WAAA,uBAAM,CAAA;qCAAzB,8BAAgB,EAAqB,yBAAgB;GATzG,gBAAgB,CAkB5B;AAlBY,4CAAgB"}
+{"version":3,"file":"GetDrafts.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/drafts/GetDrafts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0EAAiE;AACjE,gDAA2C;AAC3C,oDAAsD;AACtD,uDAA0C;AAC1C,mDAAwC;AAExC,yCAAyD;AACzD,+CAA4C;AAY5C,IAAa,gBAAgB,GAA7B,MAAa,gBAAiB,SAAQ,gBAAqC;IASvE,YAA4C,eAAiC,EAAU,SAA2B;QAC9G,KAAK,CAAC,SAAS,CAAC,CAAC;QADuB,oBAAe,GAAf,eAAe,CAAkB;IAE7E,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAyB;QACrD,MAAM,KAAK,GAAG,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC3D,OAAO,iBAAM,CAAC,EAAE,CAAC,yBAAW,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,CAAC;CACJ,CAAA;AAjB2B,gCAAe,GAAG,IAAI,uCAAe,CAAC;IAC1D,SAAS,EAAE;QACP,CAAC,IAAA,yBAAM,EAAW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI;QACvC,CAAC,IAAA,yBAAM,EAAW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI;QAC5C,CAAC,IAAA,yBAAM,EAAW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI;KACpD;CACJ,CAAE,CAAA;AAPM,gBAAgB;IASL,WAAA,uBAAM,CAAA;IAAsD,WAAA,uBAAM,CAAA;qCAAzB,8BAAgB,EAAqB,yBAAgB;GATzG,gBAAgB,CAkB5B;AAlBY,4CAAgB"}

package/dist/useCases/consumption/requests/AcceptIncomingRequest.d.ts

@@ -1,12 +1,12 @@
 import { ApplicationError, EventBus, Result } from "@js-soft/ts-utils";
 import { DecideRequestParametersJSON, IncomingRequestsController } from "@nmshd/consumption";
-import { ConsumptionRequestDTO } from "../../../types";
+import { LocalRequestDTO } from "../../../types";
 import { UseCase } from "../../common";
 export interface AcceptIncomingRequestRequest extends DecideRequestParametersJSON {
 }
-export declare class AcceptIncomingRequestUseCase extends UseCase<AcceptIncomingRequestRequest, ConsumptionRequestDTO> {
+export declare class AcceptIncomingRequestUseCase extends UseCase<AcceptIncomingRequestRequest, LocalRequestDTO> {
     private readonly incomingRequestsController;
     private readonly eventBus;
     constructor(incomingRequestsController: IncomingRequestsController, eventBus: EventBus);
-    protected executeInternal(request: AcceptIncomingRequestRequest): Promise<Result<ConsumptionRequestDTO, ApplicationError>>;
+    protected executeInternal(request: AcceptIncomingRequestRequest): Promise<Result<LocalRequestDTO, ApplicationError>>;
 }

package/dist/useCases/consumption/requests/AcceptIncomingRequest.js

@@ -17,7 +17,7 @@ const ts_utils_1 = require("@js-soft/ts-utils");
 const consumption_1 = require("@nmshd/consumption");
 const transport_1 = require("@nmshd/transport");
 const typescript_ioc_1 = require("typescript-ioc");
-const IncomingRequestStatusChangedEvent_1 = require("../../../events/consumption/IncomingRequestStatusChangedEvent");
+const events_1 = require("../../../events");
 const common_1 = require("../../common");
 const RequestMapper_1 = require("./RequestMapper");
 let AcceptIncomingRequestUseCase = class AcceptIncomingRequestUseCase extends common_1.UseCase {
@@ -27,14 +27,14 @@ let AcceptIncomingRequestUseCase = class AcceptIncomingRequestUseCase extends co
         this.eventBus = eventBus;
     }
     async executeInternal(request) {
-        let consumptionRequest = await this.incomingRequestsController.getIncomingRequest(transport_1.CoreId.from(request.requestId));
-        if (!consumptionRequest) {
-            return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound(consumption_1.ConsumptionRequest));
+        let localRequest = await this.incomingRequestsController.getIncomingRequest(transport_1.CoreId.from(request.requestId));
+        if (!localRequest) {
+            return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound(consumption_1.LocalRequest));
         }
-        const oldStatus = consumptionRequest.status;
-        consumptionRequest = await this.incomingRequestsController.accept(request);
-        const dto = RequestMapper_1.RequestMapper.toConsumptionRequestDTO(consumptionRequest);
-        this.eventBus.publish(new IncomingRequestStatusChangedEvent_1.IncomingRequestStatusChangedEvent(this.incomingRequestsController.parent.accountController.identity.address.address, {
+        const oldStatus = localRequest.status;
+        localRequest = await this.incomingRequestsController.accept(request);
+        const dto = RequestMapper_1.RequestMapper.toLocalRequestDTO(localRequest);
+        this.eventBus.publish(new events_1.IncomingRequestStatusChangedEvent(this.incomingRequestsController.parent.accountController.identity.address.address, {
             request: dto,
             oldStatus,
             newStatus: dto.status

package/dist/useCases/consumption/requests/AcceptIncomingRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcceptIncomingRequest.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/requests/AcceptIncomingRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAuE;AACvE,oDAAiH;AACjH,gDAA0C;AAC1C,mDAAwC;AACxC,qHAAkH;AAElH,yCAAsD;AACtD,mDAAgD;AAIhD,IAAa,4BAA4B,GAAzC,MAAa,4BAA6B,SAAQ,gBAA4D;IAC1G,YAA4C,0BAAsD,EAA2B,QAAkB;QAC3I,KAAK,EAAE,CAAC;QADgC,+BAA0B,GAA1B,0BAA0B,CAA4B;QAA2B,aAAQ,GAAR,QAAQ,CAAU;IAE/I,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAqC;QACjE,IAAI,kBAAkB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,kBAAkB,CAAC,kBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QAElH,IAAI,CAAC,kBAAkB,EAAE;YACrB,OAAO,iBAAM,CAAC,IAAI,CAAC,sBAAa,CAAC,OAAO,CAAC,cAAc,CAAC,gCAAkB,CAAC,CAAC,CAAC;SAChF;QAED,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC;QAE5C,kBAAkB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE3E,MAAM,GAAG,GAAG,6BAAa,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;QAEtE,IAAI,CAAC,QAAQ,CAAC,OAAO,CACjB,IAAI,qEAAiC,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE;YACrH,OAAO,EAAE,GAAG;YACZ,SAAS;YACT,SAAS,EAAE,GAAG,CAAC,MAAM;SACxB,CAAC,CACL,CAAC;QAEF,OAAO,iBAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACJ,CAAA;AA5BY,4BAA4B;IACjB,WAAA,uBAAM,CAAA;IAA2E,WAAA,uBAAM,CAAA;qCAAnC,wCAA0B,EAAqC,mBAAQ;GADtI,4BAA4B,CA4BxC;AA5BY,oEAA4B"}
+{"version":3,"file":"AcceptIncomingRequest.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/requests/AcceptIncomingRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAuE;AACvE,oDAA2G;AAC3G,gDAA0C;AAC1C,mDAAwC;AACxC,4CAAoE;AAEpE,yCAAsD;AACtD,mDAAgD;AAIhD,IAAa,4BAA4B,GAAzC,MAAa,4BAA6B,SAAQ,gBAAsD;IACpG,YAA4C,0BAAsD,EAA2B,QAAkB;QAC3I,KAAK,EAAE,CAAC;QADgC,+BAA0B,GAA1B,0BAA0B,CAA4B;QAA2B,aAAQ,GAAR,QAAQ,CAAU;IAE/I,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAqC;QACjE,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,kBAAkB,CAAC,kBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QAE5G,IAAI,CAAC,YAAY,EAAE;YACf,OAAO,iBAAM,CAAC,IAAI,CAAC,sBAAa,CAAC,OAAO,CAAC,cAAc,CAAC,0BAAY,CAAC,CAAC,CAAC;SAC1E;QAED,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC;QAEtC,YAAY,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAErE,MAAM,GAAG,GAAG,6BAAa,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAE1D,IAAI,CAAC,QAAQ,CAAC,OAAO,CACjB,IAAI,0CAAiC,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE;YACrH,OAAO,EAAE,GAAG;YACZ,SAAS;YACT,SAAS,EAAE,GAAG,CAAC,MAAM;SACxB,CAAC,CACL,CAAC;QAEF,OAAO,iBAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACJ,CAAA;AA5BY,4BAA4B;IACjB,WAAA,uBAAM,CAAA;IAA2E,WAAA,uBAAM,CAAA;qCAAnC,wCAA0B,EAAqC,mBAAQ;GADtI,4BAA4B,CA4BxC;AA5BY,oEAA4B"}

package/dist/useCases/consumption/requests/CanCreateOutgoingRequest.js

@@ -30,8 +30,8 @@ let CanCreateOutgoingRequestUseCase = class CanCreateOutgoingRequestUseCase exte
             content: request.content,
             peer: transport_1.CoreAddress.from(request.peer)
         };
-        const consumptionRequest = await this.outgoingRequestsController.canCreate(params);
-        const dto = RequestValidationResultMapper_1.RequestValidationResultMapper.toRequestValidationResultDTO(consumptionRequest);
+        const validationResult = await this.outgoingRequestsController.canCreate(params);
+        const dto = RequestValidationResultMapper_1.RequestValidationResultMapper.toRequestValidationResultDTO(validationResult);
         return ts_utils_1.Result.ok(dto);
     }
 };

package/dist/useCases/consumption/requests/CanCreateOutgoingRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"CanCreateOutgoingRequest.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/requests/CanCreateOutgoingRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAA6D;AAC7D,oDAAkG;AAClG,gDAA+C;AAC/C,mDAAwC;AAExC,yCAAuC;AAEvC,mFAAgF;AAEhF,IAAa,+BAA+B,GAA5C,MAAa,+BAAgC,SAAQ,gBAAiE;IAClH,YAA4C,0BAAsD;QAC9F,KAAK,EAAE,CAAC;QADgC,+BAA0B,GAA1B,0BAA0B,CAA4B;IAElG,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAqC;QACjE,MAAM,MAAM,GAAqC;YAC7C,oFAAoF;YACpF,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,uBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;SACvC,CAAC;QAEF,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEnF,MAAM,GAAG,GAAG,6DAA6B,CAAC,4BAA4B,CAAC,kBAAkB,CAAC,CAAC;QAE3F,OAAO,iBAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACJ,CAAA;AAlBY,+BAA+B;IACpB,WAAA,uBAAM,CAAA;qCAA8C,wCAA0B;GADzF,+BAA+B,CAkB3C;AAlBY,0EAA+B"}
+{"version":3,"file":"CanCreateOutgoingRequest.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/requests/CanCreateOutgoingRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAA6D;AAC7D,oDAAkG;AAClG,gDAA+C;AAC/C,mDAAwC;AAExC,yCAAuC;AAEvC,mFAAgF;AAEhF,IAAa,+BAA+B,GAA5C,MAAa,+BAAgC,SAAQ,gBAAiE;IAClH,YAA4C,0BAAsD;QAC9F,KAAK,EAAE,CAAC;QADgC,+BAA0B,GAA1B,0BAA0B,CAA4B;IAElG,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAqC;QACjE,MAAM,MAAM,GAAqC;YAC7C,oFAAoF;YACpF,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,uBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;SACvC,CAAC;QAEF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEjF,MAAM,GAAG,GAAG,6DAA6B,CAAC,4BAA4B,CAAC,gBAAgB,CAAC,CAAC;QAEzF,OAAO,iBAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACJ,CAAA;AAlBY,+BAA+B;IACpB,WAAA,uBAAM,CAAA;qCAA8C,wCAA0B;GADzF,+BAA+B,CAkB3C;AAlBY,0EAA+B"}

package/dist/useCases/consumption/requests/CheckPrerequisitesOfIncomingRequest.d.ts

@@ -1,20 +1,20 @@
 import { ApplicationError, EventBus, Result } from "@js-soft/ts-utils";
 import { IncomingRequestsController } from "@nmshd/consumption";
-import { ConsumptionRequestDTO } from "../../../types";
+import { LocalRequestDTO } from "../../../types";
 import { SchemaRepository, SchemaValidator, UseCase } from "../../common";
 export interface CheckPrerequisitesOfIncomingRequestRequest {
     /**
-     * @pattern REQ[A-Za-z0-9]{14}
+     * @pattern REQ[A-Za-z0-9]{17}
      */
     requestId: string;
 }
 declare class Validator extends SchemaValidator<CheckPrerequisitesOfIncomingRequestRequest> {
     constructor(schemaRepository: SchemaRepository);
 }
-export declare class CheckPrerequisitesOfIncomingRequestUseCase extends UseCase<CheckPrerequisitesOfIncomingRequestRequest, ConsumptionRequestDTO> {
+export declare class CheckPrerequisitesOfIncomingRequestUseCase extends UseCase<CheckPrerequisitesOfIncomingRequestRequest, LocalRequestDTO> {
     private readonly incomingRequestsController;
     private readonly eventBus;
     constructor(validator: Validator, incomingRequestsController: IncomingRequestsController, eventBus: EventBus);
-    protected executeInternal(request: CheckPrerequisitesOfIncomingRequestRequest): Promise<Result<ConsumptionRequestDTO, ApplicationError>>;
+    protected executeInternal(request: CheckPrerequisitesOfIncomingRequestRequest): Promise<Result<LocalRequestDTO, ApplicationError>>;
 }
 export {};

package/dist/useCases/consumption/requests/CheckPrerequisitesOfIncomingRequest.js

@@ -17,7 +17,7 @@ const ts_utils_1 = require("@js-soft/ts-utils");
 const consumption_1 = require("@nmshd/consumption");
 const transport_1 = require("@nmshd/transport");
 const typescript_ioc_1 = require("typescript-ioc");
-const IncomingRequestStatusChangedEvent_1 = require("../../../events/consumption/IncomingRequestStatusChangedEvent");
+const events_1 = require("../../../events");
 const common_1 = require("../../common");
 const RequestMapper_1 = require("./RequestMapper");
 let Validator = class Validator extends common_1.SchemaValidator {
@@ -36,14 +36,14 @@ let CheckPrerequisitesOfIncomingRequestUseCase = class CheckPrerequisitesOfIncom
         this.eventBus = eventBus;
     }
     async executeInternal(request) {
-        const consumptionRequest = await this.incomingRequestsController.checkPrerequisites({
+        const localRequest = await this.incomingRequestsController.checkPrerequisites({
             requestId: transport_1.CoreId.from(request.requestId)
         });
-        const dto = RequestMapper_1.RequestMapper.toConsumptionRequestDTO(consumptionRequest);
-        if (consumptionRequest.status === consumption_1.ConsumptionRequestStatus.DecisionRequired) {
-            this.eventBus.publish(new IncomingRequestStatusChangedEvent_1.IncomingRequestStatusChangedEvent(this.incomingRequestsController.parent.accountController.identity.address.address, {
+        const dto = RequestMapper_1.RequestMapper.toLocalRequestDTO(localRequest);
+        if (localRequest.status === consumption_1.LocalRequestStatus.DecisionRequired) {
+            this.eventBus.publish(new events_1.IncomingRequestStatusChangedEvent(this.incomingRequestsController.parent.accountController.identity.address.address, {
                 request: dto,
-                oldStatus: consumption_1.ConsumptionRequestStatus.Open,
+                oldStatus: consumption_1.LocalRequestStatus.Open,
                 newStatus: dto.status
             }));
         }

package/dist/useCases/consumption/requests/CheckPrerequisitesOfIncomingRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"CheckPrerequisitesOfIncomingRequest.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/requests/CheckPrerequisitesOfIncomingRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAuE;AACvE,oDAA0F;AAC1F,gDAA0C;AAC1C,mDAAwC;AACxC,qHAAkH;AAElH,yCAA0E;AAC1E,mDAAgD;AAShD,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,wBAA2D;IAC/E,YAA2B,gBAAkC;QACzD,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,4CAA4C,CAAC,CAAC,CAAC;IACpF,CAAC;CACJ,CAAA;AAJK,SAAS;IACS,WAAA,uBAAM,CAAA;qCAAmB,yBAAgB;GAD3D,SAAS,CAId;AAED,IAAa,0CAA0C,GAAvD,MAAa,0CAA2C,SAAQ,gBAA0E;IACtI,YAA2B,SAAoB,EAA2B,0BAAsD,EAA2B,QAAkB;QACzK,KAAK,CAAC,SAAS,CAAC,CAAC;QADqD,+BAA0B,GAA1B,0BAA0B,CAA4B;QAA2B,aAAQ,GAAR,QAAQ,CAAU;IAE7K,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAmD;QAC/E,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,kBAAkB,CAAC;YAChF,SAAS,EAAE,kBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;SAC5C,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,6BAAa,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;QAEtE,IAAI,kBAAkB,CAAC,MAAM,KAAK,sCAAwB,CAAC,gBAAgB,EAAE;YACzE,IAAI,CAAC,QAAQ,CAAC,OAAO,CACjB,IAAI,qEAAiC,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE;gBACrH,OAAO,EAAE,GAAG;gBACZ,SAAS,EAAE,sCAAwB,CAAC,IAAI;gBACxC,SAAS,EAAE,GAAG,CAAC,MAAM;aACxB,CAAC,CACL,CAAC;SACL;QAED,OAAO,iBAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACJ,CAAA;AAxBY,0CAA0C;IAC/B,WAAA,uBAAM,CAAA;IAAwB,WAAA,uBAAM,CAAA;IAA2E,WAAA,uBAAM,CAAA;qCAAnG,SAAS,EAAuD,wCAA0B,EAAqC,mBAAQ;GADpK,0CAA0C,CAwBtD;AAxBY,gGAA0C"}
+{"version":3,"file":"CheckPrerequisitesOfIncomingRequest.js","sourceRoot":"","sources":["../../../../src/useCases/consumption/requests/CheckPrerequisitesOfIncomingRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAuE;AACvE,oDAAoF;AACpF,gDAA0C;AAC1C,mDAAwC;AACxC,4CAAoE;AAEpE,yCAA0E;AAC1E,mDAAgD;AAShD,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,wBAA2D;IAC/E,YAA2B,gBAAkC;QACzD,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,4CAA4C,CAAC,CAAC,CAAC;IACpF,CAAC;CACJ,CAAA;AAJK,SAAS;IACS,WAAA,uBAAM,CAAA;qCAAmB,yBAAgB;GAD3D,SAAS,CAId;AAED,IAAa,0CAA0C,GAAvD,MAAa,0CAA2C,SAAQ,gBAAoE;IAChI,YAA2B,SAAoB,EAA2B,0BAAsD,EAA2B,QAAkB;QACzK,KAAK,CAAC,SAAS,CAAC,CAAC;QADqD,+BAA0B,GAA1B,0BAA0B,CAA4B;QAA2B,aAAQ,GAAR,QAAQ,CAAU;IAE7K,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAmD;QAC/E,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,kBAAkB,CAAC;YAC1E,SAAS,EAAE,kBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;SAC5C,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,6BAAa,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAE1D,IAAI,YAAY,CAAC,MAAM,KAAK,gCAAkB,CAAC,gBAAgB,EAAE;YAC7D,IAAI,CAAC,QAAQ,CAAC,OAAO,CACjB,IAAI,0CAAiC,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE;gBACrH,OAAO,EAAE,GAAG;gBACZ,SAAS,EAAE,gCAAkB,CAAC,IAAI;gBAClC,SAAS,EAAE,GAAG,CAAC,MAAM;aACxB,CAAC,CACL,CAAC;SACL;QAED,OAAO,iBAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACJ,CAAA;AAxBY,0CAA0C;IAC/B,WAAA,uBAAM,CAAA;IAAwB,WAAA,uBAAM,CAAA;IAA2E,WAAA,uBAAM,CAAA;qCAAnG,SAAS,EAAuD,wCAA0B,EAAqC,mBAAQ;GADpK,0CAA0C,CAwBtD;AAxBY,gGAA0C"}

package/dist/useCases/consumption/requests/CompleteIncomingRequest.d.ts

@@ -1,11 +1,11 @@
 import { ApplicationError, EventBus, Result } from "@js-soft/ts-utils";
 import { IncomingRequestsController } from "@nmshd/consumption";
 import { MessageController, RelationshipsController } from "@nmshd/transport";
-import { ConsumptionRequestDTO } from "../../../types";
+import { LocalRequestDTO } from "../../../types";
 import { SchemaRepository, SchemaValidator, UseCase } from "../../common";
 export interface CompleteIncomingRequestRequest {
     /**
-     * @pattern REQ[A-Za-z0-9]{14}
+     * @pattern REQ[A-Za-z0-9]{17}
      */
     requestId: string;
     /**
@@ -16,12 +16,12 @@ export interface CompleteIncomingRequestRequest {
 declare class Validator extends SchemaValidator<CompleteIncomingRequestRequest> {
     constructor(schemaRepository: SchemaRepository);
 }
-export declare class CompleteIncomingRequestUseCase extends UseCase<CompleteIncomingRequestRequest, ConsumptionRequestDTO> {
+export declare class CompleteIncomingRequestUseCase extends UseCase<CompleteIncomingRequestRequest, LocalRequestDTO> {
     private readonly incomingRequestsController;
     private readonly eventBus;
     private readonly messageController;
     private readonly relationshipController;
     constructor(validator: Validator, incomingRequestsController: IncomingRequestsController, eventBus: EventBus, messageController: MessageController, relationshipController: RelationshipsController);
-    protected executeInternal(request: CompleteIncomingRequestRequest): Promise<Result<ConsumptionRequestDTO, ApplicationError>>;
+    protected executeInternal(request: CompleteIncomingRequestRequest): Promise<Result<LocalRequestDTO, ApplicationError>>;
 }
 export {};