refactor: rename week resevation types

RefuAPP · Dec 13, 2023 · 175807f · 175807f
1 parent cc29f6b
commit 175807f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/app/src/app/components/reservations-chart/reservations-chart.component.ts b/app/src/app/components/reservations-chart/reservations-chart.component.ts
@@ -12,6 +12,7 @@ import {OccupationService} from '../../services/occupation/occupation.service';
 import {of} from 'rxjs';
 import {RefugeReservationService} from "../../services/reservations/refuge-reservation.service";
 import {GetUserResponse} from "../../schemas/user/fetch/get-refuge-schema";
+import {WeekReservations} from "../../schemas/reservations/reservation";
 
 @Component({
   selector: 'app-reservations-chart',
@@ -21,6 +22,8 @@ import {GetUserResponse} from "../../schemas/user/fetch/get-refuge-schema";
 export class ReservationsChartComponent implements OnInit, AfterViewInit {
   @Input({required: true}) refuge!: Refuge;
   @ViewChild('verticalBarChart') verticalBarChart?: BarVerticalComponent;
+
+  chartReservations: WeekReservations = [];
   testDate1 = new Date('2023-10-14');
   testDate2 = new Date('2023-10-15');
 
@@ -87,7 +90,7 @@ export class ReservationsChartComponent implements OnInit, AfterViewInit {
 
     this.reservationService.getWeekReservationsForRefuge(this.refuge.id, 0).subscribe({
       next: (response) => {
-        console.log("correct" + response);
+        this.chartReservations = response;
       },
       error: (err) => {
         console.log("error" + err);

diff --git a/app/src/app/schemas/reservations/get-week-reservations-refuge.ts b/app/src/app/schemas/reservations/get-week-reservations-refuge.ts
@@ -1,6 +1,6 @@
 import {HttpErrorResponse} from '@angular/common/http';
 import {isMatching} from 'ts-pattern';
-import {ReservationsWeek, ReservationsWeekPattern} from './reservation';
+import {WeekReservations, ReservationsWeekPattern} from './reservation';
 import {P} from 'ts-pattern/dist';
 import {ResourceErrors} from '../errors/resource';
 import {ServerErrors} from '../errors/server';
@@ -9,7 +9,7 @@ import {getErrorFrom} from '../errors/all-errors';
 
 export type CorrectGetWeekReservations = {
   status: 'ok';
-  week: ReservationsWeek;
+  week: WeekReservations;
 };
 
 export const CorrectGetWeekReservationsPattern: P.Pattern<CorrectGetWeekReservations> =

diff --git a/app/src/app/schemas/reservations/reservation.ts b/app/src/app/schemas/reservations/reservation.ts
@@ -13,13 +13,13 @@ export type ReservationWithId = Reservation & { id: string };
 
 export type Reservations = ReservationWithId[];
 
-export type ReservationsWeek = WeekReservation[];
+export type WeekReservations = ChartReservation[];
 
-export type WeekReservation = {
+export type ChartReservation = {
   night: Night;
   count: number;
 }
 
-export const ReservationsWeekPattern: P.Pattern<WeekReservation> = {};
+export const ReservationsWeekPattern: P.Pattern<ChartReservation> = {};
 
 export const ReservationPattern: P.Pattern<Reservation> = {};
diff --git a/app/src/app/services/reservations/common.ts b/app/src/app/services/reservations/common.ts
@@ -4,7 +4,7 @@ import {
   CorrectGetReservationsPattern,
   GetReservations,
 } from '../../schemas/reservations/get-reservations-refuge-user';
-import {Reservations, ReservationsWeek} from '../../schemas/reservations/reservation';
+import {Reservations, WeekReservations} from '../../schemas/reservations/reservation';
 import { isMatching } from 'ts-pattern';
 import {
   CorrectGetWeekReservations,
@@ -26,7 +26,7 @@ export function toReservations(
 
 export function toReservationsWeek(
   getWeekReservations: Observable<GetWeekReservations>,
-): Observable<ReservationsWeek> {
+): Observable<WeekReservations> {
   return getWeekReservations.pipe(
     map((reservations) => {
       if (isMatching(CorrectGetWeekReservationsPattern, reservations))

diff --git a/app/src/app/services/reservations/refuge-reservation.service.ts b/app/src/app/services/reservations/refuge-reservation.service.ts
@@ -11,7 +11,7 @@ import {
   of,
   retry,
 } from 'rxjs';
-import {Reservations, ReservationsWeek, WeekReservation} from '../../schemas/reservations/reservation';
+import {Reservations, WeekReservations, ChartReservation} from '../../schemas/reservations/reservation';
 import {toReservations, toReservationsWeek} from './common';
 import {
   fromError as fromReservationsError,
@@ -35,7 +35,7 @@ export class RefugeReservationService {
   getWeekReservationsForRefuge(
     refugeId: string,
     offset: number,
-  ): Observable<ReservationsWeek> {
+  ): Observable<WeekReservations> {
     const today = new Date();
     const night = nightFromDate(today)
     return toReservationsWeek(
@@ -49,7 +49,7 @@ export class RefugeReservationService {
     offset: number,
   ): Observable<GetWeekReservations> {
     const uri = this.getUriForWeekRefugeAndNight(refugeId, night, offset);
-    return this.http.get<ReservationsWeek>(uri).pipe(
+    return this.http.get<WeekReservations>(uri).pipe(
       map((reservations) => fromWeekReservationsResponse(reservations)),
       catchError((err: HttpErrorResponse) => of(fromWeekReservationsError(err))),
       retry(3),