OZG-6477 PR Anmerkungen

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 {}

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.html

 <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"

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.spec.ts

-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,6 +48,33 @@ describe('CollaborationListContainerComponent', () => {
     expect(component).toBeTruthy();
   });
 
+  describe('template', () => {
+    const collaboration: CollaborationResource = toResource(createCollaboration());
+
+    beforeEach(() => {
+      component.collaborations = [collaboration];
+    })
+
+    describe('alfa-organisations-einheit-list-item-container', () => {
+      it('should be rendered if collaborationLevel is ORGANISATIONS_EINHEIT', () => {
+        collaboration.collaborationLevel = CollaborationLevels.ORGANISATIONS_EINHEIT;
+        fixture.detectChanges();
+
+        existsAsHtmlElement(fixture, organisationsEinheitListItem);
+      });
+    })
+
+    describe('alfa-externe-fachstelle-list-item-container', () => {
+      it('should be rendered if collaborationLevel is EXTERNE_FACHSTELLE', () => {
+        collaboration.collaborationLevel = CollaborationLevels.EXTERNE_FACHSTELLE;
+        fixture.detectChanges();
+
+        existsAsHtmlElement(fixture, externeFachstelleListItem);
+      });
+    })
+  })
+
+  describe('component', () => {
     describe('getCollaborations', () => {
       it('should return empty array if state resource is null', () => {
         component.collaborationStateListResource = null;
@@ -53,24 +97,5 @@ describe('CollaborationListContainerComponent', () => {
         );
       });
     });
-
-  describe('isOrganisationsEinheit', () => {
-    it('should return true if collaborationLevel is 1', () => {
-      const collaboration = { collaborationLevel: 1 } as CollaborationResource;
-
-      const result = component.isOrganisationsEinheit(collaboration);
-
-      expect(result).toBe(true);
-    });
-  });
-
-  describe('isExterneFachstelle', () => {
-    it('should return true if collaborationLevel is 4', () => {
-      const collaboration = { collaborationLevel: 4 } as CollaborationResource;
-
-      const result = component.isExterneFachstelle(collaboration);
-
-      expect(result).toBe(true);
-    });
   });
 });

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.ts

-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;
 }

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;

alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts

@@ -39,6 +39,7 @@ describe('ExterneFachstelleListItemContainerComponent', () => {
     expect(component).toBeTruthy();
   });
 
+  describe('component', () => {
     describe('ngOnInit', () => {
       it('should call externeFachstelleResourceService getExterneFachstelle Resource', () => {
         component.ngOnInit();
@@ -47,3 +48,4 @@ describe('ExterneFachstelleListItemContainerComponent', () => {
       });
     });
   });
+});

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);

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>;

alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.spec.ts

@@ -41,6 +41,7 @@ describe('OrganisationsEinheitListItemContainerComponent', () => {
     expect(component).toBeTruthy();
   });
 
+  describe('component', () => {
     describe('ngOnInit', () => {
       it('should call organisationsEinheitResourceService getOrganisationsEinheit Resource', () => {
         component.ngOnInit();
@@ -49,3 +50,4 @@ describe('OrganisationsEinheitListItemContainerComponent', () => {
       });
     });
   });
+});

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);

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 />

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;
 }

alfa-client/libs/organisations-einheit/src/lib/organisations-einheit.util.spec.ts

-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');
-  });
-});

alfa-client/libs/organisations-einheit/src/lib/organisations-einheit.util.ts

-import { OrganisationsEinheit } from '@alfa-client/zustaendige-stelle-shared';
-
-export function formatAnschrift(anschrift: OrganisationsEinheit['anschrift']): string {
-  return `${anschrift.strasse} ${anschrift.hausnummer}, ${anschrift.plz} ${anschrift.ort}`;
-}