@glissandoo/lib 1.108.8 → 1.108.10

package/functions/index.d.ts

@@ -139,6 +139,8 @@ export declare enum FbFunctionName {
     PartnershipPartnerEdit = "partnershipPartner-edit",
     PartnershipPartnerOnWrite = "partnershipPartner-onWrite",
     PartnershipPartnerRemove = "partnershipPartner-remove",
+    PartnershipPartnerRequest = "partnershipPartner-request",
+    PartnershipPartnerAccept = "partnershipPartner-accept",
     PartnershipPaymentCreateOneTime = "partnershipPayment-createOneTime",
     PartnershipPaymentGenerateRecurringBySubscriptions = "partnershipPayment-generateRecurringBySubscriptions",
     PartnershipPaymentEdit = "partnershipPayment-edit",

package/functions/index.js

@@ -143,6 +143,8 @@ var FbFunctionName;
     FbFunctionName["PartnershipPartnerEdit"] = "partnershipPartner-edit";
     FbFunctionName["PartnershipPartnerOnWrite"] = "partnershipPartner-onWrite";
     FbFunctionName["PartnershipPartnerRemove"] = "partnershipPartner-remove";
+    FbFunctionName["PartnershipPartnerRequest"] = "partnershipPartner-request";
+    FbFunctionName["PartnershipPartnerAccept"] = "partnershipPartner-accept";
     FbFunctionName["PartnershipPaymentCreateOneTime"] = "partnershipPayment-createOneTime";
     FbFunctionName["PartnershipPaymentGenerateRecurringBySubscriptions"] = "partnershipPayment-generateRecurringBySubscriptions";
     FbFunctionName["PartnershipPaymentEdit"] = "partnershipPayment-edit";

package/functions/partnershipPartner.d.ts

@@ -34,5 +34,14 @@ export declare namespace PartnershipPartnerFbFunctionsTypes {
         partnerId: string;
     }
     export type RemoveResult = void;
+    export interface RequestParams extends CreateData {
+        partnershipId: string;
+    }
+    export type RequestResult = void;
+    export interface AcceptParams {
+        partnershipId: string;
+        partnerId: string;
+    }
+    export type AcceptResult = void;
     export {};
 }

package/functions/partnershipPayment.d.ts

@@ -5,6 +5,7 @@ export declare namespace PartnershipPaymentFbFunctionsTypes {
         amount: number;
         partnerId: string;
         paymentMethod: PaymentMethod;
+        dueDate: string;
     }
     interface CreateOneTimeParams extends CreateOneTimeData {
         partnershipId: string;
@@ -18,6 +19,7 @@ export declare namespace PartnershipPaymentFbFunctionsTypes {
         amount?: number;
         paymentMethod?: PaymentMethod;
         status?: PaymentStatus;
+        dueDate?: string;
     }
     type EditResult = void;
     type RemoveParams = {

package/functions/regions.js

@@ -148,6 +148,8 @@ const regionByFunctions = {
     [index_1.FbFunctionName.PartnershipPartnerEdit]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipPartnerOnWrite]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipPartnerRemove]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPartnerRequest]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPartnerAccept]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipPaymentCreateOneTime]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipPaymentGenerateRecurringBySubscriptions]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipPaymentEdit]: GCloudRegions.EuropeWest6,

package/helpers/communicationTemplate/index.js

