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

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

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

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

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

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

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages # Import find_packages
 
 setup(
     name='fx-shared-models',
-    version='0.2.76', # Incremented version after adding shared_models/__init__.py
+    version='0.2.78', # 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.76 → fx_shared_models-0.2.78}/shared_models/ib_commission/models.py

@@ -33,6 +33,15 @@ class IBHierarchy(BaseModel):
                                  help_text='IB account that receives commissions')
     mt5_login = models.IntegerField(help_text='MT5 login for deal processing')
     
+    default_agreement = models.ForeignKey(
+        'IBAgreement', 
+        null=True, 
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name='default_for_hierarchies',
+        help_text='Default agreement when not specified in client mapping'
+    )
+    
     is_active = models.BooleanField(default=True)
 
     def save(self, *args, **kwargs):
@@ -95,6 +104,11 @@ class ClientIBMapping(BaseModel):
                                help_text='Default agreement for this client-IB relationship')
     ib_path = models.TextField(help_text='Full path of IBs using customer ids')
     mt5_login = models.IntegerField(help_text="Client's MT5 login", null=True, blank=True)
+    agreement_path = models.TextField(
+        null=True, 
+        blank=True,
+        help_text='Agreement IDs for each IB level in hierarchy (dot-separated). Empty positions use IB default.'
+    )
 
     class Meta:
         app_label = 'ib_commission'

{fx_shared_models-0.2.76 → fx_shared_models-0.2.78}/shared_models/ib_commission/services/commission_cache_service.py

@@ -350,6 +350,7 @@ class CommissionCacheService:
                 'level': hierarchy.level,
                 'mt5_login': hierarchy.mt5_login,
                 'is_active': hierarchy.is_active,
+                'default_agreement_id': hierarchy.default_agreement_id if hasattr(hierarchy, 'default_agreement_id') else None,
             }
             
             # Add ib_account data if exists
@@ -432,6 +433,7 @@ class CommissionCacheService:
                 'direct_ib_customer_id': mapping.direct_ib_customer_id,
                 'master_ib_customer_id': mapping.master_ib_customer_id,
                 'agreement_id': mapping.agreement_id,
+                'agreement_path': mapping.agreement_path if hasattr(mapping, 'agreement_path') else None,
                 'ib_path': mapping.ib_path,
                 'mt5_login': mapping.mt5_login,
             }

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

@@ -69,6 +69,16 @@ class CommissionCalculatorService:
             logger.debug(f"[CalcDist Return Check] Returning type {type(return_value)}: {return_value}")
             return return_value
 
+        # Check if this is a close by deal with zero profit
+        if entry == cls.ENTRY_OUT_BY and profit is not None:
+            # Convert to string with 2 decimal places to check if it starts with 0.00
+            profit_str = f"{profit:.2f}"
+            if profit_str.startswith('0.00') or profit_str.startswith('-0.00'):
+                logger.info(f"Deal ({deal_ticket}) is a close by and profit is 0 ({profit}), skipping")
+                return_value = {'distributions': [], 'client_deduction': 0, 'client_server_id': None, 'is_processed': True} # Indicate skip
+                logger.debug(f"[CalcDist Return Check] Returning type {type(return_value)}: {return_value}")
+                return return_value
+
         # Check if commission already processed (excluding DELAYED)
         # This check prevents reprocessing successful or skipped/failed deals but allows retrying delayed ones.
         if CommissionDistribution.objects.filter(
@@ -293,6 +303,15 @@ class CommissionCalculatorService:
                 # Get all ancestor IB IDs from the path
                 path_parts = ib_hierarchy.path.split('.') # Includes the direct IB's ID
 
+                # Parse agreement_path if available (with backward compatibility check)
+                agreement_ids = []
+                if hasattr(client_mapping, 'agreement_path') and client_mapping.agreement_path:
+                    agreement_ids = client_mapping.agreement_path.split('.')
+                    
+                    # Validate agreement_path structure matches ib_path
+                    if len(agreement_ids) != len(path_parts):
+                        logger.warning(f"Agreement path length ({len(agreement_ids)}) doesn't match IB path length ({len(path_parts)}) for client {client_mapping.customer_id}")
+
                 # Get all relevant IB agreements (cache this if possible)
                 ib_agreements = {}
                 
@@ -312,18 +331,30 @@ class CommissionCalculatorService:
                     )
                 )
 
-                for member in agreement_members:
-                    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
+                # Build ib_agreements respecting agreement_path
+                for i, ib_id in enumerate(path_parts):
+                    if i < len(agreement_ids) and agreement_ids[i]:
+                        # Use specified agreement from agreement_path
+                        member = next((m for m in agreement_members 
+                                      if str(m.customer_id) == ib_id 
+                                      and str(m.agreement_id) == agreement_ids[i]), None)
+                        if member:
+                            ib_agreements[ib_id] = member.agreement
+                        else:
+                            logger.warning(f"Agreement {agreement_ids[i]} not found for IB {ib_id}, skipping this IB")
                     else:
-                        # For parent IBs in the hierarchy, use their agreements (current behavior)
-                        ib_agreements[member_customer_id_str] = member.agreement
+                        # Try to use default agreement from IBHierarchy
+                        hierarchy = IBHierarchy.objects.filter(
+                            customer_id=ib_id, is_active=True
+                        ).first()
+                        if hierarchy and hasattr(hierarchy, 'default_agreement') and hierarchy.default_agreement:
+                            ib_agreements[ib_id] = hierarchy.default_agreement
+                        else:
+                            # Fallback: use any agreement for this IB (current behavior)
+                            member = next((m for m in agreement_members 
+                                          if str(m.customer_id) == ib_id), None)
+                            if member:
+                                ib_agreements[ib_id] = member.agreement
 
                 # Calculate rule-based distribution for the hierarchy
                 distributions = cls._calculate_rule_based_distribution(

{fx_shared_models-0.2.76 → fx_shared_models-0.2.78}/shared_models/referrals/models.py

@@ -94,6 +94,18 @@ class ReferralSource(BaseModel):
         help_text="Optional: Specific account to receive rewards generated by this code."
     )
     
+    # IB hierarchy tracking for agreement path
+    ib_path = models.TextField(
+        null=True, 
+        blank=True,
+        help_text='Full IB hierarchy path (dot-separated customer IDs) at time of code generation'
+    )
+    agreement_path = models.TextField(
+        null=True, 
+        blank=True,
+        help_text='Agreement IDs for each IB level (dot-separated) at time of code generation'
+    )
+    
     # Status & Stats
     is_active = models.BooleanField(default=True)
     created_at = models.DateTimeField(auto_now_add=True)