@glissandoo/lib 1.115.0 → 1.117.0

package/models/Evento/Player/index.d.ts

@@ -34,4 +34,5 @@ export default class EventoPlayer extends PlayerBasic<EventPlayerData> {
     get remarks(): string | null;
     get questions(): import("./types").EventPlayerAnswers[];
     get rollCalledVia(): import("./types").EventPlayerRollCallVia | null;
+    get paymentId(): string | null;
 }

package/models/Evento/Player/index.js

@@ -96,5 +96,8 @@ class EventoPlayer extends basic_1.default {
     get rollCalledVia() {
         return this.data.rollCalledVia || null;
     }
+    get paymentId() {
+        return this.data.paymentId || null;
+    }
 }
 exports.default = EventoPlayer;

package/models/Evento/Player/types.d.ts

@@ -73,6 +73,7 @@ export interface EventPlayerData extends EventPlayerBasicData {
     questions: EventPlayerAnswers[];
     history: EventPlayerHistory[];
     remarks: string | null;
+    paymentId: string | null;
 }
 export interface AEventPlayerData extends EventPlayerData {
     id: string;

package/models/Evento/Player/types.js

@@ -6,12 +6,12 @@ var EventPlayerRollCallVia;
     EventPlayerRollCallVia["QR"] = "QR";
     EventPlayerRollCallVia["GeoLoc"] = "GeoLoc";
     EventPlayerRollCallVia["Admin"] = "Admin";
-})(EventPlayerRollCallVia || (exports.EventPlayerRollCallVia = EventPlayerRollCallVia = {}));
+})(EventPlayerRollCallVia = exports.EventPlayerRollCallVia || (exports.EventPlayerRollCallVia = {}));
 var EventPlayerStatus;
 (function (EventPlayerStatus) {
     EventPlayerStatus["Confirmed"] = "confirmed";
     EventPlayerStatus["Declined"] = "declined";
-})(EventPlayerStatus || (exports.EventPlayerStatus = EventPlayerStatus = {}));
+})(EventPlayerStatus = exports.EventPlayerStatus || (exports.EventPlayerStatus = {}));
 var EventPlayerReason;
 (function (EventPlayerReason) {
     EventPlayerReason["Sick"] = "Sick";
@@ -19,4 +19,4 @@ var EventPlayerReason;
     EventPlayerReason["ArrivingLate"] = "ArrivingLate";
     EventPlayerReason["LeavingEarly"] = "LeavingEarly";
     EventPlayerReason["Other"] = "Other";
-})(EventPlayerReason || (exports.EventPlayerReason = EventPlayerReason = {}));
+})(EventPlayerReason = exports.EventPlayerReason || (exports.EventPlayerReason = {}));

package/models/Evento/Repertory/types.d.ts

@@ -1,8 +1,7 @@
 import { Timestamp } from '@google-cloud/firestore';
-import { SourceComposition, ThemeBasicData } from '../../Repertory/types';
+import { ThemeBasicData } from '../../Repertory/types';
 export interface EventRepertoryData extends ThemeBasicData {
     order: number;
     createdAt: Timestamp;
     createdBy: string;
-    sourceComposition?: SourceComposition | null;
 }

package/models/Evento/index.d.ts

