@glissandoo/lib 1.32.0 → 1.32.2

package/helpers/errors.d.ts

@@ -8,6 +8,7 @@ export declare enum HttpsErrorMessages {
     InvalidLinkInvitation = "groupPlayer.join.linkNoValid",
     InvalidJoinPlayer = "groupPlayer.join.isPlayer",
     InvalidGroupRepertory = "error.groupRepertory.noValid",
+    GroupNotCurrentWithPaymentPlans = "error.group.notCurrentWithPaymentPlans",
     InvalidEvent = "error.event.noValid",
     InvalidEventPlayer = "error.event.noPlayer",
     InvalidMaxNumberEvents = "error.event.maxEventsPublish",

package/helpers/errors.js

@@ -12,6 +12,7 @@ var HttpsErrorMessages;
     HttpsErrorMessages["InvalidLinkInvitation"] = "groupPlayer.join.linkNoValid";
     HttpsErrorMessages["InvalidJoinPlayer"] = "groupPlayer.join.isPlayer";
     HttpsErrorMessages["InvalidGroupRepertory"] = "error.groupRepertory.noValid";
+    HttpsErrorMessages["GroupNotCurrentWithPaymentPlans"] = "error.group.notCurrentWithPaymentPlans";
     HttpsErrorMessages["InvalidEvent"] = "error.event.noValid";
     HttpsErrorMessages["InvalidEventPlayer"] = "error.event.noPlayer";
     HttpsErrorMessages["InvalidMaxNumberEvents"] = "error.event.maxEventsPublish";

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.32.0",
+	"version": "1.32.2",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",