@myclub_se/data-access 3.7.1 → 3.7.3

package/fesm2022/myclub_se-data-access.mjs

@@ -2027,9 +2027,11 @@ const leaderActivityFactory = (apiLeaderActivity) => new LeaderActivity(apiLeade
 
 const guestFactory = (apiGuest) => new Guest(apiGuest.id, apiGuest.name, apiGuest.comment, apiGuest.activity_invite_id);
 
+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);
+
 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.member_invoice_id, apiActivityInvite.next_invite, [], apiActivityInvite.payment_link, apiActivityInvite.public_payment_link, 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, (apiActivityInvite.guests && apiActivityInvite.guests.length)
     ? apiActivityInvite.guests.map((g) => guestFactory(g))
-    : []);
+    : [], apiActivityInvite.member_invoice ? searchMemberInvoiceFactory(apiActivityInvite.member_invoice) : null);
 
 const activityLocationTagFactory = (apiActivityLocationTag) => {
     return new ActivityLocationTag(apiActivityLocationTag.id, apiActivityLocationTag.club_id, apiActivityLocationTag.section_id, apiActivityLocationTag.name, apiActivityLocationTag.location_names);
@@ -2256,8 +2258,6 @@ const searchClubFactory = (apiSearchClub) => new SearchClub(apiSearchClub.id, ap
 
 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);
-
 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 swishIncidentFactory = (apiSwishIncident) => new SwishIncident(apiSwishIncident.id, apiSwishIncident.name, apiSwishIncident.swish_id, apiSwishIncident.status, apiSwishIncident.status_display, apiSwishIncident.page_status, apiSwishIncident.page_status_display, apiSwishIncident.message, apiSwishIncident.created, apiSwishIncident.updated);
@@ -2562,7 +2562,8 @@ class ActivityInvite {
     unpaid_invoices;
     updated;
     guests;
-    constructor(id, activity, comment, created, has_unpaid_invoices, last_invite, leader, member, member_invoice_id, next_invite, optional_fees, payment_link, public_payment_link, reminded, response_date, responses, status, token, unpaid_invoices, updated, guests = []) {
+    member_invoice;
+    constructor(id, activity, comment, created, has_unpaid_invoices, last_invite, leader, member, member_invoice_id, next_invite, optional_fees, payment_link, public_payment_link, reminded, response_date, responses, status, token, unpaid_invoices, updated, guests = [], member_invoice = null) {
         this.id = id;
         this.activity = activity;
         this.comment = comment;
@@ -2584,6 +2585,7 @@ class ActivityInvite {
         this.unpaid_invoices = unpaid_invoices;
         this.updated = updated;
         this.guests = guests;
+        this.member_invoice = member_invoice;
     }
 }
 
@@ -5732,7 +5734,7 @@ class ActivityService {
             activityId
         });
     }
-    signUpMemberOpenActivity(memberId, activityId, comment, optionalFees, responses) {
+    signUpMemberOpenActivity(memberId, activityId, comment, optionalFees, responses, guests = []) {
         return this.apiService
             .updateResource(openActivityFactory, Role.MemberAdmin, MEMBER_OPEN_ACTIVITY_RESPOND_WITH_DATA_PATH, {
             memberId,
@@ -5740,17 +5742,19 @@ class ActivityService {
         }, {
             comment,
             optional_fees: optionalFees,
-            responses
+            responses,
+            guests
         });
     }
-    signUpPublicOpenActivity(activityId, comment, optionalFees, responses) {
+    signUpPublicOpenActivity(activityId, comment, optionalFees, responses, guests = []) {
         return this.apiService
             .updateResource(openActivityFactory, Role.Public, PUBLIC_OPEN_ACTIVITY_RESPOND_WITH_DATA_PATH, {
             activityId
         }, {
             comment,
             optional_fees: optionalFees,
-            responses
+            responses,
+            guests
         });
     }
     updateMemberActivity(memberId, activityInviteId, activityInvite) {
@@ -8826,61 +8830,45 @@ class ActivityEffects extends ExtraMembersMixin {
         }
     }), catchError((error) => of(updateMemberActivityAttendanceFailureAction({ payload: error })))))));
     updateMemberActivityInvite$ = createEffect(() => this.actions$
-        .pipe(ofType(updateMemberActivityInviteAction), exhaustMap(({ payload }) => this.activityService.updateMemberActivity(payload.memberId, payload.activityInvite.id, payload.activityInvite)
-        .pipe(mergeMap((activityInvite) => {
-        const guests = payload.guests ?? [];
-        const existingGuests = activityInvite.guests ?? [];
-        return reconcileMemberGuests(payload.memberId, activityInvite.id, guests, existingGuests, this.activityService)
-            .pipe(catchError(() => of(null)), mergeMap(() => this.activityService.getMemberActivityInvite(payload.memberId, activityInvite.id)), catchError(() => of(activityInvite)), map((updatedInvite) => updateMemberActivityInviteSuccessAction({ payload: updatedInvite })));
-    }), catchError((error) => of(updateMemberActivityInviteFailureAction({ payload: error })))))));
+        .pipe(ofType(updateMemberActivityInviteAction), exhaustMap(({ payload }) => {
+        // New guests are sent inline with the respond request so the backend can
+        // include their guest fees in the invoice it creates on accept. Existing
+        // guests are reconciled (update/delete) before responding, so removed
+        // guests are not invoiced.
+        const existingGuests = payload.activityInvite.guests ?? [];
+        const reconcile$ = payload.guests
+            ? reconcileMemberGuests(payload.memberId, payload.activityInvite.id, payload.guests, existingGuests, this.activityService)
+                .pipe(catchError(() => of(null)))
+            : of(null);
+        return reconcile$.pipe(mergeMap(() => this.activityService.updateMemberActivity(payload.memberId, payload.activityInvite.id, { ...payload.activityInvite, guests: newGuests(payload.guests) })
+            .pipe(map((activityInvite) => updateMemberActivityInviteSuccessAction({ payload: activityInvite })), catchError((error) => of(updateMemberActivityInviteFailureAction({ payload: error }))))));
+    })));
     updateMemberOpenActivity$ = createEffect(() => this.actions$
-        .pipe(ofType(updateMemberOpenActivityAction), exhaustMap(({ payload }) => this.activityService.signUpMemberOpenActivity(payload.memberId, payload.activityId, payload.comment, payload.optional_fees, payload.responses)
-        .pipe(mergeMap((openActivity) => {
-        const guests = payload.guests ?? [];
-        if (guests.length === 0) {
-            return of(updateMemberOpenActivitySuccessAction({ payload: openActivity }));
-        }
-        // Step 2: fetch activity to find member's invite ID, then add guests
-        return this.activityService.getMemberActivity(payload.memberId, openActivity.id)
-            .pipe(mergeMap((activity) => {
-            const memberInvite = activity.invited_members.find(m => m.member_id === payload.memberId);
-            if (!memberInvite) {
-                return of(updateMemberOpenActivitySuccessAction({ payload: openActivity }));
-            }
-            const guestOps = guests.map(g => this.activityService.addMemberActivityGuest(payload.memberId, memberInvite.id, { name: g.name, comment: g.comment ?? undefined }));
-            return forkJoin(guestOps).pipe(catchError(() => of(null)), map(() => updateMemberOpenActivitySuccessAction({ payload: openActivity })));
-        }), catchError(() => of(updateMemberOpenActivitySuccessAction({ payload: openActivity }))));
-    }), catchError((error) => of(updateMemberOpenActivityFailureAction({ payload: error })))))));
+        .pipe(ofType(updateMemberOpenActivityAction), exhaustMap(({ payload }) => this.activityService.signUpMemberOpenActivity(payload.memberId, payload.activityId, payload.comment, payload.optional_fees, payload.responses, newGuests(payload.guests))
+        .pipe(map((openActivity) => updateMemberOpenActivitySuccessAction({ payload: openActivity })), catchError((error) => of(updateMemberOpenActivityFailureAction({ payload: error })))))));
     updatePublicActivityInvite$ = createEffect(() => this.actions$
-        .pipe(ofType(updatePublicActivityInviteAction), exhaustMap(({ payload }) => this.activityService.updatePublicActivityInvite(payload.activityInvite.id, payload.token, payload.activityInvite)
-        .pipe(mergeMap((activityInvite) => {
-        const guests = payload.guests ?? [];
-        const existingGuests = activityInvite.guests ?? [];
-        return reconcilePublicTokenGuests(activityInvite.id, payload.token, guests, existingGuests, this.activityService)
-            .pipe(catchError(() => of(null)), mergeMap(() => this.activityService.getPublicActivityInvite(activityInvite.id, payload.token)), catchError(() => of(activityInvite)), map((updatedInvite) => updatePublicActivityInviteSuccessAction({ payload: updatedInvite })));
-    }), catchError((error) => of(updatePublicActivityInviteFailureAction({ payload: error })))))));
+        .pipe(ofType(updatePublicActivityInviteAction), exhaustMap(({ payload }) => {
+        const existingGuests = payload.activityInvite.guests ?? [];
+        const reconcile$ = payload.guests
+            ? reconcilePublicTokenGuests(payload.activityInvite.id, payload.token, payload.guests, existingGuests, this.activityService)
+                .pipe(catchError(() => of(null)))
+            : of(null);
+        return reconcile$.pipe(mergeMap(() => this.activityService.updatePublicActivityInvite(payload.activityInvite.id, payload.token, { ...payload.activityInvite, guests: newGuests(payload.guests) })
+            .pipe(map((activityInvite) => updatePublicActivityInviteSuccessAction({ payload: activityInvite })), catchError((error) => of(updatePublicActivityInviteFailureAction({ payload: error }))))));
+    })));
     updatePublicMemberActivityInvite$ = createEffect(() => this.actions$
-        .pipe(ofType(updatePublicMemberActivityInviteAction), exhaustMap(({ payload }) => this.activityService.updatePublicMemberActivityInvite(payload.activityInvite.id, payload.activityInvite)
-        .pipe(mergeMap((activityInvite) => {
-        const guests = payload.guests ?? [];
-        const existingGuests = activityInvite.guests ?? [];
-        return reconcilePublicTokenGuests(activityInvite.id, activityInvite.token, guests, existingGuests, this.activityService)
-            .pipe(catchError(() => of(null)), mergeMap(() => this.activityService.getPublicMemberActivityInvite(activityInvite.id)), catchError(() => of(activityInvite)), map((updatedInvite) => updatePublicMemberActivityInviteSuccessAction({ payload: updatedInvite })));
-    }), catchError((error) => of(updatePublicMemberActivityInviteFailureAction({ payload: error })))))));
+        .pipe(ofType(updatePublicMemberActivityInviteAction), exhaustMap(({ payload }) => {
+        const existingGuests = payload.activityInvite.guests ?? [];
+        const reconcile$ = payload.guests
+            ? reconcilePublicTokenGuests(payload.activityInvite.id, payload.activityInvite.token, payload.guests, existingGuests, this.activityService)
+                .pipe(catchError(() => of(null)))
+            : of(null);
+        return reconcile$.pipe(mergeMap(() => this.activityService.updatePublicMemberActivityInvite(payload.activityInvite.id, { ...payload.activityInvite, guests: newGuests(payload.guests) })
+            .pipe(map((activityInvite) => updatePublicMemberActivityInviteSuccessAction({ payload: activityInvite })), catchError((error) => of(updatePublicMemberActivityInviteFailureAction({ payload: error }))))));
+    })));
     updatePublicMemberOpenActivity$ = createEffect(() => this.actions$
-        .pipe(ofType(updatePublicMemberOpenActivityAction), exhaustMap(({ payload }) => this.activityService.signUpPublicOpenActivity(payload.activityId, payload.comment, payload.optional_fees, payload.responses)
-        .pipe(mergeMap((openActivity) => {
-        const guests = payload.guests ?? [];
-        if (guests.length === 0) {
-            return of(updatePublicMemberOpenActivitySuccessAction({ payload: openActivity }));
-        }
-        return this.activityService.getPublicOpenActivityGuests(payload.activityId)
-            .pipe(mergeMap((existingCollection) => {
-            const existingGuests = existingCollection.toArray();
-            return reconcilePublicOpenActivityGuests(payload.activityId, guests, existingGuests, this.activityService)
-                .pipe(catchError(() => of(null)), map(() => updatePublicMemberOpenActivitySuccessAction({ payload: openActivity })));
-        }), catchError(() => of(updatePublicMemberOpenActivitySuccessAction({ payload: openActivity }))));
-    }), catchError((error) => of(updatePublicMemberOpenActivityFailureAction({ payload: error })))))));
+        .pipe(ofType(updatePublicMemberOpenActivityAction), exhaustMap(({ payload }) => this.activityService.signUpPublicOpenActivity(payload.activityId, payload.comment, payload.optional_fees, payload.responses, newGuests(payload.guests))
+        .pipe(map((openActivity) => updatePublicMemberOpenActivitySuccessAction({ payload: openActivity })), catchError((error) => of(updatePublicMemberOpenActivityFailureAction({ payload: error })))))));
     updateTeamActivity = createEffect(() => this.actions$
         .pipe(ofType(updateTeamActivityAction), exhaustMap(({ payload }) => this.activityService.updateTeamActivity(payload.teamId, payload.activity)
         .pipe(map((activity) => updateTeamActivitySuccessAction({ payload: activity })), catchError((error) => of(updateTeamActivityFailureAction({ payload: error })))))));