@@ -30,8 +30,8 @@ export default class Evento extends EventoPromoter<EventData> {
     get repertoryIds(): string[];
     get repertoryCount(): number;
     get activeInvitationLink(): boolean;
-    getInvitationLink(landingHost: string): string;
-    getShortDynamicLink(landingHost: string): string;
+    get invitationLink(): string;
+    get shortDynamicLink(): string;
     get deletedAt(): FirebaseFirestore.Timestamp | null;
     get deletedBy(): string | null;
     get createdAt(): FirebaseFirestore.Timestamp;
@@ -49,7 +49,6 @@ export default class Evento extends EventoPromoter<EventData> {
     get repertoryList(): {
         id: string;
         order: number;
-        sourceComposition?: import("../Repertory/types").SourceComposition | null;
         title: string;
         compositor: string | null;
         tags: string[];
@@ -88,5 +87,7 @@ export default class Evento extends EventoPromoter<EventData> {
     };
     getQuestionsByStatus(status: EventPlayerStatus): import("./types").EventQuestions[];
     get reminders(): import("./types").EventReminderOptions[];
+    get payout(): import("./types").EventPayoutConfig | null;
+    get payoutRules(): import("../../types/payoutRule").EventoPayoutRuleEntry[];
 }
 export {};

package/models/Evento/index.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
-const externalUrls_1 = require("../../helpers/externalUrls");
 const orders_1 = require("../../helpers/instruments/orders");
 const orders_2 = require("../../helpers/musicStyles/orders");
 const lang_1 = require("../../lang");
@@ -75,15 +74,15 @@ class Evento extends promoter_1.default {
     get activeInvitationLink() {
         return this.data.activeInvitationLink || false;
     }
-    getInvitationLink(landingHost) {
-        const link = (0, externalUrls_1.buildEventInvitationUrl)(landingHost, this.id);
+    get invitationLink() {
+        const link = `https://glissandoo.com/joinevent/${this.id}`;
         if (lang_1.LanguagesTypes.ES === this.lang) {
             return link;
         }
         return `${link}?lang=${this.lang}`;
     }
-    getShortDynamicLink(landingHost) {
-        const link = (0, externalUrls_1.buildEventUrl)(landingHost, this.id);
+    get shortDynamicLink() {
+        const link = `https://glissandoo.com/event/${this.id}`;
         if (lang_1.LanguagesTypes.ES === this.lang) {
             return link;
         }
@@ -246,5 +245,11 @@ class Evento extends promoter_1.default {
     get reminders() {
         return this.data.reminders || [];
     }
+    get payout() {
+        return this.data.payout || null;
+    }
+    get payoutRules() {
+        return this.data.payout?.rules || [];
+    }
 }
 exports.default = Evento;

package/models/Evento/types.d.ts

@@ -1,11 +1,45 @@
 import { DocumentReference, GeoPoint, Timestamp } from '@google-cloud/firestore';
 import { Descendant } from '../../helpers/slate';
 import { CreatedOn } from '../../helpers/types';
+import { EventoPayoutRuleEntry } from '../../types/payoutRule';
 import { StageTemplate } from '../Group/StageTemplate/types';
 import { GroupBasicData } from '../Group/types';
 import { PlayerBasicData } from '../Player/types';
-import { SourceComposition, ThemeBasicData } from '../Repertory/types';
+import { ThemeBasicData } from '../Repertory/types';
 import { EventPlayerAnswers, EventPlayerReason, EventPlayerStatus } from './Player/types';
+export declare enum EventHistoryAction {
+    Created = "created",
+    Deleted = "deleted",
+    CloseSelectionMode = "close_selection_mode",
+    EditResponseDeadline = "edit_response_deadline",
+    EditDate = "edit_date",
+    EditTime = "edit_time",
+    EditLocality = "edit_locality",
+    EditImages = "edit_images",
+    EditAttachments = "edit_attachments",
+    EditStage = "edit_stage",
+    EditDescription = "edit_description",
+    EditQuestions = "edit_questions",
+    EditReminders = "edit_reminders",
+    PlayerAdd = "player_add",
+    PlayerRemove = "player_remove",
+    PlayerStatusChange = "player_status_change",
+    RepertoireAdd = "repertoire_add",
+    RepertoireRemove = "repertoire_remove",
+    EditDisplayName = "edit_display_name",
+    EditMaxAttendance = "edit_max_attendance",
+    RollCall = "roll_call",
+    NotifyPendingPlayers = "notify_pending_players",
+    PlayerAttendance = "player_attendance",
+    PlayerAttendanceByAdmin = "player_attendance_by_admin",
+    PlayerSetNote = "player_set_note",
+    PlayerSetQuestions = "player_set_questions",
+    PlayerRollCallQR = "player_roll_call_qr",
+    PlayerRollCallGeoLoc = "player_roll_call_geo_loc",
+    PayoutInitialize = "payout_initialize",
+    PayoutEditConfig = "payout_edit_config",
+    PayoutEditRules = "payout_edit_rules"
+}
 export declare enum EventReminderOptions {
     OneHours = "1-hours",
     ThreeHours = "3-hours",
@@ -90,7 +124,6 @@ export interface AEventPlayerBasicData extends EventPlayerBasicData {
 }
 export interface EventThemeBasicData extends ThemeBasicData {
     order: number;
-    sourceComposition?: SourceComposition | null;
 }
 export interface AEventThemeBasicData extends EventThemeBasicData {
     id: string;
@@ -148,7 +181,15 @@ export interface EventData extends EventPromoterData {
     attachmentsPath: string[];
     questions: Record<EventPlayerStatus, EventQuestions[]>;
     reminders: EventReminderOptions[];
+    payout: EventPayoutConfig | null;
     readonly owner: DocumentReference;
     readonly createdAt: Timestamp;
     readonly createdOn: CreatedOn;
 }
+export interface EventPayoutConfig {
+    grossAmount: number;
+    currency: string;
+    importByMember: number | null;
+    rules: EventoPayoutRuleEntry[];
+    expenses: string[];
+}

package/models/Evento/types.js

@@ -1,6 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventSelectionMode = exports.EventStatusByTime = exports.EventRepeatPeriod = exports.EventType = exports.EventFiles = exports.EventResponseDeadlineOptions = exports.EventReminderOptions = void 0;
+exports.EventSelectionMode = exports.EventStatusByTime = exports.EventRepeatPeriod = exports.EventType = exports.EventFiles = exports.EventResponseDeadlineOptions = exports.EventReminderOptions = exports.EventHistoryAction = void 0;
+var EventHistoryAction;
+(function (EventHistoryAction) {
+    EventHistoryAction["Created"] = "created";
+    EventHistoryAction["Deleted"] = "deleted";
+    EventHistoryAction["CloseSelectionMode"] = "close_selection_mode";
+    EventHistoryAction["EditResponseDeadline"] = "edit_response_deadline";
+    EventHistoryAction["EditDate"] = "edit_date";
+    EventHistoryAction["EditTime"] = "edit_time";
+    EventHistoryAction["EditLocality"] = "edit_locality";
+    EventHistoryAction["EditImages"] = "edit_images";
+    EventHistoryAction["EditAttachments"] = "edit_attachments";
+    EventHistoryAction["EditStage"] = "edit_stage";
+    EventHistoryAction["EditDescription"] = "edit_description";
+    EventHistoryAction["EditQuestions"] = "edit_questions";
+    EventHistoryAction["EditReminders"] = "edit_reminders";
+    EventHistoryAction["PlayerAdd"] = "player_add";
+    EventHistoryAction["PlayerRemove"] = "player_remove";
+    EventHistoryAction["PlayerStatusChange"] = "player_status_change";
+    EventHistoryAction["RepertoireAdd"] = "repertoire_add";
+    EventHistoryAction["RepertoireRemove"] = "repertoire_remove";
+    EventHistoryAction["EditDisplayName"] = "edit_display_name";
+    EventHistoryAction["EditMaxAttendance"] = "edit_max_attendance";
+    EventHistoryAction["RollCall"] = "roll_call";
+    EventHistoryAction["NotifyPendingPlayers"] = "notify_pending_players";
+    EventHistoryAction["PlayerAttendance"] = "player_attendance";
+    EventHistoryAction["PlayerAttendanceByAdmin"] = "player_attendance_by_admin";
+    EventHistoryAction["PlayerSetNote"] = "player_set_note";
+    EventHistoryAction["PlayerSetQuestions"] = "player_set_questions";
+    EventHistoryAction["PlayerRollCallQR"] = "player_roll_call_qr";
+    EventHistoryAction["PlayerRollCallGeoLoc"] = "player_roll_call_geo_loc";
+    EventHistoryAction["PayoutInitialize"] = "payout_initialize";
+    EventHistoryAction["PayoutEditConfig"] = "payout_edit_config";
+    EventHistoryAction["PayoutEditRules"] = "payout_edit_rules";
+})(EventHistoryAction = exports.EventHistoryAction || (exports.EventHistoryAction = {}));
 var EventReminderOptions;
 (function (EventReminderOptions) {
     EventReminderOptions["OneHours"] = "1-hours";
@@ -11,7 +45,7 @@ var EventReminderOptions;
     EventReminderOptions["OneWeek"] = "1-weeks";
     EventReminderOptions["TwoWeeks"] = "2-weeks";
     EventReminderOptions["Custom"] = "custom";
-})(EventReminderOptions || (exports.EventReminderOptions = EventReminderOptions = {}));
+})(EventReminderOptions = exports.EventReminderOptions || (exports.EventReminderOptions = {}));
 var EventResponseDeadlineOptions;
 (function (EventResponseDeadlineOptions) {
     EventResponseDeadlineOptions["BeforeEvent"] = "BeforeEvent";
@@ -19,35 +53,35 @@ var EventResponseDeadlineOptions;
     EventResponseDeadlineOptions["OneDayBefore"] = "OneDayBefore";
     EventResponseDeadlineOptions["OneWeekBefore"] = "OneWeekBefore";
     EventResponseDeadlineOptions["Custom"] = "Custom";
-})(EventResponseDeadlineOptions || (exports.EventResponseDeadlineOptions = EventResponseDeadlineOptions = {}));
+})(EventResponseDeadlineOptions = exports.EventResponseDeadlineOptions || (exports.EventResponseDeadlineOptions = {}));
 var EventFiles;
 (function (EventFiles) {
     EventFiles["StageThumbnail"] = "stageThumbnail.png";
     EventFiles["StagePDF"] = "stage.pdf";
     EventFiles["Cover"] = "cover.jpeg";
-})(EventFiles || (exports.EventFiles = EventFiles = {}));
+})(EventFiles = exports.EventFiles || (exports.EventFiles = {}));
 var EventType;
 (function (EventType) {
     EventType["Practice"] = "practice";
     EventType["Performance"] = "performance";
     EventType["Other"] = "other";
-})(EventType || (exports.EventType = EventType = {}));
+})(EventType = exports.EventType || (exports.EventType = {}));
 var EventRepeatPeriod;
 (function (EventRepeatPeriod) {
     EventRepeatPeriod["None"] = "none";
     EventRepeatPeriod["Weekly"] = "weekly";
     EventRepeatPeriod["Biweekly"] = "biweekly";
     EventRepeatPeriod["Monthly"] = "monthly";
-})(EventRepeatPeriod || (exports.EventRepeatPeriod = EventRepeatPeriod = {}));
+})(EventRepeatPeriod = exports.EventRepeatPeriod || (exports.EventRepeatPeriod = {}));
 // Se usa en la cabecera de la vista de evento de la app
 var EventStatusByTime;
 (function (EventStatusByTime) {
     EventStatusByTime["Future"] = "future";
     EventStatusByTime["Now"] = "now";
     EventStatusByTime["Past"] = "past";
-})(EventStatusByTime || (exports.EventStatusByTime = EventStatusByTime = {}));
+})(EventStatusByTime = exports.EventStatusByTime || (exports.EventStatusByTime = {}));
 var EventSelectionMode;
 (function (EventSelectionMode) {
     EventSelectionMode["Open"] = "open";
     EventSelectionMode["Closed"] = "closed";
-})(EventSelectionMode || (exports.EventSelectionMode = EventSelectionMode = {}));
+})(EventSelectionMode = exports.EventSelectionMode || (exports.EventSelectionMode = {}));

