@glissandoo/lib 1.102.5 → 1.102.7

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

@@ -2,9 +2,9 @@ import { BadgesTypes } from '../../../helpers/badges';
 import { LanguagesTypes } from '../../../lang';
 import { EventType } from '../../Evento/types';
 import { DocumentModel } from '../../Model';
-import PlayerBasic from '../../Player/basic';
+import UserExtended from '../../User/extended';
 import { GroupPlayerData, GroupPlayerRole } from './types';
-export default class GroupPlayer extends PlayerBasic<GroupPlayerData> {
+export default class GroupPlayer extends UserExtended<GroupPlayerData> {
     constructor(doc: DocumentModel, lang?: LanguagesTypes);
     get groupId(): string;
     get instruments(): import("../../../helpers/instruments").InstrumentId[];

package/models/Group/Player/index.js

@@ -7,9 +7,9 @@ const lodash_1 = require("lodash");
 const badges_1 = require("../../../helpers/badges");
 const utils_1 = require("../../../helpers/utils");
 const lang_1 = require("../../../lang");
-const basic_1 = __importDefault(require("../../Player/basic"));
+const extended_1 = __importDefault(require("../../User/extended"));
 const types_1 = require("./types");
-class GroupPlayer extends basic_1.default {
+class GroupPlayer extends extended_1.default {
     constructor(doc, lang = lang_1.defaultLocale) {
         super(doc, lang);
     }

package/models/Player/basic.js

@@ -12,7 +12,7 @@ class PlayerBasic extends basic_1.default {
     get basicInfo() {
         return {
             name: this.name,
-            lastname: this.lastName,
+            lastname: this.lastname,
             displayName: this.displayName,
             photoURL: this.photoURL,
             username: this.username,

package/models/User/basic.d.ts

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

package/models/User/basic.js

@@ -19,7 +19,7 @@ class UserBasic extends lang_2.default {
         return {
             ...this.tinyInfo,
             name: this.name,
-            lastname: this.lastName,
+            lastname: this.lastname,
             username: this.username,
         };
     }
@@ -29,7 +29,7 @@ class UserBasic extends lang_2.default {
     get name() {
         return this.data.name;
     }
-    get lastName() {
+    get lastname() {
         return this.data.lastname;
     }
     get username() {

package/models/User/extended.d.ts

@@ -7,5 +7,6 @@ export default class UserExtended<D> extends UserBasic<D & UserExtendedData> {
     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

@@ -15,14 +15,17 @@ class UserExtended extends basic_1.default {
             email: this.email,
             locality: this.locality,
             location: this.location,
-            birthDate: this.data.birthDate,
+            birthDate: this.birthDate,
         };
     }
     get locality() {
-        return this.data.locality;
+        return this.data.locality || null;
     }
     get location() {
-        return this.data.location;
+        return this.data.location || null;
+    }
+    get birthDate() {
+        return this.data.birthDate || null;
     }
     get email() {
         return this.data.email;

package/models/User/index.d.ts

@@ -22,7 +22,6 @@ export default class User extends UserExtended<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

@@ -67,9 +67,6 @@ class User extends extended_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/package.json

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