feat: type error handling on reservations

RefuAPP · Nov 13, 2023 · 775b822 · 775b822
1 parent 201a979
commit 775b822
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 9 deletions.
diff --git a/app/src/app/state/map/map.actions.ts b/app/src/app/state/map/map.actions.ts
@@ -3,6 +3,7 @@ import { ElementRef } from '@angular/core';
 import { GoogleMapConfig } from '@capacitor/google-maps/dist/typings/definitions';
 import { Refuge } from '../../schemas/refuge/refuge';
 import { Coordinates } from '../../services/search/search.service';
+import { GetAllRefugesErrors } from '../../schemas/refuge/get-all-refuges-schema';
 
 export const loadMap = createAction(
   '[Map] Loading Map',
@@ -20,10 +21,9 @@ export const moveMapTo = createAction(
   props<{ coordinates: Coordinates }>(),
 );
 
-// TODO: This error shouldn't be any
 export const loadRefugesError = createAction(
   '[Map] Load All Refuges Error',
-  props<{ error: any }>(),
+  props<{ error: GetAllRefugesErrors }>(),
 );
 
 export const loadedRefuges = createAction(

diff --git a/app/src/app/state/map/map.effects.ts b/app/src/app/state/map/map.effects.ts
@@ -4,7 +4,7 @@ import {
   ofType,
   ROOT_EFFECTS_INIT,
 } from '@ngrx/effects';
-import { combineLatest, map, switchMap, tap } from 'rxjs';
+import { catchError, combineLatest, map, of, switchMap, tap } from 'rxjs';
 import { fromPromise } from 'rxjs/internal/observable/innerFrom';
 import { cloneDeep } from 'lodash';
 import { openModal } from '../components/modal/modal.actions';
@@ -24,6 +24,9 @@ import {
   moveMapTo,
 } from './map.actions';
 import { loadedMapLibrary } from '../init/init.actions';
+import { programmingError, unknownError } from '../errors/error.actions';
+import { match } from 'ts-pattern';
+import { GetAllRefugesErrors } from '../../schemas/refuge/get-all-refuges-schema';
 
 @Injectable()
 export class MapEffects {
@@ -52,7 +55,10 @@ export class MapEffects {
             actions[0].map,
             cloneDeep(actions[0].config),
           ),
-        ).pipe(map(() => loadedMap())),
+        ).pipe(
+          map(() => loadedMap()),
+          catchError(() => of(unknownError())),
+        ),
       ),
     ),
   );
@@ -100,4 +106,18 @@ export class MapEffects {
       ),
     { dispatch: false },
   );
+
+  getAllRefugesErrors$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(loadRefugesError),
+      map((action) => {
+        return match(action.error)
+          .with(GetAllRefugesErrors.SERVER_INCORRECT_DATA_FORMAT_ERROR, () =>
+            programmingError(),
+          )
+          .with(GetAllRefugesErrors.UNKNOWN_ERROR, () => unknownError())
+          .exhaustive();
+      }),
+    ),
+  );
 }
diff --git a/app/src/app/state/reservations/reservations.actions.ts b/app/src/app/state/reservations/reservations.actions.ts
@@ -4,6 +4,14 @@ import {
   ReservationWithoutUserId,
 } from '../../schemas/reservations/reservation';
 import { RefugeReservationsRelations } from '../../services/reservations/grouped-by/refuge';
+import {
+  CreateReservationError,
+  ErrorCreateReservation,
+} from '../../schemas/reservations/create-reservation';
+import {
+  DeleteReservationError,
+  ErrorDeleteReservation,
+} from '../../schemas/reservations/delete-reservation';
 
 export const addReservation = createAction(
   '[Reservations] Add Reservation',
@@ -22,8 +30,7 @@ export const fetchReservations = createAction(
 
 export const errorAddingReservation = createAction(
   '[Reservations] Error Adding Reservation',
-  // TODO: This error shouldn't be any
-  props<{ error: any }>(),
+  props<{ error: CreateReservationError }>(),
 );
 
 export const deleteReservation = createAction(
@@ -38,6 +45,5 @@ export const deletedReservation = createAction(
 
 export const errorDeletingReservation = createAction(
   '[Reservations] Error Deleting Reservation',
-  // TODO: This error shouldn't be any
-  props<{ error: any }>(),
+  props<{ error: DeleteReservationError }>(),
 );
diff --git a/app/src/app/state/reservations/reservations.effects.ts b/app/src/app/state/reservations/reservations.effects.ts
@@ -5,7 +5,7 @@ import {
   ofType,
   ROOT_EFFECTS_INIT,
 } from '@ngrx/effects';
-import { combineLatest, map, mergeMap, switchMap, tap } from 'rxjs';
+import { combineLatest, map, mergeMap, switchMap } from 'rxjs';
 import { loginCompleted } from '../auth/auth.actions';
 import { UserReservationService } from '../../services/reservations/user-reservation.service';
 import {