package/models/Federation/index.d.ts

@@ -23,6 +23,6 @@ export default class Federation extends Model<FederationData> {
     get deletedAt(): FirebaseFirestore.Timestamp | null;
     get deletedBy(): string | null;
     get isActive(): boolean;
-    getGlissandooAdminUrl(adminHost: string): string;
+    get glissandooAdminUrl(): string;
     get besm(): boolean;
 }

package/models/Federation/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const collections_1 = require("../../helpers/collections");
-const externalUrls_1 = require("../../helpers/externalUrls");
+const glissandooAdmin_1 = require("../../helpers/glissandooAdmin");
 const types_1 = require("../../helpers/types");
 const Model_1 = __importDefault(require("../Model"));
 class Federation extends Model_1.default {
@@ -75,8 +75,8 @@ class Federation extends Model_1.default {
     get isActive() {
         return !this.deletedAt && this.exists;
     }
-    getGlissandooAdminUrl(adminHost) {
-        return (0, externalUrls_1.buildAdminEntityUrl)(adminHost, collections_1.CollectionNames.Federation, this.id);
+    get glissandooAdminUrl() {
+        return (0, glissandooAdmin_1.getGlissandooAdminEntityURL)(collections_1.CollectionNames.Federation, this.id);
     }
     get besm() {
         return this.data.besm || false;

package/models/Group/Analytics/types.js

@@ -10,4 +10,4 @@ var SatisfactionIndexElements;
     SatisfactionIndexElements["EVENTS_ATTENDANCE_PREVISION_RATIO"] = "eventsAttendancePrevisionRatio";
     SatisfactionIndexElements["EVENTS_ANSWER_RATIO"] = "eventsAnswerRatio";
     SatisfactionIndexElements["EVENTS_WITH_REPERTORY_RATIO"] = "eventsWithRepertoryRatio";
-})(SatisfactionIndexElements || (exports.SatisfactionIndexElements = SatisfactionIndexElements = {}));
+})(SatisfactionIndexElements = exports.SatisfactionIndexElements || (exports.SatisfactionIndexElements = {}));

