@myclub_se/data-access 1.1.0 → 1.5.3

package/fesm2020/myclub_se-data-access.mjs

@@ -1,11 +1,11 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Inject, NgModule } from '@angular/core';
 import * as i1 from '@angular/common/http';
-import { HttpErrorResponse, HttpParams, HttpRequest, HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
-import { map, catchError, tap, mergeMap } from 'rxjs/operators';
+import { HttpErrorResponse, HttpParams, HttpRequest, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { map, catchError, tap, filter, take, switchMap } from 'rxjs/operators';
 import { of, throwError, BehaviorSubject } from 'rxjs';
 import { FormGroup, FormControl, Validators, FormArray } from '@angular/forms';
-import { format } from 'date-fns';
+import { format, sub } from 'date-fns';
 import * as i2 from '@angular/router';
 
 class Activity {
@@ -79,6 +79,7 @@ class Activity {
             invite_settings: new FormControl(activity?.invite_settings || ''),
             last_response_date: new FormControl(activity?.last_response_date || ''),
             max_num_attendants: new FormControl(activity?.max_num_attendants || 0),
+            max_num_attendants_type: new FormControl(activity?.max_num_attendants_type || 'only_participants'),
             meet_up_place: new FormControl(activity?.meet_up_place || ''),
             meet_up_time: new FormControl(activity?.meet_up_time || 0),
             repeat: new FormControl(activity?.repeat || 'none'),
@@ -107,7 +108,7 @@ class ActivityExtraMember {
 }
 
 class ActivityInvite {
-    constructor(id, activity, comment, created, has_unpaid_invoices, last_invite, member, reminded, response_date, status, token, unpaid_invoices, updated) {
+    constructor(id, activity, comment, created, has_unpaid_invoices, last_invite, member, next_invite, reminded, response_date, status, token, unpaid_invoices, updated) {
         this.id = id;
         this.activity = activity;
         this.comment = comment;
@@ -115,6 +116,7 @@ class ActivityInvite {
         this.has_unpaid_invoices = has_unpaid_invoices;
         this.last_invite = last_invite;
         this.member = member;
+        this.next_invite = next_invite;
         this.reminded = reminded;
         this.response_date = response_date;
         this.status = status;
@@ -362,9 +364,10 @@ class MemberCard {
 }
 
 class SearchMemberCard {
-    constructor(id, name, pdf_url) {
+    constructor(id, name, notification_count, pdf_url) {
         this.id = id;
         this.name = name;
+        this.notification_count = notification_count;
         this.pdf_url = pdf_url;
     }
 }
@@ -480,10 +483,16 @@ class Directory {
         this.location_name = location_name;
         this.updated = updated;
     }
-    belongsToTeam() {
+    belongsToTeam(teamId = null) {
+        if (teamId) {
+            return this.team_id === teamId;
+        }
         return this.team_id !== null;
     }
-    belongsToSection() {
+    belongsToSection(sectionId = null) {
+        if (sectionId) {
+            return this.section_id === sectionId;
+        }
         return this.section_id !== null;
     }
 }
@@ -531,9 +540,10 @@ class ExternalLink {
 }
 
 class FileObject {
-    constructor(id, created, member, name, section, team, updated, url) {
+    constructor(id, created, file, member, name, section, team, updated, url) {
         this.id = id;
         this.created = created;
+        this.file = file;
         this.member = member;
         this.name = name;
         this.section = section;
@@ -797,10 +807,19 @@ class MemberAttribute {
         this.value = value;
     }
     static asFormGroup(attribute = null) {
+        const attributeOptions = new FormArray(attribute?.options?.map((option) => new FormGroup({
+            text: new FormControl(option.text),
+            value: new FormControl(option.value)
+        })) || []);
         return new FormGroup({
             field_id: new FormControl(attribute?.field_id || ''),
             member_id: new FormControl(attribute?.member_id || ''),
-            value: new FormControl(attribute?.value || '')
+            leader_editable: new FormControl(attribute?.leader_editable || false),
+            member_editable: new FormControl(attribute?.member_editable || false),
+            name: new FormControl(attribute?.name || ''),
+            options: attributeOptions,
+            type: new FormControl(attribute?.type || 'text'),
+            value: new FormControl(attribute?.type === 'bool' ? attribute?.value : attribute?.value || '')
         });
     }
 }
@@ -876,13 +895,16 @@ class SearchMember {
 }
 
 class MemberActivityInvite {
-    constructor(id, comment, last_invite, leader, member_id, member_name, status) {
+    constructor(id, comment, last_invite, leader, member_email, member_id, member_name, next_invite, response_date, status) {
         this.id = id;
         this.comment = comment;
         this.last_invite = last_invite;
         this.leader = leader;
+        this.member_email = member_email;
         this.member_id = member_id;
         this.member_name = member_name;
+        this.next_invite = next_invite;
+        this.response_date = response_date;
         this.status = status;
     }
     getColorByStatus() {
@@ -938,7 +960,7 @@ class MemberTeamThrough {
 }
 
 class News {
-    constructor(id, club_id, created, created_by_id, section_id, team_id, active_to, author, ingress, news_image, news_image_text, original_height, original_width, published_date, text, title, updated) {
+    constructor(id, club_id, created, created_by_id, section_id, team_id, active_to, author, ingress, news_image, news_image_text, published_date, read, show_on_my_pages, text, title, updated, urls) {
         this.id = id;
         this.club_id = club_id;
         this.created = created;
@@ -950,12 +972,30 @@ class News {
         this.ingress = ingress;
         this.news_image = news_image;
         this.news_image_text = news_image_text;
-        this.original_height = original_height;
-        this.original_width = original_width;
         this.published_date = published_date;
+        this.read = read;
+        this.show_on_my_pages = show_on_my_pages;
         this.text = text;
         this.title = title;
         this.updated = updated;
+        this.urls = urls;
+    }
+    static asFormGroup(news = null) {
+        let show_on_my_pages = true;
+        if (typeof news?.show_on_my_pages !== 'undefined') {
+            show_on_my_pages = news.show_on_my_pages;
+        }
+        return new FormGroup({
+            id: new FormControl(news?.id || ''),
+            active_to: new FormControl(news?.active_to || ''),
+            ingress: new FormControl(news?.ingress || '', [Validators.required, Validators.minLength(1)]),
+            news_image: new FormControl(news?.news_image || ''),
+            news_image_text: new FormControl(news?.news_image_text || ''),
+            published_date: new FormControl(news?.published_date || ''),
+            show_on_my_pages: new FormControl(show_on_my_pages),
+            text: new FormControl(news?.text || '', [Validators.required, Validators.minLength(1)]),
+            title: new FormControl(news?.title || '', [Validators.required, Validators.minLength(1)])
+        });
     }
 }
 
@@ -996,14 +1036,14 @@ class SearchMemberTeam {
     }
 }
 
-class Section {
+class SearchTeam {
     constructor(id, name) {
         this.id = id;
         this.name = name;
     }
 }
 
-class SectionTeam {
+class Section {
     constructor(id, name) {
         this.id = id;
         this.name = name;
@@ -1089,11 +1129,7 @@ class ApiService {
         return this.get(role, path, pathParams, options).pipe(map((apiResource) => factory(apiResource)));
     }
     postFormData(factory, role, path, pathParams = {}, data) {
-        const body = new FormData();
-        for (const [key, value] of Object.entries(data)) {
-            body.append(key, value);
-        }
-        return this.http.post(this.url(this.path(role, path, pathParams)), body)
+        return this.http.post(this.url(this.path(role, path, pathParams)), this.getFormData(data))
             .pipe(map((apiResource) => factory(apiResource)));
     }
     postResource(factory, role, path, pathParams = {}, data, options = {}) {
@@ -1111,6 +1147,16 @@ class ApiService {
     get(role, path, pathParams, options) {
         return this.http.get(this.url(this.path(role, path, pathParams)), options);
     }
+    getFormData(data) {
+        if (data instanceof FormData) {
+            return data;
+        }
+        const formData = new FormData();
+        for (const [key, value] of Object.entries(data)) {
+            formData.append(key, value);
+        }
+        return formData;
+    }
     patch(role, path, pathParams, data, options) {
         return this.http.patch(this.url(this.path(role, path, pathParams)), data, options);
     }
@@ -1142,7 +1188,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImpo
 
 const searchMemberFactory = (apiSearchMember) => new SearchMember(apiSearchMember.id, apiSearchMember.club_id, apiSearchMember.team_id, apiSearchMember.address1, apiSearchMember.address2, apiSearchMember.calendar_url, apiSearchMember.country, apiSearchMember.district, apiSearchMember.email, apiSearchMember.first_name, apiSearchMember.image, apiSearchMember.last_name, apiSearchMember.mobile_phone, apiSearchMember.name, apiSearchMember.zip);
 
-const memberAttributeFactory = (attribute) => new MemberAttribute(attribute.display_value, attribute.field, attribute.leader_editable, attribute.member_id, attribute.member_editable, attribute.name, attribute.options, attribute.order, attribute.section_id, attribute.type, attribute.value);
+const memberAttributeFactory = (attribute) => new MemberAttribute(attribute.display_value, attribute.field_id, attribute.leader_editable, attribute.member_id, attribute.member_editable, attribute.name, attribute.options, attribute.order, attribute.section_id, attribute.type, attribute.value);
 
 const contactFactory = (contact) => new Contact(contact.id, contact.club_id, contact.member_id, contact.address1, contact.address2, contact.address3, contact.country, contact.district, contact.email, contact.first_name, contact.home_phone, contact.last_name, contact.mobile_phone, contact.work_phone, contact.zip);
 
@@ -1158,13 +1204,13 @@ const memberFactory = (apiMember) => new Member(apiMember.id, apiMember.club_id,
 const activityExtraMemberFactory = (apiActivityExtraMember) => new ActivityExtraMember(apiActivityExtraMember.id, apiActivityExtraMember.member_id, apiActivityExtraMember.team_id, apiActivityExtraMember.created, apiActivityExtraMember.leader, apiActivityExtraMember.member.birth_date ?
     memberFactory(apiActivityExtraMember.member) : searchMemberFactory(apiActivityExtraMember.member), apiActivityExtraMember.member_name);
 
-const memberActivityInviteFactory = (invitedMember) => new MemberActivityInvite(invitedMember.id, invitedMember.comment, invitedMember.last_invite, invitedMember.leader, invitedMember.member_id, invitedMember.member_name, invitedMember.status);
+const memberActivityInviteFactory = (invitedMember) => new MemberActivityInvite(invitedMember.id, invitedMember.comment, invitedMember.last_invite, invitedMember.leader, invitedMember.member_email, invitedMember.member_id, invitedMember.member_name, invitedMember.next_invite, invitedMember.response_date, invitedMember.status);
 
 const activityFactory = (apiActivity) => new Activity(apiActivity.id, apiActivity.activity_group_id, apiActivity.activity_type_id, apiActivity.club_id, apiActivity.location_id, apiActivity.team_id, apiActivity.activity_location, apiActivity.activity_type_name, apiActivity.allow_maybe, apiActivity.calendar_name, apiActivity.created, apiActivity.current_num_attendants, apiActivity.day, apiActivity.description, apiActivity.end_time, apiActivity.file, apiActivity.invitation_text, apiActivity.invite_first_days, [], apiActivity.invite_hide_before_sent, apiActivity.invite_last_response_date, apiActivity.invite_remind, apiActivity.invite_remind_receivers, apiActivity.invite_second_days, 'same_as_last', (apiActivity.invited_members && apiActivity.invited_members.length) ? apiActivity.invited_members.map((invitedMember) => memberActivityInviteFactory(invitedMember)) : [], apiActivity.last_response_date, apiActivity.max_num_attendants, apiActivity.max_num_attendants_type, apiActivity.meet_up_place, apiActivity.meet_up_time, apiActivity.meet_up_time_display, 'none', 6, format(new Date(), 'yyyy-MM-dd'), 'repeat_until', apiActivity.show_other_invited, apiActivity.start_time, apiActivity.title, apiActivity.updated, apiActivity.use_invite, false);
 
 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.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, 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);
 
@@ -1212,9 +1258,11 @@ const clubImageFactory = (apiClubImage) => new ClubImage(apiClubImage.club_id, a
 
 const clubSectionFactory = (apiSection) => new ClubSection(apiSection.id, apiSection.name);
 
+const clubTeamFactory = (apiClubTeam) => new SearchTeam(apiClubTeam.id, apiClubTeam.name);
+
 const creditCardFactory = (apiCreditCard) => new CreditCard(apiCreditCard.club_id, apiCreditCard.section_id, apiCreditCard.default_activated, apiCreditCard.merchant_id, apiCreditCard.name, apiCreditCard.payment_terms_name, apiCreditCard.payment_terms_organisation_id, apiCreditCard.payment_terms_url, apiCreditCard.rsa_key, apiCreditCard.status, apiCreditCard.test_account);
 
-const fileFactory = (file) => new FileObject(file.id, file.created, typeof file.member === 'undefined' ? null : file.member, file.name, typeof file.section === 'undefined' ? null : file.section, typeof file.team === 'undefined' ? null : file.team, file.updated, file.url);
+const fileFactory = (file) => new FileObject(file.id, file.created, null, typeof file.member === 'undefined' ? null : file.member, file.name, typeof file.section === 'undefined' ? null : file.section, typeof file.team === 'undefined' ? null : file.team, file.updated, file.url);
 
 const directoryFactory = (directory) => new Directory(directory.id, directory.club_id, directory.section_id, directory.team_id, directory.created, directory.files.map((file) => fileFactory(file)), directory.name, directory.location_name, directory.updated);
 
@@ -1244,7 +1292,7 @@ const memberTeamFactory = (apiMemberTeam) => new MemberTeam(clubFactory(apiMembe
 
 const memberTeamThroughFactory = (apiMemberTeamThrough) => new MemberTeamThrough(apiMemberTeamThrough.id, apiMemberTeamThrough.created, apiMemberTeamThrough.date_hidden, apiMemberTeamThrough.image, apiMemberTeamThrough.leader, memberFactory(apiMemberTeamThrough.member), apiMemberTeamThrough.role_id, apiMemberTeamThrough.show_on_web, apiMemberTeamThrough.updated);
 
-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.original_height, apiNews.original_width, apiNews.published_date, apiNews.text, apiNews.title, apiNews.updated);
+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.text, apiNews.title, apiNews.updated, apiNews.urls ? imageUrlsFactory(apiNews.urls) : null);
 
 const paymentAttemptFactory = (apiPaymentAttempt) => {
     let paymentAttemptData = null;
@@ -1270,7 +1318,7 @@ const paymentAttemptFactory = (apiPaymentAttempt) => {
 
 const searchClubFactory = (apiSearchClub) => new SearchClub(apiSearchClub.id, apiSearchClub.leader_member_search, apiSearchClub.member_search, apiSearchClub.name);
 
-const searchMemberCardFactory = (apiSearchMemberCard) => new SearchMemberCard(apiSearchMemberCard.id, apiSearchMemberCard.name, apiSearchMemberCard.pdf_url);
+const searchMemberCardFactory = (apiSearchMemberCard) => new SearchMemberCard(apiSearchMemberCard.id, apiSearchMemberCard.name, apiSearchMemberCard.notification_count, apiSearchMemberCard.pdf_url);
 
 const searchMemberInvoiceFactory = (apiSearchMemberInvoice) => new SearchMemberInvoice(apiSearchMemberInvoice.id, apiSearchMemberInvoice.amount, apiSearchMemberInvoice.amount_paid, apiSearchMemberInvoice.balance, apiSearchMemberInvoice.club_bill_id, apiSearchMemberInvoice.date_paid, apiSearchMemberInvoice.due_date, apiSearchMemberInvoice.is_paid, apiSearchMemberInvoice.member_id);
 
@@ -1278,6 +1326,8 @@ const searchMemberTeamFactory = (apiSearchMemberTeam) => new SearchMemberTeam(cl
 
 const searchMemberTeamThroughFactory = (apiMemberTeamThrough) => new MemberTeamThrough(apiMemberTeamThrough.id, apiMemberTeamThrough.created, apiMemberTeamThrough.date_hidden, apiMemberTeamThrough.image, apiMemberTeamThrough.leader, searchMemberFactory(apiMemberTeamThrough.member), apiMemberTeamThrough.role_id, apiMemberTeamThrough.show_on_web, apiMemberTeamThrough.updated);
 
+const sectionTeamFactory = (apiSectionTeam) => new SearchTeam(apiSectionTeam.id, apiSectionTeam.name);
+
 const tokenFactory = (apiToken) => new Token(apiToken.access_token, apiToken.refresh_token);
 
 const userFactory = (apiUser) => new User(apiUser.device_token, apiUser.email, apiUser.first_name, apiUser.is_staff, apiUser.language, apiUser.last_name, apiUser.new_email);
@@ -1339,6 +1389,8 @@ const MEMBER_CALENDAR_PATH = ':memberId/activities/calendar/';
 const PUBLIC_ACTIVITY_INVITE_PATH = 'activities/:id/:token/';
 const TEAM_ACTIVITIES_PATH = ':teamId/activities/';
 const TEAM_ACTIVITY_INVITES_PATH = ':teamId/activities/:activityId/invites/';
+const TEAM_ACTIVITY_INVITE_PATH = ':teamId/activities/:activityId/invites/:activityInviteId/';
+const TEAM_ACTIVITY_INVITE_RESEND_PATH = ':teamId/activities/:activityId/invites/:activityInviteId/resend-invite/';
 const TEAM_ACTIVITY_LOCATIONS_PATH = ':teamId/activities/locations/';
 const TEAM_ACTIVITY_NEW_PATH = ':teamId/activities/new/';
 const TEAM_ACTIVITY_PARTICIPANTS_PATH = ':teamId/activities/:activityId/participants/';
@@ -1363,7 +1415,7 @@ class ActivityService {
         return this.apiService
             .postResource(activityFactory, Role.TeamAdmin, TEAM_ACTIVITIES_PATH, {
             teamId
-        }, data);
+        }, this.removeUnusedActivityFields(data));
     }
     deleteTeamActivity(teamId, id) {
         return this.apiService
@@ -1372,6 +1424,14 @@ class ActivityService {
             id
         });
     }
+    deleteTeamActivityInvite(teamId, activityId, activityInviteId) {
+        return this.apiService
+            .deleteResource(Role.TeamAdmin, TEAM_ACTIVITY_INVITE_PATH, {
+            teamId,
+            activityId,
+            activityInviteId
+        });
+    }
     getMemberActivityInvite(memberId, activityInviteId) {
         return this.apiService
             .getResource(activityInviteFactory, Role.MemberAdmin, MEMBER_ACTIVITY_INVITE_PATH, {
@@ -1411,7 +1471,7 @@ class ActivityService {
             .getResource(activityFactory, Role.TeamAdmin, TEAM_ACTIVITY_PATH, { teamId, id });
     }
     getTeamActivityLocations(teamId) {
-        if (this.activityLocationResponseDate && this.activityLocationResponseDate > this.subtractHours(new Date(), 1)) {
+        if (this.activityLocationResponseDate && this.activityLocationResponseDate > sub(new Date(), { hours: 1 })) {
             return of(this.activityLocationCollection);
         }
         return this.apiService
@@ -1438,7 +1498,7 @@ class ActivityService {
         });
     }
     getTeamActivityTypes(teamId) {
-        if (this.activityTypeResponseDate && this.activityTypeResponseDate > this.subtractHours(new Date(), 1)) {
+        if (this.activityTypeResponseDate && this.activityTypeResponseDate > sub(new Date(), { hours: 1 })) {
             return of(this.activityTypeCollection);
         }
         return this.apiService
@@ -1460,6 +1520,14 @@ class ActivityService {
             params
         });
     }
+    resendInvite(teamId, activityId, activityInviteId) {
+        return this.apiService
+            .postResource(activityInviteFactory, Role.TeamAdmin, TEAM_ACTIVITY_INVITE_RESEND_PATH, {
+            teamId,
+            activityId,
+            activityInviteId
+        }, {});
+    }
     updateMemberActivity(memberId, activityInviteId, activityInvite) {
         return this.apiService
             .updateResource(activityInviteFactory, Role.MemberAdmin, MEMBER_ACTIVITY_INVITE_PATH, {
@@ -1479,7 +1547,15 @@ class ActivityService {
             .updateResource(activityFactory, Role.TeamAdmin, TEAM_ACTIVITY_PATH, {
             teamId,
             id: activity.id
-        }, activity);
+        }, this.removeUnusedActivityFields(activity));
+    }
+    updateTeamActivityInvite(teamId, activityId, activityInviteId, activityInvite) {
+        return this.apiService
+            .updateResource(memberActivityInviteFactory, Role.TeamAdmin, TEAM_ACTIVITY_INVITE_PATH, {
+            teamId,
+            activityId,
+            activityInviteId
+        }, activityInvite);
     }
     updateTeamActivityParticipants(teamId, activityId, members) {
         return this.apiService
@@ -1490,9 +1566,17 @@ class ActivityService {
             members
         });
     }
-    subtractHours(date, hours) {
-        date.setHours(date.getHours() - hours);
-        return date;
+    removeUnusedActivityFields(activity) {
+        if (typeof activity.id !== 'undefined') {
+            delete activity.id;
+        }
+        if (typeof activity.file !== 'undefined' && !activity.file) {
+            delete activity.file;
+        }
+        if (typeof activity.invite_last_response_date !== 'undefined' && !activity.invite_last_response_date) {
+            delete activity.invite_last_response_date;
+        }
+        return activity;
     }
 }
 ActivityService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: ActivityService, deps: [{ token: ApiService }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -1722,11 +1806,46 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImpo
         }], ctorParameters: function () { return [{ type: ApiService }]; } });
 
 const MEMBER_DIRECTORIES_PATH = ':memberId/files/';
-const TEAM_DIRECTORIES_PATH = ':teamId/files/';
+const TEAM_DIRECTORIES_PATH = ':teamId/directories/';
+const TEAM_DIRECTORY_PATH = ':teamId/directories/:directoryId/';
+const TEAM_FILES_PATH = ':teamId/directories/:directoryId/files/';
+const TEAM_FILE_PATH = ':teamId/directories/:directoryId/files/:fileId/';
 class FileService {
     constructor(apiService) {
         this.apiService = apiService;
     }
+    createTeamDirectory(teamId, directory) {
+        return this.apiService
+            .postResource(directoryFactory, Role.TeamAdmin, TEAM_DIRECTORIES_PATH, {
+            teamId
+        }, directory);
+    }
+    createTeamFile(teamId, directoryId, file) {
+        const formData = new FormData();
+        const fileObj = file.file;
+        formData.append('name', file.name);
+        formData.append('file', fileObj, fileObj.name);
+        return this.apiService
+            .postFormData(fileFactory, Role.TeamAdmin, TEAM_FILES_PATH, {
+            teamId,
+            directoryId
+        }, formData);
+    }
+    deleteTeamDirectory(teamId, directoryId) {
+        return this.apiService
+            .deleteResource(Role.TeamAdmin, TEAM_DIRECTORY_PATH, {
+            teamId,
+            directoryId
+        });
+    }
+    deleteTeamFile(teamId, directoryId, fileId) {
+        return this.apiService
+            .deleteResource(Role.TeamAdmin, TEAM_FILE_PATH, {
+            teamId,
+            directoryId,
+            fileId
+        });
+    }
     getMemberDirectories(memberId) {
         return this.apiService
             .getCollection(directoryFactory, Role.MemberAdmin, MEMBER_DIRECTORIES_PATH, { memberId }, { params: { limit: 'null' } });
@@ -1982,14 +2101,55 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImpo
                 }]
         }], ctorParameters: function () { return [{ type: ApiService }]; } });
 
-const TEAM_NEWS_LIST = ':teamId/news/';
+const MEMBER_NEWS_ITEMS_PATH = ':memberId/news/';
+const MEMBER_NEWS_ITEM_PATH = ':memberId/news/:id/';
+const TEAM_NEWS_ITEMS_PATH = ':teamId/news/';
+const TEAM_NEWS_ITEM_PATH = ':teamId/news/:id/';
 class NewsService {
     constructor(apiService) {
         this.apiService = apiService;
     }
+    createTeamNews(teamId, news) {
+        delete news.id;
+        return this.apiService
+            .postFormData(newsFactory, Role.TeamAdmin, TEAM_NEWS_ITEMS_PATH, {
+            teamId
+        }, this.createFormData(news));
+    }
+    deleteTeamNews(teamId, id) {
+        return this.apiService
+            .deleteResource(Role.TeamAdmin, TEAM_NEWS_ITEM_PATH, {
+            teamId,
+            id
+        });
+    }
+    getMemberNews(memberId, id) {
+        return this.apiService
+            .getResource(newsFactory, Role.MemberAdmin, MEMBER_NEWS_ITEM_PATH, {
+            memberId,
+            id
+        });
+    }
+    getTeamNews(teamId, id) {
+        return this.apiService
+            .getResource(newsFactory, Role.TeamAdmin, TEAM_NEWS_ITEM_PATH, {
+            teamId,
+            id
+        });
+    }
+    listMemberNews(memberId, offset) {
+        return this.apiService
+            .getCollection(newsFactory, Role.MemberAdmin, MEMBER_NEWS_ITEMS_PATH, {
+            memberId
+        }, {
+            params: {
+                offset: offset.toString(10)
+            }
+        });
+    }
     listTeamNews(teamId, offset) {
         return this.apiService
-            .getCollection(newsFactory, Role.TeamAdmin, TEAM_NEWS_LIST, {
+            .getCollection(newsFactory, Role.TeamAdmin, TEAM_NEWS_ITEMS_PATH, {
             teamId
         }, {
             params: {
@@ -1997,6 +2157,36 @@ class NewsService {
             }
         });
     }
+    updateTeamNews(teamId, id, news) {
+        return this.apiService
+            .postFormData(newsFactory, Role.TeamAdmin, TEAM_NEWS_ITEM_PATH, {
+            teamId,
+            id
+        }, this.createFormData(news));
+    }
+    createFormData(news) {
+        const formData = new FormData();
+        if (!news.active_to) {
+            news.active_to = null;
+        }
+        if (!news.news_image) {
+            news.news_image = new File([], '');
+        }
+        if (!news.published_date) {
+            news.published_date = null;
+        }
+        formData.append('title', news?.title);
+        formData.append('ingress', news?.ingress);
+        formData.append('text', news?.text);
+        if (typeof news?.news_image !== 'undefined' && news?.news_image instanceof File) {
+            formData.append('news_image', news?.news_image);
+        }
+        formData.append('news_image_text', news?.news_image_text);
+        formData.append('published_date', news?.published_date ? news?.published_date : '');
+        formData.append('active_to', news?.active_to ? news?.active_to : '');
+        formData.append('show_on_my_pages', `${news?.show_on_my_pages || false}`);
+        return formData;
+    }
 }
 NewsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: NewsService, deps: [{ token: ApiService }], target: i0.ɵɵFactoryTarget.Injectable });
 NewsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: NewsService, providedIn: 'root' });
@@ -2025,7 +2215,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImpo
                 }]
         }], ctorParameters: function () { return [{ type: ApiService }]; } });
 
-const CLUB_TEAMS_PATH = 'clubs/:clubId/teams/';
+const CLUB_TEAMS_PATH = ':clubId/teams/';
 const MEMBER_TEAM_MEMBER_PATH = ':memberId/teams/:teamId/team-members/:id/';
 const MEMBER_TEAM_MEMBERS_PATH = ':memberId/teams/:teamId/team-members/';
 const MEMBER_TEAM_EXTRA_MEMBER_PATH = ':memberId/teams/:teamId/extra-members/:id/';
@@ -2046,7 +2236,7 @@ class TeamService {
         return this.apiService.deleteResource(Role.TeamAdmin, TEAM_LEADER_TEAM_MEMBER_PATH, { teamId, id });
     }
     getClubTeams(clubId) {
-        return this.apiService.getCollection((apiClubTeam) => new SectionTeam(apiClubTeam.id, apiClubTeam.name), Role.ClubAdmin, CLUB_TEAMS_PATH, { clubId });
+        return this.apiService.getCollection(clubTeamFactory, Role.ClubAdmin, CLUB_TEAMS_PATH, { clubId });
     }
     getMemberTeam(memberId, teamId) {
         return this.apiService.getResource(memberTeamFactory, Role.MemberAdmin, MEMBER_TEAM_PATH, { memberId, teamId });
@@ -2067,7 +2257,7 @@ class TeamService {
         return this.apiService.getCollection(searchMemberTeamFactory, Role.MemberAdmin, MEMBER_TEAMS_PATH, { memberId });
     }
     getSectionTeams(role, sectionId) {
-        return this.apiService.getCollection((apiSectionTeam) => new SectionTeam(apiSectionTeam.id, apiSectionTeam.name), role, SECTION_TEAMS_PATH, { sectionId });
+        return this.apiService.getCollection(sectionTeamFactory, role, SECTION_TEAMS_PATH, { sectionId });
     }
     getTeamLeaderTeam(teamId) {
         return this.apiService.getResource(memberTeamFactory, Role.TeamAdmin, TEAM_LEADER_TEAM_PATH, { teamId });
@@ -2127,7 +2317,7 @@ class TokenService {
             if (err.status === 401) {
                 return of(null);
             }
-            return throwError(err);
+            return throwError(() => err);
         }));
     }
     logout() {
@@ -2299,6 +2489,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImpo
 class AuthenticationInterceptor {
     constructor(authenticationService) {
         this.authenticationService = authenticationService;
+        this.isRefreshing = false;
+        this.refreshTokenSubject = new BehaviorSubject(null);
     }
     intercept(request, next) {
         const authentication = this.authenticationService.authentication;
@@ -2307,16 +2499,9 @@ class AuthenticationInterceptor {
         }
         return next.handle(request).pipe(catchError((requestError) => {
             if (requestError instanceof HttpErrorResponse && requestError.status === 401) {
-                if (authentication && request.url.indexOf('accounts/token/') === -1) {
-                    return this.authenticationService.reauthenticate().pipe(mergeMap((token) => {
-                        if (token && token.accessToken) {
-                            return next.handle(this.addAuthorizationHeader(request, token.accessToken));
-                        }
-                        return throwError(requestError);
-                    }));
-                }
+                return this.handle401Error(request, next);
             }
-            return throwError(requestError);
+            return throwError(() => requestError);
         }));
     }
     addAuthorizationHeader(request, token) {
@@ -2327,11 +2512,34 @@ class AuthenticationInterceptor {
         }
         return request;
     }
+    handle401Error(request, next) {
+        if (this.isRefreshing) {
+            return this.refreshTokenSubject
+                .pipe(filter(token => token !== null), take(1), switchMap((token) => next.handle(this.addAuthorizationHeader(request, token?.accessToken))));
+        }
+        else {
+            this.isRefreshing = true;
+            this.refreshTokenSubject.next(null);
+            return this.authenticationService.reauthenticate()
+                .pipe(catchError((err) => {
+                this.isRefreshing = false;
+                this.authenticationService.clearAuthentication();
+                return throwError(() => err);
+            }), switchMap((token) => {
+                this.refreshTokenSubject.next(token);
+                this.isRefreshing = false;
+                return next.handle(this.addAuthorizationHeader(request, token.accessToken));
+            }));
+        }
+    }
 }
 AuthenticationInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: AuthenticationInterceptor, deps: [{ token: AuthenticationService }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthenticationInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: AuthenticationInterceptor });
+AuthenticationInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: AuthenticationInterceptor, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: AuthenticationInterceptor, decorators: [{
-            type: Injectable
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
         }], ctorParameters: function () { return [{ type: AuthenticationService }]; } });
 
 const REDIRECT_PARAM_NAME = 'next';
@@ -2396,18 +2604,18 @@ class DataAccessModule {
             providers: [
                 { provide: APP, useValue: config.app },
                 { provide: DOMAIN, useValue: config.domain },
-                { provide: HTTP_INTERCEPTORS, useClass: AuthenticationInterceptor, multi: true }
+                { provide: HTTP_INTERCEPTORS, useExisting: AuthenticationInterceptor, multi: true }
             ]
         };
     }
 }
 DataAccessModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: DataAccessModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-DataAccessModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.11", ngImport: i0, type: DataAccessModule, imports: [HttpClientModule] });
-DataAccessModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: DataAccessModule, imports: [HttpClientModule] });
+DataAccessModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.11", ngImport: i0, type: DataAccessModule });
+DataAccessModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: DataAccessModule });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: DataAccessModule, decorators: [{
             type: NgModule,
             args: [{
-                    imports: [HttpClientModule]
+                    imports: [] // TODO: Check if this is required
                 }]
         }] });
 
@@ -2419,5 +2627,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { APP, Activity, ActivityExtraMember, ActivityInvite, ActivityLocation, ActivityService, ActivitySettings, ActivityType, Auth, AuthMember, AuthSection, AuthService, AuthTeam, AuthTeamSection, AuthenticatedGuard, Authentication, AuthenticationInterceptor, AuthenticationService, Calendar, CalendarEvent, Card, CardDeal, CardLogo, CardLogoUrls, CardMemberTicket, CardTheme, CardTicket, CardTicketLocation, Club, ClubImage, ClubSection, ClubService, ClubTeam, Collection, ConstantService, Contact, CreditCard, DataAccessModule, Directory, Email, EmailRecipient, EmailService, Event, ExternalLink, ExternalLinkService, FileObject, FileService, GeneralImage, Giro, HandleGrantTokenGuard, HomeTeam, ImageUrls, InvoiceService, Member, MemberActivityInvite, MemberAttribute, MemberCard, MemberCardService, MemberContact, MemberFee, MemberFunction, MemberInvoice, MemberInvoiceRow, MemberPublicForm, MemberPublicFormService, MemberService, MemberTeam, MemberTeamThrough, MemberValidationSettings, News, NewsService, Partner, PaymentAttempt, PaymentAttemptService, Role, SearchClub, SearchMember, SearchMemberCard, SearchMemberInvoice, SearchMemberTeam, Section, SectionService, SectionTeam, Swish, SwishQrCode, TeamService, Token, TokenService, USER_NOTIFICATIONS_PATH, UnpaidMemberInvoice, User, UserNotification, UserNotificationService, UserService, Zimpler };
+export { APP, Activity, ActivityExtraMember, ActivityInvite, ActivityLocation, ActivityService, ActivitySettings, ActivityType, Auth, AuthMember, AuthSection, AuthService, AuthTeam, AuthTeamSection, AuthenticatedGuard, Authentication, AuthenticationInterceptor, AuthenticationService, Calendar, CalendarEvent, Card, CardDeal, CardLogo, CardLogoUrls, CardMemberTicket, CardTheme, CardTicket, CardTicketLocation, Club, ClubImage, ClubSection, ClubService, ClubTeam, Collection, ConstantService, Contact, CreditCard, DataAccessModule, Directory, Email, EmailRecipient, EmailService, Event, ExternalLink, ExternalLinkService, FileObject, FileService, GeneralImage, Giro, HandleGrantTokenGuard, HomeTeam, ImageUrls, InvoiceService, Member, MemberActivityInvite, MemberAttribute, MemberCard, MemberCardService, MemberContact, MemberFee, MemberFunction, MemberInvoice, MemberInvoiceRow, MemberPublicForm, MemberPublicFormService, MemberService, MemberTeam, MemberTeamThrough, MemberValidationSettings, News, NewsService, Partner, PaymentAttempt, PaymentAttemptService, Role, SearchClub, SearchMember, SearchMemberCard, SearchMemberInvoice, SearchMemberTeam, SearchTeam, Section, SectionService, Swish, SwishQrCode, TeamService, Token, TokenService, USER_NOTIFICATIONS_PATH, UnpaidMemberInvoice, User, UserNotification, UserNotificationService, UserService, Zimpler };
 //# sourceMappingURL=myclub_se-data-access.mjs.map