@myclub_se/data-access 2.7.2 → 2.7.3

package/fesm2020/myclub_se-data-access.mjs

@@ -318,7 +318,7 @@ class BookingCalendar {
 }
 
 class BookingCalendarApplicationTime {
-    constructor(id, section_id, slot_id, team_id, 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) {
+    constructor(id, section_id, slot_id, team_id, 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) {
         this.id = id;
         this.section_id = section_id;
         this.slot_id = slot_id;
@@ -335,6 +335,7 @@ class BookingCalendarApplicationTime {
         this.location_part_name = location_part_name;
         this.location_id = location_id;
         this.repeat = repeat;
+        this.activity_type_id = activity_type_id;
     }
     static asFormGroup(session) {
         return new FormGroup({
@@ -352,6 +353,7 @@ class BookingCalendarApplicationTime {
             status: new FormControl(session?.status || ''),
             location_part_id: new FormControl(session?.location_part_id || ''),
             repeat: new FormControl(session?.repeat || false),
+            activity_type_id: new FormControl(session?.activity_type_id || null),
         });
     }
 }
@@ -407,7 +409,7 @@ class BookingCalendarSlot {
 }
 
 class BookingCalendarSlotSession {
-    constructor(id, section_id, slot_id, team_id, end_time, section_name, start_time, team_name, is_overbooked, type, location_zones_taken, slot_index, comment, location_part_id, location_part_name, location_id, repeat) {
+    constructor(id, section_id, slot_id, team_id, end_time, section_name, start_time, team_name, is_overbooked, type, location_zones_taken, slot_index, comment, location_part_id, location_part_name, location_id, repeat, activity_type_id) {
         this.id = id;
         this.section_id = section_id;
         this.slot_id = slot_id;
@@ -425,6 +427,7 @@ class BookingCalendarSlotSession {
         this.location_part_name = location_part_name;
         this.location_id = location_id;
         this.repeat = repeat;
+        this.activity_type_id = activity_type_id;
     }
     static asFormGroup(session) {
         return new FormGroup({
@@ -442,6 +445,7 @@ class BookingCalendarSlotSession {
             comment: new FormControl(session?.comment || ''),
             location_part_id: new FormControl(session?.location_part_id || ''),
             repeat: new FormControl(session?.repeat || false),
+            activity_type_id: new FormControl(session?.activity_type_id || null),
         });
     }
 }
@@ -1585,9 +1589,9 @@ const authFactory = (apiAuth) => new Auth(apiAuth.id, apiAuth.name, apiAuth.club
 
 const bookingCalendarFactory = (apiBookingCalendar) => new BookingCalendar(apiBookingCalendar.id, apiBookingCalendar.club_id, apiBookingCalendar.section_id, apiBookingCalendar.team_id, apiBookingCalendar.club_name, apiBookingCalendar.color, apiBookingCalendar.name, apiBookingCalendar.section_name, apiBookingCalendar.team_name, apiBookingCalendar.status);
 
-const bookingCalendarApplicationTimeFactory = (apiBookingApplicationTime) => new BookingCalendarApplicationTime(apiBookingApplicationTime.id, apiBookingApplicationTime.section_id, apiBookingApplicationTime.slot_id, apiBookingApplicationTime.team_id, 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);
+const bookingCalendarApplicationTimeFactory = (apiBookingApplicationTime) => new BookingCalendarApplicationTime(apiBookingApplicationTime.id, apiBookingApplicationTime.section_id, apiBookingApplicationTime.slot_id, apiBookingApplicationTime.team_id, 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);
 
-const bookingCalendarSlotSessionFactory = (apiBookingSlotSession) => new BookingCalendarSlotSession(apiBookingSlotSession.id, apiBookingSlotSession.section_id, apiBookingSlotSession.slot_id, apiBookingSlotSession.team_id, apiBookingSlotSession.end_time, apiBookingSlotSession.section_name, apiBookingSlotSession.start_time, apiBookingSlotSession.team_name, apiBookingSlotSession.is_overbooked, apiBookingSlotSession.type, apiBookingSlotSession.location_zones_taken, apiBookingSlotSession.slot_index, apiBookingSlotSession.comment, apiBookingSlotSession.location_part_id, apiBookingSlotSession.location_part_name, apiBookingSlotSession.location_id, apiBookingSlotSession.repeat);
+const bookingCalendarSlotSessionFactory = (apiBookingSlotSession) => new BookingCalendarSlotSession(apiBookingSlotSession.id, apiBookingSlotSession.section_id, apiBookingSlotSession.slot_id, apiBookingSlotSession.team_id, apiBookingSlotSession.end_time, apiBookingSlotSession.section_name, apiBookingSlotSession.start_time, apiBookingSlotSession.team_name, apiBookingSlotSession.is_overbooked, apiBookingSlotSession.type, apiBookingSlotSession.location_zones_taken, apiBookingSlotSession.slot_index, apiBookingSlotSession.comment, apiBookingSlotSession.location_part_id, apiBookingSlotSession.location_part_name, apiBookingSlotSession.location_id, apiBookingSlotSession.repeat, apiBookingSlotSession.activity_type_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', 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);
 
@@ -1798,6 +1802,7 @@ 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_PARTS_PATH = ':clubId/activities/locations/:locationId/parts/';
+const CLUB_ACTIVITY_TYPES_PATH = ':clubId/activities/types/';
 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/';
@@ -1808,6 +1813,7 @@ const SECTION_ACTIVITY_LOCATION_GROUPS_PATH = ':sectionId/activities/locations/g
 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_PARTS_PATH = ':sectionId/activities/locations/:locationId/parts/';
+const SECTION_ACTIVITY_TYPES_PATH = ':sectionId/activities/types/';
 class ActivityService {
     constructor(apiService) {
         this.apiService = apiService;
@@ -2109,15 +2115,26 @@ class ActivityService {
             clubId,
         });
     }
-    getTeamActivityTypes(teamId) {
-        if (this.activityTypeResponseDate && this.activityTypeResponseDate > sub(new Date(), { hours: 1 })) {
-            return of(this.activityTypeCollection);
+    getActivityTypes(role, clubOrSectionOrTeamId) {
+        if (role === Role.ClubAdmin) {
+            return this.getClubActivityTypes(clubOrSectionOrTeamId);
         }
+        else if (role === Role.SectionAdmin) {
+            return this.getSectionActivityTypes(clubOrSectionOrTeamId);
+        }
+        return this.getTeamActivityTypes(clubOrSectionOrTeamId);
+    }
+    getTeamActivityTypes(teamId) {
         return this.apiService
-            .getCollection(activityTypeFactory, Role.TeamAdmin, TEAM_ACTIVITY_TYPES_PATH, { teamId }, { params: { limit: 'null' } }).pipe(tap((activityTypeCollection) => {
-            this.activityTypeResponseDate = new Date();
-            this.activityTypeCollection = activityTypeCollection;
-        }));
+            .getCollection(activityTypeFactory, Role.TeamAdmin, TEAM_ACTIVITY_TYPES_PATH, { teamId }, { params: { limit: 'null' } });
+    }
+    getClubActivityTypes(clubId) {
+        return this.apiService
+            .getCollection(activityTypeFactory, Role.ClubAdmin, CLUB_ACTIVITY_TYPES_PATH, { clubId }, { params: { limit: 'null' } });
+    }
+    getSectionActivityTypes(sectionId) {
+        return this.apiService
+            .getCollection(activityTypeFactory, Role.SectionAdmin, SECTION_ACTIVITY_TYPES_PATH, { sectionId }, { params: { limit: 'null' } });
     }
     getTeamCalendarEvents(teamId, startDate = null, endDate = null) {
         const params = { limit: 'null' };