@glissandoo/lib 1.16.9 → 1.16.11

package/helpers/utils.js

@@ -10,6 +10,7 @@ const lodash_1 = require("lodash");
 const get_1 = __importDefault(require("lodash/get"));
 const lang_1 = require("../lang");
 const Instrument_1 = __importDefault(require("../models/Instrument"));
+const instruments_1 = require("./instruments");
 const replaceVarsBrackets = (string, values) => {
     const matches = string.match(/[^[\]]+(?=])/g);
     let replaceString = string;
@@ -39,10 +40,11 @@ const replaceKeysNotification = (string, values, lang) => {
             switch (type) {
                 case 'instrument': {
                     const instrumentId = get_1.default(newValues, key.split('.'));
-                    const instrument = new Instrument_1.default(instrumentId, lang);
-                    if (instrument) {
-                        replaceString = replaceString.replace(match, instrument.name.toLowerCase());
+                    if (!Object.values(instruments_1.InstrumentId).includes(instrumentId)) {
+                        throw new Error(`Invalid instrumentId: ${instrumentId} from value: ${value}`);
                     }
+                    const instrument = new Instrument_1.default(instrumentId, lang);
+                    replaceString = replaceString.replace(match, instrument.name.toLowerCase());
                     break;
                 }
                 case 'date': {

package/models/Group/index.d.ts

@@ -2,7 +2,7 @@ import { DocumentReference, DocumentSnapshot } from '@google-cloud/firestore';
 import { PlansGroup } from '../../helpers/plans';
 import { LanguagesTypes } from '../../lang';
 import GroupBasic from './basic';
-import { GroupData, GroupStatus, SocialNetwork, GroupRepertoireTag } from './types';
+import { GroupData, GroupRepertoireTag, GroupStatus, SocialNetwork } from './types';
 export default class Group extends GroupBasic<GroupData> {
     constructor(doc: DocumentSnapshot, lang?: LanguagesTypes);
     get owner(): DocumentReference;
@@ -65,5 +65,6 @@ export default class Group extends GroupBasic<GroupData> {
     get repertoireTagsList(): (GroupRepertoireTag & {
         id: string;
     })[];
+    getRepertoireTagName(id: string): string | null;
     getRepertoireTagNameTranslator(): (id: string, repertoireTags?: Record<string, GroupRepertoireTag>, lang?: LanguagesTypes) => string | null;
 }

package/models/Group/index.js

@@ -168,6 +168,12 @@ class Group extends basic_1.default {
     get repertoireTagsList() {
         return utils_1.objToArray(this.repertoireTags);
     }
+    getRepertoireTagName(id) {
+        if (!(id in this.repertoireTags))
+            return null;
+        const tag = this.repertoireTags[id];
+        return tag.default ? lang_1.getTranslation(tag.title, this.lang) : tag.title;
+    }
     getRepertoireTagNameTranslator() {
         return (id, repertoireTags = { ...this.repertoireTags }, lang = this.lang) => {
             if (!(id in repertoireTags))

package/package.json

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