fx-shared-models 0.2.74__tar.gz → 0.2.76__tar.gz

{fx_shared_models-0.2.74/fx_shared_models.egg-info → fx_shared_models-0.2.76}/PKG-INFO

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

{fx_shared_models-0.2.74 → fx_shared_models-0.2.76/fx_shared_models.egg-info}/PKG-INFO

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

{fx_shared_models-0.2.74 → fx_shared_models-0.2.76}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages # Import find_packages
 
 setup(
     name='fx-shared-models',
-    version='0.2.74', # Incremented version after adding shared_models/__init__.py
+    version='0.2.76', # Incremented version after adding shared_models/__init__.py
     packages=find_packages(include=['shared_models', 'shared_models.*']),  # Find packages under the shared_models directory
     install_requires=[
         'Django>=4.2',  # Match the version from requirements.txt if possible

{fx_shared_models-0.2.74 → fx_shared_models-0.2.76}/shared_models/ib_commission/services/commission_calculator_service.py

@@ -313,7 +313,17 @@ class CommissionCalculatorService:
                 )
 
                 for member in agreement_members:
-                    ib_agreements[str(member.customer_id)] = member.agreement # Ensure keys are strings if path_parts are strings
+                    member_customer_id_str = str(member.customer_id)
+                    
+                    # For the direct IB, only use the client mapping agreement
+                    if member_customer_id_str == str(client_mapping.direct_ib_customer_id):
+                        # Only add if it matches the client mapping agreement
+                        if client_mapping.agreement_id and member.agreement_id == client_mapping.agreement_id:
+                            ib_agreements[member_customer_id_str] = member.agreement
+                        # Skip other agreements for the direct IB
+                    else:
+                        # For parent IBs in the hierarchy, use their agreements (current behavior)
+                        ib_agreements[member_customer_id_str] = member.agreement
 
                 # Calculate rule-based distribution for the hierarchy
                 distributions = cls._calculate_rule_based_distribution(
@@ -544,7 +554,7 @@ class CommissionCalculatorService:
                     str(h.customer_id): { # Use string keys to match ib_agreements
                         'level': h.level,
                         'parent_id': str(h.parent_customer_id) if h.parent_customer_id else None,
-                        'ib_account': h.ib_account,
+                        'ib_account_id': h.ib_account.id if h.ib_account else None,
                         'mt5_login': h.mt5_login,
                         'server_id': h.ib_account.server.id if h.ib_account and h.ib_account.server else None
                     } for h in hierarchies
@@ -639,7 +649,7 @@ class CommissionCalculatorService:
                 keep_distribution = CommissionDistribution(
                     commission_tracking=commission_tracking, # Link to tracking record (Corrected FK name)
                     customer_id=int(ib_id_str),
-                    ib_account=ib_info.get('ib_account'),
+                    ib_account_id=ib_info.get('ib_account_id'),
                     mt5_login=ib_info.get('mt5_login'),
                     distribution_type=commission_type,
                     amount=keep_amount,
@@ -685,7 +695,7 @@ class CommissionCalculatorService:
             pass_up_distribution = CommissionDistribution(
                 commission_tracking=commission_tracking, # Link to tracking record (Corrected FK name)
                 customer_id=int(parent_ib_id_str),
-                ib_account=parent_info.get('ib_account'),
+                ib_account_id=parent_info.get('ib_account_id'),
                 mt5_login=parent_info.get('mt5_login'),
                 distribution_type=commission_type, # Should be same type as originated
                 amount=total_pass_up_amount,