package/models/Group/Payment/index.d.ts

@@ -0,0 +1,45 @@
+import { GroupPaymentData, GroupPaymentHistoryItem, GroupPaymentMethod, GroupPaymentStatus, GroupPaymentType } from './types';
+/**
+ * Plain-object model for a `group_payment` row. Mirrors the previous
+ * Firestore-backed model API so dashboard components keep working with
+ * `payment.foo` getters. Build with `new GroupPayment(rowData)` where
+ * `rowData` is the deserialized DB record (or a snapshot built from a
+ * realtime callback).
+ *
+ * Timestamp getters return native `Date` objects so consumers can call
+ * `.getTime()` / format them with `date-fns`/`dayjs` directly.
+ */
+export default class GroupPayment {
+    id: string;
+    exists: boolean;
+    private _data;
+    constructor(data: GroupPaymentData);
+    get data(): GroupPaymentData;
+    get groupId(): string;
+    get type(): GroupPaymentType;
+    get isIncome(): boolean;
+    get isExpense(): boolean;
+    get eventId(): string | null;
+    get playerId(): string | null;
+    get concept(): string;
+    get assignedTo(): string;
+    get totalAmount(): number | null;
+    get baseAmount(): number | null;
+    get appliedRules(): import("../../../helpers/payoutRules").AppliedRuleEntry[];
+    get currency(): string;
+    get displayTotal(): string;
+    get status(): GroupPaymentStatus;
+    get isPending(): boolean;
+    get isPaid(): boolean;
+    get isCancelled(): boolean;
+    get paymentMethod(): GroupPaymentMethod | null;
+    get history(): GroupPaymentHistoryItem[];
+    get historyOrdered(): GroupPaymentHistoryItem[];
+    get paidAt(): Date | null;
+    get paidBy(): string | null;
+    get note(): string | null;
+    get createdAt(): Date;
+    get createdBy(): string;
+    get editedAt(): Date | null;
+    get editedBy(): string | null;
+}

