@glissandoo/lib 1.102.12 → 1.102.13

package/functions/partnershipGroup.d.ts

@@ -2,8 +2,9 @@ export declare namespace PartnershipGroupFbFunctionsTypes {
     interface AddParams {
         partnershipId: string;
         groupId: string;
+        userIds: string[];
     }
-    type AddResult = void;
+    type AddResult = Record<string, string>;
     interface RemoveParams {
         partnershipId: string;
         groupId: string;

package/functions/partnershipPartner.d.ts

@@ -1,6 +1,6 @@
+import { SetOptional } from 'type-fest';
 import { BasicAddressData, CreatedOn } from '../helpers/types';
 import { PartnershipPartnerSepaMandate } from '../models/Partnership/Partner/types';
-import { SetOptional } from 'type-fest';
 export declare namespace PartnershipPartnerFbFunctionsTypes {
     interface BaseCreateData {
         NIF: string | null;
@@ -10,7 +10,7 @@ export declare namespace PartnershipPartnerFbFunctionsTypes {
         phone: string | null;
         birthdate: number | null;
         address: BasicAddressData | null;
-        userId: string;
+        userId: string | null;
     }
     export interface CreateData extends BaseCreateData {
         sepaMandate: SetOptional<PartnershipPartnerSepaMandate, 'mandateId'> | null;

package/functions/partnershipPayment.d.ts

@@ -1,5 +1,4 @@
-import { PaymentStatus } from '../models/Partnership/Payment/types';
-import { PaymentMethod } from '../models/Partnership/Plan/types';
+import { PaymentMethod, PaymentStatus } from '../models/Partnership/Payment/types';
 export declare namespace PartnershipPaymentFbFunctionsTypes {
     interface CreateOneTimeData {
         title: string;

package/functions/partnershipPlan.d.ts

@@ -1,11 +1,10 @@
-import { PaymentMethod, PlanScheduleType } from '../models/Partnership/Plan/types';
+import { PlanScheduleType } from '../models/Partnership/Plan/types';
 export declare namespace PartnershipPlanFbFunctionsTypes {
     interface CreateData {
         name: string;
         description: string;
         price: number;
         schedule: PlanScheduleType;
-        paymentMethod: PaymentMethod;
     }
     interface CreateParams extends CreateData {
         partnershipId: string;

package/functions/partnershipSubscription.d.ts

@@ -1,12 +1,9 @@
 export declare namespace PartnershipSubscriptionFbFunctionsTypes {
-    interface CreateData {
+    interface CreateParams {
         planId: string;
-        partnerId: string;
-        endDate: number | null;
-    }
-    interface CreateParams extends CreateData {
         partnershipId: string;
-        subscriptionId: string;
+        partnerIds: string[];
+        endDate: number | null;
     }
     type CreateResult = void;
     interface EditParams {

package/lang/nl.json

@@ -206,11 +206,11 @@
     "performance": "Uitvoering",
     "practice.assistance.confirm.byAdmin.text": "Een beheerder heeft je aanwezigheid bevestigd voor de repetitie op {date:event.0.[datetime,timezone]:date}",
     "practice.assistance.confirm.byAdmin.title": "Aanwezigheid bevestigd door beheerder",
-    "practice.assistance.confirm.text": "{string:user.0.displayName} heeft zijn aanwezigheid bevestigd voor de repetitie op {date:event.0.[datetime,timezone]:date}",
+    "practice.assistance.confirm.text": "{string:user.0.displayName} heeft zijn/haar aanwezigheid bevestigd voor de repetitie op {date:event.0.[datetime,timezone]:date}",
     "practice.assistance.confirm.title": "Aanwezigheid bevestigd",
     "practice.assistance.decline.byAdmin.text": "Een beheerder heeft je aanwezigheid geweigerd voor de repetitie op {date:event.0.[datetime,timezone]:date}",
     "practice.assistance.decline.byAdmin.title": "Aanwezigheid geweigerd door beheerder",
-    "practice.assistance.decline.text": "{string:user.0.displayName} heeft zijn aanwezigheid geweigerd voor de repetitie op {date:event.0.[datetime,timezone]:date}",
+    "practice.assistance.decline.text": "{string:user.0.displayName} heeft zijn/haar aanwezigheid geweigerd voor de repetitie op {date:event.0.[datetime,timezone]:date}",
     "practice.assistance.decline.title": "Aanwezigheid geweigerd",
     "practice.cancel.text": "De repetitie op {date:event.0.[datetime,timezone]:date} van {string:group.0.displayName} is geannuleerd",
     "practice.cancel.title": "Repetitie geannuleerd",

package/models/Evento/index.d.ts

@@ -78,5 +78,6 @@ export default class Evento extends EventoPromoter<EventData> {
     get isSelectionModeClosed(): boolean;
     get isSelectionModeOpen(): boolean;
     get sites(): boolean;
+    get imagesPath(): string[];
 }
 export {};

package/models/Evento/index.js

@@ -207,5 +207,8 @@ class Evento extends promoter_1.default {
     get sites() {
         return this.data.sites || false;
     }
+    get imagesPath() {
+        return this.data.imagesPath || [];
+    }
 }
 exports.default = Evento;

package/models/Evento/types.d.ts

@@ -119,6 +119,7 @@ export interface EventData extends EventPromoterData {
     };
     selectionModeClosedAt: Timestamp | null;
     sites: boolean;
+    imagesPath: string[];
     readonly owner: DocumentReference;
     readonly createdAt: Timestamp;
     readonly createdOn: CreatedOn;

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

@@ -1,10 +1,14 @@
 import ModelWithLang from '../../Model/lang';
 import { PartnershipPartnerData } from './types';
 export default class PartnershipPartner extends ModelWithLang<PartnershipPartnerData> {
+    get tinyInfo(): {
+        displayName: string;
+        photoURL: string;
+    };
     get partnershipId(): string;
     get name(): string;
     get lastname(): string;
-    get photoURL(): string | null;
+    get photoURL(): string;
     get displayName(): string;
     get NIF(): string | null;
     get email(): string;
@@ -28,4 +32,5 @@ export default class PartnershipPartner extends ModelWithLang<PartnershipPartner
     get isActive(): boolean;
     get userId(): string | null;
     get groupIds(): string[];
+    get subscriptionIds(): string[];
 }

package/models/Partnership/Partner/index.js

@@ -7,6 +7,12 @@ const types_1 = require("../../../helpers/types");
 const utils_1 = require("../../../helpers/utils");
 const lang_1 = __importDefault(require("../../Model/lang"));
 class PartnershipPartner extends lang_1.default {
+    get tinyInfo() {
+        return {
+            displayName: this.displayName,
+            photoURL: this.photoURL,
+        };
+    }
     get partnershipId() {
         return (0, utils_1.at)(this.ref.path.split('/'), 1) || '';
     }
@@ -17,7 +23,7 @@ class PartnershipPartner extends lang_1.default {
         return this.data.lastname;
     }
     get photoURL() {
-        return this.data.photoURL || null;
+        return this.data.photoURL;
     }
     get displayName() {
         return this.data.displayName;
@@ -32,7 +38,7 @@ class PartnershipPartner extends lang_1.default {
         return this.data.phone;
     }
     get birthdate() {
-        return this.data.birthdate;
+        return this.data.birthDate;
     }
     get sepaMandate() {
         if (!this.data.sepaMandate)
@@ -72,5 +78,8 @@ class PartnershipPartner extends lang_1.default {
     get groupIds() {
         return this.data.groupIds || [];
     }
+    get subscriptionIds() {
+        return this.data.subscriptionIds || [];
+    }
 }
 exports.default = PartnershipPartner;

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

@@ -1,6 +1,7 @@
 import { Timestamp } from '@google-cloud/firestore';
 import { BasicAddressData } from '../../../helpers/types';
 import { DocumentReference } from '../../../types/firestore';
+import { UserExtendedData } from '../../User/types';
 export interface PartnershipPartnerSepaMandate {
     mandateId: string;
     iban: string;
@@ -8,19 +9,14 @@ export interface PartnershipPartnerSepaMandate {
     holderAddress: BasicAddressData;
     swiftbic: string | null;
 }
-export interface PartnershipPartnerData {
-    name: string;
-    lastname: string;
-    photoURL: string | null;
-    displayName: string;
-    email: string;
+export interface PartnershipPartnerData extends UserExtendedData {
     address: BasicAddressData | null;
     phone: string | null;
-    birthdate: Timestamp | null;
     NIF: string | null;
     sepaMandate: PartnershipPartnerSepaMandate | null;
     userId: string | null;
     groupIds: string[];
+    subscriptionIds: string[];
     createdAt: Timestamp;
     createdBy: DocumentReference;
     editedAt: Timestamp | null;

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

@@ -1,6 +1,5 @@
 import ModelWithLang from '../../Model/lang';
-import { PaymentMethod } from '../Plan/types';
-import { PartnershipPaymentData } from './types';
+import { PartnershipPaymentData, PaymentMethod } from './types';
 export default class PartnershipPayment extends ModelWithLang<PartnershipPaymentData> {
     get partnershipId(): string;
     get title(): string;
@@ -10,7 +9,7 @@ export default class PartnershipPayment extends ModelWithLang<PartnershipPayment
     get partnerId(): string;
     get isRecurrent(): boolean;
     get isOneTime(): boolean;
-    get paymentMethod(): PaymentMethod;
+    get paymentMethod(): PaymentMethod | null;
     get isMethodSepa(): boolean;
     get status(): import("./types").PaymentStatus;
     get statusHistory(): import("./types").PaymentStatusHistoryItem[];

package/models/Partnership/Payment/index.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../helpers/utils");
 const lang_1 = __importDefault(require("../../Model/lang"));
-const types_1 = require("../Plan/types");
+const types_1 = require("./types");
 class PartnershipPayment extends lang_1.default {
     get partnershipId() {
         return (0, utils_1.at)(this.ref.path.split('/'), 1) || '';

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

@@ -1,5 +1,9 @@
 import { Timestamp } from '@google-cloud/firestore';
-import { PaymentMethod } from '../Plan/types';
+export declare enum PaymentMethod {
+    Cash = "CASH",
+    Transfer = "TRANSFER",
+    SEPA = "SEPA"
+}
 export declare enum PaymentStatus {
     Pending = "pending",
     Charged = "charged",
@@ -13,7 +17,7 @@ export interface PaymentStatusHistoryItem {
 export interface PartnershipPaymentData {
     title: string;
     amount: number;
-    paymentMethod: PaymentMethod;
+    paymentMethod: PaymentMethod | null;
     subscriptionId: string | null;
     partnerId: string;
     status: PaymentStatus;

package/models/Partnership/Payment/types.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentStatus = void 0;
+exports.PaymentStatus = exports.PaymentMethod = void 0;
+var PaymentMethod;
+(function (PaymentMethod) {
+    PaymentMethod["Cash"] = "CASH";
+    PaymentMethod["Transfer"] = "TRANSFER";
+    PaymentMethod["SEPA"] = "SEPA";
+})(PaymentMethod = exports.PaymentMethod || (exports.PaymentMethod = {}));
 var PaymentStatus;
 (function (PaymentStatus) {
     PaymentStatus["Pending"] = "pending";

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

@@ -1,6 +1,7 @@
 import ModelWithLang from '../../Model/lang';
-import { PartnershipPlanData } from './types';
+import { PartnershipPlanBasicData, PartnershipPlanData } from './types';
 export default class PartnershipPlan extends ModelWithLang<PartnershipPlanData> {
+    get basicInfo(): PartnershipPlanBasicData;
     get partnershipId(): string;
     private setPaymentDay;
     private setPaymentMonth;
@@ -14,7 +15,6 @@ export default class PartnershipPlan extends ModelWithLang<PartnershipPlanData>
     get schedule(): import("./types").PlanScheduleType;
     get isAnnuallySchedule(): boolean;
     get isPaymentDayEndOfMonth(): boolean;
-    get paymentMethod(): import("./types").PaymentMethod;
     get subscriptionsCount(): number;
     get hasSubscriptions(): boolean;
     get createdAt(): FirebaseFirestore.Timestamp;

package/models/Partnership/Plan/index.js

@@ -4,10 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const date_fns_1 = require("date-fns");
+const isNumber_1 = __importDefault(require("lodash/isNumber"));
 const utils_1 = require("../../../helpers/utils");
 const lang_1 = __importDefault(require("../../Model/lang"));
-const isNumber_1 = __importDefault(require("lodash/isNumber"));
 class PartnershipPlan extends lang_1.default {
+    get basicInfo() {
+        return {
+            name: this.name,
+            price: this.price,
+            schedule: this.schedule,
+        };
+    }
     get partnershipId() {
         return (0, utils_1.at)(this.ref.path.split('/'), 1) || '';
     }
@@ -53,9 +60,9 @@ class PartnershipPlan extends lang_1.default {
     get isPaymentDayEndOfMonth() {
         return this.schedule.paymentDay === -1;
     }
-    get paymentMethod() {
-        return this.data.paymentMethod;
-    }
+    // get paymentMethod() {
+    // 	return this.data.paymentMethod;
+    // }
     get subscriptionsCount() {
         return this.data.subscriptionsCount || 0;
     }

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

@@ -1,20 +1,16 @@
 import { Timestamp } from '@google-cloud/firestore';
-export declare enum PaymentMethod {
-    Cash = "CASH",
-    Transfer = "TRANSFER",
-    SEPA = "SEPA"
-}
 export interface PlanScheduleType {
     periodInMonths: number;
     paymentDay: number;
     paymentMonth: number | null;
 }
-export interface PartnershipPlanData {
+export interface PartnershipPlanBasicData {
     name: string;
-    description: string;
     price: number;
     schedule: PlanScheduleType;
-    paymentMethod: PaymentMethod;
+}
+export interface PartnershipPlanData extends PartnershipPlanBasicData {
+    description: string;
     subscriptionsCount: number;
     createdAt: Timestamp;
     createdBy: string;

package/models/Partnership/Plan/types.js

@@ -1,9 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentMethod = void 0;
-var PaymentMethod;
-(function (PaymentMethod) {
-    PaymentMethod["Cash"] = "CASH";
-    PaymentMethod["Transfer"] = "TRANSFER";
-    PaymentMethod["SEPA"] = "SEPA";
-})(PaymentMethod = exports.PaymentMethod || (exports.PaymentMethod = {}));

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

@@ -4,7 +4,8 @@ export default class PartnershipSubscription extends Model<PartnershipSubscripti
     get partnershipId(): string;
     get planId(): string;
     get partnerId(): string;
-    get nextPaymentDate(): FirebaseFirestore.Timestamp;
+    get partnerInfo(): import("../../User/types").UserTinyData;
+    get nextPaymentDate(): FirebaseFirestore.Timestamp | null;
     get endDate(): FirebaseFirestore.Timestamp | null;
     get isEnded(): boolean;
     get createdAt(): FirebaseFirestore.Timestamp;

package/models/Partnership/Subscription/index.js

@@ -16,8 +16,11 @@ class PartnershipSubscription extends Model_1.default {
     get partnerId() {
         return this.data.partnerId;
     }
+    get partnerInfo() {
+        return this.data.partnerInfo;
+    }
     get nextPaymentDate() {
-        return this.data.nextPaymentDate;
+        return this.data.nextPaymentDate || null;
     }
     get endDate() {
         return this.data.endDate || null;

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

@@ -1,8 +1,12 @@
 import { Timestamp } from '@google-cloud/firestore';
+import { UserTinyData } from '../../User/types';
+import { PartnershipPlanBasicData } from '../Plan/types';
 export interface PartnershipSubscriptionData {
     planId: string;
     partnerId: string;
-    nextPaymentDate: Timestamp;
+    partnerInfo: UserTinyData;
+    planInfo: PartnershipPlanBasicData;
+    nextPaymentDate: Timestamp | null;
     endDate: Timestamp | null;
     createdAt: Timestamp;
     createdBy: string;

package/package.json

@@ -1,29 +1,29 @@
 {
 	"name": "@glissandoo/lib",
-	"version": "1.102.12",
+	"version": "1.102.13",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",
 	"scripts": {
-		"tsc": "cp package.json ./lib && tsc",
-		"build": "npm run tsc",
-		"build:watch": "npm run tsc -- --watch",
 		"build:link": "tsc",
-		"test": "echo \"Error: no test specified\" && exit 1",
-		"format": "prettier --write \"src/**/*.ts\" \"src/lang/*.json\"",
+		"build:watch": "npm run tsc -- --watch",
+		"build": "npm run tsc",
 		"format:single": "prettier --write",
-		"lint": "eslint --ext .ts ./src",
+		"format": "prettier --write \"src/**/*.ts\" \"src/lang/*.json\"",
+		"link": "cp package.json ./lib && cd ./lib && npm link",
 		"lint:single": "eslint",
+		"lint": "eslint --ext .ts ./src",
+		"postversion": "git push && git push --tags",
 		"prepare": "rm -rf ./lib && npm run build:link",
-		"set-husky": "node scripts/setHusky.js",
 		"preversion": "npm run lint",
-		"version": "npm run format && git add -A src && ./publish.sh",
-		"postversion": "git push && git push --tags",
 		"publish:beta": "npm publish --tag beta",
-		"link": "cp package.json ./lib && cd ./lib && npm link",
-		"translation:upload": "localazy upload",
+		"set-husky": "node scripts/setHusky.js",
+		"supabase:types": "supabase gen types typescript --local > src/types/supabase/generated.ts; prettier --write src/types/supabase/generated.ts",
+		"test": "echo \"Error: no test specified\" && exit 1",
 		"translation:download": "localazy download",
-		"supabase:types": "supabase gen types typescript --local > src/types/supabase/generated.ts; prettier --write src/types/supabase/generated.ts"
+		"translation:upload": "localazy upload",
+		"tsc": "cp package.json ./lib && tsc",
+		"version": "npm run format && git add -A src && ./publish.sh"
 	},
 	"author": "Glissandoo",
 	"license": "ISC",