@glissandoo/lib 1.78.0 → 1.80.0

package/helpers/fileSections/orders.d.ts

@@ -1,7 +1,4 @@
-import { FileSectionId } from '../../models/Group/Repertory/File/Section/types';
-import { MusicStyleType } from '../musicStyles/index';
-export declare const orders: {
-    [k: string]: FileSectionId[];
-};
-export declare const getOrderByMusicStyle: (musicStyle: MusicStyleType) => FileSectionId[];
-export declare const orderByMusicStyle: <T>(list: T[], field: keyof T, musicStyle: MusicStyleType) => T[];
+import { FileSectionIdReserved } from '../../models/Group/Repertory/File/Section/types';
+import { InstrumentId } from '../instruments';
+export declare const getFileSectionsOrder: (instrumentsOrder: InstrumentId[]) => (InstrumentId | FileSectionIdReserved)[];
+export declare const orderByInstruments: <T>(list: T[], field: keyof T, instrumentsOrder: InstrumentId[]) => T[];

package/helpers/fileSections/orders.js

@@ -1,20 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.orderByMusicStyle = exports.getOrderByMusicStyle = exports.orders = void 0;
+exports.orderByInstruments = exports.getFileSectionsOrder = void 0;
 const types_1 = require("../../models/Group/Repertory/File/Section/types");
-const fileSections_1 = require("../fileSections");
-const orders_1 = require("../musicStyles/orders");
 const utils_1 = require("../utils");
-exports.orders = Object.fromEntries(Object.entries(orders_1.orders).map(([musicStyle, instruments]) => [
-    musicStyle,
-    [types_1.FileSectionIdReserved.All, ...instruments],
-]));
-const getOrderByMusicStyle = (musicStyle) => {
-    return musicStyle in exports.orders ? exports.orders[musicStyle] : fileSections_1.fileSectionIdList;
+const getFileSectionsOrder = (instrumentsOrder) => [
+    types_1.FileSectionIdReserved.All,
+    ...instrumentsOrder,
+];
+exports.getFileSectionsOrder = getFileSectionsOrder;
+const orderByInstruments = (list, field, instrumentsOrder) => {
+    const fileSectionsOrder = (0, exports.getFileSectionsOrder)(instrumentsOrder);
+    return (0, utils_1.sortByMatch)(list, field, fileSectionsOrder);
 };
-exports.getOrderByMusicStyle = getOrderByMusicStyle;
-const orderByMusicStyle = (list, field, musicStyle) => {
-    const order = (0, exports.getOrderByMusicStyle)(musicStyle);
-    return (0, utils_1.sortByMatch)(list, field, order);
-};
-exports.orderByMusicStyle = orderByMusicStyle;
+exports.orderByInstruments = orderByInstruments;

package/helpers/instruments/orders.d.ts

@@ -0,0 +1,2 @@
+import { InstrumentId } from '.';
+export declare const orderByInstruments: <T>(list: T[], field: keyof T, instrumentsOrder: InstrumentId[]) => T[];

package/helpers/instruments/orders.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.orderByInstruments = void 0;
+const utils_1 = require("../utils");
+const orderByInstruments = (list, field, instrumentsOrder) => {
+    return (0, utils_1.sortByMatch)(list, field, instrumentsOrder);
+};
+exports.orderByInstruments = orderByInstruments;

package/helpers/rates.d.ts

@@ -1,12 +1,13 @@
+import { VoteValue } from '../models/Group/Repertory/types';
 export declare const rateSteps: {
-    id: string;
+    id: 'love' | 'like' | 'neutral' | 'dislike';
     emoji: string;
-    value: number;
-    range: number[];
+    value: VoteValue;
+    range: [number, number];
 }[];
 export declare const getStepRating: (rating: number) => {
-    id: string;
+    id: 'love' | 'like' | 'neutral' | 'dislike';
     emoji: string;
-    value: number;
-    range: number[];
+    value: VoteValue;
+    range: [number, number];
 } | undefined;

package/models/Evento/index.js

@@ -6,11 +6,11 @@ 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 utils_1 = require("../../helpers/utils");
 const lang_1 = require("../../lang");
 const basic_1 = __importDefault(require("./Player/basic"));
 const promoter_1 = __importDefault(require("./promoter"));
 const types_1 = require("./types");
+const orders_2 = require("../../helpers/instruments/orders");
 class Evento extends promoter_1.default {
     constructor(doc, lang = lang_1.defaultLocale) {
         super(doc, lang);
@@ -141,7 +141,7 @@ class Evento extends promoter_1.default {
             }))
             : Object.entries(this.players).map(([id, player]) => new basic_1.default(this.id, { id, ...player }));
         const orderedPlayers = order
-            ? (0, utils_1.sortByMatch)(players, 'mainInstrument', order)
+            ? (0, orders_2.orderByInstruments)(players, 'mainInstrument', order)
             : (0, orders_1.orderByMusicStyle)(players, 'mainInstrument', this.promoterInfo.musicStyle);
         if (showAll)
             return orderedPlayers;

package/models/Group/Repertory/File/Section/index.d.ts

@@ -1,4 +1,4 @@
-import { MusicStyleType } from '../../../../../helpers/musicStyles';
+import { InstrumentId } from '../../../../../helpers/instruments';
 import { LanguagesTypes } from '../../../../../lang';
 import { FileSectionId } from './types';
 export default class GroupRepertoryFileSection {
@@ -6,5 +6,5 @@ export default class GroupRepertoryFileSection {
     private lang;
     constructor(id: FileSectionId, lang?: LanguagesTypes);
     get name(): string;
-    getOrder(musicStyle: MusicStyleType): number;
+    getOrder(instrumentsIds: InstrumentId[]): number;
 }

package/models/Group/Repertory/File/Section/index.js

@@ -17,8 +17,8 @@ class GroupRepertoryFileSection {
             ? (0, lang_1.getTranslation)(`sections.all`, this.lang)
             : new Instrument_1.default(this.id, this.lang).name) || this.id);
     }
