@glissandoo/lib 1.29.1 → 1.30.0

package/lang/en.json

@@ -237,7 +237,7 @@
     "theme.claim.new.title": "A music sheet review has been submitted by a musician",
     "theme.claim.update.text": "{instrument:extra.instrumentId} sheet for \"{string:extra.title}\" has been added.",
     "theme.claim.update.title": "New {instrument:extra.instrumentId} sheet has been added",
-    "emails.common.footer.contact": "If you have any doubts, please don't hesitate to contact us. Our email is hola@glissandoo.com.",
+    "emails.common.footer.contact": "If you have any doubts, please don't hesitate to contact us.\nOur email is hello@glissandoo.com.",
     "emails.common.footer.rights": "© 2023 Glissandoo.com, All rights reserved.",
     "emails.biweeklyEventReminder.subject": "Don't miss these events!",
     "emails.biweeklyEventReminder.title": "Events Summary",

package/models/Communication/index.d.ts

@@ -1,9 +1,8 @@
 import { DocumentReference, DocumentSnapshot } from '@google-cloud/firestore';
 import { LanguagesTypes } from '../../lang';
-import Model from '../Model';
+import ModelWithLang from '../Model/lang';
 import { CommunicationData, CommunicationType } from './types';
-export default class Communication extends Model<CommunicationData> {
-    protected lang: LanguagesTypes;
+export default class Communication extends ModelWithLang<CommunicationData> {
     constructor(doc: DocumentSnapshot, lang?: LanguagesTypes);
     get title(): string;
     get message(): import("../../helpers/slate").Descendant[];

package/models/Communication/index.js

@@ -6,15 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
 const utils_1 = require("../../helpers/utils");
 const lang_1 = require("../../lang");
-const Model_1 = __importDefault(require("../Model"));
+const lang_2 = __importDefault(require("../Model/lang"));
 const types_1 = require("./types");
-class Communication extends Model_1.default {
+class Communication extends lang_2.default {
     constructor(doc, lang = lang_1.defaultLocale) {
-        super(doc);
+        super(doc, lang);
         this.getRecipient = (userId) => {
             return userId in this.recipientsInfo ? this.recipientsInfo[userId] : null;
         };
-        this.lang = lang;
     }
     get title() {
         return this.data.title;

package/models/Evento/basic.d.ts

@@ -1,10 +1,9 @@
 import { DocumentSnapshot } from '@google-cloud/firestore';
 import { LanguagesTypes } from '../../lang';
-import Model from '../Model';
+import ModelWithLang from '../Model/lang';
 import { EventBasicData, EventTinyData, EventType } from './types';
-export default class EventoBasic<D> extends Model<EventBasicData & D> {
-    protected lang: LanguagesTypes;
-    constructor(doc: DocumentSnapshot, lang: LanguagesTypes);
+export default class EventoBasic<D> extends ModelWithLang<EventBasicData & D> {
+    constructor(doc: DocumentSnapshot, lang?: LanguagesTypes);
     get tinyInfo(): EventTinyData;
     get basicInfo(): EventBasicData;
     get displayName(): string | null;

package/models/Evento/basic.js

@@ -5,12 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const date_fns_1 = require("date-fns");
 const lang_1 = require("../../lang");
-const Model_1 = __importDefault(require("../Model"));
+const lang_2 = __importDefault(require("../Model/lang"));
 const types_1 = require("./types");
-class EventoBasic extends Model_1.default {
-    constructor(doc, lang) {
-        super(doc);
-        this.lang = lang;
+class EventoBasic extends lang_2.default {
+    constructor(doc, lang = lang_1.defaultLocale) {
+        super(doc, lang);
     }
     get tinyInfo() {
         return {

package/models/Evento/index.d.ts

@@ -21,8 +21,8 @@ export default class Evento extends EventoPromoter<EventData> {
     get repertoryIds(): string[];
     get repertoryCount(): number;
     get activeInvitationLink(): boolean;
-    get invitationLink(): string | null;
-    get shortDynamicLink(): string | null;
+    get invitationLink(): string;
+    get shortDynamicLink(): string;
     get deletedAt(): FirebaseFirestore.Timestamp | null;
     get createdAt(): FirebaseFirestore.Timestamp;
     get createdOn(): import("./types").EventCreatedOn;

package/models/Evento/index.js

@@ -72,10 +72,11 @@ class Evento extends promoter_1.default {
         return this.data.activeInvitationLink || false;
     }
     get invitationLink() {
-        return this.data.invitationLink;
+        return this.data.invitationLink || `https://glissandoo.com/joinevent/${this.id}`;
     }
     get shortDynamicLink() {
-        return this.data.shortDynamicLink;
+        return (this.data.shortDynamicLink ||
+            `https://app.glissandoo.com/group/${this.promoterInfo.username}/events/${this.id}`);
     }
     get deletedAt() {
         return this.data.deletedAt;

package/models/Group/basic.d.ts

@@ -1,10 +1,9 @@
 import { DocumentSnapshot } from '@google-cloud/firestore';
 import { LanguagesTypes } from '../../lang';
-import Model from '../Model';
+import ModelWithLang from '../Model/lang';
 import { GroupBasicData, GroupTinyData } from './types';
-export default class GroupBasic<D> extends Model<D & GroupBasicData> {
-    protected lang: LanguagesTypes;
-    constructor(doc: DocumentSnapshot, lang: LanguagesTypes);
+export default class GroupBasic<D> extends ModelWithLang<D & GroupBasicData> {
+    constructor(doc: DocumentSnapshot, lang?: LanguagesTypes);
     get tinyInfo(): GroupTinyData;
     get basicInfo(): GroupBasicData;
     get displayName(): string;

package/models/Group/basic.js

@@ -4,11 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lang_1 = require("../../lang");
-const Model_1 = __importDefault(require("../Model"));
-class GroupBasic extends Model_1.default {
-    constructor(doc, lang) {
-        super(doc);
-        this.lang = lang;
+const lang_2 = __importDefault(require("../Model/lang"));
+class GroupBasic extends lang_2.default {
+    constructor(doc, lang = lang_1.defaultLocale) {
+        super(doc, lang);
     }
     get tinyInfo() {
         return {

package/models/Group/index.d.ts

@@ -13,9 +13,9 @@ export default class Group extends GroupBasic<GroupData> {
     get addresses(): import("./types").GroupAddressData[];
     get addressDefault(): import("./types").GroupAddressData | undefined;
     get activeInvitationLink(): boolean;
-    get invitationLink(): string | null;
+    get invitationLink(): string;
     get invitationEmails(): string[];
-    get shortDynamicLink(): string | null;
+    get shortDynamicLink(): string;
     get admins(): string[];
     get createdAt(): FirebaseFirestore.Timestamp;
     get deletedAt(): FirebaseFirestore.Timestamp | null;

package/models/Group/index.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const date_fns_1 = require("date-fns");
 const lodash_1 = require("lodash");
 const orders_1 = require("../../helpers/musicStyles/orders");
-const plans_1 = require("../../helpers/plans");
 const objects_1 = require("../../helpers/objects");
+const plans_1 = require("../../helpers/plans");
 const lang_1 = require("../../lang");
 const basic_1 = __importDefault(require("./basic"));
 const types_1 = require("./types");
@@ -49,13 +49,13 @@ class Group extends basic_1.default {
         return this.data.activeInvitationLink || false;
     }
     get invitationLink() {
-        return this.data.invitationLink;
+        return this.data.invitationLink || `https://glissandoo.com/joingroup/${this.id}`;
     }
     get invitationEmails() {
         return this.data.invitationEmails || [];
     }
     get shortDynamicLink() {
-        return this.data.shortDynamicLink;
+        return this.data.shortDynamicLink || `https://app.glissandoo.com/group/${this.username}`;
     }
     get admins() {
         return this.data.administrators || [];

package/models/Model/index.d.ts

@@ -0,0 +1,10 @@
+import * as firestore from '@google-cloud/firestore';
+export default class Model<D> {
+    id: string;
+    ref: firestore.DocumentReference;
+    exists: boolean;
+    private _data;
+    constructor(doc: firestore.DocumentSnapshot);
+    get data(): D;
+    protected get(name: string): any;
+}

package/models/Model/index.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Model {
+    constructor(doc) {
+        this.id = doc.id;
+        this._data = doc.data();
+        this.ref = doc.ref;
+        this.exists = doc.exists;
+    }
+    get data() {
+        return this._data;
+    }
+    get(name) {
+        if (!this._data || !this._data[name]) {
+            return null;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        return this._data[name];
+    }
+}
+exports.default = Model;

package/models/Model/lang.d.ts

@@ -0,0 +1,8 @@
+import { DocumentSnapshot } from '@google-cloud/firestore';
+import { LanguagesTypes } from '../../lang';
+import Model from '../Model';
+export default class ModelWithLang<D> extends Model<D> {
+    protected lang: LanguagesTypes;
+    constructor(doc: DocumentSnapshot, lang?: LanguagesTypes);
+    set language(lang: LanguagesTypes);
+}

package/models/Model/lang.js

@@ -0,0 +1,17 @@
+"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 Model_1 = __importDefault(require("../Model"));
+class ModelWithLang extends Model_1.default {
+    constructor(doc, lang = lang_1.defaultLocale) {
+        super(doc);
+        this.lang = lang;
+    }
+    set language(lang) {
+        this.lang = lang;
+    }
+}
+exports.default = ModelWithLang;

package/models/User/basic.d.ts

@@ -1,10 +1,9 @@
-import * as firestore from '@google-cloud/firestore';
+import { DocumentSnapshot } from '@google-cloud/firestore';
 import { LanguagesTypes } from '../../lang';
-import Model from '../Model';
+import ModelWithLang from '../Model/lang';
 import { UserBasicData, UserTinyData } from './types';
-export default class UserBasic<D> extends Model<D & UserBasicData> {
-    protected lang: LanguagesTypes;
-    constructor(doc: firestore.DocumentSnapshot, lang: LanguagesTypes);
+export default class UserBasic<D> extends ModelWithLang<D & UserBasicData> {
+    constructor(doc: DocumentSnapshot, lang?: LanguagesTypes);
     get tinyInfo(): UserTinyData;
     get basicInfo(): UserBasicData;
     get displayName(): string;

package/models/User/basic.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Model_1 = __importDefault(require("../Model"));
-class UserBasic extends Model_1.default {
-    constructor(doc, lang) {
-        super(doc);
-        this.lang = lang;
+const lang_1 = require("../../lang");
+const lang_2 = __importDefault(require("../Model/lang"));
+class UserBasic extends lang_2.default {
+    constructor(doc, lang = lang_1.defaultLocale) {
+        super(doc, lang);
     }
     get tinyInfo() {
         return {

package/package.json

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