From c30dd02504766f12548cdacb3d144371f649c3ea Mon Sep 17 00:00:00 2001 From: Sebastian Mahr Date: Tue, 3 Dec 2024 15:27:51 +0100 Subject: [PATCH] chore: rename backbone attrubte tag --- .../src/modules/attributes/AttributesController.ts | 8 ++++---- .../test/consumption/attributeTagCollection.test.ts | 8 ++++---- .../transport/src/modules/tags/backbone/BackboneGetTag.ts | 8 ++++---- packages/transport/src/modules/tags/backbone/TagClient.ts | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/consumption/src/modules/attributes/AttributesController.ts b/packages/consumption/src/modules/attributes/AttributesController.ts index ce77dbeae..c2b600019 100644 --- a/packages/consumption/src/modules/attributes/AttributesController.ts +++ b/packages/consumption/src/modules/attributes/AttributesController.ts @@ -16,7 +16,7 @@ import { } from "@nmshd/content"; import { CoreAddress, CoreDate, CoreId, ICoreDate, ICoreId } from "@nmshd/core-types"; import * as iql from "@nmshd/iql"; -import { SynchronizedCollection, TagClient, TransportCoreErrors } from "@nmshd/transport"; +import { AttributeTagClient, SynchronizedCollection, TransportCoreErrors } from "@nmshd/transport"; import _ from "lodash"; import { nameof } from "ts-simple-nameof"; import { ConsumptionBaseController } from "../../consumption/ConsumptionBaseController"; @@ -46,7 +46,7 @@ import { IdentityAttributeQueryTranslator, RelationshipAttributeQueryTranslator, export class AttributesController extends ConsumptionBaseController { private attributes: SynchronizedCollection; - private tagsClient: TagClient; + private tagsClient: AttributeTagClient; public constructor( parent: ConsumptionController, @@ -61,7 +61,7 @@ export class AttributesController extends ConsumptionBaseController { await super.init(); this.attributes = await this.parent.accountController.getSynchronizedCollection("Attributes"); - this.tagsClient = new TagClient(this.parent.transport.config, this.parent.accountController.authenticator, this.parent.transport.correlator); + this.tagsClient = new AttributeTagClient(this.parent.transport.config, this.parent.accountController.authenticator, this.parent.transport.correlator); return this; } @@ -1295,7 +1295,7 @@ export class AttributesController extends ConsumptionBaseController { } public async getAttributeTagCollection(): Promise { - const backboneTagList = (await this.tagsClient.getTags()).value; + const backboneTagList = (await this.tagsClient.getBackboneAttributeTagCollection()).value; return AttributeTagCollection.fromAny(backboneTagList); } } diff --git a/packages/runtime/test/consumption/attributeTagCollection.test.ts b/packages/runtime/test/consumption/attributeTagCollection.test.ts index cb922895e..922044be6 100644 --- a/packages/runtime/test/consumption/attributeTagCollection.test.ts +++ b/packages/runtime/test/consumption/attributeTagCollection.test.ts @@ -1,15 +1,15 @@ -import { ClientResult, TagClient } from "@nmshd/transport"; +import { ClientResult, DefinedTagClient } from "@nmshd/transport"; import { reset, spy, when } from "ts-mockito"; import { RuntimeServiceProvider, TestRuntimeServices } from "../lib"; const serviceProvider = new RuntimeServiceProvider(); let runtimeService: TestRuntimeServices; -let mockedRestClient: TagClient; +let mockedRestClient: DefinedTagClient; beforeAll(async () => { runtimeService = (await serviceProvider.launch(1))[0]; - const client = runtimeService.consumption.attributes["getAttributeTagCollectionUseCase"]["attributesController"]["tagsClient"] as TagClient; + const client = runtimeService.consumption.attributes["getAttributeTagCollectionUseCase"]["attributesController"]["tagsClient"] as DefinedTagClient; mockedRestClient = spy(client); }, 30000); @@ -57,7 +57,7 @@ describe("get attributeTagCollection", function () { /* eslint-enable @typescript-eslint/naming-convention */ test("should receive the legal tags from the Backbone", async function () { - when(mockedRestClient.getTags()).thenResolve(ClientResult.ok(mockTags)); + when(mockedRestClient.getBackboneDefinedTags()).thenResolve(ClientResult.ok(mockTags)); const tags = await runtimeService.consumption.attributes.getAttributeTagCollection(); expect(tags.value).toStrictEqual(mockTags); diff --git a/packages/transport/src/modules/tags/backbone/BackboneGetTag.ts b/packages/transport/src/modules/tags/backbone/BackboneGetTag.ts index 37c6a3cee..248d47001 100644 --- a/packages/transport/src/modules/tags/backbone/BackboneGetTag.ts +++ b/packages/transport/src/modules/tags/backbone/BackboneGetTag.ts @@ -1,9 +1,9 @@ -export interface BackboneDefinedTags { +export interface BackboneAttributeTagCollection { supportedLanguages: string[]; - tagsForAttributeValueTypes: Record>; + tagsForAttributeValueTypes: Record>; } -interface BackboneTag { +interface BackboneAttributeTag { displayNames: Record; - children?: Record; + children?: Record; } diff --git a/packages/transport/src/modules/tags/backbone/TagClient.ts b/packages/transport/src/modules/tags/backbone/TagClient.ts index 4affcb99f..7faca9e7e 100644 --- a/packages/transport/src/modules/tags/backbone/TagClient.ts +++ b/packages/transport/src/modules/tags/backbone/TagClient.ts @@ -1,9 +1,9 @@ import { ClientResult } from "../../../core/backbone/ClientResult"; import { RESTClientAuthenticate } from "../../../core/backbone/RESTClientAuthenticate"; -import { BackboneDefinedTags } from "./BackboneGetTag"; +import { BackboneAttributeTagCollection } from "./BackboneGetTag"; -export class TagClient extends RESTClientAuthenticate { - public async getTags(): Promise> { - return await this.get("/api/v1/Tags"); +export class AttributeTagClient extends RESTClientAuthenticate { + public async getBackboneAttributeTagCollection(): Promise> { + return await this.get("/api/v1/Tags"); } }