@glissandoo/lib 1.20.1 → 1.21.0

package/functions/groupRepertory.d.ts

@@ -56,7 +56,6 @@ export declare namespace GroupRepertoryFbFunctionsTypes {
         groupId: string;
         path: string;
         fileName: string;
-        fileId: string;
     }
     export interface IdentifyInstrumentItem {
         page: number;

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

@@ -1,6 +1,5 @@
 import { FileSectionId } from '../File/Section/types';
 import { GroupRepertoireFile } from '../types';
-import { FileSectionByTagItem, FileSectionItem } from './types';
 export default class ThemeFile {
     id: string;
     private data;
@@ -15,8 +14,16 @@ export default class ThemeFile {
     get isFileByPages(): boolean;
     get sections(): Partial<Record<FileSectionId, import("../types").GroupRepertoireFileSections>>;
     get sectionIds(): FileSectionId[];
-    get sectionsList(): FileSectionItem[];
-    get sectionListByTags(): FileSectionByTagItem[];
+    get sectionsList(): {
+        sectionId: FileSectionId;
+        tagsByFile: string[];
+        tagsByPages: Record<string, number[]>;
+    }[];
+    get sectionListByTags(): {
+        sectionId: FileSectionId;
+        tag: string;
+        pages: number[] | null;
+    }[];
     get identifyAt(): number | null;
     protected isNoTag(tags?: string[]): boolean;
 }

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_1 = require("lodash");
 const objects_1 = require("../../../../helpers/objects");
 const types_1 = require("../../types");
 class ThemeFile {
@@ -39,45 +40,36 @@ class ThemeFile {
     }
     get sectionsList() {
         const list = (0, objects_1.mapToArray)(this.sections);
-        return list.map((section) => this.isFileByPages
-            ? {
-                sectionId: section.id,
-                tagsByFile: [],
-                tagsByPages: Object.entries(section.pages || {}).reduce((acc, [page, { tags }]) => ({
-                    ...acc,
-                    ...(this.isNoTag(tags)
-                        ? {
-                            [types_1.GroupRepertoireTagReserved.NoTag]: [
-                                ...(acc[types_1.GroupRepertoireTagReserved.NoTag] || []),
-                                Number(page),
-                            ],
-                        }
-                        : tags.reduce((accTags, tag) => ({
-                            ...accTags,
-                            [tag]: [...(acc[tag] || []), Number(page)],
-                        }), {})),
-                }), {}),
+        return list.map((section) => {
+            const sectionId = section.id;
+            if (this.isFileByPages) {
+                const items = Object.entries(section.pages || {}).flatMap(([page, { tags }]) => this.isNoTag(tags)
+                    ? { page: Number(page), tag: types_1.GroupRepertoireTagReserved.NoTag }
+                    : tags.map((tag) => ({ page: Number(page), tag })));
+                const tagsByPages = (0, lodash_1.mapValues)((0, lodash_1.groupBy)(items, 'tag'), (v) => v.map((t) => t.page));
+                return {
+                    sectionId,
+                    tagsByFile: [],
+                    tagsByPages,
+                };
             }
-            : {
-                sectionId: section.id,
-                tagsByFile: this.isNoTag(section.tags)
-                    ? [types_1.GroupRepertoireTagReserved.NoTag]
-                    : section.tags || [],
+            return {
+                sectionId,
+                tagsByFile: this.isNoTag(section.tags) ? [types_1.GroupRepertoireTagReserved.NoTag] : section.tags || [],
                 tagsByPages: {},
-            });
+            };
+        });
     }
     get sectionListByTags() {
         const list = this.sectionsList;
-        return list.reduce((acc, { tagsByFile, tagsByPages, sectionId }) => [
-            ...acc,
-            ...(this.isFileByPages
-                ? Object.entries(tagsByPages).reduce((accTags, [tag, pages]) => [...accTags, { sectionId, tag, pages }], [])
-                : tagsByFile.map((tag) => ({
-                    sectionId,
-                    tag,
-                    pages: null,
-                }))),
-        ], []);
+        return list.flatMap(({ tagsByFile, tagsByPages, sectionId }) => {
+            const tags = this.isFileByPages ? Object.keys(tagsByPages) : tagsByFile;
+            return tags.map((tag) => ({
+                sectionId,
+                tag,
+                pages: this.isFileByPages ? tagsByPages[tag] : null,
+            }));
+        });
     }
     get identifyAt() {
         return this.data.identifyAt || null;

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

@@ -11,6 +11,7 @@ export default class PartnershipGroup extends GroupBasic<PartnershipGroupData> {
     get upgradedBy(): FirebaseFirestore.DocumentReference<FirebaseFirestore.DocumentData> | null;
     get planId(): PlansGroup;
     get planPeriod(): import("../../../helpers/plans").PlanPeriod | null;
+    get discount(): number | null;
     get planStripeId(): string | null;
     get subscriptionStripeId(): string | null;
     get partnershipId(): string;

package/models/Partnership/Group/index.js

@@ -29,6 +29,9 @@ class PartnershipGroup extends basic_1.default {
     get planPeriod() {
         return this.data.planPeriod || null;
     }
+    get discount() {
+        return this.data.discount || null;
+    }
     get planStripeId() {
         return this.data.planStripeId || null;
     }

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

@@ -7,6 +7,7 @@ export interface PartnershipGroupData extends GroupBasicData {
     planId: PlansGroup;
     planPeriod: PlanPeriod | null;
     planStripeId: string | null;
+    discount: number | null;
     subscriptionStripeId: string | null;
     deletedAt: Timestamp | null;
     readonly linkedBy: DocumentReference;

package/models/Partnership/index.d.ts

@@ -20,4 +20,5 @@ export default class Partnership extends PartnershipBasic<PartnershipData> {
         type: string;
         value: string;
     }[];
+    get howDidYouHearAboutUs(): string | null;
 }

package/models/Partnership/index.js

@@ -47,5 +47,8 @@ class Partnership extends basic_1.default {
     get stripeTaxIds() {
         return this.data.stripeTaxIds || [];
     }
+    get howDidYouHearAboutUs() {
+        return this.data.howDidYouHearAboutUs || null;
+    }
 }
 exports.default = Partnership;

package/models/Partnership/types.d.ts

@@ -41,5 +41,6 @@ export interface PartnershipData extends PartnershipBasicData {
         type: string;
         value: string;
     }[];
+    howDidYouHearAboutUs: string | null;
     readonly createdAt: Timestamp;
 }

package/package.json

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