-    getOrder(musicStyle) {
-        return (0, orders_1.getOrderByMusicStyle)(musicStyle).indexOf(this.id) + 1 || Infinity;
+    getOrder(instrumentsIds) {
+        return (0, orders_1.getFileSectionsOrder)(instrumentsIds).indexOf(this.id) + 1 || Infinity;
     }
 }
 exports.default = GroupRepertoryFileSection;

package/models/Group/Repertory/index.d.ts

@@ -30,9 +30,10 @@ export default class GroupRepertory extends Theme<GroupRepertoryData> {
     /** @deprecated use sections */
     get mainFilePath(): string | null;
     get visibility(): GroupRepertoireVisibility;
-    get votes(): Record<string, number>;
+    get votes(): Record<string, import("./types").VoteValue>;
     get votesCount(): number;
-    voteByUserId(userId: string): number | null;
+    get votesCountByValues(): Record<"love" | "like" | "neutral" | "dislike", number>;
+    voteByUserId(userId: string): import("./types").VoteValue;
     get rating(): number;
     get events(): string[];
     get eventsTL(): Record<string, import("../../Evento/types").EventTinyData>;

package/models/Group/Repertory/index.js

@@ -15,6 +15,7 @@ const tiny_1 = __importDefault(require("../../Evento/tiny"));
 const basic_1 = __importDefault(require("../../Repertory/basic"));
 const types_1 = require("./File/Section/types");
 const types_2 = require("./types");
+const rates_1 = require("../../../helpers/rates");
 class GroupRepertory extends basic_1.default {
     constructor(doc, lang = lang_1.defaultLocale) {
         super(doc);
@@ -65,14 +66,17 @@ class GroupRepertory extends basic_1.default {
     get votesCount() {
         return Object.keys(this.votes).length;
     }
+    get votesCountByValues() {
+        const existingCounts = (0, lodash_1.countBy)(Object.values(this.votes));
+        const allCountsEntries = rates_1.rateSteps.map(({ id, value }) => [id, existingCounts[`${value}`] || 0]);
+        return Object.fromEntries(allCountsEntries);
+    }
     voteByUserId(userId) {
         return this.votes[userId] || null;
     }
     get rating() {
-        const totalVotes = Object.entries(this.votes).reduce((acc, [, value]) => acc + value, 0);
-        if (this.votesCount === 0 || totalVotes === 0)
-            return 0;
-        return Math.round((totalVotes / this.votesCount) * 100) / 100;
+        const totalVotes = (0, lodash_1.sum)(Object.values(this.votes));
+        return totalVotes == 0 ? 0 : Math.round((totalVotes / this.votesCount) * 100) / 100;
     }
     get events() {
         return this.data.events || [];

package/models/Group/Repertory/types.d.ts

@@ -55,6 +55,7 @@ export interface GroupRepertoireFilePathItem {
     path: string;
     tag: string;
 }
+export type VoteValue = 1 | 2 | 3 | 4;
 export interface GroupRepertoryData extends ThemeBasicData {
     events: string[];
     eventsTL: Record<string, EventTinyData>;
@@ -71,7 +72,7 @@ export interface GroupRepertoryData extends ThemeBasicData {
     identifyAt: Timestamp | null;
     files: Record<FileId, GroupRepertoireFile>;
     filesPath: Partial<Record<FileSectionId, GroupRepertoireFilePathItem[]>>;
-    votes: Record<string, number>;
+    votes: Record<string, VoteValue>;
     thumbnailURL: string | null;
     editedAt: Timestamp | null;
     visibility: GroupRepertoireVisibility;

package/models/Group/index.js

@@ -7,12 +7,12 @@ const date_fns_1 = require("date-fns");
 const lodash_1 = require("lodash");
 const collections_1 = require("../../helpers/collections");
 const glissandooAdmin_1 = require("../../helpers/glissandooAdmin");
-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 basic_1 = __importDefault(require("./basic"));
 const types_1 = require("./types");
+const orders_1 = require("../../helpers/instruments/orders");
 class Group extends basic_1.default {
     constructor(doc, lang = lang_1.defaultLocale) {
         super(doc, lang);
@@ -97,7 +97,7 @@ class Group extends basic_1.default {
             ...this.players[playerId],
             id: playerId,
         }));
-        return (0, orders_1.orderByMusicStyle)(players, 'mainInstrument', this.musicStyle);
+        return (0, orders_1.orderByInstruments)(players, 'mainInstrument', this.instrumentsIds);
     }
     get isActive() {
         return this.exists && !this.deletedAt;

package/package.json

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