@glissandoo/lib 1.102.12 → 1.102.14

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/models/User/index.d.ts

@@ -15,6 +15,7 @@ export default class User extends UserExtended<UserData> {
     get pushToken(): string | null;
     get tokens(): string[];
     get notifications(): number;
+    get notificationsByGroup(): Record<string, number>;
     get language(): LanguagesTypes;
     get createdAt(): FirebaseFirestore.Timestamp;
     get intercomId(): string | null;
@@ -50,6 +51,7 @@ export default class User extends UserExtended<UserData> {
         default_events_filter: UserEventsFilter;
     }[T];
     getNotificationSetting(key: UserNotificationSettings): boolean;
+    getNotificationByGroup(groupId: string): number;
     get registerVia(): import("./types").UserRegisterVia;
     get lastAppLoginAt(): FirebaseFirestore.Timestamp | null;
     get lastWebLoginAt(): FirebaseFirestore.Timestamp | null;

package/models/User/index.js

@@ -46,6 +46,9 @@ class User extends extended_1.default {
     get notifications() {
         return this.data.notifications || 0;
     }
+    get notificationsByGroup() {
+        return this.data.notificationsByGroup || {};
+    }
     get language() {
         return this.data.language || lang_1.defaultLocale;
     }
@@ -131,6 +134,9 @@ class User extends extended_1.default {
     getNotificationSetting(key) {
         return this.data.notificationSettings[key];
     }
+    getNotificationByGroup(groupId) {
+        return groupId in this.notificationsByGroup ? this.notificationsByGroup[groupId] : 0;
+    }
     get registerVia() {
         return this.data.registerVia || null;
     }

package/models/User/types.d.ts

@@ -69,6 +69,7 @@ export interface UserData extends UserExtendedData {
     description: string | null;
     createdAt: Timestamp;
     notifications: number;
+    notificationsByGroup: Record<string, number>;
     pushToken: string | null;
     tokens: string[];
     deletedAt: Timestamp | null;

package/package.json

@@ -1,29 +1,29 @@
 {
 	"name": "@glissandoo/lib",
-	"version": "1.102.12",
+	"version": "1.102.14",
 	"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",