@@ -29,12 +29,14 @@ const replaceKeysVarsString = (text, meta) => {
 exports.replaceKeysVarsString = replaceKeysVarsString;
 function replaceKeysVarsInNodes(nodes, meta) {
     return nodes.map((node) => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const newNode = { ...node };
         for (const key in newNode) {
             if (typeof newNode[key] === 'string') {
                 newNode[key] = (0, exports.replaceKeysVarsString)(newNode[key], meta);
             }
             else if (Array.isArray(newNode[key])) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 newNode[key] = replaceKeysVarsInNodes(newNode[key], meta);
             }
         }

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

@@ -1,5 +1,5 @@
 import ModelWithLang from '../../Model/lang';
-import { PartnershipPartnerData } from './types';
+import { PartnershipPartnerData, PartnerStatus } from './types';
 export default class PartnershipPartner extends ModelWithLang<PartnershipPartnerData> {
     get tinyInfo(): {
         displayName: string;
@@ -11,7 +11,7 @@ export default class PartnershipPartner extends ModelWithLang<PartnershipPartner
     get photoURL(): string;
     get displayName(): string;
     get NIF(): string | null;
-    get email(): string | null;
+    get email(): string;
     get phone(): string | null;
     get birthdate(): FirebaseFirestore.Timestamp | null;
     get sepaMandate(): {
@@ -30,6 +30,10 @@ export default class PartnershipPartner extends ModelWithLang<PartnershipPartner
     get editedBy(): string | null;
     get isDeleted(): boolean;
     get isActive(): boolean;
+    get isPending(): boolean;
+    get acceptedAt(): FirebaseFirestore.Timestamp | null;
+    get acceptedBy(): string | null;
+    get status(): PartnerStatus;
     get userId(): string | null;
     get groupIds(): string[];
     get subscriptionIds(): string[];

package/models/Partnership/Partner/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../../../helpers/types");
 const utils_1 = require("../../../helpers/utils");
 const lang_1 = __importDefault(require("../../Model/lang"));
+const types_2 = require("./types");
 class PartnershipPartner extends lang_1.default {
     get tinyInfo() {
         return {
@@ -26,7 +27,7 @@ class PartnershipPartner extends lang_1.default {
         return this.data.photoURL;
     }
     get displayName() {
-        return this.data.displayName;
+        return `${this.name} ${this.lastname}`;
     }
     get NIF() {
         return this.data.NIF;
@@ -72,6 +73,22 @@ class PartnershipPartner extends lang_1.default {
     get isActive() {
         return this.exists && !this.isDeleted;
     }
+    get isPending() {
+        return !this.isDeleted && this.acceptedAt === null;
+    }
+    get acceptedAt() {
+        return this.data.acceptedAt || null;
+    }
+    get acceptedBy() {
+        return this.data.acceptedBy || null;
+    }
+    get status() {
+        if (this.isDeleted)
+            return types_2.PartnerStatus.Inactive;
+        if (this.isPending)
+            return types_2.PartnerStatus.Pending;
+        return types_2.PartnerStatus.Active;
+    }
     get userId() {
         return this.data.userId || null;
     }

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

@@ -1,8 +1,13 @@
 import { Timestamp } from '@google-cloud/firestore';
 import { BasicAddressData } from '../../../helpers/types';
 import { DocumentReference } from '../../../types/firestore';
-import { UserExtendedData } from '../../User/types';
+import { GroupPlayerCustomFieldValue } from '../../Group/Player/types';
 import { PartnershipPlanBasicData } from '../Plan/types';
+export declare enum PartnerStatus {
+    Active = "active",
+    Pending = "pending",
+    Inactive = "inactive"
+}
 export interface PartnershipPartnerSepaMandate {
     mandateId: string;
     iban: string;
@@ -10,19 +15,27 @@ export interface PartnershipPartnerSepaMandate {
     holderAddress: BasicAddressData;
     swiftbic: string | null;
 }
-export interface PartnershipPartnerData extends UserExtendedData {
+export interface PartnershipPartnerData {
+    userId: string | null;
+    email: string;
+    name: string;
+    lastname: string;
+    photoURL: string;
+    birthDate: Timestamp | null;
     address: BasicAddressData | null;
     phone: string | null;
     NIF: string | null;
     sepaMandate: PartnershipPartnerSepaMandate | null;
-    userId: string | null;
     groupIds: string[];
     subscriptionIds: string[];
     subscriptions: Record<string, PartnershipPlanBasicData>;
+    customFields: Record<string, GroupPlayerCustomFieldValue>;
     createdAt: Timestamp;
     createdBy: DocumentReference;
     editedAt: Timestamp | null;
     editedBy: string | null;
+    acceptedAt: Timestamp | null;
+    acceptedBy: string | null;
     deletedAt: Timestamp | null;
     deletedBy: string | null;
 }

package/models/Partnership/Partner/types.js

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PartnerStatus = void 0;
+var PartnerStatus;
+(function (PartnerStatus) {
+    PartnerStatus["Active"] = "active";
+    PartnerStatus["Pending"] = "pending";
+    PartnerStatus["Inactive"] = "inactive";
+})(PartnerStatus = exports.PartnerStatus || (exports.PartnerStatus = {}));

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

@@ -16,6 +16,7 @@ export default class PartnershipPayment extends ModelWithLang<PartnershipPayment
     get statusHistoryOrdered(): import("./types").PaymentStatusHistoryItem[];
     get sepaPaymentGroupId(): string | null;
     get isLinkedToSepaPaymentGroup(): boolean;
+    get dueDate(): FirebaseFirestore.Timestamp;
     get createdAt(): FirebaseFirestore.Timestamp;
     get createdBy(): string | null;
     get editedAt(): FirebaseFirestore.Timestamp | null;

package/models/Partnership/Payment/index.js

@@ -52,6 +52,9 @@ class PartnershipPayment extends lang_1.default {
     get isLinkedToSepaPaymentGroup() {
         return !!this.sepaPaymentGroupId;
     }
+    get dueDate() {
+        return this.data.dueDate || this.data.createdAt;
+    }
     get createdAt() {
         return this.data.createdAt;
     }

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

@@ -23,6 +23,7 @@ export interface PartnershipPaymentData {
     status: PaymentStatus;
     statusHistory: PaymentStatusHistoryItem[];
     sepaPaymentGroupId: string | null;
+    dueDate: Timestamp;
     createdAt: Timestamp;
     createdBy: string | null;
     editedAt: Timestamp | null;

package/models/Partnership/Plan/index.js

@@ -24,7 +24,7 @@ class PartnershipPlan extends lang_1.default {
             : (0, date_fns_1.setDate)(date, this.schedule.paymentDay);
     }
     setPaymentMonth(date) {
-        return (0, isNumber_1.default)(this.schedule.paymentMonth) && this.isAnnuallySchedule
+        return (0, isNumber_1.default)(this.schedule.paymentMonth) && this.schedule.periodInMonths > 1
             ? (0, date_fns_1.setMonth)(date, this.schedule.paymentMonth)
             : date;
     }
@@ -36,8 +36,11 @@ class PartnershipPlan extends lang_1.default {
         return this.setPaymentDate(newDate);
     }
     getFirstPaymentDate() {
-        const newDate = this.setPaymentDate(new Date());
-        return (0, date_fns_1.isPast)(newDate) ? (0, date_fns_1.addMonths)(newDate, this.isAnnuallySchedule ? 12 : 1) : newDate;
+        let newDate = this.setPaymentDate(new Date());
+        if ((0, date_fns_1.isPast)(newDate)) {
+            newDate = this.getNextPaymentDate(newDate);
+        }
+        return newDate;
     }
     get name() {
         return this.data.name;

package/models/Partnership/index.d.ts

@@ -1,6 +1,6 @@
 import { AdminItemStatus } from '../../helpers/types';
 import PartnershipBasic from './basic';
-import { PartnershipData } from './types';
+import { APartnershipCustomField, PartnershipData } from './types';
 export default class Partnership extends PartnershipBasic<PartnershipData> {
     get description(): string | null;
     get admins(): string[];
@@ -26,4 +26,6 @@ export default class Partnership extends PartnershipBasic<PartnershipData> {
     get deletedBy(): string | null;
     get isDeleted(): boolean;
     get isActive(): boolean;
+    get customFields(): Record<string, import("../Group/types").GroupCustomField>;
+    get customFieldsList(): APartnershipCustomField[];
 }

package/models/Partnership/index.js

@@ -64,5 +64,16 @@ class Partnership extends basic_1.default {
     get isActive() {
         return this.exists && !this.deletedAt;
     }
+    get customFields() {
+        return this.data.customFields || {};
+    }
+    get customFieldsList() {
+        return Object.entries(this.customFields)
+            .map(([id, field]) => ({
+            id,
+            ...field,
+        }))
+            .sort((a, b) => a.order - b.order);
+    }
 }
 exports.default = Partnership;

package/models/Partnership/types.d.ts

@@ -1,5 +1,8 @@
 import { DocumentReference, Timestamp } from '@google-cloud/firestore';
 import { AdminItem, BasicAddressData } from '../../helpers/types';
+import { AGroupCustomField, GroupCustomField } from '../Group/types';
+export type PartnershipCustomField = GroupCustomField;
+export type APartnershipCustomField = AGroupCustomField;
 export declare enum PartnershipRoles {
     Admin = "admin"
 }
@@ -31,6 +34,7 @@ export interface PartnershipData extends PartnershipBasicData {
     administrators: string[];
     administratorsList: AdminItem[];
     federationIds: string[];
+    customFields: Record<string, PartnershipCustomField>;
     createdAt: Timestamp;
     createdBy: DocumentReference;
     editedAt: Timestamp | null;

package/package.json

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