@@ -8899,11 +8887,17 @@ class ActivityEffects extends ExtraMembersMixin {
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ActivityEffects, decorators: [{
             type: Injectable
         }] });
+// New guests (no id yet) are sent inline with the respond request, so the
+// backend creates them before the invoice and includes their guest fees.
+function newGuests(guests) {
+    return (guests ?? []).filter(g => !g.id).map(g => ({ name: g.name, comment: g.comment ?? undefined }));
+}
+// Updates and deletes of existing guests still use the dedicated guest
+// endpoints; new guests are sent inline with the respond request instead.
 function reconcileMemberGuests(memberId, inviteId, desiredGuests, existingGuests, activityService) {
     const existingById = new Map(existingGuests.map(g => [g.id, g]));
     const desiredIds = new Set(desiredGuests.filter(g => g.id).map(g => g.id));
     const toDelete = existingGuests.filter(g => !desiredIds.has(g.id));
-    const toAdd = desiredGuests.filter(g => !g.id);
     const toUpdate = desiredGuests.filter(g => {
         if (!g.id)
             return false;
@@ -8912,7 +8906,6 @@ function reconcileMemberGuests(memberId, inviteId, desiredGuests, existingGuests
     });
     const ops = [
         ...toDelete.map(g => activityService.deleteMemberActivityGuest(memberId, inviteId, g.id)),
-        ...toAdd.map(g => activityService.addMemberActivityGuest(memberId, inviteId, { name: g.name, comment: g.comment ?? undefined })),
         ...toUpdate.map(g => activityService.updateMemberActivityGuest(memberId, inviteId, g.id, { name: g.name, comment: g.comment ?? undefined })),
     ];
     return ops.length > 0 ? forkJoin(ops) : of(null);
@@ -8921,7 +8914,6 @@ function reconcilePublicTokenGuests(id, token, desiredGuests, existingGuests, ac
     const existingById = new Map(existingGuests.map(g => [g.id, g]));
     const desiredIds = new Set(desiredGuests.filter(g => g.id).map(g => g.id));
     const toDelete = existingGuests.filter(g => !desiredIds.has(g.id));
-    const toAdd = desiredGuests.filter(g => !g.id);
     const toUpdate = desiredGuests.filter(g => {
         if (!g.id)
             return false;
@@ -8930,29 +8922,10 @@ function reconcilePublicTokenGuests(id, token, desiredGuests, existingGuests, ac
     });
     const ops = [
         ...toDelete.map(g => activityService.deletePublicActivityGuestByToken(id, token, g.id)),
-        ...toAdd.map(g => activityService.addPublicActivityGuestByToken(id, token, { name: g.name, comment: g.comment ?? undefined })),
         ...toUpdate.map(g => activityService.updatePublicActivityGuestByToken(id, token, g.id, { name: g.name, comment: g.comment ?? undefined })),
     ];
     return ops.length > 0 ? forkJoin(ops) : of(null);
 }
-function reconcilePublicOpenActivityGuests(activityId, desiredGuests, existingGuests, activityService) {
-    const existingById = new Map(existingGuests.map(g => [g.id, g]));
-    const desiredIds = new Set(desiredGuests.filter(g => g.id).map(g => g.id));
-    const toDelete = existingGuests.filter(g => !desiredIds.has(g.id));
-    const toAdd = desiredGuests.filter(g => !g.id);
-    const toUpdate = desiredGuests.filter(g => {
-        if (!g.id)
-            return false;
-        const existing = existingById.get(g.id);
-        return existing && (existing.name !== g.name || existing.comment !== g.comment);
-    });
-    const ops = [
-        ...toDelete.map(g => activityService.deletePublicOpenActivityGuest(activityId, g.id)),
-        ...toAdd.map(g => activityService.addPublicOpenActivityGuest(activityId, { name: g.name, comment: g.comment ?? undefined })),
-        ...toUpdate.map(g => activityService.updatePublicOpenActivityGuest(activityId, g.id, { name: g.name, comment: g.comment ?? undefined })),
-    ];
-    return ops.length > 0 ? forkJoin(ops) : of(null);
-}
 
 class AuthEffects {
     actions$ = inject(Actions);
@@ -11434,7 +11407,7 @@ on(updateMemberOpenActivitySuccessAction, (state, { payload }) => {
                 if (invite.activity.id === payload.id) {
                     const invitedMember = payload.invited_members.find((invitedMember) => invitedMember.id === invite.id);
                     if (invitedMember) {
-                        return new ActivityInvite(invite.id, invite.activity, invitedMember.comment, invite.created, invite.has_unpaid_invoices, invitedMember.last_invite || '', invite.leader, invite.member, invite.member_invoice_id, invitedMember.next_invite, [], invite.payment_link, invite.public_payment_link, invite.reminded, invitedMember.response_date, [], invitedMember.status, invite.token, invite.unpaid_invoices, invite.updated);
+                        return new ActivityInvite(invite.id, invite.activity, invitedMember.comment, invite.created, invite.has_unpaid_invoices, invitedMember.last_invite || '', invite.leader, invite.member, invite.member_invoice_id, invitedMember.next_invite, [], invite.payment_link, invite.public_payment_link, invite.reminded, invitedMember.response_date, [], invitedMember.status, invite.token, invite.unpaid_invoices, invite.updated, invite.guests, invite.member_invoice);
                     }
                     else {
                         return invite;