@glissandoo/lib 1.126.0 → 1.128.0

package/functions/event.d.ts

@@ -10,6 +10,19 @@ export declare namespace EventoFbFunctionsTypes {
         Future = "future",
         All = "all"
     }
+    export interface RefreshGuestInviteCodeParams {
+        eventId: string;
+    }
+    export interface RefreshGuestInviteCodeResult {
+        code: string;
+    }
+    export interface VerifyGuestInviteCodeParams {
+        eventId: string;
+        code: string;
+    }
+    export interface VerifyGuestInviteCodeResult {
+        alreadyJoined: boolean;
+    }
     export interface PublishParams {
         type: EventType;
         displayName: string | null;

package/functions/group.d.ts

@@ -69,6 +69,7 @@ export declare namespace GroupFbFunctionsTypes {
     interface GetByIdResult extends GroupBasicData {
         id: string;
         instruments: GroupData['instruments'];
+        customFields: GroupData['customFields'];
     }
     interface GetByInvitationLinkParams {
         invitationLink: string;

package/functions/groupPlayer.d.ts

@@ -36,6 +36,7 @@ export declare namespace GroupPlayerFbFunctionsTypes {
         groupId: string;
         mainInstrument: InstrumentId;
         instruments: InstrumentId[];
+        customFields?: Record<string, string | number | boolean | null>;
     }
     type JoinGroupResult = void;
     interface LeaveParams {
@@ -47,6 +48,11 @@ export declare namespace GroupPlayerFbFunctionsTypes {
         userIds: string[];
     }
     type RemoveResult = void;
+    interface PromoteGuestParams {
+        groupId: string;
+        userId: string;
+    }
+    type PromoteGuestResult = void;
     interface UpdateInstrumentsParams {
         playerId?: string;
         groupId: string;

package/functions/index.d.ts

@@ -62,6 +62,8 @@ export declare enum FbFunctionName {
     EventoMyPayments = "event-myPayments",
     EventPublish = "event-publish",
     EventRemove = "event-remove",
+    EventRefreshGuestInviteCode = "event-refreshGuestInviteCode",
+    EventVerifyGuestInviteCode = "event-verifyGuestInviteCode",
     EventRepertoryDownload = "eventRepertory-download",
     EventRepertoryDownloadPdf = "eventRepertory-downloadPdf",
     EventRepertoryEdit = "eventRepertory-edit",
@@ -106,6 +108,7 @@ export declare enum FbFunctionName {
     GroupPlayerLinkFakeAccount = "groupPlayer-linkFakeAccount",
     GroupPlayerOnUpdate = "groupPlayer-onUpdate",
     GroupPlayerRemove = "groupPlayer-remove",
+    GroupPlayerPromoteGuest = "groupPlayer-promoteGuest",
     GroupPlayerEditFakeInfo = "groupPlayer-editFakeInfo",
     GroupPlayerSetPermissions = "groupPlayer-updatePermis",
     GroupPlayerUpdateInstruments = "groupPlayer-updateInstruments",

package/functions/index.js

@@ -66,6 +66,8 @@ var FbFunctionName;
     FbFunctionName["EventoMyPayments"] = "event-myPayments";
     FbFunctionName["EventPublish"] = "event-publish";
     FbFunctionName["EventRemove"] = "event-remove";
+    FbFunctionName["EventRefreshGuestInviteCode"] = "event-refreshGuestInviteCode";
+    FbFunctionName["EventVerifyGuestInviteCode"] = "event-verifyGuestInviteCode";
     FbFunctionName["EventRepertoryDownload"] = "eventRepertory-download";
     FbFunctionName["EventRepertoryDownloadPdf"] = "eventRepertory-downloadPdf";
     FbFunctionName["EventRepertoryEdit"] = "eventRepertory-edit";
@@ -110,6 +112,7 @@ var FbFunctionName;
     FbFunctionName["GroupPlayerLinkFakeAccount"] = "groupPlayer-linkFakeAccount";
     FbFunctionName["GroupPlayerOnUpdate"] = "groupPlayer-onUpdate";
     FbFunctionName["GroupPlayerRemove"] = "groupPlayer-remove";
+    FbFunctionName["GroupPlayerPromoteGuest"] = "groupPlayer-promoteGuest";
     FbFunctionName["GroupPlayerEditFakeInfo"] = "groupPlayer-editFakeInfo";
     FbFunctionName["GroupPlayerSetPermissions"] = "groupPlayer-updatePermis";
     FbFunctionName["GroupPlayerUpdateInstruments"] = "groupPlayer-updateInstruments";

package/functions/regions.js

@@ -73,6 +73,8 @@ const regionByFunctions = {
     [index_1.FbFunctionName.EventoMyPayments]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.EventPublish]: GCloudRegions.UsCentral1,
     [index_1.FbFunctionName.EventRemove]: GCloudRegions.UsCentral1,
+    [index_1.FbFunctionName.EventRefreshGuestInviteCode]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.EventVerifyGuestInviteCode]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.EventRepertoryDownload]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.EventRepertoryDownloadPdf]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.EventRepertoryEdit]: GCloudRegions.UsCentral1,
@@ -118,6 +120,7 @@ const regionByFunctions = {
     [index_1.FbFunctionName.GroupPlayerLeave]: GCloudRegions.UsCentral1,
     [index_1.FbFunctionName.GroupPlayerOnUpdate]: GCloudRegions.UsCentral1,
     [index_1.FbFunctionName.GroupPlayerRemove]: GCloudRegions.UsCentral1,
+    [index_1.FbFunctionName.GroupPlayerPromoteGuest]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.GroupPlayerSetPermissions]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.GroupPlayerUpdateInstruments]: GCloudRegions.UsCentral1,
     [index_1.FbFunctionName.GroupPaymentCreate]: GCloudRegions.EuropeWest6,

package/functions/user.d.ts

@@ -26,6 +26,7 @@ export declare namespace UserFbFunctionsTypes {
     interface JoinEventParams {
         eventId: string;
         instrument?: string;
+        code: string;
     }
     type JoinEventResult = void;
     interface RecoveryPasswordParams {

package/helpers/appScenes.d.ts

@@ -78,6 +78,7 @@ export declare enum AppScenes {
     Join = "Join",
     JoinImageProfile = "AddProfileImage",
     JoinInstrument = "SelectGroupInstrument",
+    JoinCompleteProfile = "JoinCompleteProfile",
     JoinView = "JoinView",
     Login = "Login",
     GroupPaymentDetail = "GroupPaymentDetail",

package/helpers/appScenes.js

@@ -82,6 +82,7 @@ var AppScenes;
     AppScenes["Join"] = "Join";
     AppScenes["JoinImageProfile"] = "AddProfileImage";
     AppScenes["JoinInstrument"] = "SelectGroupInstrument";
+    AppScenes["JoinCompleteProfile"] = "JoinCompleteProfile";
     AppScenes["JoinView"] = "JoinView";
     AppScenes["Login"] = "Login";
     AppScenes["GroupPaymentDetail"] = "GroupPaymentDetail";

package/helpers/errors.d.ts

@@ -8,6 +8,7 @@ export declare enum HttpsErrorMessages {
     InvalidGroupPartnership = "error.group.partnership",
     InvalidAdminGroup = "error.group.noAdmin",
     InvalidPermissionsGroup = "error.group.noPermissions",
+    GuestCannotBeAdmin = "error.group.guestCannotBeAdmin",
     InvalidAdminAction = "error.federation.admin",
     InvalidLinkInvitation = "groupPlayer.join.linkNoValid",
     InvalidJoinPlayer = "groupPlayer.join.isPlayer",
@@ -20,6 +21,10 @@ export declare enum HttpsErrorMessages {
     InvalidEventPlayer = "error.event.noPlayer",
     InvalidMaxNumberEvents = "error.event.maxEventsPublish",
     InvalidMaxCapacityEvent = "error.event.capacityCompleted",
+    EventInvitationLinkNotActive = "error.event.invitationLinkNotActive",
+    EventNotAcceptingJoins = "error.event.notAcceptingJoins",
+    EventGuestsLimitReached = "error.event.guestsLimitReached",
+    EventInvitationCodeInvalid = "error.event.invitationCodeInvalid",
     InvalidScoreNotByInstrumentsEventRepertory = "error.eventRepertory.scoreNotByInstruments",
     InvalidUser = "error.user.noValid",
     InvalidSuperAdmin = "error.superadmin.noValid",

package/helpers/errors.js

@@ -9,6 +9,7 @@ var HttpsErrorMessages;
     HttpsErrorMessages["InvalidGroupPartnership"] = "error.group.partnership";
     HttpsErrorMessages["InvalidAdminGroup"] = "error.group.noAdmin";
     HttpsErrorMessages["InvalidPermissionsGroup"] = "error.group.noPermissions";
+    HttpsErrorMessages["GuestCannotBeAdmin"] = "error.group.guestCannotBeAdmin";
     HttpsErrorMessages["InvalidAdminAction"] = "error.federation.admin";
     HttpsErrorMessages["InvalidLinkInvitation"] = "groupPlayer.join.linkNoValid";
     HttpsErrorMessages["InvalidJoinPlayer"] = "groupPlayer.join.isPlayer";
@@ -21,6 +22,10 @@ var HttpsErrorMessages;
     HttpsErrorMessages["InvalidEventPlayer"] = "error.event.noPlayer";
     HttpsErrorMessages["InvalidMaxNumberEvents"] = "error.event.maxEventsPublish";
     HttpsErrorMessages["InvalidMaxCapacityEvent"] = "error.event.capacityCompleted";
+    HttpsErrorMessages["EventInvitationLinkNotActive"] = "error.event.invitationLinkNotActive";
+    HttpsErrorMessages["EventNotAcceptingJoins"] = "error.event.notAcceptingJoins";
+    HttpsErrorMessages["EventGuestsLimitReached"] = "error.event.guestsLimitReached";
+    HttpsErrorMessages["EventInvitationCodeInvalid"] = "error.event.invitationCodeInvalid";
     HttpsErrorMessages["InvalidScoreNotByInstrumentsEventRepertory"] = "error.eventRepertory.scoreNotByInstruments";
     HttpsErrorMessages["InvalidUser"] = "error.user.noValid";
     HttpsErrorMessages["InvalidSuperAdmin"] = "error.superadmin.noValid";

package/helpers/plans.d.ts

@@ -11,6 +11,8 @@ export declare enum PlanPeriod {
     Monthly = "monthly"
 }
 export declare const membersPerPlan: Record<PlansGroup, number>;
+export declare const MAX_GUESTS_PER_EVENT = 10;
+export declare const GUEST_INVITE_CODE_LENGTH = 6;
 export declare const pricesPerPlan: Record<PlanPeriod, Record<PlansGroup, number>>;
 export declare const planGroupTiers: {
     min: number;

package/helpers/plans.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.planGroupTiers = exports.pricesPerPlan = exports.membersPerPlan = exports.PlanPeriod = exports.PlansGroup = void 0;
+exports.planGroupTiers = exports.pricesPerPlan = exports.GUEST_INVITE_CODE_LENGTH = exports.MAX_GUESTS_PER_EVENT = exports.membersPerPlan = exports.PlanPeriod = exports.PlansGroup = void 0;
 var PlansGroup;
 (function (PlansGroup) {
     PlansGroup["Piano"] = "piano";
@@ -23,6 +23,10 @@ exports.membersPerPlan = {
     [PlansGroup.Fortissimo]: 100,
     [PlansGroup.Tutti]: 1000,
 };
+// Max reinforcements (guests) allowed per event, independent of the plan tier.
+exports.MAX_GUESTS_PER_EVENT = 10;
+// Number of digits of the event guest invitation code.
+exports.GUEST_INVITE_CODE_LENGTH = 6;
 exports.pricesPerPlan = {
     [PlanPeriod.Monthly]: {
         [PlansGroup.Piano]: 0,

package/lang/ca.json

@@ -27,6 +27,8 @@
     "communication.newComment.text": "{string:user.0.displayName} ha deixat un comentari en una publicació",
     "communication.newComment.title": "💬 Nou comentari",
     "event": "Esdeveniment",
+    "event.guest.joined.text": "{string:user.0.displayName} s'ha unit com a reforç a {string:event.0.displayName}",
+    "event.guest.joined.title": "🎺 Nou reforç",
     "group.delete.text": "El grup {string:group.0.displayName} ha sigut eliminat",
     "group.delete.title": "Grup eliminat",
     "group.onboarding.attendance.text": "Qui està disponible per a l'assaig? 😍 Descobreix-ho amb llistes senzilles d'assistència 🙋‍♀️",

package/lang/de.json

@@ -27,6 +27,8 @@
     "communication.newComment.text": "{string:user.0.displayName} hat einen Kommentar zu einem Beitrag hinterlassen",
     "communication.newComment.title": "💬 Neuer Kommentar",
     "event": "Veranstaltung",
+    "event.guest.joined.text": "{string:user.0.displayName} ist {string:event.0.displayName} als Verstärkung beigetreten",
+    "event.guest.joined.title": "🎺 Neue Verstärkung",
     "group.delete.text": "Die Gruppe {string:group.0.displayName} wurde gelöscht",
     "group.delete.title": "Gruppe gelöscht",
     "group.onboarding.attendance.text": "Wer ist bei der Probe verfügbar? 😍 Erfahre es über einfache Anwesenheitslisten 🙋‍♀️",

package/lang/en.json

@@ -27,6 +27,8 @@
     "communication.newComment.text": "{string:user.0.displayName} left a comment on a post",
     "communication.newComment.title": "💬 New comment",
     "event": "Event",
+    "event.guest.joined.text": "{string:user.0.displayName} has joined {string:event.0.displayName} as a reinforcement",
+    "event.guest.joined.title": "🎺 New reinforcement",
     "group.delete.text": "The group {string:group.0.displayName} has been deleted",
     "group.delete.title": "Group deleted",
     "group.onboarding.attendance.text": "Who's available for rehearsal? 😍 Find out through simple attendance lists 🙋‍♀️",

package/lang/es.json

@@ -27,6 +27,8 @@
     "communication.newComment.text": "{string:user.0.displayName} ha dejado un comentario en una publicación",
     "communication.newComment.title": "💬 Nuevo comentario",
     "event": "Evento",
+    "event.guest.joined.text": "{string:user.0.displayName} se ha unido como refuerzo a {string:event.0.displayName}",
+    "event.guest.joined.title": "🎺 Nuevo refuerzo",
     "group.delete.text": "El grupo {string:group.0.displayName} ha sido eliminado",
     "group.delete.title": "Grupo eliminado",
     "group.onboarding.attendance.text": "¿Quién está disponible para el ensayo? 😍 Descúbrelo a través de listas sencillas de asistencia 🙋‍♀️",

package/lang/eu.json

@@ -27,6 +27,8 @@
     "communication.newComment.text": "{string:user.0.displayName} erabiltzaileak iruzkin bat utzi du argitalpen batean",
     "communication.newComment.title": "💬 Iruzkin berria",
     "event": "Ekitaldia",
+    "event.guest.joined.text": "{string:user.0.displayName} indargarri gisa batu da {string:event.0.displayName} ekitaldira",
+    "event.guest.joined.title": "🎺 Indargarri berria",
     "group.delete.text": "{string:group.0.displayName} taldea ezabatu da",
     "group.delete.title": "Taldea ezabatuta",
     "group.onboarding.attendance.text": "Nork parte har dezake entseguan? 😍 Ezagutu erantzun sinpleekin 🙋‍♀️",

package/lang/fr.json

@@ -27,6 +27,8 @@
     "communication.newComment.text": "{string:user.0.displayName} a laissé un commentaire sur une publication",
     "communication.newComment.title": "💬 Nouveau commentaire",
     "event": "Événement",
+    "event.guest.joined.text": "{string:user.0.displayName} a rejoint {string:event.0.displayName} en renfort",
+    "event.guest.joined.title": "🎺 Nouveau renfort",
     "group.delete.text": "Le groupe {string:group.0.displayName} a été supprimé",
     "group.delete.title": "Groupe supprimé",
     "group.onboarding.attendance.text": "Qui est disponible pour la répétition ? 😍 Découvrez-le grâce à des listes de présence simples 🙋‍♀️",

package/lang/gl.json

@@ -27,6 +27,8 @@
     "communication.newComment.text": "{string:user.0.displayName} deixou un comentario nunha publicación",
     "communication.newComment.title": "💬 Novo comentario",
     "event": "Evento",
+    "event.guest.joined.text": "{string:user.0.displayName} uniuse como reforzo a {string:event.0.displayName}",
+    "event.guest.joined.title": "🎺 Novo reforzo",
     "group.delete.text": "O grupo {string:group.0.displayName} foi eliminado",
     "group.delete.title": "Grupo eliminado",
     "group.onboarding.attendance.text": "¿Quen está dispoñible para o ensaio? 😍 Descúbreo con listas sinxelas de asistencia 🙋‍♀️",

package/lang/it.json

@@ -27,6 +27,8 @@
     "communication.newComment.text": "{string:user.0.displayName} ha lasciato un commento su un post",
     "communication.newComment.title": "💬 Nuovo commento",
     "event": "Evento",
+    "event.guest.joined.text": "{string:user.0.displayName} si è unito a {string:event.0.displayName} come rinforzo",
+    "event.guest.joined.title": "🎺 Nuovo rinforzo",
     "group.delete.text": "Il gruppo {string:group.0.displayName} è stato eliminato",
     "group.delete.title": "Gruppo eliminato",
     "group.onboarding.attendance.text": "Chi è disponibile per la prova? 😍 Scoprilo tramite semplici liste di presenza 🙋‍♀️",

package/lang/nl.json

@@ -27,6 +27,8 @@
     "communication.newComment.text": "{string:user.0.displayName} heeft een reactie achtergelaten op een bericht",
     "communication.newComment.title": "💬 Nieuwe reactie",
     "event": "Evenement",
+    "event.guest.joined.text": "{string:user.0.displayName} heeft zich als versterking bij {string:event.0.displayName} aangesloten",
+    "event.guest.joined.title": "🎺 Nieuwe versterking",
     "group.delete.text": "De groep {string:group.0.displayName} is verwijderd",
     "group.delete.title": "Groep verwijderd",
     "group.onboarding.attendance.text": "Wie is beschikbaar voor de repetitie? 😍 Ontdek het via eenvoudige aanwezigheidslijsten 🙋‍♀️",

package/lang/pt.json

@@ -27,6 +27,8 @@
     "communication.newComment.text": "{string:user.0.displayName} deixou um comentário em uma publicação",
     "communication.newComment.title": "💬 Novo comentário",
     "event": "Evento",
+    "event.guest.joined.text": "{string:user.0.displayName} juntou-se a {string:event.0.displayName} como reforço",
+    "event.guest.joined.title": "🎺 Novo reforço",
     "group.delete.text": "O grupo {string:group.0.displayName} foi excluído",
     "group.delete.title": "Grupo excluído",
     "group.onboarding.attendance.text": "Quem está disponível para o ensaio? 😍 Descubra por meio de listas simples de presença 🙋‍♀️",

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

@@ -12,7 +12,6 @@ export default class EventoPlayerBasic {
     get photoURL(): string;
     get mainInstrument(): import("../../../helpers/instruments").InstrumentId;
     get isGuest(): boolean;
-    get isGroupPlayer(): boolean;
     get status(): EventPlayerStatus | null;
     get reason(): import("./types").EventPlayerReason | null;
     get note(): string | null;

package/models/Evento/Player/basic.js

@@ -31,9 +31,6 @@ class EventoPlayerBasic {
     get isGuest() {
         return this.data.isGuest || false;
     }
-    get isGroupPlayer() {
-        return !this.isGuest;
-    }
     get status() {
         return this.data.status || null;
     }

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

@@ -9,7 +9,6 @@ export default class EventoPlayer extends PlayerBasic<EventPlayerData> {
     get eventId(): string;
     get status(): EventPlayerStatus | null;
     get isGuest(): boolean;
-    get isGroupPlayer(): boolean;
     get isConfirmed(): boolean;
     get isDeclined(): boolean;
     get isPending(): boolean;

package/models/Evento/Player/index.js

@@ -27,9 +27,6 @@ class EventoPlayer extends basic_1.default {
     get isGuest() {
         return this.data.isGuest || false;
     }
-    get isGroupPlayer() {
-        return !this.isGuest;
-    }
     get isConfirmed() {
         return this.status === types_1.EventPlayerStatus.Confirmed;
     }

package/models/Evento/index.d.ts

@@ -26,10 +26,13 @@ export default class Evento extends EventoPromoter<EventData> {
     get playerIds(): string[];
     get players(): Record<string, import("./types").EventPlayerBasicData>;
     get playersCount(): number;
+    get guestIds(): string[];
+    get guestsCount(): number;
     get repertory(): Record<string, import("./types").EventThemeBasicData>;
     get repertoryIds(): string[];
     get repertoryCount(): number;
     get activeInvitationLink(): boolean;
+    get guestInviteCode(): string | null;
     get invitationLink(): string;
     get shortDynamicLink(): string;
     get deletedAt(): FirebaseFirestore.Timestamp | null;

package/models/Evento/index.js

@@ -62,6 +62,13 @@ class Evento extends promoter_1.default {
     get playersCount() {
         return this.data.playerIds.length;
     }
+    // Ids of reinforcements (guests) currently participating in this event.
+    get guestIds() {
+        return this.playerIds.filter((playerId) => this.players[playerId]?.isGuest === true);
+    }
+    get guestsCount() {
+        return this.guestIds.length;
+    }
     get repertory() {
         return this.data.repertory || {};
     }
@@ -74,6 +81,9 @@ class Evento extends promoter_1.default {
     get activeInvitationLink() {
         return this.data.activeInvitationLink || false;
     }
+    get guestInviteCode() {
+        return this.data.guestInviteCode || null;
+    }
     get invitationLink() {
         const link = `https://glissandoo.com/joinevent/${this.id}`;
         if (lang_1.LanguagesTypes.ES === this.lang) {

package/models/Evento/types.d.ts

@@ -23,6 +23,7 @@ export declare enum EventHistoryAction {
     EditReminders = "edit_reminders",
     PlayerAdd = "player_add",
     PlayerRemove = "player_remove",
+    GuestJoined = "guest_joined",
     PlayerStatusChange = "player_status_change",
     RepertoireAdd = "repertoire_add",
     RepertoireRemove = "repertoire_remove",
@@ -158,6 +159,7 @@ export interface EventData extends EventPromoterData {
     repertory: Record<string, EventThemeBasicData>;
     relEvents: string[];
     activeInvitationLink: boolean;
+    guestInviteCode: string | null;
     shortDynamicLink: string | null;
     invitationLink: string | null;
     notifyAt: Timestamp;

package/models/Evento/types.js

@@ -18,6 +18,7 @@ var EventHistoryAction;
     EventHistoryAction["EditReminders"] = "edit_reminders";
     EventHistoryAction["PlayerAdd"] = "player_add";
     EventHistoryAction["PlayerRemove"] = "player_remove";
+    EventHistoryAction["GuestJoined"] = "guest_joined";
     EventHistoryAction["PlayerStatusChange"] = "player_status_change";
     EventHistoryAction["RepertoireAdd"] = "repertoire_add";
     EventHistoryAction["RepertoireRemove"] = "repertoire_remove";

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

@@ -14,6 +14,8 @@ export default class GroupPlayer extends UserExtended<GroupPlayerData> {
     get instrumentsLastUpdatedBy(): string | null;
     get role(): GroupPlayerRole;
     get isAdmin(): boolean;
+    get isGuest(): boolean;
+    get isMember(): boolean;
     get permissions(): import("../types").AdminPermissions[];
     get joinedAt(): FirebaseFirestore.Timestamp;
     get leavedAt(): FirebaseFirestore.Timestamp | null;

package/models/Group/Player/index.js

@@ -38,6 +38,12 @@ class GroupPlayer extends extended_1.default {
     get isAdmin() {
         return this.role === types_1.GroupPlayerRole.Admin;
     }
+    get isGuest() {
+        return this.role === types_1.GroupPlayerRole.Guest;
+    }
+    get isMember() {
+        return !this.isGuest;
+    }
     get permissions() {
         return this.data.permissions || [];
     }

package/models/Group/index.d.ts

@@ -10,7 +10,7 @@ export default class Group extends GroupBasic<GroupData> {
     constructor(doc: DocumentModel, lang?: LanguagesTypes);
     get owner(): DocumentReference;
     get playerIds(): string[];
-    get players(): Record<string, import("../Player/types").PlayerBasicData>;
+    get players(): Record<string, import("./types").GroupPlayerBasicData>;
     get playersCount(): number;
     get description(): string | null;
     get addresses(): import("./types").GroupAddressData[];
@@ -36,8 +36,22 @@ export default class Group extends GroupBasic<GroupData> {
     get currency(): string;
     get currencySymbol(): string;
     get activePlayers(): string[];
+    get guestIds(): string[];
+    get activeMembers(): string[];
+    isGuestPlayer: (userId: string) => boolean;
     get playersList(): {
         id: string;
+        isGuest?: boolean | undefined;
+        mainInstrument: import("../../helpers/instruments").InstrumentId;
+        username: string;
+        name: string;
+        lastname: string;
+        displayName: string;
+        photoURL: string;
+    }[];
+    get membersList(): {
+        id: string;
+        isGuest?: boolean | undefined;
         mainInstrument: import("../../helpers/instruments").InstrumentId;
         username: string;
         name: string;
@@ -74,7 +88,7 @@ export default class Group extends GroupBasic<GroupData> {
         last: number;
     };
     get metadata(): Record<string, string>;
-    getPlayer: (userId: string) => import("../Player/types").PlayerBasicData | null;
+    getPlayer: (userId: string) => import("./types").GroupPlayerBasicData | null;
     isAdmin: (userId: string) => boolean;
     isPlayer: (userId: string) => boolean;
     /** @deprecated use isUpgradeRequired */

package/models/Group/index.js

@@ -17,6 +17,9 @@ const types_1 = require("./types");
 class Group extends basic_1.default {
     constructor(doc, lang = lang_1.defaultLocale) {
         super(doc, lang);
+        this.isGuestPlayer = (userId) => {
+            return this.players[userId]?.isGuest === true;
+        };
         this.getPlayer = (userId) => {
             return userId in this.players ? this.players[userId] : null;
         };
@@ -118,6 +121,15 @@ class Group extends basic_1.default {
     get activePlayers() {
         return Object.keys(this.players);
     }
+    // Reinforcements (guests) are members at the data level but excluded from
+    // plan limits and the normal member flows.
+    get guestIds() {
+        return this.activePlayers.filter((playerId) => this.players[playerId]?.isGuest === true);
+    }
+    // Regular members, excluding guests. Use this for plan limit calculations.
+    get activeMembers() {
+        return this.activePlayers.filter((playerId) => this.players[playerId]?.isGuest !== true);
+    }
     get playersList() {
         const players = this.activePlayers.map((playerId) => ({
             ...this.players[playerId],
@@ -125,6 +137,11 @@ class Group extends basic_1.default {
         }));
         return (0, orders_1.orderByInstruments)(players, 'mainInstrument', this.instrumentsIds);
     }
+    // Ordered list of regular members (excludes guests). Use for member
+    // selection, rosters/templates and group-wide communications.
+    get membersList() {
+        return this.playersList.filter((player) => !this.players[player.id]?.isGuest);
+    }
     get isActive() {
         return this.exists && !this.deletedAt;
     }
@@ -210,18 +227,18 @@ class Group extends basic_1.default {
     /** @deprecated use isUpgradeRequired */
     get isExpiredTrial() {
         const isOutDateTrial = (0, date_fns_1.isPast)(this.trialEndAt);
-        const members = this.activePlayers.length;
+        const members = this.activeMembers.length;
         const isAboveMembersLimitPlanFree = members > plans_1.membersPerPlan[plans_1.PlansGroup.Piano];
         return this.status !== types_1.GroupStatus.Premium && isOutDateTrial && isAboveMembersLimitPlanFree;
     }
     get isOutOfMembersLimit() {
-        const members = this.activePlayers.length;
+        const members = this.activeMembers.length;
         return members > plans_1.membersPerPlan[this.planId];
     }
     get isUpgradePlanRequired() {
         const graceMembers = 4;
         const planMembers = plans_1.membersPerPlan[this.planId] + graceMembers;
-        const members = this.activePlayers.length;
+        const members = this.activeMembers.length;
         return members > planMembers;
     }
     get firstAnswerAt() {

package/models/Group/types.d.ts

@@ -16,6 +16,7 @@ export declare enum GroupHistoryAction {
     MemberRemove = "member_remove",
     MemberInstrumentChange = "member_instrument_change",
     MemberPermissionsChange = "member_permissions_change",
+    GuestPromoted = "guest_promoted",
     TemplateCreated = "template_created",
     TemplateDeleted = "template_deleted",
     TemplateEdited = "template_edited",
@@ -38,6 +39,12 @@ export declare enum GroupCustomFieldType {
     LINK = "link",
     PARAGRAPH = "paragraph"
 }
+export declare enum GroupCustomFieldMemberAccess {
+    Private = "private",
+    ReadOnly = "readOnly",
+    Editable = "editable",
+    Required = "required"
+}
 export interface GroupCustomFieldOption {
     id: string;
     value: string;
@@ -45,9 +52,21 @@ export interface GroupCustomFieldOption {
 export interface GroupCustomField {
     label: string;
     type: GroupCustomFieldType;
-    required: boolean;
-    allowEditByMember: boolean;
-    private?: boolean;
+    /**
+     * Member-facing access level. Single source of truth for visibility,
+     * editability and join-time enforcement.
+     */
+    memberAccess?: GroupCustomFieldMemberAccess;
+    /**
+     * @deprecated Superseded by `memberAccess`. Only retained so the one-off
+     * backfill can derive `memberAccess` from legacy documents.
+     */
+    required?: boolean;
+    /**
+     * @deprecated Superseded by `memberAccess`. Only retained so the one-off
+     * backfill can derive `memberAccess` from legacy documents.
+     */
+    allowEditByMember?: boolean;
     placeholder: string | null;
     options: GroupCustomFieldOption[];
     order: number;
@@ -148,6 +167,9 @@ export interface GroupTemplateData {
 export interface AGroupTemplateData extends GroupTemplateData {
     id: string;
 }
+export interface GroupPlayerBasicData extends PlayerBasicData {
+    isGuest?: boolean;
+}
 export interface GroupAlgoliaData extends Omit<GroupBasicData, 'location'> {
     objectID: string;
     _geoloc: {
@@ -241,7 +263,7 @@ export interface AGroupEventQuestion extends GroupEventQuestion {
 export type GroupInstruments = Partial<Record<DefaultInstrumentId, DefaultGroupInstrument>> & Record<CustomInstrumentId, CustomGroupInstrument>;
 export interface GroupData extends GroupBasicData {
     playerIds: string[];
-    players: Record<string, PlayerBasicData>;
+    players: Record<string, GroupPlayerBasicData>;
     templates: Record<string, GroupTemplateData>;
     administrators: string[];
     adminPermissions: Record<string, AdminPermissions[]>;

package/models/Group/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GroupRepertoireTagDefault = exports.GroupRepertoireTagReserved = exports.SocialNetwork = exports.GroupModulePlan = exports.GroupModuleId = exports.GroupStatus = exports.GroupConfigShowAttendanceToMembers = exports.GroupConfigSitesKey = exports.GroupConfigKey = exports.AdminPermissions = exports.GroupCustomFieldType = exports.GroupHistoryAction = void 0;
+exports.GroupRepertoireTagDefault = exports.GroupRepertoireTagReserved = exports.SocialNetwork = exports.GroupModulePlan = exports.GroupModuleId = exports.GroupStatus = exports.GroupConfigShowAttendanceToMembers = exports.GroupConfigSitesKey = exports.GroupConfigKey = exports.AdminPermissions = exports.GroupCustomFieldMemberAccess = exports.GroupCustomFieldType = exports.GroupHistoryAction = void 0;
 var GroupHistoryAction;
 (function (GroupHistoryAction) {
     GroupHistoryAction["Created"] = "created";
@@ -11,6 +11,7 @@ var GroupHistoryAction;
     GroupHistoryAction["MemberRemove"] = "member_remove";
     GroupHistoryAction["MemberInstrumentChange"] = "member_instrument_change";
     GroupHistoryAction["MemberPermissionsChange"] = "member_permissions_change";
+    GroupHistoryAction["GuestPromoted"] = "guest_promoted";
     GroupHistoryAction["TemplateCreated"] = "template_created";
     GroupHistoryAction["TemplateDeleted"] = "template_deleted";
     GroupHistoryAction["TemplateEdited"] = "template_edited";
@@ -35,6 +36,13 @@ var GroupCustomFieldType;
     GroupCustomFieldType["LINK"] = "link";
     GroupCustomFieldType["PARAGRAPH"] = "paragraph";
 })(GroupCustomFieldType = exports.GroupCustomFieldType || (exports.GroupCustomFieldType = {}));
+var GroupCustomFieldMemberAccess;
+(function (GroupCustomFieldMemberAccess) {
+    GroupCustomFieldMemberAccess["Private"] = "private";
+    GroupCustomFieldMemberAccess["ReadOnly"] = "readOnly";
+    GroupCustomFieldMemberAccess["Editable"] = "editable";
+    GroupCustomFieldMemberAccess["Required"] = "required";
+})(GroupCustomFieldMemberAccess = exports.GroupCustomFieldMemberAccess || (exports.GroupCustomFieldMemberAccess = {}));
 var AdminPermissions;
 (function (AdminPermissions) {
     AdminPermissions["Owner"] = "owner";

package/models/Notification/types.d.ts

@@ -18,6 +18,7 @@ export declare enum NotificationActions {
     BadgePlayedWorksUpLevel = "badgePlayedWorks.upLevel",
     CommunicationCreate = "communication.create",
     CommunicationNewComment = "communication.newComment",
+    EventGuestJoined = "event.guest.joined",
     GroupDelete = "group.delete",
     GroupPlayersAdd = "group.players.add",
     GroupPlayersJoin = "group.players.join",

package/models/Notification/types.js

@@ -15,6 +15,7 @@ var NotificationActions;
     NotificationActions["BadgePlayedWorksUpLevel"] = "badgePlayedWorks.upLevel";
     NotificationActions["CommunicationCreate"] = "communication.create";
     NotificationActions["CommunicationNewComment"] = "communication.newComment";
+    NotificationActions["EventGuestJoined"] = "event.guest.joined";
     NotificationActions["GroupDelete"] = "group.delete";
     NotificationActions["GroupPlayersAdd"] = "group.players.add";
     NotificationActions["GroupPlayersJoin"] = "group.players.join";

package/models/Partnership/index.d.ts

@@ -27,7 +27,7 @@ export default class Partnership extends PartnershipBasic<PartnershipData> {
     get boardMembers(): import("../../helpers/types").BoardMemberItem[];
     get boardDocuments(): import("../../helpers/types").BoardDocumentItem[];
     get language(): import("../../lang").LanguagesTypes;
-    get customFields(): Record<string, import("../Group/types").GroupCustomField>;
+    get customFields(): Record<string, import("./types").PartnershipCustomField>;
     get customFieldsList(): APartnershipCustomField[];
     get tags(): Record<string, import("./types").PartnershipTag>;
     get tagsList(): APartnershipTag[];

package/models/Partnership/types.d.ts

@@ -1,9 +1,23 @@
 import { DocumentReference, Timestamp } from '@google-cloud/firestore';
 import { AdminItem, BasicAddressData, BoardDocumentItem, BoardMemberItem } from '../../helpers/types';
 import { LanguagesTypes } from '../../lang';
-import { AGroupCustomField, GroupCustomField } from '../Group/types';
-export type PartnershipCustomField = GroupCustomField;
-export type APartnershipCustomField = AGroupCustomField;
+import { GroupCustomFieldOption, GroupCustomFieldType } from '../Group/types';
+export interface PartnershipCustomField {
+    label: string;
+    type: GroupCustomFieldType;
+    required: boolean;
+    private?: boolean;
+    placeholder: string | null;
+    options: GroupCustomFieldOption[];
+    order: number;
+    createdAt: Timestamp;
+    updatedAt: Timestamp;
+    createdBy: string;
+    updatedBy: string;
+}
+export interface APartnershipCustomField extends PartnershipCustomField {
+    id: string;
+}
 export interface PartnershipTag {
     label: string;
     order: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@glissandoo/lib",
-	"version": "1.126.0",
+	"version": "1.128.0",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",