@glissandoo/lib 1.102.4 → 1.102.6

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

@@ -20,8 +20,6 @@ export default class GroupPlayer extends PlayerBasic<GroupPlayerData> {
     get eventsNoAnswered(): number;
     get eventsConfirmed(): number;
     get eventsDeclined(): number;
-    /** @deprecated use eventsConfirmed  */
-    get eventsInterested(): number;
     get eventsSelected(): number;
     get eventsDeselected(): number;
     get performanceInvited(): number;
@@ -29,16 +27,12 @@ export default class GroupPlayer extends PlayerBasic<GroupPlayerData> {
     get performanceNoAnswered(): number;
     get performanceConfirmed(): number;
     get performanceDeclined(): number;
-    /** @deprecated use performanceConfirmed  */
-    get performanceInterested(): number;
     get performanceSelected(): number;
     get performanceDeselected(): number;
     get practiceInvited(): number;
     get practiceAnswered(): number;
     get practiceConfirmed(): number;
     get practiceDeclined(): number;
-    /** @deprecated use practiceConfirmed  */
-    get practiceInterested(): number;
     get practiceSelected(): number;
     get practiceDeselected(): number;
     get practiceRollCallConfirmedStrike(): number;

package/models/Group/Player/index.js

@@ -55,10 +55,6 @@ class GroupPlayer extends basic_1.default {
     get eventsDeclined() {
         return this.data.events_declined_count || 0;
     }
-    /** @deprecated use eventsConfirmed  */
-    get eventsInterested() {
-        return this.data.events_interested_count || 0;
-    }
     get eventsSelected() {
         return this.data.events_selected_count || 0;
     }
@@ -80,10 +76,6 @@ class GroupPlayer extends basic_1.default {
     get performanceDeclined() {
         return this.data.performance_declined_count || 0;
     }
-    /** @deprecated use performanceConfirmed  */
-    get performanceInterested() {
-        return this.data.performance_interested_count || 0;
-    }
     get performanceSelected() {
         return this.data.performance_selected_count || 0;
     }
@@ -102,10 +94,6 @@ class GroupPlayer extends basic_1.default {
     get practiceDeclined() {
         return this.data.practice_declined_count || 0;
     }
-    /** @deprecated use practiceConfirmed  */
-    get practiceInterested() {
-        return this.data.practice_interested_count || 0;
-    }
     get practiceSelected() {
         return this.data.practice_selected_count || 0;
     }

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

@@ -1,6 +1,6 @@
 import { Timestamp } from '@google-cloud/firestore';
 import { InstrumentId } from '../../../helpers/instruments';
-import { PlayerBasicData } from '../../Player/types';
+import { UserExtendedData } from '../../User/types';
 export declare enum GroupPlayerRole {
     Admin = "admin",
     Member = "member",
@@ -9,7 +9,8 @@ export declare enum GroupPlayerRole {
 export type BadgeLevels = {
     [level: string]: Timestamp;
 };
-export interface GroupPlayerData extends PlayerBasicData {
+export interface GroupPlayerData extends UserExtendedData {
+    mainInstrument: InstrumentId;
     instruments: InstrumentId[];
     instrumentsLastUpdatedBy: string;
     role: GroupPlayerRole;
@@ -24,8 +25,6 @@ export interface GroupPlayerData extends PlayerBasicData {
     events_answered_count?: number;
     events_confirmed_count?: number;
     events_declined_count?: number;
-    /** @deprecated use events_confirmed_count  */
-    events_interested_count?: number;
     events_selected_count?: number;
     events_deselected_count?: number;
     events_rollcall_count?: number;
@@ -35,8 +34,6 @@ export interface GroupPlayerData extends PlayerBasicData {
     performance_answered_count?: number;
     performance_confirmed_count?: number;
     performance_declined_count?: number;
-    /** @deprecated use performance_confirmed_count  */
-    performance_interested_count?: number;
     performance_selected_count?: number;
     performance_deselected_count?: number;
     performance_rollcall_count?: number;
@@ -46,8 +43,6 @@ export interface GroupPlayerData extends PlayerBasicData {
     practice_answered_count?: number;
     practice_confirmed_count?: number;
     practice_declined_count?: number;
-    /** @deprecated use practice_confirmed_count  */
-    practice_interested_count?: number;
     practice_selected_count?: number;
     practice_deselected_count?: number;
     practice_rollcall_count?: number;

package/models/Group/index.d.ts

@@ -33,6 +33,8 @@ export default class Group extends GroupBasic<GroupData> {
         id: string;
         mainInstrument: import("../../helpers/instruments").InstrumentId;
         username: string;
+        name: string;
+        lastname: string;
         displayName: string;
         photoURL: string;
     }[];

package/models/Player/basic.js

@@ -11,6 +11,8 @@ class PlayerBasic extends basic_1.default {
     }
     get basicInfo() {
         return {
+            name: this.name,
+            lastname: this.lastname,
             displayName: this.displayName,
             photoURL: this.photoURL,
             username: this.username,

package/models/User/basic.d.ts

@@ -7,6 +7,8 @@ export default class UserBasic<D> extends ModelWithLang<D & UserBasicData> {
     get tinyInfo(): UserTinyData;
     get basicInfo(): UserBasicData;
     get displayName(): string;
+    get name(): string;
+    get lastname(): string;
     get username(): string;
     get photoURL(): string;
 }

package/models/User/basic.js

@@ -17,14 +17,21 @@ class UserBasic extends lang_2.default {
     }
     get basicInfo() {
         return {
-            displayName: this.displayName,
-            photoURL: this.photoURL,
+            ...this.tinyInfo,
+            name: this.name,
+            lastname: this.lastname,
             username: this.username,
         };
     }
     get displayName() {
         return this.data.displayName;
     }
+    get name() {
+        return this.data.name;
+    }
+    get lastname() {
+        return this.data.lastname;
+    }
     get username() {
         return this.data.username;
     }

package/models/User/extended.d.ts

@@ -0,0 +1,12 @@
+import { LanguagesTypes } from '../../lang';
+import { DocumentModel } from '../Model';
+import UserBasic from './basic';
+import { UserExtendedData } from './types';
+export default class UserExtended<D> extends UserBasic<D & UserExtendedData> {
+    constructor(doc: DocumentModel, lang?: LanguagesTypes);
+    get extendedInfo(): UserExtendedData;
+    get locality(): string | null;
+    get location(): FirebaseFirestore.GeoPoint | null;
+    get birthDate(): FirebaseFirestore.Timestamp | null;
+    get email(): string;
+}

package/models/User/extended.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lang_1 = require("../../lang");
+const basic_1 = __importDefault(require("./basic"));
+class UserExtended extends basic_1.default {
+    constructor(doc, lang = lang_1.defaultLocale) {
+        super(doc, lang);
+    }
+    get extendedInfo() {
+        return {
+            ...this.basicInfo,
+            email: this.email,
+            locality: this.locality,
+            location: this.location,
+            birthDate: this.birthDate,
+        };
+    }
+    get locality() {
+        return this.data.locality || null;
+    }
+    get location() {
+        return this.data.location || null;
+    }
+    get birthDate() {
+        return this.data.birthDate || null;
+    }
+    get email() {
+        return this.data.email;
+    }
+}
+exports.default = UserExtended;

package/models/User/index.d.ts

@@ -1,16 +1,11 @@
 import { LanguagesTypes } from '../../lang';
 import { DocumentModel } from '../Model';
 import { RepertoireFilterBy, RepertoireFilterDirection } from '../Repertory/types';
-import UserBasic from './basic';
+import UserExtended from './extended';
 import { UserAppConfig, UserDashboardConfig, UserData, UserEmailSettings, UserEventsFilter, UserNotificationSettings, UserRole } from './types';
-export default class User extends UserBasic<UserData> {
+export default class User extends UserExtended<UserData> {
     constructor(doc: DocumentModel);
-    get name(): string;
-    get lastName(): string;
-    get locality(): string | null;
-    get location(): FirebaseFirestore.GeoPoint | null;
     get instruments(): string[];
-    get email(): string;
     get hasRegistrationComplete(): boolean;
     get role(): UserRole;
     get isSuperAdmin(): boolean;
@@ -27,7 +22,6 @@ export default class User extends UserBasic<UserData> {
     get groups(): string[];
     get groupsAdmin(): string[];
     get isAdmin(): boolean;
-    get birthDate(): FirebaseFirestore.Timestamp | null;
     get notificationSettings(): Record<UserNotificationSettings, boolean>;
     get emailSettings(): Record<UserEmailSettings, boolean>;
     get isActive(): boolean;

package/models/User/index.js

@@ -10,30 +10,15 @@ const objects_1 = require("../../helpers/objects");
 const utils_1 = require("../../helpers/utils");
 const lang_1 = require("../../lang");
 const types_1 = require("../Repertory/types");
-const basic_1 = __importDefault(require("./basic"));
+const extended_1 = __importDefault(require("./extended"));
 const types_2 = require("./types");
-class User extends basic_1.default {
+class User extends extended_1.default {
     constructor(doc) {
         super(doc, doc.get('language') || lang_1.defaultLocale);
     }
-    get name() {
-        return this.data.name;
-    }
-    get lastName() {
-        return this.data.lastname;
-    }
-    get locality() {
-        return this.data.locality;
-    }
-    get location() {
-        return this.data.location;
-    }
     get instruments() {
         return this.data.instruments || [];
     }
-    get email() {
-        return this.data.email;
-    }
     get hasRegistrationComplete() {
         return (0, lodash_1.isString)(this.displayName) && (0, lodash_1.isString)(this.photoURL) && (0, lodash_1.isString)(this.email);
     }
@@ -82,9 +67,6 @@ class User extends basic_1.default {
     get isAdmin() {
         return this.groupsAdmin.length > 0;
     }
-    get birthDate() {
-        return this.data.birthDate;
-    }
     get notificationSettings() {
         return this.data.notificationSettings || (0, utils_1.enumToObj)(types_2.UserNotificationSettings, true);
     }

package/models/User/types.d.ts

@@ -51,11 +51,16 @@ export interface UserTinyData {
 }
 export interface UserBasicData extends UserTinyData {
     username: string;
-}
-export interface UserData extends UserBasicData {
     name: string;
     lastname: string;
+}
+export interface UserExtendedData extends UserBasicData {
     email: string;
+    locality: string | null;
+    location: GeoPoint | null;
+    birthDate: Timestamp | null;
+}
+export interface UserData extends UserExtendedData {
     instruments: string[];
     role: UserRole;
     language: LanguagesTypes;
@@ -63,8 +68,6 @@ export interface UserData extends UserBasicData {
     messageBirdId: string | null;
     description: string | null;
     createdAt: Timestamp;
-    locality: string | null;
-    location: GeoPoint | null;
     notifications: number;
     pushToken: string | null;
     tokens: string[];
@@ -74,7 +77,6 @@ export interface UserData extends UserBasicData {
     customerIds: string[];
     groups: string[];
     groups_admin: string[];
-    birthDate: Timestamp | null;
     devices: Record<string, UserDeviceInfo>;
     notificationSettings: Record<UserNotificationSettings, boolean>;
     emailSettings: Record<UserEmailSettings, boolean>;

package/package.json

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