@glissandoo/lib 1.32.11 → 1.32.13

package/models/Counters/Group/Analytics/index.js

@@ -4,13 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const date_fns_1 = require("date-fns");
+const get_1 = __importDefault(require("lodash/get"));
 const Model_1 = __importDefault(require("../../../Model"));
 class GroupAnalytics extends Model_1.default {
     constructor(doc) {
         super(doc);
     }
     get groupId() {
-        return this.ref.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }
     get satisfactionIndex() {
         return this.data.satisfactionIndex || 0;

package/models/Evento/Player/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 get_1 = __importDefault(require("lodash/get"));
 const lang_1 = require("../../../lang");
 const basic_1 = __importDefault(require("../../Player/basic"));
 const types_1 = require("./types");
@@ -14,7 +15,7 @@ class EventoPlayer extends basic_1.default {
         return this.data.joinedAt;
     }
     get eventId() {
-        return this.ref.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }
     get status() {
         return this.data.status;

package/models/Evento/Repertory/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 get_1 = __importDefault(require("lodash/get"));
 const basic_1 = __importDefault(require("../../Repertory/basic"));
 class EventoRepertory extends basic_1.default {
     constructor(doc) {
@@ -15,7 +16,7 @@ class EventoRepertory extends basic_1.default {
         return this.data.order || 0;
     }
     get eventId() {
-        return this.ref.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }
     get isActive() {
         return this.exists;

package/models/Federation/Partnership/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 get_1 = __importDefault(require("lodash/get"));
 const basic_1 = __importDefault(require("../../Partnership/basic"));
 class FederationPartnership extends basic_1.default {
     constructor(doc) {
@@ -12,7 +13,7 @@ class FederationPartnership extends basic_1.default {
         return this.data.connectedAt || null;
     }
     get federationId() {
-        return this.ref.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }
     get isConnected() {
         return this.connectedAt !== null;

package/models/Group/Analytics/index.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const date_fns_1 = require("date-fns");
+const get_1 = __importDefault(require("lodash/get"));
 const Model_1 = __importDefault(require("../../Model"));
 // @deprecate -> usar Counter/Group/Analytics
 class GroupAnalytics extends Model_1.default {
@@ -11,7 +12,7 @@ class GroupAnalytics extends Model_1.default {
         super(doc);
     }
     get groupId() {
-        return this.ref.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }
     get satisfactionIndex() {
         return this.data.satisfactionIndex || 0;

package/models/Group/Player/Event/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 get_1 = __importDefault(require("lodash/get"));
 const lang_1 = require("../../../../lang");
 const basic_1 = __importDefault(require("../../../Evento/basic"));
 const types_1 = require("../../../Evento/Player/types");
@@ -11,10 +12,10 @@ class GroupPlayerEvent extends basic_1.default {
         super(doc, lang);
     }
     get playerId() {
-        return this.ref.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }
     get groupId() {
-        return this.ref.parent?.parent?.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'parent', 'parent', 'id']);
     }
     get status() {
         return this.data.status || null;

package/models/Group/Player/index.js

@@ -13,7 +13,7 @@ class GroupPlayer extends basic_1.default {
         super(doc, lang);
     }
     get groupId() {
-        return this.ref.parent?.parent?.id;
+        return (0, lodash_1.get)(this.ref, ['parent', 'parent', 'id']);
     }
     get instruments() {
         return this.data.instruments || [];

package/models/Group/Repertory/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const endOfDay_1 = __importDefault(require("date-fns/endOfDay"));
 const isFuture_1 = __importDefault(require("date-fns/isFuture"));
 const lodash_1 = require("lodash");
+const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const objects_1 = require("../../../helpers/objects");
 const ts_extras_1 = require("../../../helpers/ts-extras");
@@ -21,7 +22,7 @@ class GroupRepertory extends basic_1.default {
         this.lang = lang;
     }
     get groupId() {
-        return this.ref.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }
     get tagsAlgolia() {
         return this.data.tagsAlgolia || [];

package/models/Group/index.d.ts

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

package/models/Group/index.js

@@ -9,7 +9,6 @@ const orders_1 = require("../../helpers/musicStyles/orders");
 const objects_1 = require("../../helpers/objects");
 const plans_1 = require("../../helpers/plans");
 const lang_1 = require("../../lang");
-const firestore_1 = require("../../types/firestore");
 const basic_1 = __importDefault(require("./basic"));
 const types_1 = require("./types");
 class Group extends basic_1.default {
@@ -149,7 +148,7 @@ class Group extends basic_1.default {
         return this.data.metadata || {};
     }
     get isExpiredTrial() {
-        const isOutDateTrial = (0, date_fns_1.isPast)(this.trialEndAt.toDate());
+        const isOutDateTrial = (0, date_fns_1.isPast)(this.trialEndAt);
         const members = this.activePlayers.length;
         const isAboveMembersLimitPlanFree = members > plans_1.membersPerPlan[plans_1.PlansGroup.Piano];
         return this.status !== types_1.GroupStatus.Premium && isOutDateTrial && isAboveMembersLimitPlanFree;
@@ -176,7 +175,10 @@ class Group extends basic_1.default {
         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));
+        if (this.data.trialEndAt) {
+            return this.data.trialEndAt.toDate();
+        }
+        return (0, date_fns_1.addMonths)(this.createdAt.toDate(), 1);
     }
 }
 exports.default = Group;

package/models/Partnership/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 get_1 = __importDefault(require("lodash/get"));
 const plans_1 = require("../../../helpers/plans");
 const lang_1 = require("../../../lang");
 const basic_1 = __importDefault(require("../../Group/basic"));
@@ -41,7 +42,7 @@ class PartnershipGroup extends basic_1.default {
         return this.data.subscriptionStripeId || null;
     }
     get partnershipId() {
-        return this.ref.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }
 }
 exports.default = PartnershipGroup;

package/models/Partnership/Partner/Subscription/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 get_1 = __importDefault(require("lodash/get"));
 const payments_1 = require("../../../../helpers/payments");
 const basic_1 = __importDefault(require("../../Plan/basic"));
 const types_1 = require("./types");
@@ -14,10 +15,10 @@ class PartnerSubscription extends basic_1.default {
         return this.data.planRef;
     }
     get partnerId() {
-        return this.ref.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }
     get partnershipId() {
-        return this.ref.parent?.parent?.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'parent', 'parent', 'id']);
     }
     get status() {
         return this.data.status;

package/models/Partnership/Partner/index.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const get_1 = __importDefault(require("lodash/get"));
 const basic_1 = __importDefault(require("../../Partner/basic"));
 class PartnershipPartner extends basic_1.default {
     constructor(doc) {
         super(doc);
     }
     get partnershipId() {
-        return this.ref.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }
     get subscriptionIds() {
         return this.data.subscriptionIds || [];

package/models/Partnership/Plan/index.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const get_1 = __importDefault(require("lodash/get"));
 const basic_1 = __importDefault(require("./basic"));
 class PartnershipPlan extends basic_1.default {
     constructor(doc) {
         super(doc);
     }
     get partnershipId() {
-        return this.ref.parent?.parent?.id;
+        return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }
     get deletedAt() {
         return this.data.deletedAt || null;

package/models/User/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 lodash_1 = require("lodash");
 const lang_1 = require("../../../lang");
 const basic_1 = __importDefault(require("../../Group/basic"));
 const types_1 = require("../../Group/Player/types");
@@ -11,7 +12,7 @@ class UserGroup extends basic_1.default {
         super(doc, lang);
     }
     get groupId() {
-        return this.ref.parent?.parent?.id;
+        return (0, lodash_1.get)(this.ref, ['parent', 'parent', 'id']);
     }
     get mainInstrument() {
         return this.data.mainInstrument;

package/package.json

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