all

.gitignore

@@ -37,4 +37,3 @@ coverage
 trash
 logs
 .env
-.git2222

src/bots/handlers/purchaseHandlers.ts

@@ -16,6 +16,7 @@ import {
 } from "../utils/messageUtils";
 import { getLoggedInMenuKeyboard, getMainMenuKeyboard } from "../utils/keyboardUtils";
 import { messageManager } from "../utils/messageManager";
+import { calculatePriceWithProfit } from "../utils/priceUtils";
 
 const logger = createLogger('PurchaseHandlers');
 const authService = AuthService.getInstance();
@@ -62,6 +63,7 @@ export const executePurchase = async (
     return;
   }
   
+  let costWithProfit = 0;
   try {
     const fiveSimService = serviceMapping[service];
     const prices = await virtualNumberService.getPrices(fiveSimService, countryId);
@@ -78,12 +80,15 @@ export const executePurchase = async (
 
     const cost = prices[countryId][fiveSimService][operator].cost;
     
+    // Apply profit to the cost
+    costWithProfit = calculatePriceWithProfit(ctx, cost, 'RUB');
+    
     // 💰 Balance check
     const user = await authService.getUserByTelegramId(telegramId);
-    if (!user || user.balance < cost) {
+    if (!user || user.balance < costWithProfit) {
       await ctx.deleteMessage(loadingMsgId);
       await ctx.reply(
-        getInsufficientBalanceMessage(cost, user?.balance || 0),
+        getInsufficientBalanceMessage(costWithProfit, user?.balance || 0),
         getLoggedInMenuKeyboard()
       );
       return;
@@ -95,7 +100,7 @@ export const executePurchase = async (
     
     if (purchaseResult && purchaseResult.phone) {
       // ➖ Deduct balance
-      await authService.updateUserBalance(telegramId, user.balance - cost);
+      await authService.updateUserBalance(telegramId, user.balance - costWithProfit);
       
       // 💾 Create purchase record in database with PENDING state
       const purchaseRecord = await purchaseTrackingService.createPurchase({
@@ -106,13 +111,13 @@ export const executePurchase = async (
         operator: operator,
         phoneNumber: purchaseResult.phone,
         orderId: purchaseResult.id,
-        cost: cost,
+        cost: costWithProfit,
         state: PurchaseState.PENDING
       });
       
       // Send purchase confirmation
       const confirmMsg = await ctx.reply(
-        getPurchaseSuccessMessage(purchaseResult, service, countryId, operator, cost),
+        getPurchaseSuccessMessage(purchaseResult, service, countryId, operator, costWithProfit),
         getLoggedInMenuKeyboard()
       );
       
@@ -135,6 +140,9 @@ export const executePurchase = async (
               PurchaseState.TIMEOUT
             );
             
+            // Return the cost to user's balance on timeout
+            await authService.updateUserBalance(telegramId, user.balance + costWithProfit);
+            
             await ctx.reply(
               getVerificationTimeoutMessage(),
               getLoggedInMenuKeyboard()
@@ -197,7 +205,7 @@ export const executePurchase = async (
           service: service,
           countryId: countryId,
           operator: operator,
-          cost: cost,
+          cost: costWithProfit,
           state: PurchaseState.FAILED
         });
       }
@@ -212,13 +220,16 @@ export const executePurchase = async (
     try {
       const user = await authService.getUserByTelegramId(telegramId!);
       if (user) {
+        // Return the cost to user's balance on error
+        await authService.updateUserBalance(telegramId!, user.balance + costWithProfit);
+        
         await purchaseTrackingService.createPurchase({
           userId: user.id,
           telegramId: telegramId!,
           service: service,
           countryId: countryId,
           operator: operator,
-          cost: 0, // We don't know the cost in this error case
+          cost: costWithProfit,
           state: PurchaseState.FAILED
         });
       }