diff --git a/packages/consumption/src/consumption/ConsumptionController.ts b/packages/consumption/src/consumption/ConsumptionController.ts index 56e94ce7e..2a5ba82cd 100644 --- a/packages/consumption/src/consumption/ConsumptionController.ts +++ b/packages/consumption/src/consumption/ConsumptionController.ts @@ -124,8 +124,7 @@ export class ConsumptionController { this, this.transport.eventBus, this.accountController.identity, - this.accountController.relationships, - this.accountController.relationshipTemplates + this.accountController.relationships ).init(); const notificationItemProcessorRegistry = new NotificationItemProcessorRegistry(this, this.getDefaultNotificationItemProcessors()); diff --git a/packages/consumption/src/modules/requests/incoming/IncomingRequestsController.ts b/packages/consumption/src/modules/requests/incoming/IncomingRequestsController.ts index 827933e8a..5d9cbb322 100644 --- a/packages/consumption/src/modules/requests/incoming/IncomingRequestsController.ts +++ b/packages/consumption/src/modules/requests/incoming/IncomingRequestsController.ts @@ -40,9 +40,6 @@ export class IncomingRequestsController extends ConsumptionBaseController { private readonly relationshipResolver: { getRelationshipToIdentity(id: CoreAddress): Promise; getExistingRelationshipToIdentity(id: CoreAddress): Promise; - }, - private readonly relationshipTemplateResolver: { - getRelationshipTemplate(id: CoreId): Promise; } ) { super(ConsumptionControllerName.RequestsController, parent); diff --git a/packages/consumption/test/modules/requests/IncomingRequestsController.test.ts b/packages/consumption/test/modules/requests/IncomingRequestsController.test.ts index 92cb8df35..c2af7c4ca 100644 --- a/packages/consumption/test/modules/requests/IncomingRequestsController.test.ts +++ b/packages/consumption/test/modules/requests/IncomingRequestsController.test.ts @@ -1,7 +1,7 @@ import { IDatabaseConnection } from "@js-soft/docdb-access-abstractions"; import { IRequest, IRequestItemGroup, RejectResponseItem, Request, RequestItemGroup, ResponseItem, ResponseItemGroup, ResponseItemResult } from "@nmshd/content"; import { CoreDate, CoreId } from "@nmshd/core-types"; -import { CoreIdHelper, RelationshipTemplate, TransportLoggerFactory } from "@nmshd/transport"; +import { CoreIdHelper, TransportLoggerFactory } from "@nmshd/transport"; import { ConsumptionIds, DecideRequestItemGroupParametersJSON, @@ -1027,7 +1027,6 @@ describe("IncomingRequestsController", function () { items: [TestRequestItem.from({ mustBeAccepted: false })] }); const template = TestObjectFactory.createIncomingIRelationshipTemplate(); - context.templateToReturnFromGetTemplate = RelationshipTemplate.from(template); let cnsRequest = await context.incomingRequestsController.received({ receivedRequest: request, diff --git a/packages/consumption/test/modules/requests/RequestsIntegrationTest.ts b/packages/consumption/test/modules/requests/RequestsIntegrationTest.ts index e30283576..6ce638447 100644 --- a/packages/consumption/test/modules/requests/RequestsIntegrationTest.ts +++ b/packages/consumption/test/modules/requests/RequestsIntegrationTest.ts @@ -58,7 +58,7 @@ export class RequestsTestsContext { public mockEventBus = new MockEventBus(); public relationshipToReturnFromGetRelationshipToIdentity: Relationship | undefined; public relationshipToReturnFromGetExistingRelationshipToIdentity: Relationship | undefined; - public templateToReturnFromGetTemplate: RelationshipTemplate | undefined; + public consumptionController: ConsumptionController; private constructor() { @@ -114,9 +114,6 @@ export class RequestsTestsContext { { getRelationshipToIdentity: () => Promise.resolve(context.relationshipToReturnFromGetRelationshipToIdentity), getExistingRelationshipToIdentity: () => Promise.resolve(context.relationshipToReturnFromGetExistingRelationshipToIdentity) - }, - { - getRelationshipTemplate: () => Promise.resolve(context.templateToReturnFromGetTemplate) } ); @@ -139,7 +136,6 @@ export class RequestsTestsContext { this.actionToTry = undefined; this.relationshipToReturnFromGetRelationshipToIdentity = undefined; this.relationshipToReturnFromGetExistingRelationshipToIdentity = undefined; - this.templateToReturnFromGetTemplate = undefined; TestRequestItemProcessor.numberOfApplyIncomingResponseItemCalls = 0; @@ -230,12 +226,6 @@ export class RequestsGiven { requestSourceObject: params.requestSource }); - try { - this.context.templateToReturnFromGetTemplate = RelationshipTemplate.from(params.requestSource as any); - } catch (_) { - // the source is not a template - } - await this.moveIncomingRequestToStatus(localRequest, params.status); this.context.givenLocalRequest = localRequest;