package/models/Group/Payment/index.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const types_1 = require("./types");
+/**
+ * Plain-object model for a `group_payment` row. Mirrors the previous
+ * Firestore-backed model API so dashboard components keep working with
+ * `payment.foo` getters. Build with `new GroupPayment(rowData)` where
+ * `rowData` is the deserialized DB record (or a snapshot built from a
+ * realtime callback).
+ *
+ * Timestamp getters return native `Date` objects so consumers can call
+ * `.getTime()` / format them with `date-fns`/`dayjs` directly.
+ */
+class GroupPayment {
+    constructor(data) {
+        this.id = data.id;
+        this._data = data;
+        this.exists = true;
+    }
+    get data() {
+        return this._data;
+    }
+    get groupId() {
+        return this._data.groupId;
+    }
+    get type() {
+        return this._data.type;
+    }
+    get isIncome() {
+        return this.type === types_1.GroupPaymentType.Income;
+    }
+    get isExpense() {
+        return this.type === types_1.GroupPaymentType.Expense;
+    }
+    get eventId() {
+        return this._data.eventId || null;
+    }
+    get playerId() {
+        return this._data.playerId || null;
+    }
+    get concept() {
+        return this._data.concept || '';
+    }
+    get assignedTo() {
+        return this._data.assignedTo || '';
+    }
+    get totalAmount() {
+        return this._data.totalAmount;
+    }
+    get baseAmount() {
+        return this._data.baseAmount ?? this._data.totalAmount;
+    }
+    get appliedRules() {
+        return this._data.appliedRules || [];
+    }
+    get currency() {
+        return this._data.currency || 'EUR';
+    }
+    get displayTotal() {
+        if (this.totalAmount === null)
+            return '— €';
+        const sign = this.isExpense ? '-' : '';
+        return `${sign}${this.totalAmount} €`;
+    }
+    get status() {
+        return this._data.status;
+    }
+    get isPending() {
+        return this.status === types_1.GroupPaymentStatus.Pending;
+    }
+    get isPaid() {
+        return this.status === types_1.GroupPaymentStatus.Paid;
+    }
+    get isCancelled() {
+        return this.status === types_1.GroupPaymentStatus.Cancelled;
+    }
+    get paymentMethod() {
+        return this._data.paymentMethod || null;
+    }
+    get history() {
+        return this._data.history || [];
+    }
+    get historyOrdered() {
+        return this.history
+            .slice()
+            .sort((a, b) => new Date(a.changedAt).getTime() < new Date(b.changedAt).getTime() ? 1 : -1);
+    }
+    get paidAt() {
+        return this._data.paidAt ? new Date(this._data.paidAt) : null;
+    }
+    get paidBy() {
+        return this._data.paidBy || null;
+    }
+    get note() {
+        return this._data.note || null;
+    }
+    get createdAt() {
+        return new Date(this._data.createdAt);
+    }
+    get createdBy() {
+        return this._data.createdBy;
+    }
+    get editedAt() {
+        return this._data.editedAt ? new Date(this._data.editedAt) : null;
+    }
+    get editedBy() {
+        return this._data.editedBy || null;
+    }
+}
+exports.default = GroupPayment;

