@glissandoo/lib 1.41.0 → 1.43.0

package/functions/federation.d.ts

@@ -44,9 +44,7 @@ export declare namespace FederationFbFunctionsTypes {
         federationId: string;
     }
     type ConfirmAdminResult = void;
-    interface GetConfederationParams {
-        federationIds: string[];
-    }
+    type GetConfederationParams = void;
     type ConfederationPartnershipType = Pick<FederationPartnership, 'id' | 'displayName' | 'email' | 'hasSchool' | 'leaderCount' | 'photoURL' | 'phone' | 'address' | 'CIF' | 'partnerCount' | 'memberCount' | 'connectedAt' | 'teacherCount' | 'studentCount' | 'updatedAt'>;
     type FederationConfederationType = Pick<Federation, 'id' | 'displayName' | 'email' | 'photoURL' | 'phone' | 'web' | 'address' | 'partnershipIds'>;
     interface GetConfederationResult {

package/helpers/objects.d.ts

@@ -1,5 +1,5 @@
-export declare const mapToArray: <V>(obj: Record<string, V>) => (V & {
-    id: string;
+export declare const mapToArray: <K extends string, V, O extends Record<K, V>>(obj: O) => (O[`${Exclude<keyof O, symbol>}`] & {
+    id: keyof O;
 })[];
 export declare const map: <KIn extends string, VIn, KOut extends string, VOut>(obj: Record<KIn, VIn>, fn: (key: `${KIn}`, value: VIn, index?: number) => [KOut, VOut]) => Record<KOut, VOut>;
 export declare const filter: <K extends string, V>(obj: Record<K, V>, fn: (key: `${Exclude<K, symbol>}`, value: V, index?: number) => unknown) => Record<`${Exclude<K, symbol>}`, V>;

package/models/Federation/index.d.ts

@@ -22,4 +22,5 @@ export default class Federation extends Model<FederationData> {
     get deletedAt(): import("../../types/firestore").Timestamp | null;
     get isActive(): boolean;
     get glissandooAdminUrl(): string;
+    get besm(): boolean;
 }

package/models/Federation/index.js

@@ -67,5 +67,8 @@ class Federation extends Model_1.default {
     get glissandooAdminUrl() {
         return (0, glissandooAdmin_1.getGlissandooAdminEntityURL)(collections_1.CollectionNames.Federation, this.id);
     }
+    get besm() {
+        return this.data.besm || false;
+    }
 }
 exports.default = Federation;

package/models/Federation/types.d.ts

@@ -13,6 +13,7 @@ export interface FederationData {
     adminIds: string[];
     adminList: AdminItem[];
     deletedAt: Timestamp | null;
+    besm: boolean;
     readonly createdAt: Timestamp;
     readonly createdBy: DocumentReference;
 }

package/models/Group/index.d.ts

@@ -70,4 +70,8 @@ export default class Group extends GroupBasic<GroupData> {
     get trialEndAt(): Date;
     get glissandooAdminUrl(): string;
     get createdOn(): import("./types").GroupCreatedOn;
+    get instruments(): Partial<Record<import("../../helpers/instruments").InstrumentId, import("./types").GroupInstrument>>;
+    get instrumentsList(): (import("./types").GroupInstrument & {
+        id: import("../../helpers/instruments").InstrumentId;
+    })[];
 }

package/models/Group/index.js

@@ -191,5 +191,11 @@ class Group extends basic_1.default {
     get createdOn() {
         return this.data.createdOn;
     }
+    get instruments() {
+        return this.data.instruments;
+    }
+    get instrumentsList() {
+        return (0, objects_1.mapToArray)(this.instruments).sort((a, b) => a.order - b.order);
+    }
 }
 exports.default = Group;

package/models/Group/types.d.ts

@@ -1,3 +1,4 @@
+import { InstrumentId } from '../../helpers/instruments';
 import { MusicStyleType } from '../../helpers/musicStyles';
 import { PlansGroup } from '../../helpers/plans';
 import { StageTemplate } from '../../helpers/types';
@@ -85,6 +86,12 @@ export interface GroupRepertoireTag {
 export interface AGroupRepertoireTag extends GroupRepertoireTag {
     id: string;
 }
+export interface GroupInstrument {
+    order: number;
+}
+export interface AGroupInstrument extends GroupInstrument {
+    id: InstrumentId;
+}
 export interface GroupData extends GroupBasicData {
     playerIds: string[];
     players: Record<string, PlayerBasicData>;
@@ -113,6 +120,7 @@ export interface GroupData extends GroupBasicData {
     communicationCount: number;
     country: string;
     stageTemplates: Record<string, StageTemplate>;
+    instruments: Partial<Record<InstrumentId, GroupInstrument>>;
     metadata: Record<string, string>;
     firstAnswerAt: Timestamp | null;
     repertoireTags: Record<string, GroupRepertoireTag>;

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

@@ -1,4 +1,3 @@
-import { PlansGroup } from '../../../helpers/plans';
 import { LanguagesTypes } from '../../../lang';
 import { DocumentSnapshot } from '../../../types/firestore';
 import GroupBasic from '../../Group/basic';
@@ -7,21 +6,5 @@ export default class PartnershipGroup extends GroupBasic<PartnershipGroupData> {
     constructor(doc: DocumentSnapshot, lang?: LanguagesTypes);
     get linkedAt(): import("../../../types/firestore").Timestamp;
     get linkedBy(): import("../../../types/firestore").DocumentReference<import("../../../types/firestore").DocumentData>;
-    /** @deprecated use customer */
-    get upgradedAt(): import("../../../types/firestore").Timestamp | null;
-    /** @deprecated use customer */
-    get upgradedBy(): import("../../../types/firestore").DocumentReference<import("../../../types/firestore").DocumentData> | null;
-    /** @deprecated use customer */
-    get upgradedMethod(): string | null;
-    /** @deprecated use customer */
-    get planId(): PlansGroup;
-    /** @deprecated use customer */
-    get planPeriod(): import("../../../helpers/plans").PlanPeriod | null;
-    /** @deprecated use customer */
-    get planDiscount(): string | null;
-    /** @deprecated use customer */
-    get planStripeId(): string | null;
-    /** @deprecated use customer */
-    get subscriptionStripeId(): string | null;
     get partnershipId(): string;
 }

package/models/Partnership/Group/index.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const get_1 = __importDefault(require("lodash/get"));
-const plans_1 = require("../../../helpers/plans");
 const lang_1 = require("../../../lang");
 const basic_1 = __importDefault(require("../../Group/basic"));
 class PartnershipGroup extends basic_1.default {
@@ -17,38 +16,6 @@ class PartnershipGroup extends basic_1.default {
     get linkedBy() {
         return this.data.linkedBy;
     }
-    /** @deprecated use customer */
-    get upgradedAt() {
-        return this.data.upgradedAt || null;
-    }
-    /** @deprecated use customer */
-    get upgradedBy() {
-        return this.data.upgradedBy || null;
-    }
-    /** @deprecated use customer */
-    get upgradedMethod() {
-        return this.data.upgradedMethod || null;
-    }
-    /** @deprecated use customer */
-    get planId() {
-        return this.data.planId || plans_1.PlansGroup.Piano;
-    }
-    /** @deprecated use customer */
-    get planPeriod() {
-        return this.data.planPeriod || null;
-    }
-    /** @deprecated use customer */
-    get planDiscount() {
-        return this.data.planDiscount || null;
-    }
-    /** @deprecated use customer */
-    get planStripeId() {
-        return this.data.planStripeId || null;
-    }
-    /** @deprecated use customer */
-    get subscriptionStripeId() {
-        return this.data.subscriptionStripeId || null;
-    }
     get partnershipId() {
         return (0, get_1.default)(this.ref, ['parent', 'parent', 'id']);
     }

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

@@ -1,23 +1,6 @@
-import { PlanPeriod, PlansGroup } from '../../../helpers/plans';
 import { DocumentReference, Timestamp } from '../../../types/firestore';
 import { GroupBasicData } from '../../Group/types';
 export interface PartnershipGroupData extends GroupBasicData {
-    /** @deprecated use customer */
-    upgradedAt: Timestamp | null;
-    /** @deprecated use customer */
-    upgradedBy: DocumentReference | null;
-    /** @deprecated use customer */
-    upgradedMethod: string | null;
-    /** @deprecated use customer */
-    planId: PlansGroup;
-    /** @deprecated use customer */
-    planPeriod: PlanPeriod | null;
-    /** @deprecated use customer */
-    planDiscount: string | null;
-    /** @deprecated use customer */
-    planStripeId: string | null;
-    /** @deprecated use customer */
-    subscriptionStripeId: string | null;
     readonly linkedBy: DocumentReference;
     readonly linkedAt: Timestamp;
 }

package/models/Partnership/index.d.ts

@@ -15,17 +15,6 @@ export default class Partnership extends PartnershipBasic<PartnershipData> {
     get isDeleted(): boolean;
     get isActive(): boolean;
     get federationIds(): string[];
-    /** @deprecated use customer */
-    get gocardlessCustomerId(): string | null;
-    /** @deprecated use customer */
-    get stripeCustomerId(): string | null;
-    /** @deprecated use customer */
-    get stripeTaxIds(): {
-        type: string;
-        value: string;
-    }[];
-    /** @deprecated use customer */
-    get howDidYouHearAboutUs(): string | null;
     get groupIds(): string[];
     get glissandooAdminUrl(): string;
 }

package/models/Partnership/index.js

@@ -43,22 +43,6 @@ class Partnership extends basic_1.default {
     get federationIds() {
         return this.data.federationIds || [];
     }
-    /** @deprecated use customer */
-    get gocardlessCustomerId() {
-        return this.data.gocardlessCustomerId || null;
-    }
-    /** @deprecated use customer */
-    get stripeCustomerId() {
-        return this.data.stripeCustomerId || null;
-    }
-    /** @deprecated use customer */
-    get stripeTaxIds() {
-        return this.data.stripeTaxIds || [];
-    }
-    /** @deprecated use customer */
-    get howDidYouHearAboutUs() {
-        return this.data.howDidYouHearAboutUs || null;
-    }
     get groupIds() {
         return this.data.groupIds || [];
     }

package/models/Partnership/types.d.ts

@@ -35,17 +35,6 @@ export interface PartnershipData extends PartnershipBasicData {
     administratorsList: AdminItem[];
     deletedAt: Timestamp | null;
     federationIds: string[];
-    /** @deprecated use customer */
-    gocardlessCustomerId: string | null;
-    /** @deprecated use customer */
-    stripeCustomerId: string | null;
-    /** @deprecated use customer */
-    stripeTaxIds: {
-        type: string;
-        value: string;
-    }[];
-    /** @deprecated use customer */
-    howDidYouHearAboutUs: string | null;
     readonly createdAt: Timestamp;
     readonly createdBy: DocumentReference;
 }

package/package.json

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