@myclub_se/data-access 2.6.2 → 2.7.1

package/fesm2015/myclub_se-data-access.mjs

@@ -447,11 +447,12 @@ class BookingCalendarSlotSession {
 }
 
 class BookingSettings {
-    constructor(id, calendar_step, calendar_min_time, calendar_max_time, should_split_booking_into_zones) {
+    constructor(id, calendar_step, calendar_min_time, calendar_max_time, calendar_session_duration, should_split_booking_into_zones) {
         this.id = id;
         this.calendar_step = calendar_step;
         this.calendar_min_time = calendar_min_time;
         this.calendar_max_time = calendar_max_time;
+        this.calendar_session_duration = calendar_session_duration;
         this.should_split_booking_into_zones = should_split_booking_into_zones;
     }
     static asFormGroup(settings) {
@@ -460,6 +461,7 @@ class BookingSettings {
             calendar_step: new FormControl((settings === null || settings === void 0 ? void 0 : settings.calendar_step) || '01:00:00', [Validators.required]),
             calendar_min_time: new FormControl((settings === null || settings === void 0 ? void 0 : settings.calendar_min_time) || '00:00:00', [Validators.required]),
             calendar_max_time: new FormControl((settings === null || settings === void 0 ? void 0 : settings.calendar_max_time) || '23:00:00', [Validators.required]),
+            calendar_session_duration: new FormControl((settings === null || settings === void 0 ? void 0 : settings.calendar_session_duration) || '01:00:00', [Validators.required]),
             should_split_booking_into_zones: new FormControl(typeof (settings === null || settings === void 0 ? void 0 : settings.should_split_booking_into_zones) !== 'undefined' ? settings === null || settings === void 0 ? void 0 : settings.should_split_booking_into_zones : true, [Validators.required]),
         });
     }
@@ -1127,6 +1129,27 @@ class MemberValidationSettings {
     }
 }
 
