Feature/967 create default hospital (#981)

* Add new catch-all hospital

* Hide delete button for catch-all hospital

* Update changelog

* Update test scenarios

* Improve cypress tests

* Apply suggestions from code review

Co-authored-by: Lukas Radermacher <[email protected]>

* Show badge for nonremovable hospital

* lint

---------

Co-authored-by: Lukas Radermacher <[email protected]>

Author: Nils1729

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project does **not** adhere to [Semantic Versioning](https://semver.org
 -   Selected material, personnel and vehicles are now highlighted on the map.
     -   When material or personnel is selected, the corresponding vehicle is highlighted as well.
     -   When a vehicle is selected, the corresponding material and personnel are highlighted as well.
+-   A generic catch-all hospital is present in every exercise and cannot be deleted.
 -   The reports behavior can generate reports on the counts of transferred patients per triage category.
 -   The reports behavior can generate event-based reports when the last patient of a triage category has been transferred to a hospital.
 

frontend/cypress/e2e/exercise.cy.ts

@@ -341,8 +341,12 @@ describe('A trainer on the exercise page', () => {
 
         cy.log('add a hospital').get('[data-cy="hospitalAddButton"]').click();
         cy.get('@trainerSocketPerformedActions')
-            .lastElement()
+            .firstElement()
             .should('have.property', 'type', '[Hospital] Add hospital');
+        cy.get('@trainerSocketPerformedActions')
+            .firstElement()
+            .its('hospital')
+            .as('createdHospital');
 
         cy.getState()
             .its('exerciseState')
@@ -351,7 +355,7 @@ describe('A trainer on the exercise page', () => {
 
         cy.log('update a hospitals transport time')
             .get('[data-cy="hospitalUpdateTransportTimeInput"]')
-            .first()
+            .last()
             .clear()
             .type('30');
 
@@ -367,7 +371,7 @@ describe('A trainer on the exercise page', () => {
             .its('exerciseState')
             .its('hospitals')
             .itsValues()
-            .firstElement()
+            .lastElement()
             .should('have.property', 'transportDuration', 1800000);
 
         cy.get('[data-cy=hospitalClosePopupButton]').click({ force: true });
@@ -377,7 +381,7 @@ describe('A trainer on the exercise page', () => {
         cy.get('[data-cy=transferPointPopupHospitalNav]').click();
         cy.get('[data-cy=transferPointPopupAddHospitalButton]').click();
         cy.get('[data-cy=transferPointPopupAddHospitalDropdownButton]')
-            .first()
+            .last()
             .click({ force: true });
 
         cy.get('@trainerSocketPerformedActions')
@@ -392,7 +396,7 @@ describe('A trainer on the exercise page', () => {
             .its('exerciseState')
             .its('transferPoints')
             .itsValues()
-            .firstElement()
+            .lastElement()
             .its('reachableHospitals')
             .should('not.be.empty');
 
@@ -416,7 +420,7 @@ describe('A trainer on the exercise page', () => {
             .its('exerciseState')
             .its('hospitals')
             .itsValues()
-            .firstElement()
+            .lastElement()
             .its('patientIds')
             .should('not.be.empty');
 
@@ -437,7 +441,7 @@ describe('A trainer on the exercise page', () => {
             .its('exerciseState')
             .its('transferPoints')
             .itsValues()
-            .firstElement()
+            .lastElement()
             .its('reachableHospitals')
             .should('be.empty');
 
@@ -451,7 +455,12 @@ describe('A trainer on the exercise page', () => {
             .lastElement()
             .should('have.property', 'type', '[Hospital] Remove hospital');
 
-        cy.getState().its('exerciseState').its('hospitals').should('be.empty');
+        cy.get('@createdHospital').then((hospital: any) => {
+            cy.getState()
+                .its('exerciseState')
+                .its('hospitals')
+                .should('not.have.keys', hospital.id);
+        });
     });
 
     it('can manage transfer points (within simulated regions) and transfer vehicles', () => {

frontend/src/app/pages/exercises/exercise/shared/hospital-editor/hospital-editor-modal/hospital-editor-modal.component.html

@@ -69,14 +69,21 @@ <h4 class="modal-title">
                     />
                     <span class="ps-2 pe-2" title="Minuten">min</span>
                 </td>
-                <td>
+                <td class="align-middle">
                     <button
                         (click)="removeHospital(hospital.id)"
                         class="btn btn-outline-danger float-end"
                         data-cy="hospitalDeleteButton"
+                        *ngIf="
+                            hospital.id !== catchAllHospitalId;
+                            else catchAllHospital
+                        "
                     >
                         <i class="bi bi-trash"></i> Löschen
                     </button>
+                    <ng-template #catchAllHospital>
+                        <span class="badge text-bg-secondary">Standard</span>
+                    </ng-template>
                 </td>
             </tr>
         </tbody>

frontend/src/app/pages/exercises/exercise/shared/hospital-editor/hospital-editor-modal/hospital-editor-modal.component.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
 import type { UUID } from 'digital-fuesim-manv-shared';
-import { Hospital } from 'digital-fuesim-manv-shared';
+import { Hospital, catchAllHospitalId } from 'digital-fuesim-manv-shared';
 import { ExerciseService } from 'src/app/core/exercise.service';
 import type { AppState } from 'src/app/state/app.state';
 import { selectHospitals } from 'src/app/state/application/selectors/exercise.selectors';
@@ -14,6 +14,7 @@ import { selectHospitals } from 'src/app/state/application/selectors/exercise.se
 })
 export class HospitalEditorModalComponent {
     public hospitals$ = this.store.select(selectHospitals);
+    public catchAllHospitalId = catchAllHospitalId;
 
     constructor(
         private readonly store: Store<AppState>,

shared/src/data/default-state/catch-all-hospital.ts

@@ -0,0 +1,17 @@
+import type { Hospital } from '../../models';
+import type { UUID } from '../../utils';
+import { cloneDeepMutable } from '../../utils';
+
+export const catchAllHospitalId: UUID = '00000000-0000-4000-8000-000000000000';
+
+const catchAllHospital: Hospital = {
+    type: 'hospital',
+    id: catchAllHospitalId,
+    name: 'Beliebiges Krankenhaus',
+    transportDuration: 60 * 60 * 1000,
+    patientIds: {},
+};
+
+export function createCatchAllHospital() {
+    return cloneDeepMutable(catchAllHospital);
+}

shared/src/data/index.ts

@@ -2,4 +2,5 @@ export * from './default-state/map-images-templates';
 export * from './default-state/patient-templates';
 export * from './default-state/vehicle-templates';
 export * from './default-state/tile-map-properties';
+export * from './default-state/catch-all-hospital';
 export * from './dummy-objects/patient';

shared/src/state-migrations/34-add-catch-all-hospital.ts

@@ -0,0 +1,20 @@
+import type { Migration } from './migration-functions';
+
+export const addCatchAllHospital34: Migration = {
+    action: null,
+    state: (state) => {
+        const typedState = state as {
+            hospitals: {
+                [key: string]: any;
+            };
+        };
+        const catchAllHospitalId = '00000000-0000-4000-8000-000000000000';
+        typedState.hospitals[catchAllHospitalId] = {
+            type: 'hospital',
+            id: catchAllHospitalId,
+            name: 'Beliebiges Krankenhaus',
+            transportDuration: 60 * 60 * 1000,
+            patientIds: {},
+        };
+    },
+};

shared/src/state-migrations/migration-functions.ts

@@ -23,6 +23,7 @@ import { reportTreatmentStatusChanges30 } from './30-report-treatment-status-cha
 import { improveLoadVehicleActivity31 } from './31-improve-load-vehicle-activity';
 import { removeIdFromEvents32 } from './32-remove-id-from-events';
 import { reportTransferCategoryCompleted33 } from './33-report-transfer-category-completed';
+import { addCatchAllHospital34 } from './34-add-catch-all-hospital';
 import { removeSetParticipantIdAction4 } from './4-remove-set-participant-id-action';
 import { removeStatistics5 } from './5-remove-statistics';
 import { removeStateHistory6 } from './6-remove-state-history';
@@ -89,4 +90,5 @@ export const migrations: {
     31: improveLoadVehicleActivity31,
     32: removeIdFromEvents32,
     33: reportTransferCategoryCompleted33,
+    34: addCatchAllHospital34,
 };

shared/src/state.ts

@@ -51,6 +51,10 @@ import type { SpatialElementPlural } from './store/action-reducers/utils/spatial
 import type { UUID } from './utils';
 import { uuid, uuidValidationOptions } from './utils';
 import { IsIdMap, IsLiteralUnion, IsMultiTypedIdMap } from './utils/validators';
+import {
+    createCatchAllHospital,
+    catchAllHospitalId,
+} from './data/default-state/catch-all-hospital';
 
 export class ExerciseState {
     @IsUUID(4, uuidValidationOptions)
@@ -92,7 +96,9 @@ export class ExerciseState {
     public readonly transferPoints: { readonly [key: UUID]: TransferPoint } =
         {};
     @IsIdMap(Hospital)
-    public readonly hospitals: { readonly [key: UUID]: Hospital } = {};
+    public readonly hospitals: { readonly [key: UUID]: Hospital } = {
+        [catchAllHospitalId]: createCatchAllHospital(),
+    };
     @IsIdMap(HospitalPatient, (hospitalPatient) => hospitalPatient.patientId)
     public readonly hospitalPatients: {
         readonly [key: UUID]: HospitalPatient;
@@ -160,5 +166,5 @@ export class ExerciseState {
      *
      * This number MUST be increased every time a change to any object (that is part of the state or the state itself) is made in a way that there may be states valid before that are no longer valid.
      */
-    static readonly currentStateVersion = 33;
+    static readonly currentStateVersion = 34;
 }

shared/src/store/action-reducers/hospital.ts

@@ -12,6 +12,7 @@ import { cloneDeepMutable, UUID, uuidValidationOptions } from '../../utils';
 import { IsValue } from '../../utils/validators';
 import type { Action, ActionReducer } from '../action-reducer';
 import { ExpectedReducerError } from '../reducer-error';
+import { catchAllHospitalId } from '../../data/default-state/catch-all-hospital';
 import { isCompletelyLoaded } from './utils/completely-load-vehicle';
 import { getElement } from './utils/get-element';
 import { deleteVehicle } from './vehicle';
@@ -96,6 +97,12 @@ export namespace HospitalActionReducers {
     export const removeHospital: ActionReducer<RemoveHospitalAction> = {
         action: RemoveHospitalAction,
         reducer: (draftState, { hospitalId }) => {
+            if (hospitalId === catchAllHospitalId) {
+                throw new ExpectedReducerError(
+                    'Dieses Krankenhaus darf aus technischen Gründen nicht gelöscht werden.'
+                );
+            }
+
             const hospital = getElement(draftState, 'hospital', hospitalId);
             // TODO: maybe make a hospital undeletable (if at least one patient is in it)
             for (const patientId of Object.keys(hospital.patientIds)) {