package/models/Group/Payment/supabase.d.ts

@@ -0,0 +1,16 @@
+import { Database } from '../../../types/supabase';
+import { GroupPaymentData, GroupPaymentHistoryItem } from './types';
+export type GroupPaymentRow = Database['public']['Tables']['group_payment']['Row'];
+export type GroupPaymentInsert = Database['public']['Tables']['group_payment']['Insert'];
+export type GroupPaymentUpdate = Database['public']['Tables']['group_payment']['Update'];
+export type GroupPaymentHistoryRow = Database['public']['Tables']['group_payment_history']['Row'];
+export type GroupPaymentHistoryInsert = Database['public']['Tables']['group_payment_history']['Insert'];
+export declare const GROUP_PAYMENT_TABLE: "group_payment";
+export declare const GROUP_PAYMENT_HISTORY_TABLE: "group_payment_history";
+/**
+ * Convert a raw `group_payment` DB row into the canonical `GroupPaymentData`
+ * shape consumed by the `GroupPayment` model. `history` defaults to an empty
+ * array; hydrate it from the history table when needed.
+ */
+export declare function rowToGroupPaymentData(row: GroupPaymentRow, history?: GroupPaymentHistoryItem[]): GroupPaymentData;
+export declare function historyRowToItem(row: GroupPaymentHistoryRow): GroupPaymentHistoryItem;

package/models/Group/Payment/supabase.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.historyRowToItem = exports.rowToGroupPaymentData = exports.GROUP_PAYMENT_HISTORY_TABLE = exports.GROUP_PAYMENT_TABLE = void 0;
+exports.GROUP_PAYMENT_TABLE = 'group_payment';
+exports.GROUP_PAYMENT_HISTORY_TABLE = 'group_payment_history';
+/**
+ * Convert a raw `group_payment` DB row into the canonical `GroupPaymentData`
+ * shape consumed by the `GroupPayment` model. `history` defaults to an empty
+ * array; hydrate it from the history table when needed.
+ */
+function rowToGroupPaymentData(row, history = []) {
+    return {
+        id: row.id,
+        groupId: row.groupId,
+        type: row.type,
+        eventId: row.eventId,
+        playerId: row.playerId,
+        concept: row.concept,
+        assignedTo: row.assignedTo,
+        totalAmount: row.totalAmount === null ? null : Number(row.totalAmount),
+        baseAmount: row.baseAmount === null ? null : Number(row.baseAmount),
+        appliedRules: row.appliedRules ?? [],
+        currency: row.currency,
+        status: row.status,
+        history,
+        paymentMethod: row.paymentMethod ?? null,
+        paidAt: row.paidAt,
+        paidBy: row.paidBy,
+        note: row.note,
+        createdAt: row.createdAt,
+        createdBy: row.createdBy,
+        editedAt: row.updatedAt,
+        editedBy: row.editedBy,
+    };
+}
+exports.rowToGroupPaymentData = rowToGroupPaymentData;
+function historyRowToItem(row) {
+    return {
+        action: row.action,
+        oldValue: row.old_value,
+        newValue: row.new_value,
+        changedAt: row.changed_at,
+        changedBy: row.changed_by,
+    };
+}
+exports.historyRowToItem = historyRowToItem;

