Merge branch 'develop' into custom/HIO687AS

# Conflicts:
#	apps/concierge/src/app/parking/parking-state.service.ts

Author: MrYuion

apps/concierge/src/app/desks/desks-state.service.ts

@@ -13,6 +13,7 @@ import {
     rejectBooking,
     removeBooking,
     saveBooking,
+    updateBooking,
 } from '@placeos/bookings';
 import {
     AsyncHandler,
@@ -37,7 +38,14 @@ import {
     showMetadata,
     updateMetadata,
 } from '@placeos/ts-client';
-import { addHours, endOfDay, getUnixTime, set, startOfDay } from 'date-fns';
+import {
+    addHours,
+    endOfDay,
+    getUnixTime,
+    set,
+    startOfDay,
+    subDays,
+} from 'date-fns';
 import { combineLatest, lastValueFrom, of, Subject } from 'rxjs';
 import {
     catchError,
@@ -525,19 +533,32 @@ export class DesksStateService extends AsyncHandler {
     }
 
     private async _clearAssignedBooking(desk: Desk) {
+        const today = Date.now();
         const booking_list = await lastValueFrom(
             queryBookings({
-                period_start: getUnixTime(startOfDay(Date.now())),
-                period_end: getUnixTime(endOfDay(Date.now())),
+                period_start: getUnixTime(startOfDay(today)),
+                period_end: getUnixTime(endOfDay(today)),
                 type: 'desk',
                 email: desk.assigned_to,
                 include_checked_out: true,
             }),
         );
         const filtered = booking_list.filter((_) => _.asset_id === desk.id);
-        await Promise.all(
-            filtered.map((_) => lastValueFrom(removeBooking(_.id))),
-        );
+        for (const booking of filtered) {
+            const is_recurring =
+                booking.recurrence_type && booking.recurrence_type !== 'none';
+            if (is_recurring && booking.instance) {
+                // Set recurrence_end to end of yesterday to preserve past instances
+                const yesterday_end = getUnixTime(endOfDay(subDays(today, 1)));
+                await lastValueFrom(
+                    updateBooking(booking.id, {
+                        recurrence_end: yesterday_end,
+                    }),
+                );
+            } else {
+                await lastValueFrom(removeBooking(booking.id));
+            }
+        }
     }
 
     private _getActiveZones(zones: string[] = []): string[] {

apps/concierge/src/app/parking/parking-state.service.ts

@@ -23,6 +23,7 @@ import {
     rejectBookingInstance,
     removeBooking,
     saveBooking,
+    updateBooking,
 } from '@placeos/bookings';
 import {
     AsyncHandler,
@@ -48,8 +49,9 @@ import {
     set,
     startOfDay,
     startOfWeek,
+    subDays,
 } from 'date-fns';
-import { BehaviorSubject, combineLatest, of } from 'rxjs';
+import { BehaviorSubject, combineLatest, lastValueFrom, of } from 'rxjs';
 import {
     debounceTime,
     filter,
@@ -182,7 +184,9 @@ export class ParkingStateService extends AsyncHandler {
                     : startOfDay(options.date);
             const period_end =
                 options.period === 'week'
-                    ? endOfWeek(options.date, { weekStartsOn: this._week_start })
+                    ? endOfWeek(options.date, {
+                          weekStartsOn: this._week_start,
+                      })
                     : endOfDay(options.date);
             this._loading.next([...this._loading.getValue(), '[BOOKINGS]']);
             return queryBookings({
@@ -577,16 +581,33 @@ export class ParkingStateService extends AsyncHandler {
         if (result) this._change.next(Date.now());
     }
 
-    private async _clearAssignedBooking(space: ParkingSpace) {
-        const booking_list = await queryBookings({
-            period_start: getUnixTime(startOfDay(Date.now())),
-            period_end: getUnixTime(endOfDay(Date.now())),
-            type: 'parking',
-            email: space.assigned_to,
-            include_checked_out: true,
-        }).toPromise();
-        const filtered = booking_list.filter((_) => _.asset_id === space.id);
-        await Promise.all(filtered.map((_) => removeBooking(_.id).toPromise()));
+    private async _clearAssignedBooking(resource: ParkingSpace) {
+        const today = Date.now();
+        const booking_list = await lastValueFrom(
+            queryBookings({
+                period_start: getUnixTime(startOfDay(today)),
+                period_end: getUnixTime(endOfDay(today)),
+                type: 'parking',
+                email: resource.assigned_to,
+                include_checked_out: true,
+            }),
+        );
+        const filtered = booking_list.filter((_) => _.asset_id === resource.id);
+        for (const booking of filtered) {
+            const is_recurring =
+                booking.recurrence_type && booking.recurrence_type !== 'none';
+            if (is_recurring && booking.instance) {
+                // Set recurrence_end to end of yesterday to preserve past instances
+                const yesterday_end = getUnixTime(endOfDay(subDays(today, 1)));
+                await lastValueFrom(
+                    updateBooking(booking.id, {
+                        recurrence_end: yesterday_end,
+                    }),
+                );
+            } else {
+                await lastValueFrom(removeBooking(booking.id));
+            }
+        }
     }
 
     private get _week_start(): 0 | 1 | 2 | 3 | 4 | 5 | 6 {

libs/bookings/src/index.ts

@@ -15,6 +15,5 @@ export * from './lib/parking-select-modal/parking-select-modal.component';
 export * from './lib/parking-space-list-field.component';
 export * from './lib/parking.service';
 
-export * from './lib/recurring-clash-modal.component';
 export * from './lib/visitor-invite-form.component';
 export * from './lib/visitor-invite-success.component';

libs/bookings/src/lib/booking-form.service.ts

@@ -5,6 +5,7 @@ import { queryParkingSpacesForZones } from '@placeos/assets';
 import {
     AsyncHandler,
     Booking,
+    BookingClash,
     BookingRuleset,
     BookingType,
     currentUser,
@@ -38,6 +39,7 @@ import {
     getUnixTime,
     startOfDay,
 } from 'date-fns';
+import { openRecurringClashModal } from 'libs/components/src/lib/recurring-clash-modal.component';
 import {
     BehaviorSubject,
     combineLatest,
@@ -69,14 +71,12 @@ import {
 } from './booking.utilities';
 import {
     bookedResourceList,
-    BookingClash,
     findBookingClashes,
     queryBookings,
     removeBooking,
     saveBooking,
 } from './bookings.fn';
 import { DeskQuestionsModalComponent } from './desk-questions-modal.component';
-import { openRecurringClashModal } from './recurring-clash-modal.component';
 
 import { AssetStateService } from 'libs/assets/src/lib/asset-state.service';
 import { validateAssetRequestsForResource } from 'libs/assets/src/lib/assets.fn';

libs/bookings/src/lib/bookings.fn.ts

@@ -5,6 +5,7 @@ import { catchError, map, switchMap } from 'rxjs/operators';
 import {
     BookableResource,
     Booking,
+    BookingClash,
     BookingType,
     CalendarEvent,
     flatten,
@@ -81,12 +82,6 @@ export interface BookingClashQueryOptions {
     include_clash_time?: boolean;
 }
 
-export interface BookingClash {
-    asset_id: string;
-    booking_start: number;
-    booking_end: number;
-}
-
 /**
  * List resources that clash within the given parameters
  * @param q Parameters to pass to the API request
@@ -366,7 +361,7 @@ export function queryBookingGuests(id: string) {
 export function checkinBookingGuest(
     id: string,
     guest_id: string,
-    state: boolean = true,
+    state = true,
 ) {
     return post(
         `${BOOKINGS_ENDPOINT}/${encodeURIComponent(

libs/common/src/lib/types/booking.class.ts

@@ -35,6 +35,12 @@ export interface BookingComplete extends Booking {
     guests?: User[];
 }
 
+export interface BookingClash {
+    asset_id: string;
+    booking_start: number;
+    booking_end: number;
+}
+
 export enum RecurrenceDays {
     SUNDAY = 1 << 0,
     MONDAY = 1 << 1,
@@ -154,7 +160,7 @@ export class Booking {
     public readonly linked_parent_booking?: LinkedBooking;
 
     public readonly process_state: string;
-    /** Unix epoch for the start time of the reccurence instance in seconds */
+    /** Unix epoch for the start time of the reccurence instance in seconds. Only set when instance of a recurring series */
     public readonly instance?: number;
     /** Type of recurrence instance */
     public readonly recurrence_type: 'none' | 'daily' | 'weekly' | 'monthly';

…c/lib/recurring-clash-modal.component.ts …c/lib/recurring-clash-modal.component.tslibs/bookings/src/lib/recurring-clash-modal.component.ts renamed to libs/components/src/lib/recurring-clash-modal.component.ts libs/bookings/src/lib/recurring-clash-modal.component.ts renamed to libs/components/src/lib/recurring-clash-modal.component.ts

@@ -7,11 +7,10 @@ import {
     MatDialogModule,
     MatDialogRef,
 } from '@angular/material/dialog';
-import { DialogEvent } from '@placeos/common';
+import { BookingClash, DialogEvent } from '@placeos/common';
 import { IconComponent } from 'libs/components/src/lib/icon.component';
 import { TranslatePipe } from 'libs/components/src/lib/translate.pipe';
 import { first } from 'rxjs/operators';
-import { BookingClash } from './bookings.fn';
 
 export interface RecurringClashModalData {
     clashes: BookingClash[];

libs/events/src/lib/event-form.service.ts

@@ -21,6 +21,7 @@ import {
     BehaviorSubject,
     combineLatest,
     forkJoin,
+    lastValueFrom,
     merge,
     Observable,
     of,
@@ -53,10 +54,13 @@ import {
     queryResourceAvailability,
     saveBooking,
 } from 'libs/bookings/src/lib/bookings.fn';
+import { openRecurringClashModal } from 'libs/bookings/src/lib/recurring-clash-modal.component';
 import { SpacePipe } from 'libs/events/src/lib/space.pipe';
 import { requestSpacesForZone } from 'libs/events/src/lib/space.utilities';
 import { PaymentsService } from 'libs/payments/src/lib/payments.service';
 import {
+    EventClash,
+    findEventClashes,
     querySpaceAvailability,
     removeEvent,
     saveEvent,
@@ -642,6 +646,19 @@ export class OldEventFormService extends AsyncHandler {
                     throw _;
                 });
             }
+            // Check for clashing events in recurring series
+            if (value.recurring && spaces.length) {
+                await this._checkRecurringClashes(
+                    new CalendarEvent({
+                        ...value,
+                        resources: spaces,
+                    }),
+                ).catch((_) => {
+                    this._loading.next('');
+                    reject(_);
+                    throw _;
+                });
+            }
             spaces = form.get('resources')?.value || [];
             const is_owner =
                 host === currentUser()?.email ||
@@ -919,6 +936,62 @@ export class OldEventFormService extends AsyncHandler {
         return true;
     }
 
+    /**
+     * Check for clashing events in a recurring event series
+     * @param event The calendar event to check for clashes
+     * @returns true if no clashes or user confirmed to continue
+     * @throws Error if first instance clashes or clashes not allowed
+     */
+    private async _checkRecurringClashes(
+        event: CalendarEvent,
+    ): Promise<boolean> {
+        if (!event.recurring) {
+            return true;
+        }
+
+        const clashes = (await lastValueFrom(
+            findEventClashes(event, { include_clash_time: true }),
+        )) as EventClash[];
+
+        if (!clashes?.length) {
+            return true;
+        }
+
+        const sorted_clashes = [...clashes].sort(
+            (a, b) => a.booking_start - b.booking_start,
+        );
+
+        const event_start_unix = Math.floor(event.date / 1000);
+        const first_clash = sorted_clashes[0];
+        const is_first_instance_clash =
+            first_clash.booking_start === event_start_unix;
+
+        if (is_first_instance_clash) {
+            throw i18n('CALENDAR_EVENT.FIRST_INSTANCE_CLASH');
+        }
+
+        const allow_clashes =
+            this._settings.get('app.events.allow_recurring_instance_clashes') ??
+            true;
+
+        if (!allow_clashes) {
+            throw i18n('CALENDAR_EVENT.RECURRING_CLASHES_NOT_ALLOWED', {
+                count: clashes.length,
+            });
+        }
+
+        const result = await openRecurringClashModal(
+            { clashes: sorted_clashes },
+            this._dialog,
+        );
+
+        if (result?.reason !== 'done') {
+            throw 'User cancelled';
+        }
+
+        return true;
+    }
+
     private _updateVisitorList(attendees: User[]) {
         const visitors = attendees.filter((user) => user.is_external);
         if (!visitors?.length) return;

libs/events/src/lib/events.fn.ts

@@ -1,4 +1,9 @@
-import { CalendarEvent, GuestUser, toQueryString } from '@placeos/common';
+import {
+    BookingClash,
+    CalendarEvent,
+    GuestUser,
+    toQueryString,
+} from '@placeos/common';
 import { del, get, patch, post, put, query } from '@placeos/ts-client';
 import { addMinutes, getUnixTime } from 'date-fns';
 import { Observable, combineLatest, of } from 'rxjs';
@@ -402,3 +407,32 @@ export function querySpaceAvailability(
         }),
     );
 }
+
+export interface EventClashQueryOptions {
+    // Requires multple assets in the event to use
+    return_available?: boolean;
+    // Added the time that the clashes occur with each returned asset
+    include_clash_time?: boolean;
+}
+
+/**
+ * List resources that clash within the given parameters
+ * @param q Parameters to pass to the API request
+ */
+export function findEventClashes(
+    event: CalendarEvent,
+    q: EventClashQueryOptions = {},
+): Observable<string[] | BookingClash[]> {
+    const query = toQueryString({ ...q, limit: 10000 });
+    return post(
+        `${EVENTS_ENDPOINT}/clashing-assets${query ? '?' + query : ''}`,
+        event.toJSON(),
+    ).pipe(
+        map((list) =>
+            q.include_clash_time
+                ? (list as BookingClash[])
+                : (list as string[]),
+        ),
+        catchError((_) => of([])),
+    );
+}