From 4947e9b2f4eb52a9eccd779f76a3747d9d8a26d1 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 4 Dec 2024 09:52:18 +0100
Subject: [PATCH] OZG-6477 PR Anmerkungen
---
.../src/lib/collaboration.model.ts | 7 +-
...ollaboration-list-container.component.html | 4 +-
...ollaboration-list-container.component.scss | 0
...aboration-list-container.component.spec.ts | 91 ++++++++++++-------
.../collaboration-list-container.component.ts | 16 ++--
.../collaboration-request.component.scss | 0
.../collaboration-request.component.ts | 1 -
...hstelle-list-item-container.component.scss | 0
...elle-list-item-container.component.spec.ts | 10 +-
...achstelle-list-item-container.component.ts | 1 -
...xterne-fachstelle-list-item.component.scss | 0
.../externe-fachstelle-list-item.component.ts | 1 -
...einheit-list-item-container.component.scss | 0
...heit-list-item-container.component.spec.ts | 10 +-
...s-einheit-list-item-container.component.ts | 1 -
...nisations-einheit-list-item.component.html | 5 +-
...nisations-einheit-list-item.component.scss | 0
...ganisations-einheit-list-item.component.ts | 3 -
.../lib/organisations-einheit.util.spec.ts | 16 ----
.../src/lib/organisations-einheit.util.ts | 5 -
.../organisations-einheit/src/test-setup.ts | 23 -----
21 files changed, 89 insertions(+), 105 deletions(-)
delete mode 100644 alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.scss
delete mode 100644 alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.scss
delete mode 100644 alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.scss
delete mode 100644 alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.scss
delete mode 100644 alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.scss
delete mode 100644 alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.scss
delete mode 100644 alfa-client/libs/organisations-einheit/src/lib/organisations-einheit.util.spec.ts
delete mode 100644 alfa-client/libs/organisations-einheit/src/lib/organisations-einheit.util.ts
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 fcb9e46a0f..8f6640e0ee 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 31b668b27e..46094ca0c4 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 e69de29bb2..0000000000
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 3d7d8e7a6c..4d31e3de38 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 d6c389f4d3..81608691c4 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 e69de29bb2..0000000000
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 c48a4d2b7b..7da73df01b 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 e69de29bb2..0000000000
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 b3114d31bc..5f1cf590cf 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 f902b18cc6..263fc45cfd 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 e69de29bb2..0000000000
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 dfa121e968..efbcedd1d9 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 e69de29bb2..0000000000
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 d54a577a03..d6b0570ed3 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 9ed50c0dd7..e2465c76a0 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 e90fbe36c0..a801ca2d22 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 e69de29bb2..0000000000
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 eaeb036fed..dd43446706 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 78ba70598e..0000000000
--- 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 5506a6a2cb..0000000000
--- 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 03a84127dc..c408668266 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';
--
GitLab