package/models/Group/Payment/types.d.ts

@@ -0,0 +1,96 @@
+import { AppliedRuleEntry } from '../../../helpers/payoutRules';
+export declare enum GroupPaymentType {
+    Income = "income",
+    Expense = "expense"
+}
+export declare enum GroupPaymentStatus {
+    Pending = "pending",
+    Paid = "paid",
+    Cancelled = "cancelled"
+}
+export declare enum GroupPaymentMethod {
+    Cash = "cash",
+    Transfer = "transfer"
+}
+export declare enum GroupPaymentHistoryAction {
+    Status = "status",
+    Amount = "amount",
+    Concept = "concept",
+    Method = "method"
+}
+/**
+ * Unified audit entry for a payment. Each entry records one change to a
+ * single field (status, amount, concept or method) with the previous and
+ * new values, who performed it and when.
+ *
+ * For the very first entry (creation), `oldValue` is `null` and `newValue`
+ * holds the initial status.
+ *
+ * Timestamps are ISO 8601 strings (Postgres `timestamptz` representation).
+ */
+export interface GroupPaymentHistoryItem {
+    action: GroupPaymentHistoryAction;
+    oldValue: string | number | null;
+    newValue: string | number | null;
+    changedAt: string;
+    changedBy: string;
+}
+/**
+ * Flat payment record at the group level — represents both incomes
+ * (e.g. event payout owed to a musician) and expenses (e.g. fuel reimbursement,
+ * supplier invoice). Persisted in Postgres (`public.group_payment`).
+ *
+ * `totalAmount` is always positive; the sign is encoded by `type`.
+ *
+ * `assignedTo` is a free-form string: it may be a userId (a player), a groupId
+ * (the band itself), or any free string (external supplier name).
+ *
+ * `playerId` is only set when the payment originates from rollcall — it links
+ * the payment back to the attendee via `eventPlayer.paymentId`.
+ *
+ * Timestamps are ISO 8601 strings.
+ */
+export interface GroupPaymentData {
+    id: string;
+    groupId: string;
+    type: GroupPaymentType;
+    eventId: string | null;
+    playerId: string | null;
+    concept: string;
+    assignedTo: string;
+    /**
+     * Positive amount. `null` only while the payment is Pending (e.g. payouts
+     * waiting for the admin to fix a per-member share). Transitioning to Paid
+     * requires a concrete number.
+     */
+    totalAmount: number | null;
+    /**
+     * `importByMember` at the moment the payment was created/recomputed.
+     * Equals `totalAmount` when no rules apply. `null` mirrors `totalAmount`
+     * when the per-member share is "to be determined".
+     */
+    baseAmount: number | null;
+    /**
+     * Snapshot of the event payout rules that affected this player, ordered
+     * by `order`. Empty array when no rules matched. Used for traceability
+     * and to drive the breakdown tooltip in the UI.
+     */
+    appliedRules: AppliedRuleEntry[];
+    currency: string;
+    status: GroupPaymentStatus;
+    /**
+     * In-memory audit trail loaded from `group_payment_history`. Empty `[]`
+     * when not hydrated. Use the model's `historyOrdered` getter for a desc
+     * view.
+     */
+    history: GroupPaymentHistoryItem[];
+    paymentMethod: GroupPaymentMethod | null;
+    paidAt: string | null;
+    paidBy: string | null;
+    note: string | null;
+    createdAt: string;
+    createdBy: string;
+    editedAt: string | null;
+    editedBy: string | null;
+}
+export type AGroupPaymentData = GroupPaymentData;