@glissandoo/lib 1.53.2 → 1.53.4

package/models/Evento/Player/{Basic.d.ts → basic.d.ts}

@@ -1,12 +1,9 @@
-import { LanguagesTypes } from '../../../lang';
 import { AEventPlayerBasicData } from '../types';
 import { EventPlayerStatus } from './types';
 export default class EventoPlayerBasic {
     eventId: string;
-    exists: boolean;
     protected data: AEventPlayerBasicData;
-    protected lang: LanguagesTypes;
-    constructor(eventId: string, data: AEventPlayerBasicData | null, lang?: LanguagesTypes);
+    constructor(eventId: string, data: AEventPlayerBasicData);
     get id(): string;
     get username(): string;
     get displayName(): string;
@@ -20,6 +17,9 @@ export default class EventoPlayerBasic {
     get selected(): boolean | null;
     get isActive(): boolean;
     get isInterested(): boolean;
+    get isPendingInterested(): boolean;
+    get isSelected(): boolean;
+    get isDiscarded(): boolean;
     get isConfirmed(): boolean;
     get isDeclined(): boolean;
     get isPending(): boolean;

package/models/Evento/Player/{Basic.js → basic.js}

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
-const lang_1 = require("../../../lang");
 const types_1 = require("./types");
 class EventoPlayerBasic {
-    constructor(eventId, data, lang = lang_1.defaultLocale) {
+    constructor(eventId, data) {
         this.eventId = eventId;
-        this.data = data || {};
-        this.exists = data !== null;
-        this.lang = lang;
+        this.data = data;
     }
     get id() {
         return this.data.id;
@@ -44,11 +41,20 @@ class EventoPlayerBasic {
         return !(0, lodash_1.isUndefined)(this.data.selected) ? this.data.selected : null;
     }
     get isActive() {
-        return this.exists && this.selected !== false;
+        return !this.isDiscarded;
     }
     get isInterested() {
         return this.interested === true;
     }
+    get isPendingInterested() {
+        return this.interested === null;
+    }
+    get isSelected() {
+        return this.selected === true;
+    }
+    get isDiscarded() {
+        return this.selected === false;
+    }
     get isConfirmed() {
         return this.status === types_1.EventPlayerStatus.Confirmed;
     }

package/models/Evento/index.d.ts

@@ -1,9 +1,14 @@
 import { InstrumentId } from '../../helpers/instruments';
 import { LanguagesTypes } from '../../lang';
 import { DocumentReference, DocumentSnapshot } from '../../types/firestore';
+import EventoPlayerBasic from './Player/basic';
 import EventoPromoter from './promoter';
-import { EventData, EventResponseDeadlineOptions, EventStatusByTime } from './types';
-import EventoPlayerBasic from './Player/Basic';
+import { AEventPlayerBasicData, EventData, EventResponseDeadlineOptions, EventStatusByTime } from './types';
+interface PlayerListOptions {
+    showAll?: boolean;
+    order?: InstrumentId[];
+    asObject?: boolean;
+}
 export default class Evento extends EventoPromoter<EventData> {
     constructor(doc: DocumentSnapshot, lang?: LanguagesTypes);
     get maxAttendance(): number | null;
@@ -17,9 +22,7 @@ export default class Evento extends EventoPromoter<EventData> {
     get relEvents(): string[];
     get isASerie(): boolean;
     get playerIds(): string[];
-    get players(): {
-        [x: string]: EventoPlayerBasic;
-    };
+    get players(): Record<string, import("./types").EventPlayerBasicData>;
     get playersCount(): number;
     get repertory(): Record<string, import("./types").EventThemeBasicData>;
     get repertoryIds(): string[];
@@ -48,22 +51,19 @@ export default class Evento extends EventoPromoter<EventData> {
         tags: string[];
         media: import("../Repertory/types").ThemeMediaType | null;
     }[];
-    playersList({ showAll, order }?: {
-        showAll?: boolean;
-        order?: InstrumentId[];
-    }): EventoPlayerBasic[];
-    get interestedPlayers(): string[];
-    get confirmedPlayers(): string[];
-    get declinedPlayers(): string[];
-    get pendingPlayers(): string[];
-    get confirmedRollCallPlayers(): string[];
-    get declinedRollCallPlayers(): string[];
+    playersList<T extends PlayerListOptions>(data?: T): T['asObject'] extends true ? AEventPlayerBasicData[] : EventoPlayerBasic[];
+    get interestedPlayers(): EventoPlayerBasic[];
+    get confirmedPlayers(): EventoPlayerBasic[];
+    get declinedPlayers(): EventoPlayerBasic[];
+    get pendingPlayers(): EventoPlayerBasic[];
+    get confirmedRollCallPlayers(): EventoPlayerBasic[];
+    get declinedRollCallPlayers(): EventoPlayerBasic[];
     get isRollCalled(): boolean;
     get isActiveRollCall(): boolean;
     get templateId(): string | null;
     get repeat(): import("./types").EventRepeatType | null;
     isPlayer: (userId: string) => boolean;
-    getPlayer: (userId: string) => EventoPlayerBasic;
+    getPlayer: (userId: string) => EventoPlayerBasic | null;
     get responseDeadline(): {
         option: EventResponseDeadlineOptions;
         customAt: import("../../types/firestore").Timestamp | null;
@@ -73,3 +73,4 @@ export default class Evento extends EventoPromoter<EventData> {
     get isSelectionModeClose(): boolean;
     get isSelectionModeOpen(): boolean;
 }
+export {};

package/models/Evento/index.js

@@ -8,9 +8,9 @@ const lodash_1 = require("lodash");
 const orders_1 = require("../../helpers/musicStyles/orders");
 const utils_1 = require("../../helpers/utils");
 const lang_1 = require("../../lang");
+const basic_1 = __importDefault(require("./Player/basic"));
 const promoter_1 = __importDefault(require("./promoter"));
 const types_1 = require("./types");
-const Basic_1 = __importDefault(require("./Player/Basic"));
 class Evento extends promoter_1.default {
     constructor(doc, lang = lang_1.defaultLocale) {
         super(doc, lang);
@@ -19,8 +19,8 @@ class Evento extends promoter_1.default {
         };
         this.getPlayer = (userId) => {
             return userId in this.players
-                ? this.players[userId]
-                : new Basic_1.default(this.id, null, this.lang);
+                ? new basic_1.default(this.id, { id: userId, ...this.players[userId] })
+                : null;
         };
     }
     get maxAttendance() {
@@ -57,7 +57,7 @@ class Evento extends promoter_1.default {
         return this.data.playerIds || [];
     }
     get players() {
-        return (0, lodash_1.mapValues)(this.data.players || {}, (player, id) => new Basic_1.default(this.id, { id, ...player }, this.lang));
+        return this.data.players || {};
     }
     get playersCount() {
         return this.data.playerIds.length;
@@ -133,32 +133,37 @@ class Evento extends promoter_1.default {
         }));
         return (0, lodash_1.orderBy)(repertory, 'order', 'asc');
     }
-    playersList({ showAll, order } = {}) {
-        const players = Object.values(this.players);
+    playersList({ showAll, order, asObject } = {}) {
+        const players = asObject
+            ? Object.entries(this.players).map(([id, player]) => ({
+                id,
+                ...player,
+            }))
+            : Object.entries(this.players).map(([id, player]) => new basic_1.default(this.id, { id, ...player }));
         const orderedPlayers = order
             ? (0, utils_1.sortByMatch)(players, 'mainInstrument', order)
             : (0, orders_1.orderByMusicStyle)(players, 'mainInstrument', this.promoterInfo.musicStyle);
         if (showAll)
             return orderedPlayers;
-        return orderedPlayers.filter((player) => player.isActive);
+        return orderedPlayers.filter((player) => player.selected !== false);
     }
     get interestedPlayers() {
-        return this.playerIds.filter((playerId) => this.players[playerId].isInterested);
+        return this.playersList({ showAll: true }).filter((player) => player.isInterested);
     }
     get confirmedPlayers() {
-        return this.playerIds.filter((playerId) => this.players[playerId].isConfirmed);
+        return this.playersList().filter((player) => player.isConfirmed);
     }
     get declinedPlayers() {
-        return this.playerIds.filter((playerId) => this.players[playerId].isDeclined);
+        return this.playersList().filter((player) => player.isDeclined);
     }
     get pendingPlayers() {
-        return this.playerIds.filter((playerId) => this.players[playerId].isPending);
+        return this.playersList().filter((player) => player.isPending);
     }
     get confirmedRollCallPlayers() {
-        return this.playerIds.filter((playerId) => this.players[playerId].isRollCallConfirmed);
+        return this.playersList().filter((player) => player.isRollCallConfirmed);
     }
     get declinedRollCallPlayers() {
-        return this.playerIds.filter((playerId) => this.players[playerId].isRollCallDeclined);
+        return this.playersList().filter((player) => player.isRollCallDeclined);
     }
     get isRollCalled() {
         return this.rollCalledAt !== null;

package/package.json

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