+class OtherMember {
+    constructor(id, country, created, firstName, image, lastName, name, fields) {
+        this.id = id;
+        this.country = country;
+        this.created = created;
+        this.firstName = firstName;
+        this.image = image;
+        this.lastName = lastName;
+        this.name = name;
+        this.fields = fields;
+    }
+}
+
+class OtherMemberField {
+    constructor(displayName, fieldName, value) {
+        this.displayName = displayName;
+        this.fieldName = fieldName;
+        this.value = value;
+    }
+}
+
 class SearchMember {
     constructor(id, club_id, team_id, address1, address2, calendar_url, country, district, email, first_name, image, last_name, mobile_phone, name, zip) {
         this.id = id;
@@ -1334,10 +1357,11 @@ var Role;
 })(Role || (Role = {}));
 
 class SearchClub {
-    constructor(id, leader_member_search, member_search, name) {
+    constructor(id, leader_member_search, member_search, member_view, name) {
         this.id = id;
         this.leader_member_search = leader_member_search;
         this.member_search = member_search;
+        this.member_view = member_view;
         this.name = name;
     }
 }
@@ -1570,7 +1594,7 @@ const bookingCalendarSlotSessionFactory = (apiBookingSlotSession) => new Booking
 
 const bookingCalendarSlotFactory = (apiBookingSlot) => new BookingCalendarSlot(apiBookingSlot.id, apiBookingSlot.calendar_id, apiBookingSlot.calendar_status, apiBookingSlot.location_id, apiBookingSlot.color, apiBookingSlot.day, apiBookingSlot.end_time, apiBookingSlot.group_id, apiBookingSlot.location_name, apiBookingSlot.number_of_available_sessions, apiBookingSlot.sessions && apiBookingSlot.sessions.length ? apiBookingSlot.sessions.map((apiBookingSlotSession) => bookingCalendarSlotSessionFactory(apiBookingSlotSession)) : [], apiBookingSlot.open_sessions && apiBookingSlot.open_sessions.length ? apiBookingSlot.open_sessions.map((apiBookingSlotSession) => bookingCalendarSlotSessionFactory(apiBookingSlotSession)) : [], apiBookingSlot.start_time, apiBookingSlot.type, 'none', false, false, 6, format(new Date(), 'yyyy-MM-dd'), 'repeat_until', apiBookingSlot.reserved_time, apiBookingSlot.reserved_time_position, apiBookingSlot.application_times && apiBookingSlot.application_times.length ? apiBookingSlot.application_times.map((apiBookingApplicationTime) => bookingCalendarApplicationTimeFactory(apiBookingApplicationTime)) : [], apiBookingSlot.last_repeating_date);
 
-const bookingSettingsFactory = (apiBookingSettings) => new BookingSettings(apiBookingSettings.id, apiBookingSettings.calendar_step, apiBookingSettings.calendar_min_time, apiBookingSettings.calendar_max_time, apiBookingSettings.should_split_booking_into_zones);
+const bookingSettingsFactory = (apiBookingSettings) => new BookingSettings(apiBookingSettings.id, apiBookingSettings.calendar_step, apiBookingSettings.calendar_min_time, apiBookingSettings.calendar_max_time, apiBookingSettings.calendar_session_duration, apiBookingSettings.should_split_booking_into_zones);
 
 const imageUrlsFactory = (apiImageUrls) => new ImageUrls(apiImageUrls.lg, apiImageUrls.md, apiImageUrls.raw, apiImageUrls.sm, apiImageUrls.xs);
 
@@ -1666,6 +1690,10 @@ const memberTeamThroughFactory = (apiMemberTeamThrough) => new MemberTeamThrough
 
 const newsFactory = (apiNews) => new News(apiNews.id, apiNews.club_id, apiNews.created, apiNews.created_by_id, apiNews.section_id, apiNews.team_id, apiNews.active_to, apiNews.author, apiNews.ingress, apiNews.news_image, apiNews.news_image_text, apiNews.published_date, apiNews.read, apiNews.show_on_my_pages, apiNews.show_on_webpage, apiNews.text, apiNews.title, apiNews.updated, apiNews.urls ? imageUrlsFactory(apiNews.urls) : null);
 
+const otherMemberFieldFactory = (apiOtherMemberFieldFactory) => new OtherMemberField(apiOtherMemberFieldFactory.display_name, apiOtherMemberFieldFactory.field_name, apiOtherMemberFieldFactory.value);
+
+const otherMemberFactory = (apiOtherMember) => new OtherMember(apiOtherMember.id, apiOtherMember.country, apiOtherMember.created, apiOtherMember.first_name, apiOtherMember.image, apiOtherMember.last_name, apiOtherMember.name, apiOtherMember.fields ? apiOtherMember.fields.map((memberField) => otherMemberFieldFactory(memberField)) : []);
+
 const paymentAttemptFactory = (apiPaymentAttempt) => {
     var _a;
     let paymentAttemptData = null;
@@ -1689,7 +1717,7 @@ const paymentAttemptFactory = (apiPaymentAttempt) => {
     return new PaymentAttempt(apiPaymentAttempt.id, apiPaymentAttempt.amount, apiPaymentAttempt.error, apiPaymentAttempt.invoice_id, apiPaymentAttempt.paid_date, paymentAttemptData, apiPaymentAttempt.status, apiPaymentAttempt.type);
 };
 
-const searchClubFactory = (apiSearchClub) => new SearchClub(apiSearchClub.id, apiSearchClub.leader_member_search, apiSearchClub.member_search, apiSearchClub.name);
+const searchClubFactory = (apiSearchClub) => new SearchClub(apiSearchClub.id, apiSearchClub.leader_member_search, apiSearchClub.member_search, apiSearchClub.member_view, apiSearchClub.name);
 
 const searchMemberCardFactory = (apiSearchMemberCard) => new SearchMemberCard(apiSearchMemberCard.id, apiSearchMemberCard.name, apiSearchMemberCard.notification_count, apiSearchMemberCard.pdf_url);
 
@@ -2212,6 +2240,46 @@ const TEAM_BOOKING_CALENDAR_SLOT_SESSIONS_PATH = ':teamId/activities/sessions/';
 const TEAM_BOOKING_CALENDAR_SLOT_SESSION_PATH = ':teamId/activities/sessions/:id/';
 const TEAM_BOOKING_CALENDAR_APPLICATION_TIMES_PATH = ':teamId/activities/application-times/';
 const TEAM_BOOKING_CALENDAR_APPLICATION_TIME_PATH = ':teamId/activities/application-times/:id/';
+class BookingSlotFilter {
+    constructor(startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, locationGroupIds = null, hasOpenSessions = null) {
+        this.startDate = startDate;
+        this.endDate = endDate;
+        this.calendarIds = calendarIds;
+        this.locationIds = locationIds;
+        this.tagIds = tagIds;
+        this.teamIds = teamIds;
+        this.locationGroupIds = locationGroupIds;
+        this.hasOpenSessions = hasOpenSessions;
+    }
+    toParams() {
+        const params = { limit: 'null' };
+        if (this.startDate) {
+            params['day__gte'] = this.startDate;
+        }
+        if (this.endDate) {
+            params['day__lte'] = this.endDate;
+        }
+        if (this.calendarIds && this.calendarIds.length) {
+            params['calendar_id'] = this.calendarIds.join(',');
+        }
+        if (this.locationIds && this.locationIds.length) {
+            params['location_id'] = this.locationIds.join(',');
+        }
+        if (this.locationGroupIds && this.locationGroupIds.length) {
+            params['location_group_id'] = this.locationGroupIds.join(',');
+        }
+        if (this.tagIds && this.tagIds.length) {
+            params['tag_id'] = this.tagIds.join(',');
+        }
+        if (this.teamIds && this.teamIds.length) {
+            params['team_id'] = this.teamIds.join(',');
+        }
+        if (typeof this.hasOpenSessions === 'boolean') {
+            params['has_open_sessions'] = String(this.hasOpenSessions);
+        }
+        return params;
+    }
+}
 class BookingCalendarService {
     constructor(apiService) {
         this.apiService = apiService;
@@ -2338,221 +2406,74 @@ class BookingCalendarService {
             sectionId,
         }, slot);
     }
-    getBookingCalendarSlots(role, clubOrSectionOrTeamId, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
+    getBookingCalendarSlots(role, clubOrSectionOrTeamId, bookingSlotFilter) {
         if (role == Role.ClubAdmin) {
-            return this.getClubBookingCalendarSlots(clubOrSectionOrTeamId, startDate, endDate, calendarIds, locationIds, tagIds, teamIds, hasOpenSessions);
+            return this.getClubBookingCalendarSlots(clubOrSectionOrTeamId, bookingSlotFilter);
         }
         else if (role == Role.SectionAdmin) {
-            return this.getSectionBookingCalendarSlots(clubOrSectionOrTeamId, startDate, endDate, calendarIds, locationIds, tagIds, teamIds, hasOpenSessions);
+            return this.getSectionBookingCalendarSlots(clubOrSectionOrTeamId, bookingSlotFilter);
         }
-        return this.getTeamBookingCalendarSlots(clubOrSectionOrTeamId, startDate, endDate, calendarIds, locationIds, tagIds, teamIds, hasOpenSessions);
+        return this.getTeamBookingCalendarSlots(clubOrSectionOrTeamId, bookingSlotFilter);
     }
-    getClubBookingCalendarSlots(clubId, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
-        if (typeof hasOpenSessions === 'boolean') {
-            params['has_open_sessions'] = String(hasOpenSessions);
-        }
+    getClubBookingCalendarSlots(clubId, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .getCollection(bookingCalendarSlotFactory, Role.ClubAdmin, CLUB_BOOKING_CALENDAR_SLOTS_PATH, { clubId }, {
             params
         });
     }
-    getSectionBookingCalendarSlots(sectionId, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
-        if (typeof hasOpenSessions === 'boolean') {
-            params['has_open_sessions'] = String(hasOpenSessions);
-        }
+    getSectionBookingCalendarSlots(sectionId, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .getCollection(bookingCalendarSlotFactory, Role.SectionAdmin, SECTION_BOOKING_CALENDAR_SLOTS_PATH, { sectionId }, {
             params
         });
     }
-    getTeamBookingCalendarSlots(teamId, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
-        if (typeof hasOpenSessions === 'boolean') {
-            params['has_open_sessions'] = String(hasOpenSessions);
-        }
+    getTeamBookingCalendarSlots(teamId, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .getCollection(bookingCalendarSlotFactory, Role.TeamAdmin, TEAM_BOOKING_CALENDAR_SLOTS_PATH, { teamId }, {
             params
         });
     }
-    getBookingCalendarApplicationTimeSlots(role, clubOrSectionOrTeamId, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
+    getBookingCalendarApplicationTimeSlots(role, clubOrSectionOrTeamId, bookingSlotFilter) {
         if (role == Role.ClubAdmin) {
-            return this.getClubBookingCalendarApplicationTimeSlots(clubOrSectionOrTeamId, startDate, endDate, calendarIds, locationIds, tagIds, teamIds, hasOpenSessions);
+            return this.getClubBookingCalendarApplicationTimeSlots(clubOrSectionOrTeamId, bookingSlotFilter);
         }
         else if (role == Role.SectionAdmin) {
-            return this.getSectionBookingCalendarApplicationTimeSlots(clubOrSectionOrTeamId, startDate, endDate, calendarIds, locationIds, tagIds, teamIds, hasOpenSessions);
+            return this.getSectionBookingCalendarApplicationTimeSlots(clubOrSectionOrTeamId, bookingSlotFilter);
         }
-        return this.getTeamBookingCalendarApplicationTimeSlots(clubOrSectionOrTeamId, startDate, endDate, calendarIds, locationIds, tagIds, teamIds, hasOpenSessions);
+        return this.getTeamBookingCalendarApplicationTimeSlots(clubOrSectionOrTeamId, bookingSlotFilter);
     }
-    getClubBookingCalendarApplicationTimeSlots(clubId, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
-        if (typeof hasOpenSessions === 'boolean') {
-            params['has_open_sessions'] = String(hasOpenSessions);
-        }
+    getClubBookingCalendarApplicationTimeSlots(clubId, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .getCollection(bookingCalendarSlotFactory, Role.ClubAdmin, CLUB_BOOKING_CALENDAR_SLOTS_APPLICATION_TIMES_PATH, { clubId }, {
             params
         });
     }
-    getSectionBookingCalendarApplicationTimeSlots(sectionId, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
-        if (typeof hasOpenSessions === 'boolean') {
-            params['has_open_sessions'] = String(hasOpenSessions);
-        }
+    getSectionBookingCalendarApplicationTimeSlots(sectionId, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .getCollection(bookingCalendarSlotFactory, Role.SectionAdmin, SECTION_BOOKING_CALENDAR_SLOTS_APPLICATION_TIMES_PATH, { sectionId }, {
             params
         });
     }
-    getTeamBookingCalendarApplicationTimeSlots(teamId, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
-        if (typeof hasOpenSessions === 'boolean') {
-            params['has_open_sessions'] = String(hasOpenSessions);
-        }
+    getTeamBookingCalendarApplicationTimeSlots(teamId, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .getCollection(bookingCalendarSlotFactory, Role.TeamAdmin, TEAM_BOOKING_CALENDAR_SLOTS_APPLICATION_TIMES_PATH, { teamId }, {
             params
         });
     }
-    copyBookingCalendarSlots(role, clubOrSectionOrTeamId, weekRelativeIndexes, onlyCopySlots = false, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
+    copyBookingCalendarSlots(role, clubOrSectionOrTeamId, weekRelativeIndexes, onlyCopySlots = false, bookingSlotFilter) {
         if (role === Role.ClubAdmin) {
-            return this.copyClubBookingCalendarSlots(clubOrSectionOrTeamId, weekRelativeIndexes, onlyCopySlots, startDate, endDate, calendarIds, locationIds, tagIds, teamIds, hasOpenSessions);
+            return this.copyClubBookingCalendarSlots(clubOrSectionOrTeamId, weekRelativeIndexes, onlyCopySlots, bookingSlotFilter);
         }
-        return this.copySectionBookingCalendarSlots(clubOrSectionOrTeamId, weekRelativeIndexes, onlyCopySlots, startDate, endDate, calendarIds, locationIds, tagIds, teamIds, hasOpenSessions);
+        return this.copySectionBookingCalendarSlots(clubOrSectionOrTeamId, weekRelativeIndexes, onlyCopySlots, bookingSlotFilter);
     }
-    copyClubBookingCalendarSlots(clubId, weekRelativeIndexes, onlyCopySlots = false, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
-        if (typeof hasOpenSessions === 'boolean') {
-            params['has_open_sessions'] = String(hasOpenSessions);
-        }
+    copyClubBookingCalendarSlots(clubId, weekRelativeIndexes, onlyCopySlots = false, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .postResourceNoResponse(Role.ClubAdmin, CLUB_BOOKING_CALENDAR_SLOTS_COPY_PATH, { clubId }, {
             week_relative_indexes: weekRelativeIndexes,
@@ -2561,29 +2482,8 @@ class BookingCalendarService {
             params
         });
     }
-    copySectionBookingCalendarSlots(sectionId, weekRelativeIndexes, onlyCopySlots = false, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
-        if (typeof hasOpenSessions === 'boolean') {
-            params['has_open_sessions'] = String(hasOpenSessions);
-        }
+    copySectionBookingCalendarSlots(sectionId, weekRelativeIndexes, onlyCopySlots = false, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .postResourceNoResponse(Role.SectionAdmin, SECTION_BOOKING_CALENDAR_SLOTS_COPY_PATH, { sectionId }, {
             week_relative_indexes: weekRelativeIndexes,
@@ -2592,35 +2492,14 @@ class BookingCalendarService {
             params
         });
     }
-    clearBookingCalendarSlots(role, clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, onlyDeleteSessions = false, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
+    clearBookingCalendarSlots(role, clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, onlyDeleteSessions = false, bookingSlotFilter) {
         if (role === Role.ClubAdmin) {
-            return this.clearClubBookingCalendarSlots(clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, onlyDeleteSessions, startDate, endDate, calendarIds, locationIds, tagIds, teamIds, hasOpenSessions);
+            return this.clearClubBookingCalendarSlots(clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, onlyDeleteSessions, bookingSlotFilter);
         }
-        return this.clearSectionBookingCalendarSlots(clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, onlyDeleteSessions, startDate, endDate, calendarIds, locationIds, tagIds, teamIds, hasOpenSessions);
+        return this.clearSectionBookingCalendarSlots(clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, onlyDeleteSessions, bookingSlotFilter);
     }
-    clearClubBookingCalendarSlots(clubId, currentWeekStartDate, weekRelativeIndexes, onlyDeleteSessions = false, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
-        if (typeof hasOpenSessions === 'boolean') {
-            params['has_open_sessions'] = String(hasOpenSessions);
-        }
+    clearClubBookingCalendarSlots(clubId, currentWeekStartDate, weekRelativeIndexes, onlyDeleteSessions = false, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .deleteResourceWithBody(Role.ClubAdmin, CLUB_BOOKING_CALENDAR_SLOTS_CLEAR_PATH, { clubId }, {
             body: {
@@ -2631,29 +2510,8 @@ class BookingCalendarService {
             params,
         });
     }
-    clearSectionBookingCalendarSlots(sectionId, currentWeekStartDate, weekRelativeIndexes, onlyDeleteSessions = false, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null, hasOpenSessions = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
-        if (typeof hasOpenSessions === 'boolean') {
-            params['has_open_sessions'] = String(hasOpenSessions);
-        }
+    clearSectionBookingCalendarSlots(sectionId, currentWeekStartDate, weekRelativeIndexes, onlyDeleteSessions = false, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .deleteResourceWithBody(Role.SectionAdmin, SECTION_BOOKING_CALENDAR_SLOTS_CLEAR_PATH, { sectionId }, {
             body: {
@@ -2664,87 +2522,33 @@ class BookingCalendarService {
             params,
         });
     }
-    syncBookingCalendarSlots(role, clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null) {
+    syncBookingCalendarSlots(role, clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, bookingSlotFilter) {
         if (role == Role.ClubAdmin) {
-            return this.syncClubBookingCalendarSlots(clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, startDate, endDate, calendarIds, locationIds, teamIds);
+            return this.syncClubBookingCalendarSlots(clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, bookingSlotFilter);
         }
         else if (role == Role.SectionAdmin) {
-            return this.syncSectionBookingCalendarSlots(clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, startDate, endDate, calendarIds, locationIds, teamIds);
+            return this.syncSectionBookingCalendarSlots(clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, bookingSlotFilter);
         }
-        return this.syncTeamBookingCalendarSlots(clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, startDate, endDate, calendarIds, locationIds, teamIds);
+        return this.syncTeamBookingCalendarSlots(clubOrSectionOrTeamId, currentWeekStartDate, weekRelativeIndexes, bookingSlotFilter);
     }
-    syncClubBookingCalendarSlots(clubId, currentWeekStartDate, weekRelativeIndexes, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
+    syncClubBookingCalendarSlots(clubId, currentWeekStartDate, weekRelativeIndexes, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .postResourceNoResponse(Role.ClubAdmin, CLUB_BOOKING_CALENDAR_SLOTS_SYNC_PATH, { clubId }, {
             current_week_start_date: currentWeekStartDate,
             week_relative_indexes: weekRelativeIndexes,
         }, { params });
     }
-    syncSectionBookingCalendarSlots(sectionId, currentWeekStartDate, weekRelativeIndexes, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
+    syncSectionBookingCalendarSlots(sectionId, currentWeekStartDate, weekRelativeIndexes, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .postResourceNoResponse(Role.SectionAdmin, SECTION_BOOKING_CALENDAR_SLOTS_SYNC_PATH, { sectionId }, {
             current_week_start_date: currentWeekStartDate,
             week_relative_indexes: weekRelativeIndexes,
         }, { params });
     }
-    syncTeamBookingCalendarSlots(teamId, currentWeekStartDate, weekRelativeIndexes, startDate = null, endDate = null, calendarIds = null, locationIds = null, tagIds = null, teamIds = null) {
-        const params = { limit: 'null' };
-        if (startDate) {
-            params['day__gte'] = startDate;
-        }
-        if (endDate) {
-            params['day__lte'] = endDate;
-        }
-        if (calendarIds && calendarIds.length) {
-            params['calendar_id'] = calendarIds.join(',');
-        }
-        if (locationIds && locationIds.length) {
-            params['location_id'] = locationIds.join(',');
-        }
-        if (tagIds && tagIds.length) {
-            params['tag_id'] = tagIds.join(',');
-        }
-        if (teamIds && teamIds.length) {
-            params['team_id'] = teamIds.join(',');
-        }
+    syncTeamBookingCalendarSlots(teamId, currentWeekStartDate, weekRelativeIndexes, bookingSlotFilter) {
+        const params = bookingSlotFilter.toParams();
         return this.apiService
             .postResourceNoResponse(Role.TeamAdmin, TEAM_BOOKING_CALENDAR_SLOTS_SYNC_PATH, { teamId }, {
             current_week_start_date: currentWeekStartDate,
@@ -3392,13 +3196,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImpo
                 }]
         }], ctorParameters: function () { return []; } });
 
-const MEMBER_OTHER_MEMBER_PATH = ':memberId/others/clubmembers/:id/';
-const MEMBER_OTHER_MEMBER_SEARCH_PATH = ':memberId/others/clubmembers/';
+const MEMBER_OTHER_MEMBER_PATH = ':memberId/others/clubmembersv2/:id/';
+const MEMBER_OTHER_MEMBER_SEARCH_PATH = ':memberId/others/clubmembersv2/';
 const MEMBER_PROFILE_CONTACT_PATH = ':memberId/member-detail/contacts/:contactId/';
 const MEMBER_PROFILE_PATH = ':memberId/member-detail/';
 const TEAM_MEMBER_CONTACT_PATH = ':teamId/team-members/:memberId/contacts/:contactId/';
-const TEAM_OTHER_MEMBER_PATH = ':teamId/team-members/others/:id/';
-const TEAM_OTHER_MEMBER_SEARCH_PATH = ':teamId/team-members/others/';
+const TEAM_OTHER_MEMBER_PATH = ':teamId/team-members/othersv2/:id/';
+const TEAM_OTHER_MEMBER_SEARCH_PATH = ':teamId/team-members/othersv2/';
 class MemberService {
     constructor(apiService) {
         this.apiService = apiService;
@@ -3409,11 +3213,11 @@ class MemberService {
     }
     getMemberOtherMember(memberId, id) {
         return this.apiService
-            .getResource(memberFactory, Role.MemberAdmin, MEMBER_OTHER_MEMBER_PATH, { memberId, id });
+            .getResource(otherMemberFactory, Role.MemberAdmin, MEMBER_OTHER_MEMBER_PATH, { memberId, id });
     }
     getTeamOtherMember(teamId, id) {
         return this.apiService
-            .getResource(memberFactory, Role.MemberAdmin, TEAM_OTHER_MEMBER_PATH, { teamId, id });
+            .getResource(otherMemberFactory, Role.TeamAdmin, TEAM_OTHER_MEMBER_PATH, { teamId, id });
     }
     removeMemberProfileContact(memberId, contactId) {
         return this.apiService
@@ -3425,11 +3229,11 @@ class MemberService {
     }
     searchMemberOtherMembers(memberId, searchTerm) {
         return this.apiService
-            .getCollection(searchMemberFactory, Role.MemberAdmin, MEMBER_OTHER_MEMBER_SEARCH_PATH, { memberId }, { params: { q: searchTerm } });
+            .getCollection(otherMemberFactory, Role.MemberAdmin, MEMBER_OTHER_MEMBER_SEARCH_PATH, { memberId }, { params: { q: searchTerm } });
     }
     searchTeamOtherMembers(teamId, searchTerm) {
         return this.apiService
-            .getCollection(searchMemberFactory, Role.TeamAdmin, TEAM_OTHER_MEMBER_SEARCH_PATH, { teamId }, { params: { q: searchTerm } });
+            .getCollection(otherMemberFactory, Role.TeamAdmin, TEAM_OTHER_MEMBER_SEARCH_PATH, { teamId }, { params: { q: searchTerm } });
     }
     updateMemberProfile(memberId, memberProfile) {
         return this.apiService
@@ -4106,5 +3910,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { APP, Activity, ActivityExtraMember, ActivityInvite, ActivityLocation, ActivityLocationGroup, ActivityLocationPart, ActivityLocationTag, ActivityService, ActivitySettings, ActivityType, Auth, AuthMember, AuthSection, AuthService, AuthTeam, AuthTeamSection, AuthenticatedGuard, Authentication, AuthenticationInterceptor, AuthenticationService, BookingCalendar, BookingCalendarApplicationTime, BookingCalendarService, BookingCalendarSlot, BookingCalendarSlotSession, BookingSettings, Calendar, CalendarEvent, Card, CardDeal, CardLogo, CardLogoUrls, CardMemberTicket, CardTheme, CardTicket, CardTicketLocation, Club, ClubImage, ClubSection, ClubService, Collection, ConstantService, Contact, CreditCard, DataAccessModule, Directory, Email, EmailService, Event, ExternalLink, ExternalLinkService, FileObject, FileService, GeneralImage, Giro, GroupRole, HandleGrantTokenGuard, HomeTeam, ImageUrls, InvoiceService, MaintenanceModeService, Member, MemberActivityInvite, MemberAttribute, MemberCard, MemberCardService, MemberContact, MemberFee, MemberFunction, MemberInvoice, MemberInvoiceRow, MemberPublicForm, MemberPublicFormField, MemberPublicFormFieldOption, MemberPublicFormService, MemberService, MemberTeam, MemberTeamThrough, MemberType, MemberValidationSettings, News, NewsService, Partner, PaymentAttempt, PaymentAttemptService, Role, SearchClub, SearchMember, SearchMemberCard, SearchMemberInvoice, SearchTeam, Section, SectionService, Swish, SwishQrCode, TeamService, Token, TokenService, USER_NOTIFICATIONS_PATH, UnpaidMemberInvoice, User, UserNotification, UserNotificationService, UserService, Zimpler };
+export { APP, Activity, ActivityExtraMember, ActivityInvite, ActivityLocation, ActivityLocationGroup, ActivityLocationPart, ActivityLocationTag, ActivityService, ActivitySettings, ActivityType, Auth, AuthMember, AuthSection, AuthService, AuthTeam, AuthTeamSection, AuthenticatedGuard, Authentication, AuthenticationInterceptor, AuthenticationService, BookingCalendar, BookingCalendarApplicationTime, BookingCalendarService, BookingCalendarSlot, BookingCalendarSlotSession, BookingSettings, BookingSlotFilter, Calendar, CalendarEvent, Card, CardDeal, CardLogo, CardLogoUrls, CardMemberTicket, CardTheme, CardTicket, CardTicketLocation, Club, ClubImage, ClubSection, ClubService, Collection, ConstantService, Contact, CreditCard, DataAccessModule, Directory, Email, EmailService, Event, ExternalLink, ExternalLinkService, FileObject, FileService, GeneralImage, Giro, GroupRole, HandleGrantTokenGuard, HomeTeam, ImageUrls, InvoiceService, MaintenanceModeService, Member, MemberActivityInvite, MemberAttribute, MemberCard, MemberCardService, MemberContact, MemberFee, MemberFunction, MemberInvoice, MemberInvoiceRow, MemberPublicForm, MemberPublicFormField, MemberPublicFormFieldOption, MemberPublicFormService, MemberService, MemberTeam, MemberTeamThrough, MemberType, MemberValidationSettings, News, NewsService, OtherMember, OtherMemberField, Partner, PaymentAttempt, PaymentAttemptService, Role, SearchClub, SearchMember, SearchMemberCard, SearchMemberInvoice, SearchTeam, Section, SectionService, Swish, SwishQrCode, TeamService, Token, TokenService, USER_NOTIFICATIONS_PATH, UnpaidMemberInvoice, User, UserNotification, UserNotificationService, UserService, Zimpler };
 //# sourceMappingURL=myclub_se-data-access.mjs.map