@myclub_se/data-access 2.14.0 → 2.15.1

package/fesm2015/myclub_se-data-access.mjs

@@ -152,10 +152,10 @@ class ActivityLocationPart {
         this.id = id;
         this.name = name;
     }
-    static asFormGroup(tag) {
+    static asFormGroup(part) {
         return new FormGroup({
-            id: new FormControl((tag === null || tag === void 0 ? void 0 : tag.id) || ''),
-            name: new FormControl((tag === null || tag === void 0 ? void 0 : tag.name) || '', Validators.required),
+            id: new FormControl((part === null || part === void 0 ? void 0 : part.id) || ''),
+            name: new FormControl((part === null || part === void 0 ? void 0 : part.name) || '', Validators.required),
         });
     }
 }
@@ -319,6 +319,86 @@ class Authentication {
     }
 }
 
+class BookableGroup {
+    constructor(id, club_id, section_id, active, name, bookable_items) {
+        this.id = id;
+        this.club_id = club_id;
+        this.section_id = section_id;
+        this.active = active;
+        this.name = name;
+        this.bookable_items = bookable_items;
+    }
+    static asFormGroup(bookableGroup) {
+        return new FormGroup({
+            id: new FormControl((bookableGroup === null || bookableGroup === void 0 ? void 0 : bookableGroup.id) || ''),
+            club_id: new FormControl((bookableGroup === null || bookableGroup === void 0 ? void 0 : bookableGroup.club_id) || '', Validators.required),
+            section_id: new FormControl((bookableGroup === null || bookableGroup === void 0 ? void 0 : bookableGroup.section_id) || ''),
+            name: new FormControl((bookableGroup === null || bookableGroup === void 0 ? void 0 : bookableGroup.name) || '', Validators.required),
+            active: new FormControl(typeof (bookableGroup === null || bookableGroup === void 0 ? void 0 : bookableGroup.active) !== 'undefined' ? bookableGroup === null || bookableGroup === void 0 ? void 0 : bookableGroup.active : false),
+        });
+    }
+}
+
+class BookableTag {
+    constructor(id, club_id, section_id, name, bookable_item_names = []) {
+        this.id = id;
+        this.club_id = club_id;
+        this.section_id = section_id;
+        this.name = name;
+        this.bookable_item_names = bookable_item_names;
+    }
+    static asFormGroup(tag) {
+        return new FormGroup({
+            id: new FormControl((tag === null || tag === void 0 ? void 0 : tag.id) || ''),
+            name: new FormControl((tag === null || tag === void 0 ? void 0 : tag.name) || '', Validators.required),
+        });
+    }
+}
+
+class BookablePart {
+    constructor(id, name) {
+        this.id = id;
+        this.name = name;
+    }
+    static asFormGroup(part) {
+        return new FormGroup({
+            id: new FormControl((part === null || part === void 0 ? void 0 : part.id) || ''),
+            name: new FormControl((part === null || part === void 0 ? void 0 : part.name) || '', Validators.required),
+        });
+    }
+}
+
+class BookableItem {
+    constructor(id, club_id, section_id, group_id, active, name, tags, parts) {
+        this.id = id;
+        this.club_id = club_id;
+        this.section_id = section_id;
+        this.group_id = group_id;
+        this.active = active;
+        this.name = name;
+        this.tags = tags;
+        this.parts = parts;
+    }
+    static asFormGroup(bookable) {
+        const tags = [];
+        const parts = [];
+        if (bookable === null || bookable === void 0 ? void 0 : bookable.tags) {
+            bookable.tags.forEach((tag) => tags.push(BookableTag.asFormGroup(tag)));
+        }
+        if (bookable === null || bookable === void 0 ? void 0 : bookable.parts) {
+            bookable.parts.forEach((part) => parts.push(BookablePart.asFormGroup(part)));
+        }
+        return new FormGroup({
+            id: new FormControl((bookable === null || bookable === void 0 ? void 0 : bookable.id) || ''),
+            club_id: new FormControl((bookable === null || bookable === void 0 ? void 0 : bookable.club_id) || '', Validators.required),
+            active: new FormControl(typeof (bookable === null || bookable === void 0 ? void 0 : bookable.active) !== 'undefined' ? bookable === null || bookable === void 0 ? void 0 : bookable.active : false),
+            group_id: new FormControl((bookable === null || bookable === void 0 ? void 0 : bookable.group_id) || ''),
+            tags: new FormArray(tags),
+            parts: new FormArray(parts),
+        });
+    }
+}
+
 class SearchTeam {
     constructor(club, section, id, club_name, name, section_name) {
         this.club = club;
@@ -337,7 +417,7 @@ class SearchTeam {
 }
 
 class BookingCalendar {
-    constructor(id, club_id, section_id, team_id, club_name, name, section_name, team_name, status, max_application_number, allow_team_export, allow_repeated_bookings, is_default, location_groups, available_for_teams) {
+    constructor(id, club_id, section_id, team_id, club_name, name, section_name, team_name, status, max_application_number, allow_team_export, allow_repeated_bookings, is_default, available_for_teams, bookable_groups) {
         this.id = id;
         this.club_id = club_id;
         this.section_id = section_id;
@@ -351,15 +431,15 @@ class BookingCalendar {
         this.allow_team_export = allow_team_export;
         this.allow_repeated_bookings = allow_repeated_bookings;
         this.is_default = is_default;
-        this.location_groups = location_groups;
         this.available_for_teams = available_for_teams;
+        this.bookable_groups = bookable_groups;
     }
     static asFormGroup(calendar) {
-        const locationGroups = [];
+        const bookableGroups = [];
         const availableForTeams = [];
-        if (calendar === null || calendar === void 0 ? void 0 : calendar.location_groups) {
-            calendar.location_groups.forEach((locationGroup) => {
-                locationGroups.push(ActivityLocationGroup.asFormGroup(locationGroup));
+        if (calendar === null || calendar === void 0 ? void 0 : calendar.bookable_groups) {
+            calendar.bookable_groups.forEach((bookableGroup) => {
+                bookableGroups.push(BookableGroup.asFormGroup(bookableGroup));
             });
         }
         if (calendar === null || calendar === void 0 ? void 0 : calendar.available_for_teams) {
@@ -377,7 +457,7 @@ class BookingCalendar {
             section_name: new FormControl((calendar === null || calendar === void 0 ? void 0 : calendar.section_name) || ''),
             team_name: new FormControl((calendar === null || calendar === void 0 ? void 0 : calendar.team_name) || ''),
             status: new FormControl((calendar === null || calendar === void 0 ? void 0 : calendar.status) || 'preliminary'),
-            location_groups: new FormArray(locationGroups),
+            bookable_groups: new FormArray(bookableGroups),
             available_for_teams: new FormArray(availableForTeams),
             max_application_number: new FormControl((calendar === null || calendar === void 0 ? void 0 : calendar.max_application_number) || 0),
             is_default: new FormControl((calendar === null || calendar === void 0 ? void 0 : calendar.is_default) || false),
@@ -388,7 +468,7 @@ class BookingCalendar {
 }
 
 class BookingCalendarApplicationTime {
-    constructor(id, section_id, slot_id, team_id, title, end_time, section_name, start_time, team_name, location_zones_taken, applicant_comment, reviewer_comment, status, location_part_id, location_part_name, location_id, repeat, activity_type_id, color = null, slot_start_time, slot_end_time, slot_day, slot_number_of_available_sessions, slot_last_repeating_date, created, location_name) {
+    constructor(id, section_id, slot_id, team_id, title, end_time, section_name, start_time, team_name, applicant_comment, reviewer_comment, status, repeat, activity_type_id, color = null, slot_start_time, slot_end_time, slot_day, slot_number_of_available_sessions, slot_last_repeating_date, created, bookable_zones_taken, bookable_part_id, bookable_part_name, bookable_id, bookable_name) {
         this.id = id;
         this.section_id = section_id;
         this.slot_id = slot_id;
@@ -398,13 +478,9 @@ class BookingCalendarApplicationTime {
         this.section_name = section_name;
         this.start_time = start_time;
         this.team_name = team_name;
-        this.location_zones_taken = location_zones_taken;
         this.applicant_comment = applicant_comment;
         this.reviewer_comment = reviewer_comment;
         this.status = status;
-        this.location_part_id = location_part_id;
-        this.location_part_name = location_part_name;
-        this.location_id = location_id;
         this.repeat = repeat;
         this.activity_type_id = activity_type_id;
         this.color = color;
@@ -414,7 +490,11 @@ class BookingCalendarApplicationTime {
         this.slot_number_of_available_sessions = slot_number_of_available_sessions;
         this.slot_last_repeating_date = slot_last_repeating_date;
         this.created = created;
-        this.location_name = location_name;
+        this.bookable_zones_taken = bookable_zones_taken;
+        this.bookable_part_id = bookable_part_id;
+        this.bookable_part_name = bookable_part_name;
+        this.bookable_id = bookable_id;
+        this.bookable_name = bookable_name;
     }
     static asFormGroup(session) {
         return new FormGroup({
@@ -427,28 +507,26 @@ class BookingCalendarApplicationTime {
             section_name: new FormControl((session === null || session === void 0 ? void 0 : session.section_name) || ''),
             start_time: new FormControl((session === null || session === void 0 ? void 0 : session.start_time) || '', Validators.required),
             team_name: new FormControl((session === null || session === void 0 ? void 0 : session.team_name) || ''),
-            location_zones_taken: new FormControl((session === null || session === void 0 ? void 0 : session.location_zones_taken) || 1, [Validators.min(1), Validators.required]),
             applicant_comment: new FormControl((session === null || session === void 0 ? void 0 : session.applicant_comment) || null),
             reviewer_comment: new FormControl((session === null || session === void 0 ? void 0 : session.reviewer_comment) || null),
             status: new FormControl((session === null || session === void 0 ? void 0 : session.status) || ''),
-            location_part_id: new FormControl((session === null || session === void 0 ? void 0 : session.location_part_id) || ''),
             repeat: new FormControl((session === null || session === void 0 ? void 0 : session.repeat) || false),
             activity_type_id: new FormControl((session === null || session === void 0 ? void 0 : session.activity_type_id) || null),
+            bookable_zones_taken: new FormControl((session === null || session === void 0 ? void 0 : session.bookable_zones_taken) || 1, [Validators.min(1), Validators.required]),
+            bookable_part_id: new FormControl((session === null || session === void 0 ? void 0 : session.bookable_part_id) || ''),
         });
     }
 }
 
 class BookingCalendarSlot {
-    constructor(id, calendar_id, calendar_status, location_id, color, day, end_time, group_id, location_name, number_of_available_sessions, sessions, open_sessions, start_time, type, repeat, update_repeating, update_until_date = null, reserved_time_enabled, repeat_num, repeat_to_day, repeat_type, reserved_time, reserved_time_position, application_times, last_repeating_date) {
+    constructor(id, calendar_id, calendar_status, color, day, end_time, group_id, number_of_available_sessions, sessions, open_sessions, start_time, type, repeat, update_repeating, update_until_date = null, reserved_time_enabled, repeat_num, repeat_to_day, repeat_type, reserved_time, reserved_time_position, application_times, last_repeating_date, bookable_name, bookable_id) {
         this.id = id;
         this.calendar_id = calendar_id;
         this.calendar_status = calendar_status;
-        this.location_id = location_id;
         this.color = color;
         this.day = day;
         this.end_time = end_time;
         this.group_id = group_id;
-        this.location_name = location_name;
         this.number_of_available_sessions = number_of_available_sessions;
         this.sessions = sessions;
         this.open_sessions = open_sessions;
@@ -465,12 +543,13 @@ class BookingCalendarSlot {
         this.reserved_time_position = reserved_time_position;
         this.application_times = application_times;
         this.last_repeating_date = last_repeating_date;
+        this.bookable_name = bookable_name;
+        this.bookable_id = bookable_id;
     }
     static asFormGroup(slot) {
         return new FormGroup({
             id: new FormControl((slot === null || slot === void 0 ? void 0 : slot.id) || ''),
             calendar_id: new FormControl((slot === null || slot === void 0 ? void 0 : slot.calendar_id) || '', Validators.required),
-            location_id: new FormControl((slot === null || slot === void 0 ? void 0 : slot.location_id) || '', Validators.required),
             day: new FormControl((slot === null || slot === void 0 ? void 0 : slot.day) || '', Validators.required),
             end_time: new FormControl((slot === null || slot === void 0 ? void 0 : slot.end_time) || '', Validators.required),
             group_id: new FormControl((slot === null || slot === void 0 ? void 0 : slot.group_id) || null, { nonNullable: false }),
@@ -486,12 +565,13 @@ class BookingCalendarSlot {
             reserved_time_enabled: new FormControl(typeof (slot === null || slot === void 0 ? void 0 : slot.reserved_time_enabled) !== 'undefined' ? slot === null || slot === void 0 ? void 0 : slot.reserved_time_enabled : false),
             reserved_time: new FormControl((slot === null || slot === void 0 ? void 0 : slot.reserved_time) || '00:00'),
             reserved_time_position: new FormControl((slot === null || slot === void 0 ? void 0 : slot.reserved_time_position) || ''),
+            bookable_id: new FormControl((slot === null || slot === void 0 ? void 0 : slot.bookable_id) || '', Validators.required),
         });
     }
 }
 
 class BookingCalendarSlotSession {
-    constructor(id, section_id, slot_id, team_id, title, end_time, section_name, start_time, team_name, is_overbooked, last_repeating_date, type, location_zones_taken, slot_index, comment, location_part_id, location_part_name, location_name, location_id, day, repeat, activity_type_id, color = null, update_repeating, update_until_date = null) {
+    constructor(id, section_id, slot_id, team_id, title, end_time, section_name, start_time, team_name, is_overbooked, last_repeating_date, type, slot_index, comment, day, repeat, activity_type_id, color = null, update_repeating, update_until_date = null, bookable_zones_taken, bookable_part_id, bookable_part_name, bookable_name, bookable_id) {
         this.id = id;
         this.section_id = section_id;
         this.slot_id = slot_id;
@@ -504,19 +584,19 @@ class BookingCalendarSlotSession {
         this.is_overbooked = is_overbooked;
         this.last_repeating_date = last_repeating_date;
         this.type = type;
-        this.location_zones_taken = location_zones_taken;
         this.slot_index = slot_index;
         this.comment = comment;
-        this.location_part_id = location_part_id;
-        this.location_part_name = location_part_name;
-        this.location_name = location_name;
-        this.location_id = location_id;
         this.day = day;
         this.repeat = repeat;
         this.activity_type_id = activity_type_id;
         this.color = color;
         this.update_repeating = update_repeating;
         this.update_until_date = update_until_date;
+        this.bookable_zones_taken = bookable_zones_taken;
+        this.bookable_part_id = bookable_part_id;
+        this.bookable_part_name = bookable_part_name;
+        this.bookable_name = bookable_name;
+        this.bookable_id = bookable_id;
     }
     static asFormGroup(session) {
         return new FormGroup({
@@ -532,13 +612,13 @@ class BookingCalendarSlotSession {
             is_overbooked: new FormControl((session === null || session === void 0 ? void 0 : session.is_overbooked) || false),
             last_repeating_date: new FormControl((session === null || session === void 0 ? void 0 : session.last_repeating_date) || null),
             type: new FormControl((session === null || session === void 0 ? void 0 : session.type) || ''),
-            location_zones_taken: new FormControl((session === null || session === void 0 ? void 0 : session.location_zones_taken) || 1, [Validators.min(1), Validators.required]),
             comment: new FormControl((session === null || session === void 0 ? void 0 : session.comment) || ''),
-            location_part_id: new FormControl((session === null || session === void 0 ? void 0 : session.location_part_id) || ''),
             repeat: new FormControl((session === null || session === void 0 ? void 0 : session.repeat) || false),
             activity_type_id: new FormControl((session === null || session === void 0 ? void 0 : session.activity_type_id) || null),
             update_repeating: new FormControl(!!(session === null || session === void 0 ? void 0 : session.update_repeating) || false),
             update_until_date: new FormControl(null),
+            bookable_zones_taken: new FormControl((session === null || session === void 0 ? void 0 : session.bookable_zones_taken) || 1, [Validators.min(1), Validators.required]),
+            bookable_part_id: new FormControl((session === null || session === void 0 ? void 0 : session.bookable_part_id) || ''),
         });
     }
 }
@@ -1177,7 +1257,7 @@ class MemberAttribute {
             name: new FormControl((attribute === null || attribute === void 0 ? void 0 : attribute.name) || ''),
             options: attributeOptions,
             type: new FormControl((attribute === null || attribute === void 0 ? void 0 : attribute.type) || 'text'),
-            value: new FormControl((attribute === null || attribute === void 0 ? void 0 : attribute.type) === 'bool' ? attribute === null || attribute === void 0 ? void 0 : attribute.value : (attribute === null || attribute === void 0 ? void 0 : attribute.value) || '')
+            value: new FormControl((attribute === null || attribute === void 0 ? void 0 : attribute.type) === 'bool' ? attribute === null || attribute === void 0 ? void 0 : attribute.value : ((attribute === null || attribute === void 0 ? void 0 : attribute.type) === 'date' ? (attribute === null || attribute === void 0 ? void 0 : attribute.value) || undefined : (attribute === null || attribute === void 0 ? void 0 : attribute.value) || ''))
         });
     }
 }
@@ -1427,11 +1507,11 @@ class News {
         }
         return new FormGroup({
             id: new FormControl((news === null || news === void 0 ? void 0 : news.id) || ''),
-            active_to: new FormControl((news === null || news === void 0 ? void 0 : news.active_to) || ''),
+            active_to: new FormControl((news === null || news === void 0 ? void 0 : news.active_to) || undefined),
             ingress: new FormControl((news === null || news === void 0 ? void 0 : news.ingress) || '', [Validators.required, Validators.minLength(1)]),
             news_image: new FormControl((news === null || news === void 0 ? void 0 : news.news_image) || ''),
             news_image_text: new FormControl((news === null || news === void 0 ? void 0 : news.news_image_text) || ''),
-            published_date: new FormControl((news === null || news === void 0 ? void 0 : news.published_date) || ''),
+            published_date: new FormControl((news === null || news === void 0 ? void 0 : news.published_date) || undefined),
             show_on_my_pages: new FormControl(show_on_my_pages),
             show_on_webpage: new FormControl(show_on_webpage),
             text: new FormControl((news === null || news === void 0 ? void 0 : news.text) || '', [Validators.required, Validators.minLength(1)]),
@@ -1513,6 +1593,16 @@ class OptionalFee {
     }
 }
 
+class OverbookedBookableItem {
+    constructor(start_time, end_time, day, bookable_name, session_names) {
+        this.start_time = start_time;
+        this.end_time = end_time;
+        this.day = day;
+        this.bookable_name = bookable_name;
+        this.session_names = session_names;
+    }
+}
+
 class OverbookedLocation {
     constructor(start_time, end_time, day, location_name, session_names) {
         this.start_time = start_time;
@@ -1689,19 +1779,33 @@ const authTeamFactory = (apiAuthTeam) => new AuthTeam(apiAuthTeam.id, apiAuthTea
 
 const authFactory = (apiAuth) => new Auth(apiAuth.id, apiAuth.name, apiAuth.club_admin, apiAuth.is_section_club, apiAuth.members.map((apiAuthMember) => authMemberFactory(apiAuthMember)), apiAuth.registration_enabled, apiAuth.sections.map((apiAuthSection) => authSectionFactory(apiAuthSection)), apiAuth.site_enabled, apiAuth.teams.map((apiAuthTeam) => authTeamFactory(apiAuthTeam)), apiAuth.user_name);
 
+const bookablePartFactory = (apiBookablePart) => {
+    return new BookablePart(apiBookablePart.id, apiBookablePart.name);
+};
+
+const bookableTagFactory = (apiBookableTag) => {
+    return new BookableTag(apiBookableTag.id, apiBookableTag.club_id, apiBookableTag.section_id, apiBookableTag.name, apiBookableTag.bookable_item_names);
+};
+
+const bookableItemFactory = (apiBookableItem) => new BookableItem(apiBookableItem.id, apiBookableItem.club_id, apiBookableItem.section_id, apiBookableItem.group_id, apiBookableItem.active, apiBookableItem.name, apiBookableItem.tags && apiBookableItem.tags.length > 0 ? apiBookableItem.tags.map((apiBookableTag) => bookableTagFactory(apiBookableTag)) : [], apiBookableItem.parts && apiBookableItem.parts.length > 0 ? apiBookableItem.parts.map((apiBookablePart) => bookablePartFactory(apiBookablePart)) : []);
+
+const bookableGroupFactory = (apiBookableGroup) => {
+    return new BookableGroup(apiBookableGroup.id, apiBookableGroup.club_id, apiBookableGroup.section_id, apiBookableGroup.active, apiBookableGroup.name, apiBookableGroup.bookable_items && apiBookableGroup.bookable_items.length ? apiBookableGroup.bookable_items.map((apiBookableItem) => bookableItemFactory(apiBookableItem)) : []);
+};
+
 const clubFactory = (apiClub) => new Club(apiClub.id, apiClub.name);
 
 const sectionFactory = (apiSection) => new Section(apiSection.id, apiSection.name);
 
 const searchTeamFactory = (apiSearchTeam) => new SearchTeam(apiSearchTeam.club ? clubFactory(apiSearchTeam.club) : undefined, apiSearchTeam.section ? sectionFactory(apiSearchTeam.section) : undefined, apiSearchTeam.id, apiSearchTeam.club_name, apiSearchTeam.name, apiSearchTeam.section_name);
 
-const bookingCalendarFactory = (apiBookingCalendar) => new BookingCalendar(apiBookingCalendar.id, apiBookingCalendar.club_id, apiBookingCalendar.section_id, apiBookingCalendar.team_id, apiBookingCalendar.club_name, apiBookingCalendar.name, apiBookingCalendar.section_name, apiBookingCalendar.team_name, apiBookingCalendar.status, apiBookingCalendar.max_application_number, apiBookingCalendar.allow_team_export, apiBookingCalendar.allow_repeated_bookings, apiBookingCalendar.is_default, apiBookingCalendar.location_groups && apiBookingCalendar.location_groups.length ? apiBookingCalendar.location_groups.map((apiActivityLocationGroup) => activityLocationGroupFactory(apiActivityLocationGroup)) : [], apiBookingCalendar.available_for_teams && apiBookingCalendar.available_for_teams.length ? apiBookingCalendar.available_for_teams.map((apiSearchTeam) => searchTeamFactory(apiSearchTeam)) : []);
+const bookingCalendarFactory = (apiBookingCalendar) => new BookingCalendar(apiBookingCalendar.id, apiBookingCalendar.club_id, apiBookingCalendar.section_id, apiBookingCalendar.team_id, apiBookingCalendar.club_name, apiBookingCalendar.name, apiBookingCalendar.section_name, apiBookingCalendar.team_name, apiBookingCalendar.status, apiBookingCalendar.max_application_number, apiBookingCalendar.allow_team_export, apiBookingCalendar.allow_repeated_bookings, apiBookingCalendar.is_default, apiBookingCalendar.available_for_teams && apiBookingCalendar.available_for_teams.length ? apiBookingCalendar.available_for_teams.map((apiSearchTeam) => searchTeamFactory(apiSearchTeam)) : [], apiBookingCalendar.bookable_groups && apiBookingCalendar.bookable_groups.length ? apiBookingCalendar.bookable_groups.map((apiBookableGroup) => bookableGroupFactory(apiBookableGroup)) : []);
 
-const bookingCalendarApplicationTimeFactory = (apiBookingApplicationTime) => new BookingCalendarApplicationTime(apiBookingApplicationTime.id, apiBookingApplicationTime.section_id, apiBookingApplicationTime.slot_id, apiBookingApplicationTime.team_id, apiBookingApplicationTime.title, apiBookingApplicationTime.end_time, apiBookingApplicationTime.section_name, apiBookingApplicationTime.start_time, apiBookingApplicationTime.team_name, apiBookingApplicationTime.location_zones_taken, apiBookingApplicationTime.applicant_comment, apiBookingApplicationTime.reviewer_comment, apiBookingApplicationTime.status, apiBookingApplicationTime.location_part_id, apiBookingApplicationTime.location_part_name, apiBookingApplicationTime.location_id, apiBookingApplicationTime.repeat, apiBookingApplicationTime.activity_type_id, apiBookingApplicationTime.color, apiBookingApplicationTime.slot_start_time, apiBookingApplicationTime.slot_end_time, apiBookingApplicationTime.slot_day, apiBookingApplicationTime.slot_number_of_available_sessions, apiBookingApplicationTime.slot_last_repeating_date, apiBookingApplicationTime.created, apiBookingApplicationTime.location_name);
+const bookingCalendarApplicationTimeFactory = (apiBookingApplicationTime) => new BookingCalendarApplicationTime(apiBookingApplicationTime.id, apiBookingApplicationTime.section_id, apiBookingApplicationTime.slot_id, apiBookingApplicationTime.team_id, apiBookingApplicationTime.title, apiBookingApplicationTime.end_time, apiBookingApplicationTime.section_name, apiBookingApplicationTime.start_time, apiBookingApplicationTime.team_name, apiBookingApplicationTime.applicant_comment, apiBookingApplicationTime.reviewer_comment, apiBookingApplicationTime.status, apiBookingApplicationTime.repeat, apiBookingApplicationTime.activity_type_id, apiBookingApplicationTime.color, apiBookingApplicationTime.slot_start_time, apiBookingApplicationTime.slot_end_time, apiBookingApplicationTime.slot_day, apiBookingApplicationTime.slot_number_of_available_sessions, apiBookingApplicationTime.slot_last_repeating_date, apiBookingApplicationTime.created, apiBookingApplicationTime.bookable_zones_taken, apiBookingApplicationTime.bookable_part_id, apiBookingApplicationTime.bookable_part_name, apiBookingApplicationTime.bookable_id, apiBookingApplicationTime.bookable_name);
 
-const bookingCalendarSlotSessionFactory = (apiBookingSlotSession) => new BookingCalendarSlotSession(apiBookingSlotSession.id, apiBookingSlotSession.section_id, apiBookingSlotSession.slot_id, apiBookingSlotSession.team_id, apiBookingSlotSession.title, apiBookingSlotSession.end_time, apiBookingSlotSession.section_name, apiBookingSlotSession.start_time, apiBookingSlotSession.team_name, apiBookingSlotSession.is_overbooked, apiBookingSlotSession.last_repeating_date, apiBookingSlotSession.type, apiBookingSlotSession.location_zones_taken, apiBookingSlotSession.slot_index, apiBookingSlotSession.comment, apiBookingSlotSession.location_part_id, apiBookingSlotSession.location_part_name, apiBookingSlotSession.location_name, apiBookingSlotSession.location_id, apiBookingSlotSession.day, apiBookingSlotSession.repeat, apiBookingSlotSession.activity_type_id, apiBookingSlotSession.color, apiBookingSlotSession.update_repeating, apiBookingSlotSession.update_until_date);
+const bookingCalendarSlotSessionFactory = (apiBookingSlotSession) => new BookingCalendarSlotSession(apiBookingSlotSession.id, apiBookingSlotSession.section_id, apiBookingSlotSession.slot_id, apiBookingSlotSession.team_id, apiBookingSlotSession.title, apiBookingSlotSession.end_time, apiBookingSlotSession.section_name, apiBookingSlotSession.start_time, apiBookingSlotSession.team_name, apiBookingSlotSession.is_overbooked, apiBookingSlotSession.last_repeating_date, apiBookingSlotSession.type, apiBookingSlotSession.slot_index, apiBookingSlotSession.comment, apiBookingSlotSession.day, apiBookingSlotSession.repeat, apiBookingSlotSession.activity_type_id, apiBookingSlotSession.color, apiBookingSlotSession.update_repeating, apiBookingSlotSession.update_until_date, apiBookingSlotSession.bookable_zones_taken, apiBookingSlotSession.bookable_part_id, apiBookingSlotSession.bookable_part_name, apiBookingSlotSession.bookable_name, apiBookingSlotSession.bookable_id);
 
-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', apiBookingSlot.update_repeating, apiBookingSlot.update_until_date, 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 bookingCalendarSlotFactory = (apiBookingSlot) => new BookingCalendarSlot(apiBookingSlot.id, apiBookingSlot.calendar_id, apiBookingSlot.calendar_status, apiBookingSlot.color, apiBookingSlot.day, apiBookingSlot.end_time, apiBookingSlot.group_id, 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', apiBookingSlot.update_repeating, apiBookingSlot.update_until_date, 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, apiBookingSlot.bookable_name, apiBookingSlot.bookable_id);
 
 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);
 
@@ -1797,6 +1901,8 @@ const optionalFeeFactory = (apiOptionalFee) => new OptionalFee(apiOptionalFee.id
 
 const openActivityFactory = (apiOpenActivity) => new OpenActivity(apiOpenActivity.id, apiOpenActivity.activity_group_id, apiOpenActivity.activity_type_id, apiOpenActivity.club_id, apiOpenActivity.location_id, apiOpenActivity.member_id, apiOpenActivity.team_id, apiOpenActivity.activity_location, apiOpenActivity.activity_type_name, apiOpenActivity.allow_maybe, apiOpenActivity.calendar_name, apiOpenActivity.created, apiOpenActivity.current_num_attendants, apiOpenActivity.day, apiOpenActivity.default_fee, apiOpenActivity.description, apiOpenActivity.end, apiOpenActivity.end_time, apiOpenActivity.file, apiOpenActivity.invitation_text, apiOpenActivity.invite_first_days, [], apiOpenActivity.invite_hide_before_sent, apiOpenActivity.invite_last_response_date, apiOpenActivity.invite_remind, apiOpenActivity.invite_remind_receivers, apiOpenActivity.invite_second_days, 'same_as_last', (apiOpenActivity.invited_members && apiOpenActivity.invited_members.length) ? apiOpenActivity.invited_members.map((invitedMember) => memberActivityInviteFactory(invitedMember)) : [], apiOpenActivity.last_response_date, apiOpenActivity.location_name, apiOpenActivity.max_num_attendants, apiOpenActivity.max_num_attendants_type, apiOpenActivity.meet_up_place, apiOpenActivity.meet_up_time, apiOpenActivity.meet_up_time_display, apiOpenActivity.meet_up_time_show, apiOpenActivity.member_invoice, apiOpenActivity.member_name, apiOpenActivity.open_activity, (apiOpenActivity.optional_fees && apiOpenActivity.optional_fees.length) ? apiOpenActivity.optional_fees.map((fee) => optionalFeeFactory(fee)) : [], apiOpenActivity.optional_fee_required, apiOpenActivity.optional_fee_type, 'none', 6, format(new Date(), 'yyyy-MM-dd'), 'repeat_until', apiOpenActivity.show_other_invited, apiOpenActivity.start, apiOpenActivity.start_time, apiOpenActivity.status, apiOpenActivity.title, apiOpenActivity.updated, apiOpenActivity.use_invite, false);
 
+const overbookedBookableItemFactory = (apiOverbookedBookableItem) => new OverbookedBookableItem(apiOverbookedBookableItem.start_time, apiOverbookedBookableItem.end_time, apiOverbookedBookableItem.day, apiOverbookedBookableItem.bookable_name, apiOverbookedBookableItem.session_names);
+
 const overbookedLocationFactory = (apiOverbookedLocation) => new OverbookedLocation(apiOverbookedLocation.start_time, apiOverbookedLocation.end_time, apiOverbookedLocation.day, apiOverbookedLocation.location_name, apiOverbookedLocation.session_names);
 
 const otherMemberFieldFactory = (apiOtherMemberFieldFactory) => new OtherMemberField(apiOtherMemberFieldFactory.display_name, apiOtherMemberFieldFactory.field_name, apiOtherMemberFieldFactory.value);
@@ -2033,24 +2139,11 @@ const TEAM_ACTIVITY_TYPES_PATH = ':teamId/activities/types/';
 const TEAM_CALENDAR_PATH = ':teamId/activities/calendar/';
 const CLUB_ACTIVITY_LOCATIONS_PATH = ':clubId/activities/locations/';
 const CLUB_ACTIVITY_LOCATION_PATH = ':clubId/activities/locations/:locationId/';
-const CLUB_ACTIVITY_LOCATION_GROUPS_PATH = ':clubId/activities/locations/groups/';
-const CLUB_ACTIVITY_LOCATION_GROUP_PATH = ':clubId/activities/locations/groups/:groupId/';
-const CLUB_ACTIVITY_LOCATION_TAGS_PATH = ':clubId/activities/locations/tags/';
-const CLUB_ACTIVITY_LOCATION_TAG_PATH = ':clubId/activities/locations/tags/:tagId/';
-const CLUB_ACTIVITY_LOCATION_PARTS_PATH = ':clubId/activities/locations/:locationId/parts/';
 const CLUB_ACTIVITY_TYPES_PATH = ':clubId/activities/types/';
 const CLUB_ACTIVITY_TYPE_PATH = ':clubId/activities/types/:typeId/';
 const TEAM_ACTIVITY_LOCATIONS_PATH = ':teamId/activities/locations/';
-const TEAM_ACTIVITY_LOCATION_GROUPS_PATH = ':teamId/activities/locations/groups/';
-const TEAM_ACTIVITY_LOCATION_TAGS_PATH = ':teamId/activities/locations/tags/';
-const TEAM_ACTIVITY_LOCATION_PARTS_PATH = ':teamId/activities/locations/:locationId/parts/';
 const SECTION_ACTIVITY_LOCATIONS_PATH = ':sectionId/activities/locations/';
 const SECTION_ACTIVITY_LOCATION_PATH = ':sectionId/activities/locations/:locationId/';
-const SECTION_ACTIVITY_LOCATION_GROUPS_PATH = ':sectionId/activities/locations/groups/';
-const SECTION_ACTIVITY_LOCATION_GROUP_PATH = ':sectionId/activities/locations/groups/:groupId/';
-const SECTION_ACTIVITY_LOCATION_TAGS_PATH = ':sectionId/activities/locations/tags/';
-const SECTION_ACTIVITY_LOCATION_TAG_PATH = ':sectionId/activities/locations/tags/:tagId/';
-const SECTION_ACTIVITY_LOCATION_PARTS_PATH = ':sectionId/activities/locations/:locationId/parts/';
 const SECTION_ACTIVITY_TYPES_PATH = ':sectionId/activities/types/';
 const SECTION_ACTIVITY_TYPE_PATH = ':sectionId/activities/types/:typeId/';
 class ActivityService {
@@ -2251,179 +2344,6 @@ class ActivityService {
             locationId: location.id
         }, location);
     }
-    getActivityLocationGroups(role, clubOrSectionOrTeamId) {
-        if (role == Role.ClubAdmin) {
-            return this.getClubActivityLocationGroups(clubOrSectionOrTeamId);
-        }
-        else if (role == Role.SectionAdmin) {
-            return this.getSectionActivityLocationGroups(clubOrSectionOrTeamId);
-        }
-        return this.getTeamActivityLocationGroups(clubOrSectionOrTeamId);
-    }
-    getClubActivityLocationGroups(clubId) {
-        return this.apiService
-            .getCollection(activityLocationGroupFactory, Role.ClubAdmin, CLUB_ACTIVITY_LOCATION_GROUPS_PATH, { clubId }, { params: { limit: 'null' } });
-    }
-    getSectionActivityLocationGroups(sectionId) {
-        return this.apiService
-            .getCollection(activityLocationGroupFactory, Role.SectionAdmin, SECTION_ACTIVITY_LOCATION_GROUPS_PATH, { sectionId }, { params: { limit: 'null' } });
-    }
-    getTeamActivityLocationGroups(teamId) {
-        return this.apiService
-            .getCollection(activityLocationGroupFactory, Role.TeamAdmin, TEAM_ACTIVITY_LOCATION_GROUPS_PATH, { teamId }, { params: { limit: 'null' } });
-    }
-    updateActivityLocationGroup(role, clubOrSectionOrTeamId, locationGroup) {
-        if (role === Role.ClubAdmin) {
-            return this.updateClubActivityLocationGroup(clubOrSectionOrTeamId, locationGroup);
-        }
-        return this.updateSectionActivityLocationGroup(clubOrSectionOrTeamId, locationGroup);
-    }
-    updateClubActivityLocationGroup(clubId, locationGroup) {
-        return this.apiService
-            .updateResource(activityLocationGroupFactory, Role.ClubAdmin, CLUB_ACTIVITY_LOCATION_GROUP_PATH, {
-            clubId,
-            groupId: locationGroup.id
-        }, locationGroup);
-    }
-    updateSectionActivityLocationGroup(sectionId, locationGroup) {
-        return this.apiService
-            .updateResource(activityLocationGroupFactory, Role.SectionAdmin, SECTION_ACTIVITY_LOCATION_GROUP_PATH, {
-            sectionId,
-            groupId: locationGroup.id
-        }, locationGroup);
-    }
-    createActivityLocationGroup(role, clubOrSectionOrTeamId, locationGroup) {
-        if (role === Role.ClubAdmin) {
-            return this.createClubActivityLocationGroup(clubOrSectionOrTeamId, locationGroup);
-        }
-        return this.createSectionActivityLocationGroup(clubOrSectionOrTeamId, locationGroup);
-    }
-    createClubActivityLocationGroup(clubId, locationGroup) {
-        delete locationGroup.id;
-        return this.apiService
-            .postResource(activityLocationGroupFactory, Role.ClubAdmin, CLUB_ACTIVITY_LOCATION_GROUPS_PATH, {
-            clubId,
-        }, locationGroup);
-    }
-    createSectionActivityLocationGroup(sectionId, locationGroup) {
-        delete locationGroup.id;
-        return this.apiService
-            .postResource(activityLocationGroupFactory, Role.SectionAdmin, SECTION_ACTIVITY_LOCATION_GROUPS_PATH, {
-            sectionId,
-        }, locationGroup);
-    }
-    getActivityLocationTags(role, clubOrSectionOrTeamId) {
-        if (role == Role.ClubAdmin) {
-            return this.getClubActivityLocationTags(clubOrSectionOrTeamId);
-        }
-        else if (role == Role.SectionAdmin) {
-            return this.getSectionActivityLocationTags(clubOrSectionOrTeamId);
-        }
-        return this.getTeamActivityLocationTags(clubOrSectionOrTeamId);
-    }
-    getClubActivityLocationTags(clubId) {
-        return this.apiService
-            .getCollection(activityLocationTagFactory, Role.ClubAdmin, CLUB_ACTIVITY_LOCATION_TAGS_PATH, { clubId }, { params: { limit: 'null' } });
-    }
-    getSectionActivityLocationTags(sectionId) {
-        return this.apiService
-            .getCollection(activityLocationTagFactory, Role.SectionAdmin, SECTION_ACTIVITY_LOCATION_TAGS_PATH, { sectionId }, { params: { limit: 'null' } });
-    }
-    getTeamActivityLocationTags(teamId) {
-        return this.apiService
-            .getCollection(activityLocationTagFactory, Role.TeamAdmin, TEAM_ACTIVITY_LOCATION_TAGS_PATH, { teamId }, { params: { limit: 'null' } });
-    }
-    createActivityLocationTag(role, clubOrSectionOrTeamId, tag) {
-        if (role == Role.ClubAdmin) {
-            return this.createClubActivityLocationTag(clubOrSectionOrTeamId, tag);
-        }
-        else if (role == Role.SectionAdmin) {
-            return this.createSectionActivityLocationTag(clubOrSectionOrTeamId, tag);
-        }
-        return this.createTeamActivityLocationTag(clubOrSectionOrTeamId, tag);
-    }
-    createClubActivityLocationTag(clubId, tag) {
-        delete tag.id;
-        return this.apiService
-            .postResource(activityLocationTagFactory, Role.ClubAdmin, CLUB_ACTIVITY_LOCATION_TAGS_PATH, {
-            clubId,
-        }, tag);
-    }
-    createSectionActivityLocationTag(sectionId, tag) {
-        delete tag.id;
-        return this.apiService
-            .postResource(activityLocationTagFactory, Role.SectionAdmin, SECTION_ACTIVITY_LOCATION_TAGS_PATH, {
-            sectionId,
-        }, tag);
-    }
-    createTeamActivityLocationTag(teamId, tag) {
-        delete tag.id;
-        return this.apiService
-            .postResource(activityLocationTagFactory, Role.TeamAdmin, TEAM_ACTIVITY_LOCATION_TAGS_PATH, {
-            teamId,
-        }, tag);
-    }
-    updateActivityLocationTag(role, clubOrSectionOrTeamId, tag) {
-        if (role == Role.ClubAdmin) {
-            return this.updateClubActivityLocationTag(clubOrSectionOrTeamId, tag);
-        }
-        return this.updateSectionActivityLocationTag(clubOrSectionOrTeamId, tag);
-    }
-    updateClubActivityLocationTag(clubId, tag) {
-        return this.apiService
-            .updateResource(activityLocationTagFactory, Role.ClubAdmin, CLUB_ACTIVITY_LOCATION_TAG_PATH, {
-            clubId,
-            tagId: tag.id,
-        }, tag);
-    }
-    updateSectionActivityLocationTag(sectionId, tag) {
-        return this.apiService
-            .updateResource(activityLocationTagFactory, Role.SectionAdmin, SECTION_ACTIVITY_LOCATION_TAG_PATH, {
-            sectionId,
-            tagId: tag.id,
-        }, tag);
-    }
-    deleteActivityLocationTag(role, clubOrSectionOrTeamId, tag) {
-        if (role == Role.ClubAdmin) {
-            return this.deleteClubActivityLocationTag(clubOrSectionOrTeamId, tag);
-        }
-        return this.deleteSectionActivityLocationTag(clubOrSectionOrTeamId, tag);
-    }
-    deleteClubActivityLocationTag(clubId, tag) {
-        return this.apiService
-            .deleteResource(Role.ClubAdmin, CLUB_ACTIVITY_LOCATION_TAG_PATH, {
-            clubId,
-            tagId: tag.id,
-        });
-    }
-    deleteSectionActivityLocationTag(sectionId, tag) {
-        return this.apiService
-            .deleteResource(Role.SectionAdmin, SECTION_ACTIVITY_LOCATION_TAG_PATH, {
-            sectionId,
-            tagId: tag.id,
-        });
-    }
-    getActivityLocationParts(role, clubOrSectionOrTeamId, locationId) {
-        if (role == Role.ClubAdmin) {
-            return this.getClubActivityLocationParts(clubOrSectionOrTeamId, locationId);
-        }
-        else if (role == Role.SectionAdmin) {
-            return this.getSectionActivityLocationParts(clubOrSectionOrTeamId, locationId);
-        }
-        return this.getTeamActivityLocationParts(clubOrSectionOrTeamId, locationId);
-    }
-    getClubActivityLocationParts(clubId, locationId) {
-        return this.apiService
-            .getCollection(activityLocationPartFactory, Role.ClubAdmin, CLUB_ACTIVITY_LOCATION_PARTS_PATH, { clubId, locationId }, { params: { limit: 'null' } });
-    }
-    getSectionActivityLocationParts(sectionId, locationId) {
-        return this.apiService
-            .getCollection(activityLocationPartFactory, Role.SectionAdmin, SECTION_ACTIVITY_LOCATION_PARTS_PATH, { sectionId, locationId }, { params: { limit: 'null' } });
-    }
-    getTeamActivityLocationParts(teamId, locationId) {
-        return this.apiService
-            .getCollection(activityLocationPartFactory, Role.TeamAdmin, TEAM_ACTIVITY_LOCATION_PARTS_PATH, { teamId, locationId }, { params: { limit: 'null' } });
-    }
     getTeamActivityNew(teamId) {
         return this.apiService
             .getResource(activityFactory, Role.TeamAdmin, TEAM_ACTIVITY_NEW_PATH, { teamId });
@@ -2649,6 +2569,259 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImpo
                 }]
         }], ctorParameters: function () { return [{ type: ApiService }]; } });
 
+const CLUB_BOOKABLES_PATH = ':clubId/activities/bookables/';
+const CLUB_BOOKABLE_PATH = ':clubId/activities/bookables/:bookableId/';
+const CLUB_BOOKABLE_GROUPS_PATH = ':clubId/activities/bookables/groups/';
+const CLUB_BOOKABLE_GROUP_PATH = ':clubId/activities/bookables/groups/:groupId/';
+const CLUB_BOOKABLE_TAGS_PATH = ':clubId/activities/bookables/tags/';
+const CLUB_BOOKABLE_TAG_PATH = ':clubId/activities/bookables/tags/:tagId/';
+const CLUB_BOOKABLE_PARTS_PATH = ':clubId/activities/bookables/:bookableId/parts/';
+const TEAM_BOOKABLES_PATH = ':teamId/activities/bookables/';
+const TEAM_BOOKABLE_GROUPS_PATH = ':teamId/activities/bookables/groups/';
+const TEAM_BOOKABLE_TAGS_PATH = ':teamId/activities/bookables/tags/';
+const TEAM_BOOKABLE_PARTS_PATH = ':teamId/activities/bookables/:bookableId/parts/';
+const SECTION_BOOKABLES_PATH = ':sectionId/activities/bookables/';
+const SECTION_BOOKABLE_PATH = ':sectionId/activities/bookables/:bookableId/';
+const SECTION_BOOKABLE_GROUPS_PATH = ':sectionId/activities/bookables/groups/';
+const SECTION_BOOKABLE_GROUP_PATH = ':sectionId/activities/bookables/groups/:groupId/';
+const SECTION_BOOKABLE_TAGS_PATH = ':sectionId/activities/bookables/tags/';
+const SECTION_BOOKABLE_TAG_PATH = ':sectionId/activities/bookables/tags/:tagId/';
+const SECTION_BOOKABLE_PARTS_PATH = ':sectionId/activities/bookables/:bookableId/parts/';
+class BookableService {
+    constructor(apiService) {
+        this.apiService = apiService;
+    }
+    // region Bookable Items
+    getBookableItems(role, clubOrSectionOrTeamId) {
+        if (role == Role.ClubAdmin) {
+            return this.getClubBookableItems(clubOrSectionOrTeamId);
+        }
+        else if (role == Role.SectionAdmin) {
+            return this.getSectionBookableItems(clubOrSectionOrTeamId);
+        }
+        return this.getTeamBookableItems(clubOrSectionOrTeamId);
+    }
+    getTeamBookableItems(teamId) {
+        return this.apiService
+            .getCollection(bookableItemFactory, Role.TeamAdmin, TEAM_BOOKABLES_PATH, { teamId }, { params: { limit: 'null' } });
+    }
+    getClubBookableItems(clubId) {
+        return this.apiService
+            .getCollection(bookableItemFactory, Role.ClubAdmin, CLUB_BOOKABLES_PATH, { clubId }, { params: { limit: 'null' } });
+    }
+    getSectionBookableItems(sectionId) {
+        return this.apiService
+            .getCollection(bookableItemFactory, Role.SectionAdmin, SECTION_BOOKABLES_PATH, { sectionId }, { params: { limit: 'null' } });
+    }
+    updateBookableItem(role, clubOrSectionOrTeamId, bookableItem) {
+        if (role === Role.ClubAdmin) {
+            return this.updateClubBookableItem(clubOrSectionOrTeamId, bookableItem);
+        }
+        return this.updateSectionBookableItem(clubOrSectionOrTeamId, bookableItem);
+    }
+    updateClubBookableItem(clubId, bookableItem) {
+        return this.apiService
+            .updateResource(bookableItemFactory, Role.ClubAdmin, CLUB_BOOKABLE_PATH, {
+            clubId,
+            bookableId: bookableItem.id
+        }, bookableItem);
+    }
+    updateSectionBookableItem(sectionId, bookableItem) {
+        return this.apiService
+            .updateResource(bookableItemFactory, Role.SectionAdmin, SECTION_BOOKABLE_PATH, {
+            sectionId,
+            bookableId: bookableItem.id
+        }, bookableItem);
+    }
+    // endregion
+    // region Bookable Groups
+    getBookableGroups(role, clubOrSectionOrTeamId) {
+        if (role == Role.ClubAdmin) {
+            return this.getClubBookableGroups(clubOrSectionOrTeamId);
+        }
+        else if (role == Role.SectionAdmin) {
+            return this.getSectionBookableGroups(clubOrSectionOrTeamId);
+        }
+        return this.getTeamBookableGroups(clubOrSectionOrTeamId);
+    }
+    getClubBookableGroups(clubId) {
+        return this.apiService
+            .getCollection(bookableGroupFactory, Role.ClubAdmin, CLUB_BOOKABLE_GROUPS_PATH, { clubId }, { params: { limit: 'null' } });
+    }
+    getSectionBookableGroups(sectionId) {
+        return this.apiService
+            .getCollection(bookableGroupFactory, Role.SectionAdmin, SECTION_BOOKABLE_GROUPS_PATH, { sectionId }, { params: { limit: 'null' } });
+    }
+    getTeamBookableGroups(teamId) {
+        return this.apiService
+            .getCollection(bookableGroupFactory, Role.TeamAdmin, TEAM_BOOKABLE_GROUPS_PATH, { teamId }, { params: { limit: 'null' } });
+    }
+    updateBookableGroup(role, clubOrSectionOrTeamId, bookableGroup) {
+        if (role === Role.ClubAdmin) {
+            return this.updateClubBookableGroup(clubOrSectionOrTeamId, bookableGroup);
+        }
+        return this.updateSectionBookableGroup(clubOrSectionOrTeamId, bookableGroup);
+    }
+    updateClubBookableGroup(clubId, bookableGroup) {
+        return this.apiService
+            .updateResource(bookableGroupFactory, Role.ClubAdmin, CLUB_BOOKABLE_GROUP_PATH, {
+            clubId,
+            groupId: bookableGroup.id
+        }, bookableGroup);
+    }
+    updateSectionBookableGroup(sectionId, bookableGroup) {
+        return this.apiService
+            .updateResource(bookableGroupFactory, Role.SectionAdmin, SECTION_BOOKABLE_GROUP_PATH, {
+            sectionId,
+            groupId: bookableGroup.id
+        }, bookableGroup);
+    }
+    createBookableGroup(role, clubOrSectionOrTeamId, bookableGroup) {
+        if (role === Role.ClubAdmin) {
+            return this.createClubBookableGroup(clubOrSectionOrTeamId, bookableGroup);
+        }
+        return this.createSectionBookableGroup(clubOrSectionOrTeamId, bookableGroup);
+    }
+    createClubBookableGroup(clubId, bookableGroup) {
+        delete bookableGroup.id;
+        return this.apiService
+            .postResource(bookableGroupFactory, Role.ClubAdmin, CLUB_BOOKABLE_GROUPS_PATH, {
+            clubId,
+        }, bookableGroup);
+    }
+    createSectionBookableGroup(sectionId, bookableGroup) {
+        delete bookableGroup.id;
+        return this.apiService
+            .postResource(bookableGroupFactory, Role.SectionAdmin, SECTION_BOOKABLE_GROUPS_PATH, {
+            sectionId,
+        }, bookableGroup);
+    }
+    // endregion
+    // region Bookable Tags
+    getBookableTags(role, clubOrSectionOrTeamId) {
+        if (role == Role.ClubAdmin) {
+            return this.getClubBookableTags(clubOrSectionOrTeamId);
+        }
+        else if (role == Role.SectionAdmin) {
+            return this.getSectionBookableTags(clubOrSectionOrTeamId);
+        }
+        return this.getTeamBookableTags(clubOrSectionOrTeamId);
+    }
+    getClubBookableTags(clubId) {
+        return this.apiService
+            .getCollection(bookableTagFactory, Role.ClubAdmin, CLUB_BOOKABLE_TAGS_PATH, { clubId }, { params: { limit: 'null' } });
+    }
+    getSectionBookableTags(sectionId) {
+        return this.apiService
+            .getCollection(bookableTagFactory, Role.SectionAdmin, SECTION_BOOKABLE_TAGS_PATH, { sectionId }, { params: { limit: 'null' } });
+    }
+    getTeamBookableTags(teamId) {
+        return this.apiService
+            .getCollection(bookableTagFactory, Role.TeamAdmin, TEAM_BOOKABLE_TAGS_PATH, { teamId }, { params: { limit: 'null' } });
+    }
+    createBookableTag(role, clubOrSectionOrTeamId, tag) {
+        if (role == Role.ClubAdmin) {
+            return this.createClubBookableTag(clubOrSectionOrTeamId, tag);
+        }
+        else if (role == Role.SectionAdmin) {
+            return this.createSectionBookableTag(clubOrSectionOrTeamId, tag);
+        }
+        return this.createTeamBookableTag(clubOrSectionOrTeamId, tag);
+    }
+    createClubBookableTag(clubId, tag) {
+        delete tag.id;
+        return this.apiService
+            .postResource(bookableTagFactory, Role.ClubAdmin, CLUB_BOOKABLE_TAGS_PATH, {
+            clubId,
+        }, tag);
+    }
+    createSectionBookableTag(sectionId, tag) {
+        delete tag.id;
+        return this.apiService
+            .postResource(bookableTagFactory, Role.SectionAdmin, SECTION_BOOKABLE_TAGS_PATH, {
+            sectionId,
+        }, tag);
+    }
+    createTeamBookableTag(teamId, tag) {
+        delete tag.id;
+        return this.apiService
+            .postResource(bookableTagFactory, Role.TeamAdmin, TEAM_BOOKABLE_TAGS_PATH, {
+            teamId,
+        }, tag);
+    }
+    updateBookableTag(role, clubOrSectionOrTeamId, tag) {
+        if (role == Role.ClubAdmin) {
+            return this.updateClubBookableTag(clubOrSectionOrTeamId, tag);
+        }
+        return this.updateSectionBookableTag(clubOrSectionOrTeamId, tag);
+    }
+    updateClubBookableTag(clubId, tag) {
+        return this.apiService
+            .updateResource(bookableTagFactory, Role.ClubAdmin, CLUB_BOOKABLE_TAG_PATH, {
+            clubId,
+            tagId: tag.id,
+        }, tag);
+    }
+    updateSectionBookableTag(sectionId, tag) {
+        return this.apiService
+            .updateResource(bookableTagFactory, Role.SectionAdmin, SECTION_BOOKABLE_TAG_PATH, {
+            sectionId,
+            tagId: tag.id,
+        }, tag);
+    }
+    deleteBookableTag(role, clubOrSectionOrTeamId, tag) {
+        if (role == Role.ClubAdmin) {
+            return this.deleteClubBookableTag(clubOrSectionOrTeamId, tag);
+        }
+        return this.deleteSectionBookableTag(clubOrSectionOrTeamId, tag);
+    }
+    deleteClubBookableTag(clubId, tag) {
+        return this.apiService
+            .deleteResource(Role.ClubAdmin, CLUB_BOOKABLE_TAG_PATH, {
+            clubId,
+            tagId: tag.id,
+        });
+    }
+    deleteSectionBookableTag(sectionId, tag) {
+        return this.apiService
+            .deleteResource(Role.SectionAdmin, SECTION_BOOKABLE_TAG_PATH, {
+            sectionId,
+            tagId: tag.id,
+        });
+    }
+    // endregion
+    // region Bookable Parts
+    getBookableParts(role, clubOrSectionOrTeamId, bookableId) {
+        if (role == Role.ClubAdmin) {
+            return this.getClubBookableParts(clubOrSectionOrTeamId, bookableId);
+        }
+        else if (role == Role.SectionAdmin) {
+            return this.getSectionBookableParts(clubOrSectionOrTeamId, bookableId);
+        }
+        return this.getTeamBookableParts(clubOrSectionOrTeamId, bookableId);
+    }
+    getClubBookableParts(clubId, bookableId) {
+        return this.apiService
+            .getCollection(bookablePartFactory, Role.ClubAdmin, CLUB_BOOKABLE_PARTS_PATH, { clubId, bookableId }, { params: { limit: 'null' } });
+    }
+    getSectionBookableParts(sectionId, bookableId) {
+        return this.apiService
+            .getCollection(bookablePartFactory, Role.SectionAdmin, SECTION_BOOKABLE_PARTS_PATH, { sectionId, bookableId }, { params: { limit: 'null' } });
+    }
+    getTeamBookableParts(teamId, bookableId) {
+        return this.apiService
+            .getCollection(bookablePartFactory, Role.TeamAdmin, TEAM_BOOKABLE_PARTS_PATH, { teamId, bookableId }, { params: { limit: 'null' } });
+    }
+}
+BookableService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: BookableService, deps: [{ token: ApiService }], target: i0.ɵɵFactoryTarget.Injectable });
+BookableService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: BookableService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: BookableService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: ApiService }]; } });
+
 const CLUB_BOOKING_CALENDARS_PATH = ':clubId/activities/calendars/';
 const CLUB_BOOKING_CALENDAR_PATH = ':clubId/activities/calendars/:id/';
 const CLUB_BOOKING_CALENDAR_SLOTS_PATH = ':clubId/activities/slots/';
@@ -2664,8 +2837,8 @@ const CLUB_BOOKING_CALENDAR_REPEATABLE_SESSION_PATH = ':clubId/activities/sessio
 const CLUB_BOOKING_SETTINGS_PATH = ':clubId/activities/booking-settings/';
 const CLUB_BOOKING_CALENDAR_APPLICATION_TIME_PATH = ':clubId/activities/application-times/:id/';
 const CLUB_BOOKING_CALENDAR_APPLICATION_TIMES_PATH = ':clubId/activities/application-times/';
-const CLUB_BOOKING_OVERBOOKED_LOCATIONS_PATH = ':clubId/activities/overbooked/locations/';
 const CLUB_BOOKING_OVERBOOKED_SESSIONS_PATH = ':clubId/activities/overbooked/sessions/';
+const CLUB_BOOKING_OVERBOOKED_BOOKABLES_PATH = ':clubId/activities/overbooked/bookables/';
 const SECTION_BOOKING_CALENDARS_PATH = ':sectionId/activities/calendars/';
 const SECTION_BOOKING_CALENDAR_PATH = ':sectionId/activities/calendars/:id/';
 const SECTION_BOOKING_CALENDAR_SLOTS_PATH = ':sectionId/activities/slots/';
@@ -2681,8 +2854,8 @@ const SECTION_BOOKING_CALENDAR_REPEATABLE_SESSION_PATH = ':sectionId/activities/
 const SECTION_BOOKING_SETTINGS_PATH = ':sectionId/activities/booking-settings/';
 const SECTION_BOOKING_CALENDAR_APPLICATION_TIME_PATH = ':sectionId/activities/application-times/:id/';
 const SECTION_BOOKING_CALENDAR_APPLICATION_TIMES_PATH = ':sectionId/activities/application-times/';
-const SECTION_BOOKING_OVERBOOKED_LOCATIONS_PATH = ':sectionId/activities/overbooked/locations/';
 const SECTION_BOOKING_OVERBOOKED_SESSIONS_PATH = ':sectionId/activities/overbooked/sessions/';
+const SECTION_BOOKING_OVERBOOKED_BOOKABLES_PATH = ':sectionId/activities/overbooked/bookables/';
 const TEAM_BOOKING_CALENDARS_PATH = ':teamId/activities/calendars/';
 const TEAM_BOOKING_CALENDAR_SLOTS_PATH = ':teamId/activities/slots/';
 const TEAM_BOOKING_CALENDAR_SLOTS_SYNC_PATH = ':teamId/activities/slots/sync/';
@@ -2694,21 +2867,22 @@ const TEAM_BOOKING_CALENDAR_SLOT_PATH = ':teamId/activities/slots/: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 = [], locationIds = [], tagIds = [], teamIds = [], locationGroupIds = [], activityTypeIds = [], hasOpenSessions = null, showApplicationTimes = null, sortBy = null) {
+    constructor(startDate = null, endDate = null, calendarIds = [], locationIds = [], bookableItemIds = [], tagIds = [], teamIds = [], bookableGroupIds = [], activityTypeIds = [], hasOpenSessions = null, showApplicationTimes = null, sortBy = null) {
         this.startDate = startDate;
         this.endDate = endDate;
         this.calendarIds = calendarIds;
         this.locationIds = locationIds;
+        this.bookableItemIds = bookableItemIds;
         this.tagIds = tagIds;
         this.teamIds = teamIds;
-        this.locationGroupIds = locationGroupIds;
+        this.bookableGroupIds = bookableGroupIds;
         this.activityTypeIds = activityTypeIds;
         this.hasOpenSessions = hasOpenSessions;
         this.showApplicationTimes = showApplicationTimes;
         this.sortBy = sortBy;
     }
     static fromFilter(filter) {
-        return new this(filter.startDate, filter.endDate, filter.calendarIds, filter.locationIds, filter.tagIds, filter.teamIds, filter.locationGroupIds, filter.activityTypeIds, filter.hasOpenSessions, filter.showApplicationTimes, filter.sortBy);
+        return new this(filter.startDate, filter.endDate, filter.calendarIds, filter.locationIds, filter.bookableItemIds, filter.tagIds, filter.teamIds, filter.bookableGroupIds, filter.activityTypeIds, filter.hasOpenSessions, filter.showApplicationTimes, filter.sortBy);
     }
     toParams() {
         const params = { limit: 'null' };
@@ -2724,11 +2898,14 @@ class BookingSlotFilter {
         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.bookableItemIds && this.bookableItemIds.length) {
+            params['bookable_id'] = this.bookableItemIds.join(',');
+        }
+        if (this.bookableGroupIds && this.bookableGroupIds.length) {
+            params['bookable_group_id'] = this.bookableGroupIds.join(',');
         }
         if (this.tagIds && this.tagIds.length) {
-            params['tag_id'] = this.tagIds.join(',');
+            params['bookable_tag_id'] = this.tagIds.join(',');
         }
         if (this.teamIds && this.teamIds.length) {
             params['team_id'] = this.teamIds.join(',');
@@ -3381,46 +3558,46 @@ class BookingCalendarService {
         });
     }
     // endregion
-    // region Overbooked locations
-    getOverbookedLocations(role, clubOrSectionOrTeamId, bookingSlotFilter) {
+    // region Overbooked sessions
+    getOverbookedSessions(role, clubOrSectionOrTeamId, bookingSlotFilter) {
         if (role == Role.ClubAdmin) {
-            return this.getClubOverbookedLocations(clubOrSectionOrTeamId, bookingSlotFilter);
+            return this.getClubOverbookedSessions(clubOrSectionOrTeamId, bookingSlotFilter);
         }
-        return this.getSectionOverbookedLocations(clubOrSectionOrTeamId, bookingSlotFilter);
+        return this.getSectionOverbookedSessions(clubOrSectionOrTeamId, bookingSlotFilter);
     }
-    getClubOverbookedLocations(clubId, bookingSlotFilter) {
+    getClubOverbookedSessions(clubId, bookingSlotFilter) {
         const params = bookingSlotFilter.toParams();
         return this.apiService
-            .getCollection(overbookedLocationFactory, Role.ClubAdmin, CLUB_BOOKING_OVERBOOKED_LOCATIONS_PATH, { clubId }, {
+            .getCollection(bookingCalendarSlotSessionFactory, Role.ClubAdmin, CLUB_BOOKING_OVERBOOKED_SESSIONS_PATH, { clubId }, {
             params
         });
     }
-    getSectionOverbookedLocations(sectionId, bookingSlotFilter) {
+    getSectionOverbookedSessions(sectionId, bookingSlotFilter) {
         const params = bookingSlotFilter.toParams();
         return this.apiService
-            .getCollection(overbookedLocationFactory, Role.SectionAdmin, SECTION_BOOKING_OVERBOOKED_LOCATIONS_PATH, { sectionId }, {
+            .getCollection(bookingCalendarSlotSessionFactory, Role.SectionAdmin, SECTION_BOOKING_OVERBOOKED_SESSIONS_PATH, { sectionId }, {
             params
         });
     }
     // endregion
-    // region Overbooked sessions
-    getOverbookedSessions(role, clubOrSectionOrTeamId, bookingSlotFilter) {
+    // region Overbooked bookables
+    getOverbookedBookables(role, clubOrSectionOrTeamId, bookingSlotFilter) {
         if (role == Role.ClubAdmin) {
-            return this.getClubOverbookedSessions(clubOrSectionOrTeamId, bookingSlotFilter);
+            return this.getClubOverbookedBookables(clubOrSectionOrTeamId, bookingSlotFilter);
         }
-        return this.getSectionOverbookedSessions(clubOrSectionOrTeamId, bookingSlotFilter);
+        return this.getSectionOverbookedBookables(clubOrSectionOrTeamId, bookingSlotFilter);
     }
-    getClubOverbookedSessions(clubId, bookingSlotFilter) {
+    getClubOverbookedBookables(clubId, bookingSlotFilter) {
         const params = bookingSlotFilter.toParams();
         return this.apiService
-            .getCollection(bookingCalendarSlotSessionFactory, Role.ClubAdmin, CLUB_BOOKING_OVERBOOKED_SESSIONS_PATH, { clubId }, {
+            .getCollection(overbookedBookableItemFactory, Role.ClubAdmin, CLUB_BOOKING_OVERBOOKED_BOOKABLES_PATH, { clubId }, {
             params
         });
     }
-    getSectionOverbookedSessions(sectionId, bookingSlotFilter) {
+    getSectionOverbookedBookables(sectionId, bookingSlotFilter) {
         const params = bookingSlotFilter.toParams();
         return this.apiService
-            .getCollection(bookingCalendarSlotSessionFactory, Role.SectionAdmin, SECTION_BOOKING_OVERBOOKED_SESSIONS_PATH, { sectionId }, {
+            .getCollection(overbookedBookableItemFactory, Role.SectionAdmin, SECTION_BOOKING_OVERBOOKED_BOOKABLES_PATH, { sectionId }, {
             params
         });
     }
@@ -4629,5 +4806,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, ActivityParticipant, 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, OpenActivity, OptionalFee, OtherMember, OtherMemberField, OverbookedLocation, Partner, PaymentAttempt, PaymentAttemptService, PublicAuthentication, RegistrationQRCode, RegistrationQRCodeService, 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, ActivityParticipant, ActivityService, ActivitySettings, ActivityType, Auth, AuthMember, AuthSection, AuthService, AuthTeam, AuthTeamSection, AuthenticatedGuard, Authentication, AuthenticationInterceptor, AuthenticationService, BookableGroup, BookableItem, BookablePart, BookableService, BookableTag, 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, OpenActivity, OptionalFee, OtherMember, OtherMemberField, OverbookedBookableItem, OverbookedLocation, Partner, PaymentAttempt, PaymentAttemptService, PublicAuthentication, RegistrationQRCode, RegistrationQRCodeService, 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