@myclub_se/data-access 2.1.0 → 2.2.1

package/fesm2020/myclub_se-data-access.mjs

@@ -108,13 +108,14 @@ class ActivityExtraMember {
 }
 
 class ActivityInvite {
-    constructor(id, activity, comment, created, has_unpaid_invoices, last_invite, member, next_invite, reminded, response_date, status, token, unpaid_invoices, updated) {
+    constructor(id, activity, comment, created, has_unpaid_invoices, last_invite, leader, member, next_invite, reminded, response_date, status, token, unpaid_invoices, updated) {
         this.id = id;
         this.activity = activity;
         this.comment = comment;
         this.created = created;
         this.has_unpaid_invoices = has_unpaid_invoices;
         this.last_invite = last_invite;
+        this.leader = leader;
         this.member = member;
         this.next_invite = next_invite;
         this.reminded = reminded;
@@ -257,7 +258,7 @@ class BookingCalendar {
 }
 
 class BookingCalendarSlot {
-    constructor(id, calendar_id, location_id, color, day, end_time, group_id, location_name, number_of_available_sessions, sessions, start_time, type, repeat, update_repeating, repeat_num, repeat_to_day, repeat_type) {
+    constructor(id, calendar_id, location_id, color, day, end_time, group_id, location_name, number_of_available_sessions, sessions, open_sessions, start_time, type, repeat, update_repeating, reserved_time_enabled, repeat_num, repeat_to_day, repeat_type, reserved_time, reserved_time_type, reserved_time_position) {
         this.id = id;
         this.calendar_id = calendar_id;
         this.location_id = location_id;
@@ -268,13 +269,18 @@ class BookingCalendarSlot {
         this.location_name = location_name;
         this.number_of_available_sessions = number_of_available_sessions;
         this.sessions = sessions;
+        this.open_sessions = open_sessions;
         this.start_time = start_time;
         this.type = type;
         this.repeat = repeat;
         this.update_repeating = update_repeating;
+        this.reserved_time_enabled = reserved_time_enabled;
         this.repeat_num = repeat_num;
         this.repeat_to_day = repeat_to_day;
         this.repeat_type = repeat_type;
+        this.reserved_time = reserved_time;
+        this.reserved_time_type = reserved_time_type;
+        this.reserved_time_position = reserved_time_position;
     }
     static asFormGroup(slot) {
         return new FormGroup({
@@ -291,13 +297,17 @@ class BookingCalendarSlot {
             repeat_num: new FormControl(slot?.repeat_num || 6, Validators.max(24)),
             repeat_to_day: new FormControl(slot?.repeat_to_day || ''),
             repeat_type: new FormControl(slot?.repeat_type || ''),
-            update_repeating: new FormControl(typeof slot?.update_repeating !== 'undefined' ? slot?.update_repeating : false)
+            update_repeating: new FormControl(typeof slot?.update_repeating !== 'undefined' ? slot?.update_repeating : false),
+            reserved_time_enabled: new FormControl(typeof slot?.reserved_time_enabled !== 'undefined' ? slot?.reserved_time_enabled : false),
+            reserved_time: new FormControl(slot?.reserved_time || '00:00'),
+            reserved_time_type: new FormControl(slot?.reserved_time_type || ''),
+            reserved_time_position: new FormControl(slot?.reserved_time_position || ''),
         });
     }
 }
 
 class BookingCalendarSlotSession {
-    constructor(id, section_id, slot_id, team_id, end_time, section_name, start_time, team_name) {
+    constructor(id, section_id, slot_id, team_id, end_time, section_name, start_time, team_name, is_overbooked, type) {
         this.id = id;
         this.section_id = section_id;
         this.slot_id = slot_id;
@@ -306,17 +316,21 @@ class BookingCalendarSlotSession {
         this.section_name = section_name;
         this.start_time = start_time;
         this.team_name = team_name;
+        this.is_overbooked = is_overbooked;
+        this.type = type;
     }
     static asFormGroup(session) {
         return new FormGroup({
             id: new FormControl(session?.id || ''),
             section_id: new FormControl(session?.section_id || ''),
             slot_id: new FormControl(session?.slot_id || '', Validators.required),
-            team_id: new FormControl(session?.team_id || ''),
+            team_id: new FormControl(session?.team_id || '', Validators.required),
             end_time: new FormControl(session?.end_time || '', Validators.required),
             section_name: new FormControl(session?.section_name || ''),
             start_time: new FormControl(session?.start_time || '', Validators.required),
-            team_name: new FormControl(session?.team_name || '')
+            team_name: new FormControl(session?.team_name || ''),
+            is_overbooked: new FormControl(session?.is_overbooked || false),
+            type: new FormControl(session?.type || '')
         });
     }
 }
@@ -1175,7 +1189,7 @@ class User {
             firstName: new FormControl(user?.firstName || ''),
             language: new FormControl(user?.language || 'sv'),
             lastName: new FormControl(user?.lastName || ''),
-            newEmail: new FormControl(user?.email || ''),
+            newEmail: new FormControl(user?.newEmail || ''),
             newPassword: new FormControl(''),
             verifyPassword: new FormControl(''),
             password: new FormControl('')
@@ -1309,7 +1323,7 @@ const activityFactory = (apiActivity) => new Activity(apiActivity.id, apiActivit
 
 const unpaidInvoiceFactory = (apiUnpaidInvoice) => new UnpaidMemberInvoice(apiUnpaidInvoice.id, apiUnpaidInvoice.club_bill_id, apiUnpaidInvoice.member_id, apiUnpaidInvoice.token);
 
-const activityInviteFactory = (apiActivityInvite) => new ActivityInvite(apiActivityInvite.id, activityFactory(apiActivityInvite.activity), apiActivityInvite.comment, apiActivityInvite.created, apiActivityInvite.has_unpaid_invoices, apiActivityInvite.last_invite, searchMemberFactory(apiActivityInvite.member), apiActivityInvite.next_invite, apiActivityInvite.reminded, apiActivityInvite.response_date, apiActivityInvite.status, apiActivityInvite.token, apiActivityInvite.unpaid_invoices && apiActivityInvite.unpaid_invoices.length ? apiActivityInvite.unpaid_invoices.map((apiUnpaidInvoice) => unpaidInvoiceFactory(apiUnpaidInvoice)) : [], apiActivityInvite.updated);
+const activityInviteFactory = (apiActivityInvite) => new ActivityInvite(apiActivityInvite.id, activityFactory(apiActivityInvite.activity), apiActivityInvite.comment, apiActivityInvite.created, apiActivityInvite.has_unpaid_invoices, apiActivityInvite.last_invite, apiActivityInvite.leader, searchMemberFactory(apiActivityInvite.member), apiActivityInvite.next_invite, apiActivityInvite.reminded, apiActivityInvite.response_date, apiActivityInvite.status, apiActivityInvite.token, apiActivityInvite.unpaid_invoices && apiActivityInvite.unpaid_invoices.length ? apiActivityInvite.unpaid_invoices.map((apiUnpaidInvoice) => unpaidInvoiceFactory(apiUnpaidInvoice)) : [], apiActivityInvite.updated);
 
 const activityLocationFactory = (apiActivityLocation) => new ActivityLocation(apiActivityLocation.id, apiActivityLocation.club_id, apiActivityLocation.section_id, apiActivityLocation.active, apiActivityLocation.mun_location_city_area, apiActivityLocation.mun_location_name, apiActivityLocation.name);
 
@@ -1717,9 +1731,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImpo
 
 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);
 
-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);
+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);
 
-const bookingCalendarSlotFactory = (apiBookingSlot) => new BookingCalendarSlot(apiBookingSlot.id, apiBookingSlot.calendar_id, 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.start_time, apiBookingSlot.type, 'none', false, 6, format(new Date(), 'yyyy-MM-dd'), 'repeat_until');
+const bookingCalendarSlotFactory = (apiBookingSlot) => new BookingCalendarSlot(apiBookingSlot.id, apiBookingSlot.calendar_id, 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_type, apiBookingSlot.reserved_time_position);
 
 const CLUB_BOOKING_CALENDARS_PATH = ':clubId/activities/calendars/';
 const CLUB_BOOKING_CALENDAR_PATH = ':clubId/activities/calendars/:id/';
@@ -2680,7 +2694,7 @@ class UserService {
             data['password'] = user.password;
         }
         if (user.newEmail) {
-            data['email'] = user.newEmail;
+            data['new_email'] = user.newEmail;
         }
         if (user.language) {
             data['language'] = user.language;
@@ -2793,7 +2807,7 @@ class AuthenticationInterceptor {
             request = this.addAuthorizationHeader(request, authentication.accessToken);
         }
         return next.handle(request).pipe(catchError((requestError) => {
-            if (requestError instanceof HttpErrorResponse && requestError.status === 401) {
+            if (request.url.indexOf('accounts/token/') === -1 && requestError instanceof HttpErrorResponse && requestError.status === 401) {
                 return this.handle401Error(request, next);
             }
             return throwError(() => requestError);