@misterhomer1992/payment-manager 1.0.0 → 1.0.2

package/dist/collections/payments.js

@@ -1,17 +1,21 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = create;
 exports.update = update;
 exports.findPendingByUserAndPlan = findPendingByUserAndPlan;
 exports.findPendingByUserAndTokenPack = findPendingByUserAndTokenPack;
 exports.findByOrderReference = findByOrderReference;
+const moment_1 = __importDefault(require("moment"));
 const config_js_1 = require("../config.js");
 const COLLECTION = 'payments';
 function collection() {
     return (0, config_js_1.getConfig)().firestore.collection(COLLECTION);
 }
 async function create(payment) {
-    const now = new Date();
+    const now = (0, moment_1.default)().toDate();
     const docRef = await collection().add({
         ...payment,
         createdAt: now,
@@ -24,7 +28,7 @@ async function update(paymentId, data) {
         .doc(paymentId)
         .update({
         ...data,
-        updatedAt: new Date(),
+        updatedAt: (0, moment_1.default)().toDate(),
     });
 }
 async function findPendingByUserAndPlan(userId, planId) {

package/dist/collections/plans.js

@@ -1,10 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getById = getById;
 exports.getAll = getAll;
 exports.create = create;
 exports.update = update;
 exports.upsert = upsert;
+const moment_1 = __importDefault(require("moment"));
 const config_js_1 = require("../config.js");
 const COLLECTION = 'subscriptionPlans';
 function collection() {
@@ -21,7 +25,7 @@ async function getAll() {
     return snapshot.docs.map((doc) => ({ id: doc.id, ...doc.data() }));
 }
 async function create(plan) {
-    const now = new Date();
+    const now = (0, moment_1.default)().toDate();
     await collection()
         .doc(plan.id)
         .set({
@@ -35,11 +39,11 @@ async function update(planId, data) {
         .doc(planId)
         .update({
         ...data,
-        updatedAt: new Date(),
+        updatedAt: (0, moment_1.default)().toDate(),
     });
 }
 async function upsert(plan) {
-    const now = new Date();
+    const now = (0, moment_1.default)().toDate();
     await collection()
         .doc(plan.id)
         .set({

package/dist/collections/subscriptions.d.ts

@@ -1,6 +1,7 @@
 import type { SubscriptionEntity } from '../types/index.js';
+export declare function getById(subscriptionId: string): Promise<SubscriptionEntity | null>;
 export declare function getActiveByUserId(userId: string): Promise<SubscriptionEntity | null>;
-export declare function getByUserId(userId: string): Promise<SubscriptionEntity[]>;
 export declare function create(subscription: Omit<SubscriptionEntity, 'id' | 'createdAt' | 'updatedAt'>): Promise<string>;
 export declare function update(subscriptionId: string, data: Partial<Omit<SubscriptionEntity, 'id'>>): Promise<void>;
+export declare function getByUser(userId: string, statuses: SubscriptionEntity['status'][]): Promise<SubscriptionEntity[]>;
 export declare function getAllActiveAndCancelled(): Promise<SubscriptionEntity[]>;

package/dist/collections/subscriptions.js

@@ -1,15 +1,26 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getById = getById;
 exports.getActiveByUserId = getActiveByUserId;
-exports.getByUserId = getByUserId;
 exports.create = create;
 exports.update = update;
+exports.getByUser = getByUser;
 exports.getAllActiveAndCancelled = getAllActiveAndCancelled;
+const moment_1 = __importDefault(require("moment"));
 const config_js_1 = require("../config.js");
 const COLLECTION = 'subscriptions';
 function collection() {
     return (0, config_js_1.getConfig)().firestore.collection(COLLECTION);
 }
+async function getById(subscriptionId) {
+    const doc = await collection().doc(subscriptionId).get();
+    if (!doc.exists)
+        return null;
+    return { id: doc.id, ...doc.data() };
+}
 async function getActiveByUserId(userId) {
     const snapshot = await collection().where('userId', '==', userId).where('status', '==', 'active').limit(1).get();
     if (snapshot.empty)
@@ -17,15 +28,8 @@ async function getActiveByUserId(userId) {
     const doc = snapshot.docs[0];
     return { id: doc.id, ...doc.data() };
 }
-async function getByUserId(userId) {
-    const snapshot = await collection()
-        .where('userId', '==', userId)
-        .where('status', 'in', ['active', 'cancelled'])
-        .get();
-    return snapshot.docs.map((doc) => ({ id: doc.id, ...doc.data() }));
-}
 async function create(subscription) {
-    const now = new Date();
+    const now = (0, moment_1.default)().toDate();
     const docRef = await collection().add({
         ...subscription,
         createdAt: now,
@@ -38,9 +42,16 @@ async function update(subscriptionId, data) {
         .doc(subscriptionId)
         .update({
         ...data,
-        updatedAt: new Date(),
+        updatedAt: (0, moment_1.default)().toDate(),
     });
 }
+async function getByUser(userId, statuses) {
+    const snapshot = await collection()
+        .where('userId', '==', userId)
+        .where('status', 'in', statuses)
+        .get();
+    return snapshot.docs.map((doc) => ({ id: doc.id, ...doc.data() }));
+}
 async function getAllActiveAndCancelled() {
     const snapshot = await collection().where('status', 'in', ['active', 'cancelled']).get();
     return snapshot.docs.map((doc) => ({ id: doc.id, ...doc.data() }));

package/dist/collections/tokenPacks.js

@@ -1,10 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getById = getById;
 exports.getAll = getAll;
 exports.create = create;
 exports.update = update;
 exports.remove = remove;
+const moment_1 = __importDefault(require("moment"));
 const config_js_1 = require("../config.js");
 const COLLECTION = 'tokenPacks';
 function collection() {
@@ -21,7 +25,7 @@ async function getAll() {
     return snapshot.docs.map((doc) => ({ id: doc.id, ...doc.data() }));
 }
 async function create(pack) {
-    const now = new Date();
+    const now = (0, moment_1.default)().toDate();
     const docRef = await collection().add({
         ...pack,
         createdAt: now,
@@ -34,7 +38,7 @@ async function update(packId, data) {
         .doc(packId)
         .update({
         ...data,
-        updatedAt: new Date(),
+        updatedAt: (0, moment_1.default)().toDate(),
     });
 }
 async function remove(packId) {

package/dist/collections/userTokenBalances.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getByUserId = getByUserId;
 exports.addTokens = addTokens;
 exports.update = update;
+const moment_1 = __importDefault(require("moment"));
 const config_js_1 = require("../config.js");
 const firestore_1 = require("firebase-admin/firestore");
 const COLLECTION = 'userTokenBalances';
@@ -12,7 +16,7 @@ function collection() {
 const DEFAULT_BALANCE = {
     balance: 0,
     totalPurchased: 0,
-    updatedAt: new Date(0),
+    updatedAt: (0, moment_1.default)(0).toDate(),
 };
 async function getByUserId(userId) {
     const doc = await collection().doc(userId).get();
@@ -28,7 +32,7 @@ async function addTokens(userId, amount) {
         userId,
         balance: firestore_1.FieldValue.increment(amount),
         totalPurchased: firestore_1.FieldValue.increment(amount),
-        updatedAt: new Date(),
+        updatedAt: (0, moment_1.default)().toDate(),
     }, { merge: true });
 }
 async function update(userId, data) {
@@ -36,6 +40,6 @@ async function update(userId, data) {
         .doc(userId)
         .update({
         ...data,
-        updatedAt: new Date(),
+        updatedAt: (0, moment_1.default)().toDate(),
     });
 }

package/dist/index.d.ts

@@ -21,7 +21,9 @@ export interface PaymentManager {
         expire: (userId: string) => Promise<void>;
         deactivate: (userId: string) => Promise<void>;
         changePlan: (userId: string, newPlanId: string) => Promise<void>;
+        getById: (subscriptionId: string) => Promise<SubscriptionEntity | null>;
         getActiveByUserId: (userId: string) => Promise<SubscriptionEntity | null>;
+        getByUser: (userId: string, statuses: SubscriptionEntity['status'][]) => Promise<SubscriptionEntity[]>;
     };
     tokenPacks: {
         create: (pack: Omit<TokenPackEntity, 'id' | 'createdAt' | 'updatedAt'>) => Promise<string>;

package/dist/index.js

@@ -56,7 +56,9 @@ function init(config) {
             expire: subscriptionService.expire,
             deactivate: subscriptionService.deactivate,
             changePlan: subscriptionService.changePlan,
+            getById: subscriptionService.getById,
             getActiveByUserId: subscriptionService.getActiveByUserId,
+            getByUser: subscriptionService.getByUser,
         },
         tokenPacks: {
             create: tokenPackService.create,

package/dist/services/paymentService.js

@@ -32,17 +32,21 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSubscriptionPayment = createSubscriptionPayment;
 exports.createTokenPackPayment = createTokenPackPayment;
 exports.updatePaymentStatus = updatePaymentStatus;
+const moment_1 = __importDefault(require("moment"));
 const config_js_1 = require("../config.js");
 const paymentsCollection = __importStar(require("../collections/payments.js"));
 const plansCollection = __importStar(require("../collections/plans.js"));
 const orderReference_js_1 = require("../utils/orderReference.js");
 const wayforpay_api_1 = require("@misterhomer1992/wayforpay-api");
 const errors_js_1 = require("../types/errors.js");
-const CACHE_TTL_MS = 5 * 60 * 1000; // 5 minutes
+const CACHE_TTL_MS = moment_1.default.duration(5, 'minutes').asMilliseconds();
 const ORDER_REF_VERSION = '1';
 function isCacheValid(payment) {
     if (!payment.paymentLink || !payment.paymentLinkCreatedAt)
@@ -50,7 +54,7 @@ function isCacheValid(payment) {
     const createdAt = payment.paymentLinkCreatedAt instanceof Date
         ? payment.paymentLinkCreatedAt
         : new Date(payment.paymentLinkCreatedAt);
-    return Date.now() - createdAt.getTime() < CACHE_TTL_MS;
+    return (0, moment_1.default)().diff((0, moment_1.default)(createdAt)) < CACHE_TTL_MS;
 }
 async function createSubscriptionPayment(userId, planId, currency, productName) {
     const { wayforpay, platform, logger } = (0, config_js_1.getConfig)();
@@ -68,14 +72,14 @@ async function createSubscriptionPayment(userId, planId, currency, productName)
         });
         return { paymentUrl: cached.paymentLink };
     }
-    const now = new Date();
+    const now = (0, moment_1.default)();
     const orderReference = (0, orderReference_js_1.buildOrderReference)({
         version: ORDER_REF_VERSION,
         platform,
         userId,
         type: 'sub',
         planId,
-        date: now,
+        date: now.toDate(),
     });
     let url;
     try {
@@ -84,7 +88,7 @@ async function createSubscriptionPayment(userId, planId, currency, productName)
             merchantSecretKey: wayforpay.merchantSecretKey,
             merchantDomainName: wayforpay.merchantDomainName,
             orderReference,
-            orderDate: Math.floor(now.getTime() / 1000),
+            orderDate: now.unix(),
             productName: [productName],
             productPrice: [plan.amount],
             currency: currency,
@@ -106,7 +110,7 @@ async function createSubscriptionPayment(userId, planId, currency, productName)
         status: 'pending',
         orderReference,
         paymentLink: url,
-        paymentLinkCreatedAt: now,
+        paymentLinkCreatedAt: now.toDate(),
     });
     logger?.info('Payment created', { userId, planId, orderReference });
     return { paymentUrl: url };
@@ -122,14 +126,14 @@ async function createTokenPackPayment(userId, packId, currency, productName, pri
         });
         return { paymentUrl: cached.paymentLink };
     }
-    const now = new Date();
+    const now = (0, moment_1.default)();
     const orderReference = (0, orderReference_js_1.buildOrderReference)({
         version: ORDER_REF_VERSION,
         platform,
         userId,
         type: 'tkn',
         tokenPackId: packId,
-        date: now,
+        date: now.toDate(),
     });
     let url;
     try {
@@ -138,7 +142,7 @@ async function createTokenPackPayment(userId, packId, currency, productName, pri
             merchantSecretKey: wayforpay.merchantSecretKey,
             merchantDomainName: wayforpay.merchantDomainName,
             orderReference,
-            orderDate: Math.floor(now.getTime() / 1000),
+            orderDate: now.unix(),
             productName: [productName],
             productPrice: [price],
             currency: currency,
@@ -158,7 +162,7 @@ async function createTokenPackPayment(userId, packId, currency, productName, pri
         status: 'pending',
         orderReference,
         paymentLink: url,
-        paymentLinkCreatedAt: now,
+        paymentLinkCreatedAt: now.toDate(),
     });
     logger?.info('Payment created', { userId, packId, orderReference });
     return { paymentUrl: url };

package/dist/services/subscriptionService.d.ts

@@ -10,4 +10,7 @@ export declare function create(params: {
 export declare function expire(userId: string): Promise<void>;
 export declare function deactivate(userId: string): Promise<void>;
 export declare function changePlan(userId: string, newPlanId: string): Promise<void>;
+export declare function getById(subscriptionId: string): Promise<SubscriptionEntity | null>;
 export declare function getActiveByUserId(userId: string): Promise<SubscriptionEntity | null>;
+export declare function getByUser(userId: string, statuses: SubscriptionEntity['status'][]): Promise<SubscriptionEntity[]>;
+export declare function getExistingByUserId(userId: string): Promise<SubscriptionEntity | null>;

package/dist/services/subscriptionService.js

@@ -32,12 +32,19 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = create;
 exports.expire = expire;
 exports.deactivate = deactivate;
 exports.changePlan = changePlan;
+exports.getById = getById;
 exports.getActiveByUserId = getActiveByUserId;
+exports.getByUser = getByUser;
+exports.getExistingByUserId = getExistingByUserId;
+const moment_1 = __importDefault(require("moment"));
 const config_js_1 = require("../config.js");
 const subscriptionsCollection = __importStar(require("../collections/subscriptions.js"));
 const plansCollection = __importStar(require("../collections/plans.js"));
@@ -48,10 +55,10 @@ const errors_js_1 = require("../types/errors.js");
 async function create(params) {
     const { logger } = (0, config_js_1.getConfig)();
     const { userId, planId, currency, productName } = params;
-    const existing = await subscriptionsCollection.getActiveByUserId(userId);
-    if (existing) {
-        await subscriptionsCollection.update(existing.id, {
-            status: 'cancelled',
+    const existing = await subscriptionsCollection.getByUser(userId, ['active', 'cancelled']);
+    for (const sub of existing) {
+        await subscriptionsCollection.update(sub.id, {
+            status: 'expired',
         });
     }
     const plan = await plansCollection.getById(planId);
@@ -117,10 +124,10 @@ async function changePlan(userId, newPlanId) {
     if (newPlan.amount === currentPlan.amount) {
         throw new errors_js_1.PaymentManagerError('Cannot change to a plan with the same price', 'SAME_PRICE_PLAN_CHANGE');
     }
-    const now = new Date();
+    const now = (0, moment_1.default)();
     const isUpgrade = newPlan.amount > currentPlan.amount;
     if (isUpgrade) {
-        const proration = (0, proration_js_1.calculateUpgradeProration)(currentPlan, newPlan, subscription.startedAt, subscription.expiresAt, now);
+        const proration = (0, proration_js_1.calculateUpgradeProration)(currentPlan, newPlan, subscription.startedAt, subscription.expiresAt, now.toDate());
         await subscriptionsCollection.update(subscription.id, {
             planId: newPlanId,
             expiresAt: proration.newExpiresAt,
@@ -133,7 +140,7 @@ async function changePlan(userId, newPlanId) {
                 amount: newPlan.amount,
                 currency: 'UAH',
                 regularMode: newPlan.regularMode,
-                dateBegin: now.toISOString().split('T')[0],
+                dateBegin: now.format('DD.MM.YYYY'),
                 dateEnd: '',
             });
         }
@@ -145,7 +152,7 @@ async function changePlan(userId, newPlanId) {
             subscriptionId: subscription.id,
             oldPlanId: subscription.planId,
             newPlanId,
-            newExpiresAt: proration.newExpiresAt.toISOString(),
+            newExpiresAt: (0, moment_1.default)(proration.newExpiresAt).toISOString(),
         });
     }
     else {
@@ -162,7 +169,7 @@ async function changePlan(userId, newPlanId) {
                 amount: newPlan.amount,
                 currency: 'UAH',
                 regularMode: newPlan.regularMode,
-                dateBegin: pendingPlanChangeDate.toISOString().split('T')[0],
+                dateBegin: (0, moment_1.default)(pendingPlanChangeDate).format('DD.MM.YYYY'),
                 dateEnd: '',
             });
         }
@@ -174,10 +181,20 @@ async function changePlan(userId, newPlanId) {
             subscriptionId: subscription.id,
             oldPlanId: subscription.planId,
             newPlanId,
-            pendingPlanChangeDate: pendingPlanChangeDate.toISOString(),
+            pendingPlanChangeDate: (0, moment_1.default)(pendingPlanChangeDate).toISOString(),
         });
     }
 }
+async function getById(subscriptionId) {
+    return subscriptionsCollection.getById(subscriptionId);
+}
 async function getActiveByUserId(userId) {
     return subscriptionsCollection.getActiveByUserId(userId);
 }
+async function getByUser(userId, statuses) {
+    return subscriptionsCollection.getByUser(userId, statuses);
+}
+async function getExistingByUserId(userId) {
+    const results = await subscriptionsCollection.getByUser(userId, ['active', 'cancelled', 'expired']);
+    return results[0] ?? null;
+}

package/dist/services/webhookService.js

@@ -32,9 +32,13 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlePaymentCheck = handlePaymentCheck;
 exports.handleSubscriptionDeactivationCheck = handleSubscriptionDeactivationCheck;
+const moment_1 = __importDefault(require("moment"));
 const config_js_1 = require("../config.js");
 const orderReference_js_1 = require("../utils/orderReference.js");
 const webhookResponse_js_1 = require("../utils/webhookResponse.js");
@@ -45,8 +49,8 @@ const subscriptionsCollection = __importStar(require("../collections/subscriptio
 const plansCollection = __importStar(require("../collections/plans.js"));
 const tokenPacksCollection = __importStar(require("../collections/tokenPacks.js"));
 const userTokenBalancesCollection = __importStar(require("../collections/userTokenBalances.js"));
+const wayforpay_api_1 = require("@misterhomer1992/wayforpay-api");
 const errors_js_1 = require("../types/errors.js");
-const MS_PER_DAY = 24 * 60 * 60 * 1000;
 const SUCCESS_REASON_CODES = [1100, 4100];
 async function handlePaymentCheck(reqBody, headers) {
     const { wayforpay, webhookSecret, logger } = (0, config_js_1.getConfig)();
@@ -68,6 +72,9 @@ async function handlePaymentCheck(reqBody, headers) {
     if (ref.type === 'sub') {
         await handleSubscriptionPayment(ref.userId, ref.planId, orderReference);
     }
+    else if (ref.type === 'upg') {
+        await handleUpgradePayment(ref.userId, ref.planId, orderReference);
+    }
     else {
         await handleTokenPackPayment(ref.userId, ref.tokenPackId, orderReference);
     }
@@ -83,17 +90,17 @@ async function handleSubscriptionPayment(userId, planId, orderReference) {
     const existing = await subscriptionsCollection.getActiveByUserId(userId);
     if (existing) {
         // Recurrent payment — check for pending downgrade first
-        const now = new Date();
-        if (existing.pendingPlanId && existing.pendingPlanChangeDate && existing.pendingPlanChangeDate <= now) {
+        const now = (0, moment_1.default)();
+        if (existing.pendingPlanId && existing.pendingPlanChangeDate && (0, moment_1.default)(existing.pendingPlanChangeDate).isSameOrBefore(now)) {
             // Apply pending downgrade
             const newPlanId = existing.pendingPlanId;
             const plan = await plansCollection.getById(newPlanId);
             const days = plan ? (0, proration_js_1.cycleDays)(plan.regularMode) : (0, proration_js_1.cycleDays)('monthly');
-            const newExpiresAt = new Date(now.getTime() + days * MS_PER_DAY);
+            const newExpiresAt = now.clone().add(days, 'days').toDate();
             await subscriptionsCollection.update(existing.id, {
                 planId: newPlanId,
                 expiresAt: newExpiresAt,
-                startedAt: now,
+                startedAt: now.toDate(),
                 pendingPlanId: undefined,
                 pendingPlanChangeDate: undefined,
             });
@@ -108,14 +115,14 @@ async function handleSubscriptionPayment(userId, planId, orderReference) {
             // Extend subscription
             const plan = await plansCollection.getById(existing.planId);
             const days = plan ? (0, proration_js_1.cycleDays)(plan.regularMode) : (0, proration_js_1.cycleDays)('monthly');
-            const newExpiresAt = new Date(existing.expiresAt.getTime() + days * MS_PER_DAY);
+            const newExpiresAt = (0, moment_1.default)(existing.expiresAt).add(days, 'days').toDate();
             await subscriptionsCollection.update(existing.id, {
                 expiresAt: newExpiresAt,
             });
             logger?.info('Subscription renewed', {
                 userId,
                 subscriptionId: existing.id,
-                newExpiresAt: newExpiresAt.toISOString(),
+                newExpiresAt: (0, moment_1.default)(newExpiresAt).toISOString(),
             });
         }
     }
@@ -123,22 +130,71 @@ async function handleSubscriptionPayment(userId, planId, orderReference) {
         // First payment — create new subscription
         const plan = await plansCollection.getById(planId);
         const days = plan ? (0, proration_js_1.cycleDays)(plan.regularMode) : (0, proration_js_1.cycleDays)('monthly');
-        const now = new Date();
-        const expiresAt = new Date(now.getTime() + days * MS_PER_DAY);
+        const now = (0, moment_1.default)();
+        const expiresAt = now.clone().add(days, 'days').toDate();
         const subscriptionId = await subscriptionsCollection.create({
             userId,
             planId,
             status: 'active',
-            startedAt: now,
+            startedAt: now.toDate(),
             expiresAt,
         });
         logger?.info('Subscription created', {
             userId,
             subscriptionId,
             planId,
-            expiresAt: expiresAt.toISOString(),
+            expiresAt: (0, moment_1.default)(expiresAt).toISOString(),
+        });
+    }
+}
+async function handleUpgradePayment(userId, newPlanId, orderReference) {
+    const { wayforpay, logger } = (0, config_js_1.getConfig)();
+    const existing = await subscriptionsCollection.getActiveByUserId(userId);
+    if (!existing) {
+        logger?.error('No active subscription found for upgrade', { userId, orderReference });
+        return;
+    }
+    const newPlan = await plansCollection.getById(newPlanId);
+    if (!newPlan) {
+        logger?.error('New plan not found for upgrade', { newPlanId, orderReference });
+        return;
+    }
+    const expiresAt = existing.expiresAt;
+    // Expire the old subscription
+    await subscriptionsCollection.update(existing.id, { status: 'expired' });
+    // Create a new subscription with the upgraded plan, keeping the same expiresAt
+    const now = (0, moment_1.default)();
+    const subscriptionId = await subscriptionsCollection.create({
+        userId,
+        planId: newPlanId,
+        status: 'active',
+        startedAt: now.toDate(),
+        expiresAt,
+    });
+    // Update recurring billing to the new plan
+    try {
+        await (0, wayforpay_api_1.editRegularPurchase)({
+            merchantAccount: wayforpay.merchantAccount,
+            merchantPassword: wayforpay.merchantSecretKey,
+            orderReference: subscriptionId,
+            amount: newPlan.amount,
+            currency: 'UAH',
+            regularMode: newPlan.regularMode,
+            dateBegin: (0, moment_1.default)(expiresAt).format('DD.MM.YYYY'),
+            dateEnd: '',
         });
     }
+    catch (error) {
+        throw new errors_js_1.PaymentProviderError(`Failed to edit regular purchase for upgrade: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    logger?.info('Subscription upgraded via payment', {
+        userId,
+        oldSubscriptionId: existing.id,
+        newSubscriptionId: subscriptionId,
+        oldPlanId: existing.planId,
+        newPlanId,
+        expiresAt: (0, moment_1.default)(expiresAt).toISOString(),
+    });
 }
 async function handleTokenPackPayment(userId, tokenPackId, orderReference) {
     const { logger } = (0, config_js_1.getConfig)();
@@ -162,7 +218,7 @@ async function handleSubscriptionDeactivationCheck(headers) {
         throw new errors_js_1.InvalidWebhookSecretError();
     }
     const subscriptions = await subscriptionsCollection.getAllActiveAndCancelled();
-    const now = new Date();
+    const now = (0, moment_1.default)();
     const expired = [];
     const downgraded = [];
     for (const subscription of subscriptions) {
@@ -170,7 +226,7 @@ async function handleSubscriptionDeactivationCheck(headers) {
         if (!plan)
             continue;
         const expirationWithGrace = (0, gracePeriod_js_1.getExpirationWithGrace)(subscription.expiresAt, plan.regularMode);
-        if (now > expirationWithGrace) {
+        if (now.isAfter(expirationWithGrace)) {
             await subscriptionsCollection.update(subscription.id, { status: 'expired' });
             expired.push(subscription.userId);
             logger?.info('Subscription expired by deactivation check', {
@@ -181,15 +237,15 @@ async function handleSubscriptionDeactivationCheck(headers) {
         }
         if (subscription.pendingPlanId &&
             subscription.pendingPlanChangeDate &&
-            subscription.pendingPlanChangeDate <= now) {
+            (0, moment_1.default)(subscription.pendingPlanChangeDate).isSameOrBefore(now)) {
             const newPlanId = subscription.pendingPlanId;
             const newPlan = await plansCollection.getById(newPlanId);
             const days = newPlan ? (0, proration_js_1.cycleDays)(newPlan.regularMode) : (0, proration_js_1.cycleDays)('monthly');
-            const newExpiresAt = new Date(now.getTime() + days * MS_PER_DAY);
+            const newExpiresAt = now.clone().add(days, 'days').toDate();
             await subscriptionsCollection.update(subscription.id, {
                 planId: newPlanId,
                 expiresAt: newExpiresAt,
-                startedAt: now,
+                startedAt: now.toDate(),
                 pendingPlanId: undefined,
                 pendingPlanChangeDate: undefined,
             });

package/dist/types/orderReference.d.ts

@@ -2,7 +2,7 @@ export interface OrderReferenceParams {
     version: string;
     platform: string;
     userId: string;
-    type: 'sub' | 'tkn';
+    type: 'sub' | 'tkn' | 'upg';
     planId?: string;
     tokenPackId?: string;
     date: Date;
@@ -11,7 +11,7 @@ export interface ParsedOrderReference {
     version: string;
     platform: string;
     userId: string;
-    type: 'sub' | 'tkn';
+    type: 'sub' | 'tkn' | 'upg';
     planId?: string;
     tokenPackId?: string;
     date: Date;

package/dist/types/plan.d.ts

@@ -2,6 +2,7 @@ export interface SubscriptionPlanEntity {
     id: string;
     name: string;
     amount: number;
+    credits: number;
     regularMode: 'daily' | 'monthly' | 'yearly';
     description?: string;
     isActive: boolean;

package/dist/utils/gracePeriod.d.ts

@@ -1,3 +1,4 @@
+import moment from 'moment';
 import type { SubscriptionPlanEntity } from '../types/plan.js';
-export declare function getGracePeriod(regularMode: SubscriptionPlanEntity['regularMode']): number;
+export declare function getGracePeriod(regularMode: SubscriptionPlanEntity['regularMode']): moment.Duration;
 export declare function getExpirationWithGrace(expiresAt: Date, regularMode: SubscriptionPlanEntity['regularMode']): Date;