diff --git a/alfa-client/libs/collaboration-shared/src/lib/collaboration.model.ts b/alfa-client/libs/collaboration-shared/src/lib/collaboration.model.ts index fcb9e46a0f425881fde852945de31f85de3c1408..8f6640e0ee779637a1a7196aa377244815cd87be 100644 --- a/alfa-client/libs/collaboration-shared/src/lib/collaboration.model.ts +++ b/alfa-client/libs/collaboration-shared/src/lib/collaboration.model.ts @@ -5,7 +5,12 @@ export interface Collaboration { titel: string; beschreibung: string; zustaendigeStelle: ResourceUri; - collaborationLevel?: number; + collaborationLevel?: typeof CollaborationLevels[keyof typeof CollaborationLevels]; +} + +export class CollaborationLevels { + public static readonly ORGANISATIONS_EINHEIT = "1"; + public static readonly EXTERNE_FACHSTELLE = "4"; } export interface CollaborationResource extends Collaboration, Resource, ListItemResource {} diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.html index 31b668b27ed3a68f5e9f477279a31d9da75140e7..46094ca0c480d3579ff92ede7e7ca66afdc55691 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.html +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.html @@ -1,6 +1,6 @@ <ozgcloud-spinner [stateResource]="collaborationStateListResource"> @for(collaboration of collaborations; track collaboration.zustaendigeStelle){ - @if(isOrganisationsEinheit(collaboration)){ + @if(collaboration.collaborationLevel === CollaborationLevels.ORGANISATIONS_EINHEIT){ <alfa-organisations-einheit-list-item-container [organisationsEinheitResourceUri]="collaboration.zustaendigeStelle" data-test-id="organisations-einheit-list-item" @@ -8,7 +8,7 @@ <alfa-collaboration-request [collaboration]="collaboration"/> </alfa-organisations-einheit-list-item-container> } - @if(isExterneFachstelle(collaboration)){ + @if(collaboration.collaborationLevel === CollaborationLevels.EXTERNE_FACHSTELLE){ <alfa-externe-fachstelle-list-item-container [externeFachstelleResourceUri] = "collaboration.zustaendigeStelle" data-test-id="externe-fachstelle-list-item" diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.scss b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.scss deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.spec.ts index 3d7d8e7a6c41045bc05894e78cfd192d16a1e1e2..4d31e3de38064a86ea5a602f987b8336bac5d1e5 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.spec.ts +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.spec.ts @@ -1,23 +1,40 @@ -import { CollaborationListLinkRel, CollaborationListResource, CollaborationResource } from '@alfa-client/collaboration-shared'; +import { + CollaborationLevels, + CollaborationListLinkRel, + CollaborationListResource, + CollaborationResource, +} from '@alfa-client/collaboration-shared'; import { createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared'; import { SpinnerComponent } from '@alfa-client/ui'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { createCollaborationListResource } from 'libs/collaboration-shared/test/collaboration'; -import { ExterneFachstelleListItemContainerComponent } from 'libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component'; -import { OrganisationsEinheitListItemContainerComponent } from 'libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component'; +import { createCollaboration, createCollaborationListResource } from 'libs/collaboration-shared/test/collaboration'; +import { + ExterneFachstelleListItemContainerComponent, +} from 'libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component'; +import { + OrganisationsEinheitListItemContainerComponent, +} from 'libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component'; import { MockComponent } from 'ng-mocks'; import { CollaborationListContainerComponent } from './collaboration-list-container.component'; +import { toResource } from 'libs/tech-shared/test/resource'; +import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; +import { existsAsHtmlElement } from '@alfa-client/test-utils'; +import { CollaborationRequestComponent } from './collaboration-request/collaboration-request.component'; describe('CollaborationListContainerComponent', () => { let component: CollaborationListContainerComponent; let fixture: ComponentFixture<CollaborationListContainerComponent>; + const organisationsEinheitListItem: string = getDataTestIdOf('organisations-einheit-list-item'); + const externeFachstelleListItem: string = getDataTestIdOf('externe-fachstelle-list-item'); + beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ CollaborationListContainerComponent, MockComponent(OrganisationsEinheitListItemContainerComponent), MockComponent(ExterneFachstelleListItemContainerComponent), + MockComponent(CollaborationRequestComponent), MockComponent(SpinnerComponent), ], }).compileComponents(); @@ -31,46 +48,54 @@ describe('CollaborationListContainerComponent', () => { expect(component).toBeTruthy(); }); - describe('getCollaborations', () => { - it('should return empty array if state resource is null', () => { - component.collaborationStateListResource = null; + describe('template', () => { + const collaboration: CollaborationResource = toResource(createCollaboration()); - expect(component.getCollaborations()).toEqual([]); - }); + beforeEach(() => { + component.collaborations = [collaboration]; + }) - it('should return empty array if resource is null', () => { - component.collaborationStateListResource = createEmptyStateResource(); + describe('alfa-organisations-einheit-list-item-container', () => { + it('should be rendered if collaborationLevel is ORGANISATIONS_EINHEIT', () => { + collaboration.collaborationLevel = CollaborationLevels.ORGANISATIONS_EINHEIT; + fixture.detectChanges(); - expect(component.getCollaborations()).toEqual([]); - }); + existsAsHtmlElement(fixture, organisationsEinheitListItem); + }); + }) - it('should return embedded resource', () => { - const collaborationListResource: CollaborationListResource = createCollaborationListResource(); - component.collaborationStateListResource = createStateResource(collaborationListResource); + describe('alfa-externe-fachstelle-list-item-container', () => { + it('should be rendered if collaborationLevel is EXTERNE_FACHSTELLE', () => { + collaboration.collaborationLevel = CollaborationLevels.EXTERNE_FACHSTELLE; + fixture.detectChanges(); - expect(component.getCollaborations()).toEqual( - collaborationListResource._embedded[CollaborationListLinkRel.COLLABORATION_LIST], - ); - }); - }); + existsAsHtmlElement(fixture, externeFachstelleListItem); + }); + }) + }) - describe('isOrganisationsEinheit', () => { - it('should return true if collaborationLevel is 1', () => { - const collaboration = { collaborationLevel: 1 } as CollaborationResource; + describe('component', () => { + describe('getCollaborations', () => { + it('should return empty array if state resource is null', () => { + component.collaborationStateListResource = null; - const result = component.isOrganisationsEinheit(collaboration); + expect(component.getCollaborations()).toEqual([]); + }); - expect(result).toBe(true); - }); - }); + it('should return empty array if resource is null', () => { + component.collaborationStateListResource = createEmptyStateResource(); - describe('isExterneFachstelle', () => { - it('should return true if collaborationLevel is 4', () => { - const collaboration = { collaborationLevel: 4 } as CollaborationResource; + expect(component.getCollaborations()).toEqual([]); + }); - const result = component.isExterneFachstelle(collaboration); + it('should return embedded resource', () => { + const collaborationListResource: CollaborationListResource = createCollaborationListResource(); + component.collaborationStateListResource = createStateResource(collaborationListResource); - expect(result).toBe(true); + expect(component.getCollaborations()).toEqual( + collaborationListResource._embedded[CollaborationListLinkRel.COLLABORATION_LIST], + ); + }); }); }); }); diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.ts index d6c389f4d3f86f0d2d779c6dfdb5d45ea5259057..81608691c46baf38806ac682d54e4f182f18fae2 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.ts +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.ts @@ -1,11 +1,15 @@ -import { CollaborationListLinkRel, CollaborationListResource, CollaborationResource } from '@alfa-client/collaboration-shared'; +import { + CollaborationLevels, + CollaborationListLinkRel, + CollaborationListResource, + CollaborationResource, +} from '@alfa-client/collaboration-shared'; import { getEmbeddedResources, StateResource } from '@alfa-client/tech-shared'; import { Component, Input, OnChanges } from '@angular/core'; @Component({ selector: 'alfa-collaboration-list-container', templateUrl: './collaboration-list-container.component.html', - styleUrl: './collaboration-list-container.component.scss', }) export class CollaborationListContainerComponent implements OnChanges { @Input() public collaborationStateListResource: StateResource<CollaborationListResource>; @@ -20,11 +24,5 @@ export class CollaborationListContainerComponent implements OnChanges { return getEmbeddedResources(this.collaborationStateListResource, CollaborationListLinkRel.COLLABORATION_LIST); } - public isOrganisationsEinheit(collaboration: CollaborationResource): boolean { - return collaboration.collaborationLevel === 1; - } - - public isExterneFachstelle(collaboration: CollaborationResource): boolean { - return collaboration.collaborationLevel === 4; - } + protected readonly CollaborationLevels = CollaborationLevels; } diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.scss b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.scss deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.ts index c48a4d2b7bfd21c9d99a13ccc4fbb00ceff25431..7da73df01b0fe0fbcf58bfb228b364d43c4e6a4e 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.ts +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.ts @@ -4,7 +4,6 @@ import { Component, Input } from '@angular/core'; @Component({ selector: 'alfa-collaboration-request', templateUrl: './collaboration-request.component.html', - styleUrl: './collaboration-request.component.scss', }) export class CollaborationRequestComponent { @Input() public collaboration: CollaborationResource; diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.scss b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.scss deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts index b3114d31bc3eaaac0bffed0d9cf0d737e9c18d96..5f1cf590cfdea34c7ad7c856d0d8779b2c6770a7 100644 --- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts +++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts @@ -39,11 +39,13 @@ describe('ExterneFachstelleListItemContainerComponent', () => { expect(component).toBeTruthy(); }); - describe('ngOnInit', () => { - it('should call externeFachstelleResourceService getExterneFachstelle Resource', () => { - component.ngOnInit(); + describe('component', () => { + describe('ngOnInit', () => { + it('should call externeFachstelleResourceService getExterneFachstelle Resource', () => { + component.ngOnInit(); - expect(externeFachstelleResourceService.getExterneFachstelle).toHaveBeenCalled(); + expect(externeFachstelleResourceService.getExterneFachstelle).toHaveBeenCalled(); + }); }); }); }); diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.ts b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.ts index f902b18cc6d5f50f9d636066ae0f56ce63e46c24..263fc45cfd4794b3dfdabc94a8af6a2b8b7895db 100644 --- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.ts +++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.ts @@ -13,7 +13,6 @@ import { ExterneFachstelleListItemComponent } from './externe-fachstelle-list-it imports: [CommonModule, ExterneFachstelleListItemComponent], providers: [ExterneFachstelleResourceService], templateUrl: './externe-fachstelle-list-item-container.component.html', - styleUrl: './externe-fachstelle-list-item-container.component.scss', }) export class ExterneFachstelleListItemContainerComponent implements OnInit { private externeFachstelleResourceService: ExterneFachstelleResourceService = inject(ExterneFachstelleResourceService); diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.scss b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.scss deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts index dfa121e96837efeb14af42d139bfb12ee7b47bc3..efbcedd1d9319ba969614e302b2a754b3e6e1fd4 100644 --- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts +++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts @@ -9,7 +9,6 @@ import { ExternalUnitIconComponent, PublicAdministrationIconComponent } from '@o standalone: true, imports: [PublicAdministrationIconComponent, ExternalUnitIconComponent, UiModule], templateUrl: './externe-fachstelle-list-item.component.html', - styleUrl: './externe-fachstelle-list-item.component.scss', }) export class ExterneFachstelleListItemComponent { @Input() externeFachstelleStateResource: StateResource<ExterneFachstelleResource>; diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.scss b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.scss deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.spec.ts b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.spec.ts index d54a577a0369f42f139a0d9a5aedc7cd7f44cec9..d6b0570ed3e929c4f4d59080785fd3cbd53c3887 100644 --- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.spec.ts +++ b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.spec.ts @@ -41,11 +41,13 @@ describe('OrganisationsEinheitListItemContainerComponent', () => { expect(component).toBeTruthy(); }); - describe('ngOnInit', () => { - it('should call organisationsEinheitResourceService getOrganisationsEinheit Resource', () => { - component.ngOnInit(); + describe('component', () => { + describe('ngOnInit', () => { + it('should call organisationsEinheitResourceService getOrganisationsEinheit Resource', () => { + component.ngOnInit(); - expect(organisationsEinheitResourceService.getOrganisationsEinheit).toHaveBeenCalled(); + expect(organisationsEinheitResourceService.getOrganisationsEinheit).toHaveBeenCalled(); + }); }); }); }); diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.ts b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.ts index 9ed50c0dd72ebd711da566e9af3f41d83c9d8597..e2465c76a0159ff7dca9b2157777e945e8e958a4 100644 --- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.ts +++ b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.ts @@ -13,7 +13,6 @@ import { OrganisationsEinheitListItemComponent } from './organisations-einheit-l imports: [CommonModule, OrganisationsEinheitListItemComponent], providers: [OrganisationsEinheitResourceService], templateUrl: './organisations-einheit-list-item-container.component.html', - styleUrl: './organisations-einheit-list-item-container.component.scss', }) export class OrganisationsEinheitListItemContainerComponent implements OnInit { private organisationsEinheitResourceService: OrganisationsEinheitResourceService = inject(OrganisationsEinheitResourceService); diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html index e90fbe36c0802141c9ef87719df5fa2add8add61..a801ca2d22ebf156400134267a50b727447ba637 100644 --- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html +++ b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html @@ -10,7 +10,10 @@ </div> </div> <div class="flex-1"> - <div class="block">{{ formatAnschrift(resource.anschrift) }}</div> + <div class="block"> + {{ resource.anschrift.strasse }} {{ resource.anschrift.hausnummer }} + , {{ resource.anschrift.plz }} {{ resource.anschrift.ort }} + </div> </div> </div> <ng-content /> diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.scss b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.scss deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts index eaeb036fed30eff0e0bce1ffdf9428a24a9896cd..dd4344670644c7facae2212d848f3aedd58fe9a0 100644 --- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts +++ b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts @@ -3,16 +3,13 @@ import { UiModule } from '@alfa-client/ui'; import { OrganisationsEinheitResource } from '@alfa-client/zustaendige-stelle-shared'; import { Component, Input } from '@angular/core'; import { ExternalUnitIconComponent, PublicAdministrationIconComponent } from '@ods/system'; -import { formatAnschrift } from '../../organisations-einheit.util'; @Component({ selector: 'alfa-organisations-einheit-list-item', standalone: true, imports: [ExternalUnitIconComponent, PublicAdministrationIconComponent, UiModule], templateUrl: './organisations-einheit-list-item.component.html', - styleUrl: './organisations-einheit-list-item.component.scss', }) export class OrganisationsEinheitListItemComponent { @Input() organisationsEinheitStateResource: StateResource<OrganisationsEinheitResource>; - protected readonly formatAnschrift = formatAnschrift; } diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit.util.spec.ts b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit.util.spec.ts deleted file mode 100644 index 78ba70598e46d89e523eb2afc18ce0df18267306..0000000000000000000000000000000000000000 --- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit.util.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { formatAnschrift } from './organisations-einheit.util'; - -describe('formatAnschrit', () => { - it('should format Anschrift correctly', () => { - const anschrift = { - strasse: 'Musterstraße', - hausnummer: '123', - plz: '12345', - ort: 'Musterort', - }; - - const formattedAnschrift: string = formatAnschrift(anschrift); - - expect(formattedAnschrift).toEqual('Musterstraße 123, 12345 Musterort'); - }); -}); diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit.util.ts b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit.util.ts deleted file mode 100644 index 5506a6a2cbc04b3da30709210c817a9353d52095..0000000000000000000000000000000000000000 --- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit.util.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { OrganisationsEinheit } from '@alfa-client/zustaendige-stelle-shared'; - -export function formatAnschrift(anschrift: OrganisationsEinheit['anschrift']): string { - return `${anschrift.strasse} ${anschrift.hausnummer}, ${anschrift.plz} ${anschrift.ort}`; -} diff --git a/alfa-client/libs/organisations-einheit/src/test-setup.ts b/alfa-client/libs/organisations-einheit/src/test-setup.ts index 03a84127dca1b63fa485fc51d162cec76921b596..c408668266d2fec3a9803c0ec044bc163fb987fe 100644 --- a/alfa-client/libs/organisations-einheit/src/test-setup.ts +++ b/alfa-client/libs/organisations-einheit/src/test-setup.ts @@ -1,26 +1,3 @@ -/* - * Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ import '@testing-library/jest-dom'; import 'jest-preset-angular/setup-jest';