@glissandoo/lib 1.31.0 → 1.32.1

package/helpers/utils.d.ts

@@ -2,6 +2,6 @@ import { LanguagesTypes } from '../lang';
 import { MetaNotificationData } from '../models/User/Notification/types';
 import { Descendant } from './slate';
 export declare const replaceVarsBrackets: (string: string, values: MetaNotificationData) => string;
-export declare const replaceKeysNotification: (string: string, values: MetaNotificationData, lang: LanguagesTypes) => string;
+export declare const replaceKeysNotification: (text: string, values: MetaNotificationData, lang: LanguagesTypes) => string;
 export declare const serializeSlateBlock: (nodes: Descendant[]) => string;
 export declare const orderByMatch: <T>(list: T[], field: keyof T, order: string[]) => T[];

package/helpers/utils.js

@@ -21,54 +21,59 @@ const replaceVarsBrackets = (string, values) => {
     return replaceString;
 };
 exports.replaceVarsBrackets = replaceVarsBrackets;
-const replaceKeysNotification = (string, values, lang) => {
+const replaceKeysNotification = (text, values, lang) => {
     const dateLang = (0, lang_1.getDateLang)(lang);
-    const matches = string.match(/(\{).+?(\})/g);
+    const matches = text.match(/(\{).+?(\})/g);
     const { extra, ...other } = values;
     const newValues = { extra };
     Object.keys(other || {}).forEach((key) => Object.assign(newValues, {
         [key]: Object.values((0, get_1.default)(other, key)),
     }));
-    let replaceString = string;
-    if (matches && matches.length > 0) {
-        matches.forEach((match) => {
-            const value = match.slice(1, -1);
-            const typeKeyMatch = value.split(':');
-            const type = typeKeyMatch[0];
-            const key = typeKeyMatch[1];
-            switch (type) {
-                case 'instrument': {
-                    const instrumentId = (0, get_1.default)(newValues, key.split('.'));
-                    const instrument = new Instrument_1.default(instrumentId, lang);
-                    if (instrument) {
-                        replaceString = replaceString.replace(match, instrument.name.toLowerCase());
-                    }
-                    break;
-                }
-                case 'date': {
-                    const timestamp = (0, get_1.default)(newValues, key.split('.'));
-                    if (!timestamp) {
-                        replaceString = replaceString.replace(match, '');
-                    }
-                    else {
-                        const dateUTC = (0, date_fns_tz_1.utcToZonedTime)(timestamp.toDate(), 'Europe/Madrid');
-                        const formatValue = typeKeyMatch[2] || 'shortDate';
-                        const dateFormat = (0, date_fns_1.format)(dateUTC, (0, get_1.default)(dateLang.format, formatValue), {
-                            locale: dateLang.locale,
-                        });
-                        replaceString = replaceString.replace(match, dateFormat);
-                    }
-                    break;
+    let replaceString = text;
+    if (!matches || matches.length === 0) {
+        return replaceString;
+    }
+    for (const match of matches) {
+        const value = match.slice(1, -1);
+        const typeKeyMatch = value.split(':');
+        const type = typeKeyMatch[0];
+        const key = typeKeyMatch[1];
+        const path = key.split('.');
+        switch (type) {
+            case 'instrument': {
+                const instrumentId = (0, get_1.default)(newValues, path);
+                const instrument = new Instrument_1.default(instrumentId, lang);
+                if (instrument) {
+                    replaceString = replaceString.replace(match, instrument.name.toLowerCase());
                 }
-                case 'string': {
-                    replaceString = replaceString.replace(match, (0, get_1.default)(newValues, key.split('.')));
-                    break;
+                break;
+            }
+            case 'date': {
+                const timestamp = (0, get_1.default)(newValues, path);
+                if (!timestamp) {
+                    replaceString = replaceString.replace(match, '');
                 }
-                default: {
-                    break;
+                else {
+                    const timezonePath = path;
+                    timezonePath[path.length - 1] = 'timezone';
+                    const timezone = (0, get_1.default)(newValues, timezonePath) || 'Europe/Madrid';
+                    const dateUTC = (0, date_fns_tz_1.utcToZonedTime)(timestamp.toDate(), timezone);
+                    const formatValue = typeKeyMatch[2] || 'shortDate';
+                    const dateFormat = (0, date_fns_1.format)(dateUTC, (0, get_1.default)(dateLang.format, formatValue), {
+                        locale: dateLang.locale,
+                    });
+                    replaceString = replaceString.replace(match, dateFormat);
                 }
+                break;
             }
-        });
+            case 'string': {
+                replaceString = replaceString.replace(match, (0, get_1.default)(newValues, path));
+                break;
+            }
+            default: {
+                break;
+            }
+        }
     }
     return replaceString;
 };

package/models/Evento/basic.d.ts

@@ -18,4 +18,5 @@ export default class EventoBasic<D> extends ModelWithLang<EventBasicData & D> {
     get duration(): number;
     get isOutDate(): boolean;
     get isHappening(): boolean;
+    get timezone(): string;
 }

package/models/Evento/basic.js

@@ -16,6 +16,7 @@ class EventoBasic extends lang_2.default {
             displayName: this.displayName,
             datetime: this.datetime,
             type: this.type,
+            timezone: this.data.timezone,
         };
     }
     get basicInfo() {
@@ -26,6 +27,7 @@ class EventoBasic extends lang_2.default {
             datetime: this.datetime,
             datetimeEnd: this.datetimeEnd,
             type: this.type,
+            timezone: this.data.timezone,
         };
     }
     get displayName() {
@@ -67,5 +69,8 @@ class EventoBasic extends lang_2.default {
     get isHappening() {
         return (0, date_fns_1.isPast)(this.datetime.toDate()) && (0, date_fns_1.isFuture)(this.datetimeEnd.toDate());
     }
+    get timezone() {
+        return this.data.timezone || 'Europe/Madrid';
+    }
 }
 exports.default = EventoBasic;

package/models/Evento/index.d.ts

@@ -53,19 +53,8 @@ export default class Evento extends EventoPromoter<EventData> {
     get declinedRollCallPlayers(): string[];
     get isRollCalled(): boolean;
     get isActiveRollCall(): boolean;
-    /** @deprecated  */
-    get viewers(): Record<string, import("./types").EventViewer>;
-    /** @deprecated  */
-    get listViewers(): (import("./types").EventViewer & {
-        id: string;
-    })[];
-    /** @deprecated  */
-    get totalViews(): number;
     get templateId(): string | null;
     get repeat(): import("./types").EventRepeatType | null;
-    get timezone(): string;
-    /** @deprecated  */
-    getViewer(userId: string): import("./types").EventViewer | null;
     isPlayer: (userId: string) => boolean;
     getPlayer: (userId: string) => EventPlayerBasicData | null;
     isPlayerConfirmed(player: EventPlayerBasicData): boolean;

package/models/Evento/index.js

@@ -152,33 +152,12 @@ class Evento extends promoter_1.default {
     get isActiveRollCall() {
         return (0, date_fns_1.isPast)((0, date_fns_1.addHours)(this.datetime.toDate(), -1));
     }
-    /** @deprecated  */
-    get viewers() {
-        return this.data.viewers || {};
-    }
-    /** @deprecated  */
-    get listViewers() {
-        return Object.keys(this.viewers).map((userId) => Object.assign(this.viewers[userId], { id: userId }));
-    }
-    /** @deprecated  */
-    get totalViews() {
-        return this.listViewers
-            .map((viewer) => viewer.count || 0)
-            .reduce((acc, current) => acc + current);
-    }
     get templateId() {
         return this.data.templateId || null;
     }
     get repeat() {
         return this.data.repeat || null;
     }
-    get timezone() {
-        return this.data.timezone || 'Europe/Madrid';
-    }
-    /** @deprecated  */
-    getViewer(userId) {
-        return userId in this.viewers ? this.viewers[userId] : null;
-    }
     isPlayerConfirmed(player) {
         return player.status === types_1.EventPlayerStatus.Confirmed;
     }

package/models/Evento/tiny.d.ts

@@ -11,4 +11,5 @@ export default class EventoTiny {
     get isPractice(): boolean;
     get isPerformance(): boolean;
     get datetime(): FirebaseFirestore.Timestamp;
+    get timezone(): string;
 }

package/models/Evento/tiny.js

@@ -29,5 +29,8 @@ class EventoTiny {
     get datetime() {
         return this.data.datetime;
     }
+    get timezone() {
+        return this.data.timezone || 'Europe/Madrid';
+    }
 }
 exports.default = EventoTiny;

package/models/Evento/types.d.ts

@@ -59,6 +59,7 @@ export interface EventTinyData {
     displayName: string | null;
     datetime: Timestamp;
     type: EventType;
+    timezone: string;
 }
 export interface EventBasicData extends EventTinyData {
     locality: string | null;
@@ -94,7 +95,6 @@ export interface EventData extends EventPromoterData {
     repeat: EventRepeatType | null;
     stage: EventStage | null;
     stageTemplateId: string | null;
-    timezone: string;
     readonly owner: DocumentReference;
     readonly createdAt: Timestamp;
     readonly createdOn: EventCreatedOn;

package/models/Group/index.d.ts

@@ -1,4 +1,4 @@
-import { DocumentReference, DocumentSnapshot } from '@google-cloud/firestore';
+import { DocumentReference, DocumentSnapshot, Timestamp } from '@google-cloud/firestore';
 import { PlansGroup } from '../../helpers/plans';
 import { LanguagesTypes } from '../../lang';
 import GroupBasic from './basic';
@@ -17,8 +17,8 @@ export default class Group extends GroupBasic<GroupData> {
     get invitationEmails(): string[];
     get shortDynamicLink(): string;
     get admins(): string[];
-    get createdAt(): FirebaseFirestore.Timestamp;
-    get deletedAt(): FirebaseFirestore.Timestamp | null;
+    get createdAt(): Timestamp;
+    get deletedAt(): Timestamp | null;
     get repertoryCount(): number;
     get eventCount(): Record<import("../Evento/types").EventType, number>;
     get performanceCount(): number;
@@ -60,10 +60,11 @@ export default class Group extends GroupBasic<GroupData> {
     get stageTemplatesList(): (import("../../helpers/types").StageTemplate & {
         id: string;
     })[];
-    get firstAnswerAt(): FirebaseFirestore.Timestamp | null;
+    get firstAnswerAt(): Timestamp | null;
     get repertoireTags(): Record<string, import("./types").GroupRepertoireTag>;
     get repertoireTagsList(): (import("./types").GroupRepertoireTag & {
         id: string;
     })[];
     getRepertoireTagName(id: string): string | null;
+    get trialEndAt(): Timestamp;
 }

package/models/Group/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const firestore_1 = require("@google-cloud/firestore");
 const date_fns_1 = require("date-fns");
 const lodash_1 = require("lodash");
 const orders_1 = require("../../helpers/musicStyles/orders");
@@ -148,7 +149,7 @@ class Group extends basic_1.default {
         return this.data.metadata || {};
     }
     get isExpiredTrial() {
-        const isOutDateTrial = (0, date_fns_1.isBefore)(this.createdAt.toDate(), (0, date_fns_1.subMonths)(new Date(), 1));
+        const isOutDateTrial = (0, date_fns_1.isPast)(this.trialEndAt.toDate());
         const members = this.activePlayers.length;
         const isAboveMembersLimitPlanFree = members > plans_1.membersPerPlan[plans_1.PlansGroup.Piano];
         return this.status !== types_1.GroupStatus.Premium && isOutDateTrial && isAboveMembersLimitPlanFree;
@@ -174,5 +175,8 @@ class Group extends basic_1.default {
         const tag = this.repertoireTags[id];
         return tag.default ? (0, lang_1.getTranslation)(tag.title, this.lang) : tag.title;
     }
+    get trialEndAt() {
+        return this.data.trialEndAt || firestore_1.Timestamp.fromDate((0, date_fns_1.addMonths)(this.createdAt.toDate(), 1));
+    }
 }
 exports.default = Group;

package/models/Group/types.d.ts

@@ -110,6 +110,7 @@ export interface GroupData extends GroupBasicData {
     metadata: Record<string, string>;
     firstAnswerAt: Timestamp | null;
     repertoireTags: Record<string, GroupRepertoireTag>;
+    trialEndAt: Timestamp | null;
     readonly owner: DocumentReference;
     readonly createdAt: Timestamp;
 }

package/package.json

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