fx-shared-models 0.2.4__tar.gz → 0.2.6__tar.gz

{fx_shared_models-0.2.4/fx_shared_models.egg-info → fx_shared_models-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fx-shared-models
-Version: 0.2.4
+Version: 0.2.6
 Summary: Shared models for FX Backend
 Home-page: https://github.com/fxbackend/fx-shared-models
 Author: FX Backend

{fx_shared_models-0.2.4 → fx_shared_models-0.2.6/fx_shared_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fx-shared-models
-Version: 0.2.4
+Version: 0.2.6
 Summary: Shared models for FX Backend
 Home-page: https://github.com/fxbackend/fx-shared-models
 Author: FX Backend

{fx_shared_models-0.2.4 → fx_shared_models-0.2.6}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='fx-shared-models',
-    version='0.2.4',
+    version='0.2.6',
     packages=find_namespace_packages(include=['shared_models*']),
     install_requires=[
         'Django>=3.0',

{fx_shared_models-0.2.4 → fx_shared_models-0.2.6}/shared_models/__init__.py

@@ -3,4 +3,4 @@ Shared models package for FX Backend
 Contains Customer, System Settings, and IB Commission models
 """
 
-__version__ = '0.2.4'  
+__version__ = '0.2.6'  

{fx_shared_models-0.2.4 → fx_shared_models-0.2.6}/shared_models/ib_commission/services/commission_calculator_service.py

@@ -45,6 +45,7 @@ class CommissionCalculatorService:
             Dictionary containing:
             - distributions: List of calculated distributions
             - client_deduction: Total amount to deduct from client (for entry positions)
+            - client_server_id: Server ID for the client account (for MT5 processing)
             - is_processed: Whether distributions have been processed
         """
         # Extract deal data
@@ -60,24 +61,23 @@ class CommissionCalculatorService:
         
         # Check if commission already calculated
         if CommissionDistribution.objects.filter(deal_ticket=deal_ticket).exists():
-            return {'distributions': [], 'client_deduction': 0, 'is_processed': True}
+            return {'distributions': [], 'client_deduction': 0, 'client_server_id': None, 'is_processed': True}
         
         # Find account using MT5 login
         account = Account.objects.filter(login=mt5_login, is_active=True).first()
         if not account:
-            return {'distributions': [], 'client_deduction': 0, 'is_processed': False}
+            return {'distributions': [], 'client_deduction': 0, 'client_server_id': None, 'is_processed': False}
         
         # Get customer from account
         customer = account.customer
         
         # Find mapping for this customer
         client_mapping = ClientIBMapping.objects.filter(
-            customer=customer, 
-            is_active=True
+            customer=customer
         ).first()
         
         if not client_mapping:
-            return {'distributions': [], 'client_deduction': 0, 'is_processed': False}
+            return {'distributions': [], 'client_deduction': 0, 'client_server_id': None, 'is_processed': False}
         
         # Determine which rules to apply based on entry type
         is_entry = entry in [cls.ENTRY_IN, cls.ENTRY_INOUT]  # Entry or InOut
@@ -98,7 +98,7 @@ class CommissionCalculatorService:
         )
         
         if not applicable_rules:
-            return {'distributions': [], 'client_deduction': 0, 'is_processed': False}
+            return {'distributions': [], 'client_deduction': 0, 'client_server_id': None, 'is_processed': False}
         
         distributions = []
         client_deduction = Decimal('0.0')
@@ -126,7 +126,7 @@ class CommissionCalculatorService:
             ).first()
             
             if not ib_hierarchy:
-                return {'distributions': [], 'client_deduction': 0, 'is_processed': False}
+                return {'distributions': [], 'client_deduction': 0, 'client_server_id': None, 'is_processed': False}
 
             path_parts = ib_hierarchy.path.split('.')
             
@@ -160,9 +160,18 @@ class CommissionCalculatorService:
                 commission_tracking.amount = client_deduction
                 commission_tracking.save()
         
+        # Get client server ID for MT5 processing
+        client_server_id = account.server.id if account else None
+        
+        # Enrich distributions with server information
+        for dist in distributions:
+            if dist.ib_account and not hasattr(dist, 'server_id'):
+                dist.server_id = dist.ib_account.server.id
+        
         return {
             'distributions': distributions,
             'client_deduction': client_deduction,
+            'client_server_id': client_server_id,
             'is_processed': False
         }
 
@@ -293,11 +302,15 @@ class CommissionCalculatorService:
                     
                     ib_account = None
                     mt5_login = 0
+                    server_id = None
                     
                     if ib_hierarchy_entry:
                         ib_account = ib_hierarchy_entry.ib_account
                         mt5_login = ib_hierarchy_entry.mt5_login
+                        if ib_account:
+                            server_id = ib_account.server.id
                     
+                    # Create distribution record with server information
                     keep_distribution = CommissionDistribution.objects.create(
                         deal_ticket=deal_ticket,
                         customer_id=ib_id,
@@ -308,8 +321,15 @@ class CommissionCalculatorService:
                         level=hierarchy_info[ib_id]['level'],
                         rule=rule,
                         is_processed=False,
-                        processed_time=datetime.now()
+                        processed_time=datetime.now(),
+                        processing_status='PENDING',
+                        processing_notes=f'Server ID: {server_id}' if server_id else 'No server information available'
                     )
+                    
+                    # Add server_id as an attribute for easy access
+                    if server_id:
+                        keep_distribution.server_id = server_id
+                        
                     distributions.append(keep_distribution)
 
                 # Calculate pass-up amount if not master IB
@@ -325,11 +345,15 @@ class CommissionCalculatorService:
                         
                         parent_account = None
                         parent_mt5_login = 0
+                        parent_server_id = None
                         
                         if parent_hierarchy_entry:
                             parent_account = parent_hierarchy_entry.ib_account
                             parent_mt5_login = parent_hierarchy_entry.mt5_login
+                            if parent_account:
+                                parent_server_id = parent_account.server.id
                         
+                        # Create pass-up distribution record with server information
                         pass_up_distribution = CommissionDistribution.objects.create(
                             deal_ticket=deal_ticket,
                             customer_id=parent_id,
@@ -341,8 +365,15 @@ class CommissionCalculatorService:
                             rule=rule,
                             is_pass_up=True,
                             is_processed=False,
-                            processed_time=datetime.now()
+                            processed_time=datetime.now(),
+                            processing_status='PENDING',
+                            processing_notes=f'Server ID: {parent_server_id}' if parent_server_id else 'No server information available'
                         )
+                        
+                        # Add server_id as an attribute for easy access
+                        if parent_server_id:
+                            pass_up_distribution.server_id = parent_server_id
+                            
                         distributions.append(pass_up_distribution)
                     
         return distributions
@@ -395,7 +426,7 @@ class CommissionCalculatorService:
         """
         # Find all active agreements for this IB
         ib_agreements = IBAgreementMember.objects.filter(
-            member_id=ib_id,
+            customer_id=ib_id,
             agreement__is_active=True
         ).values_list('agreement_id', flat=True)