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

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

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

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

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

{fx_shared_models-0.2.78 → fx_shared_models-0.2.80}/fx_shared_models.egg-info/SOURCES.txt

@@ -90,6 +90,7 @@ shared_models/ib_commission/migrations/0008_ibcommissionrule_lot_size.py
 shared_models/ib_commission/migrations/0009_ibcommissionrule_min_volume.py
 shared_models/ib_commission/migrations/0010_alter_commissiondistribution_rule_and_more.py
 shared_models/ib_commission/migrations/0011_alter_clientibmapping_agreement_and_more.py
+shared_models/ib_commission/migrations/0012_clientibmapping_agreement_path_and_more.py
 shared_models/ib_commission/migrations/__init__.py
 shared_models/ib_commission/model/ib_onboarding.py
 shared_models/ib_commission/model/ib_questionnaire.py
@@ -101,6 +102,7 @@ shared_models/referrals/apps.py
 shared_models/referrals/models.py
 shared_models/referrals/migrations/0001_initial.py
 shared_models/referrals/migrations/0002_alter_referralreward_payment_gateway_and_more.py
+shared_models/referrals/migrations/0003_referralsource_agreement_path_referralsource_ib_path.py
 shared_models/referrals/migrations/__init__.py
 shared_models/services/group_resolver.py
 shared_models/system_settings/apps.py

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

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages # Import find_packages
 
 setup(
     name='fx-shared-models',
-    version='0.2.78', # Incremented version after adding shared_models/__init__.py
+    version='0.2.80', # 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.80/shared_models/ib_commission/migrations/0012_clientibmapping_agreement_path_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.20 on 2025-08-14 12:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ib_commission', '0011_alter_clientibmapping_agreement_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='clientibmapping',
+            name='agreement_path',
+            field=models.TextField(blank=True, help_text='Agreement IDs for each IB level in hierarchy (dot-separated). Empty positions use IB default.', null=True),
+        ),
+        migrations.AddField(
+            model_name='ibhierarchy',
+            name='default_agreement',
+            field=models.ForeignKey(blank=True, help_text='Default agreement when not specified in client mapping', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='default_for_hierarchies', to='ib_commission.ibagreement'),
+        ),
+    ]

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

@@ -30,7 +30,8 @@ class CommissionCacheService:
     """Service for caching commission-related data using Django's cache framework"""
     
     # Cache key patterns (use consistent patterns across projects)
-    RULE_CACHE_KEY = "commission_rule:{agreement_id}:{symbol}:{commission_type}"
+    # NOTE: Symbol not included in key to support comma-separated symbols
+    RULE_CACHE_KEY = "commission_rule:{agreement_id}:{commission_type}"
     AGREEMENT_CACHE_KEY = "ib_agreement:{customer_id}"
     HIERARCHY_CACHE_KEY = "ib_hierarchy:{customer_id}"
     CLIENT_MAPPING_CACHE_KEY = "client_mapping:{mt5_login}:{customer_id}"
@@ -166,38 +167,57 @@ class CommissionCacheService:
             logger.info("Cache disabled, fetching from database")
             return cls._get_commission_rules_from_db(agreement_id, symbol, commission_type, account_type_id)
             
+        # Build cache key without symbol to support comma-separated symbols
         cache_key = cls.RULE_CACHE_KEY.format(
             agreement_id=agreement_id,
-            symbol=symbol if symbol is not None else "none",
             commission_type=commission_type
         )
         
-        # Add account type to cache key if provided
-        if account_type_id:
-            cache_key += f":at{account_type_id}"
-        
-        logger.info(f"Looking for cache key: {cache_key}")
+        logger.info(f"Looking for cache key: {cache_key} (will filter for symbol: {symbol})")
         
         # Try to get from cache first
         cached_rules = get_cache().get(cache_key)
         if cached_rules is not None:
             logger.info(f"Cache hit for {cache_key}")
-            # Convert dicts back to objects that support attribute access
+            # Convert dicts back to objects that support attribute access and filter
             rules = []
             for rule_dict in cached_rules:
                 # Create a simple object with attributes
                 rule_obj = type('CachedRule', (), rule_dict)()
-                rules.append(rule_obj)
+                
+                # Filter by account type if specified
+                if account_type_id:
+                    # Include rules with matching account type or no account type (wildcard)
+                    if rule_obj.account_type_id and rule_obj.account_type_id != account_type_id:
+                        continue
+                
+                # Filter by symbol
+                if symbol and symbol != '*':
+                    if not rule_obj.symbol or rule_obj.symbol == '*':
+                        # Wildcard rules always match
+                        rules.append(rule_obj)
+                    elif ',' in rule_obj.symbol:
+                        # Check if our symbol is in the comma-separated list
+                        rule_symbols = [s.strip().upper() for s in rule_obj.symbol.split(',')]
+                        if symbol.upper() in rule_symbols:
+                            rules.append(rule_obj)
+                    elif rule_obj.symbol.upper() == symbol.upper():
+                        # Exact match
+                        rules.append(rule_obj)
+                else:
+                    # No symbol filter or wildcard requested
+                    rules.append(rule_obj)
+            
             return rules
         
         logger.info(f"Cache miss for {cache_key}")
         
-        # If not in cache, get from database
-        rules = cls._get_commission_rules_from_db(agreement_id, symbol, commission_type, account_type_id)
+        # If not in cache, get ALL rules for this agreement/commission_type from database
+        all_rules = cls._get_all_commission_rules_from_db(agreement_id, commission_type)
         
-        # Convert rules to serializable format for caching
+        # Convert ALL rules to serializable format for caching
         serialized_rules = []
-        for rule in rules:
+        for rule in all_rules:
             rule_dict = model_to_dict(rule)
             # Add account_type_id explicitly since model_to_dict uses 'account_type' for FK
             rule_dict['account_type_id'] = rule.account_type_id
@@ -206,10 +226,52 @@ class CommissionCacheService:
                 rule_dict['account_type_name'] = rule.account_type.name
             serialized_rules.append(rule_dict)
         
-        # Store in cache for future use
-        logger.info(f"Storing in cache: {cache_key}")
+        # Store ALL rules in cache
+        logger.info(f"Storing {len(serialized_rules)} rules in cache: {cache_key}")
         get_cache().set(cache_key, serialized_rules, cls.RULE_CACHE_EXPIRY)
         
+        # Now filter the rules based on the requested criteria
+        filtered_rules = []
+        for rule in all_rules:
+            # Filter by account type if specified
+            if account_type_id:
+                # Include rules with matching account type or no account type (wildcard)
+                if rule.account_type_id and rule.account_type_id != account_type_id:
+                    continue
+            
+            # Filter by symbol
+            if symbol and symbol != '*':
+                if not rule.symbol or rule.symbol == '*':
+                    # Wildcard rules always match
+                    filtered_rules.append(rule)
+                elif ',' in rule.symbol:
+                    # Check if our symbol is in the comma-separated list
+                    rule_symbols = [s.strip().upper() for s in rule.symbol.split(',')]
+                    if symbol.upper() in rule_symbols:
+                        filtered_rules.append(rule)
+                elif rule.symbol.upper() == symbol.upper():
+                    # Exact match
+                    filtered_rules.append(rule)
+            else:
+                # No symbol filter or wildcard requested
+                filtered_rules.append(rule)
+        
+        return filtered_rules
+    
+    @classmethod
+    def _get_all_commission_rules_from_db(cls, agreement_id, commission_type):
+        """Get ALL commission rules for an agreement from database (no filtering)"""
+        from shared_models.ib_commission.models import IBCommissionRule
+        
+        logger.info(f"Fetching ALL rules from DB for agreement_id={agreement_id}, commission_type={commission_type}")
+        
+        rules = IBCommissionRule.objects.filter(
+            agreement_id=agreement_id,
+            commission_type=commission_type
+        ).select_related('account_type').order_by('priority')
+        
+        rules = list(rules)
+        logger.info(f"Found {len(rules)} total rules in database")
         return rules
     
     @classmethod
@@ -227,9 +289,15 @@ class CommissionCacheService:
         
         # Smart filtering based on symbol
         if symbol and symbol != '*':
-            rules_query = rules_query.filter(
-                models.Q(symbol__iexact=symbol) | models.Q(symbol='*') | models.Q(symbol__isnull=True)
-            )
+            # Build Q object for symbol matching (including comma-separated symbols)
+            symbol_q = models.Q(symbol__iexact=symbol)
+            # Also check if the symbol is contained in comma-separated lists
+            symbol_q |= models.Q(symbol__icontains=f"{symbol},")  # Symbol at start or middle
+            symbol_q |= models.Q(symbol__icontains=f",{symbol}")  # Symbol at end or middle
+            # Also include wildcards
+            symbol_q |= models.Q(symbol='*') | models.Q(symbol__isnull=True)
+            
+            rules_query = rules_query.filter(symbol_q)
         
         # Filter by account type if provided
         if account_type_id:
@@ -239,6 +307,23 @@ class CommissionCacheService:
         
         rules = list(rules_query.select_related('account_type').order_by('priority'))
         
+        # Post-process to ensure exact symbol matches for comma-separated values
+        if symbol and symbol != '*':
+            filtered_rules = []
+            for rule in rules:
+                if not rule.symbol or rule.symbol == '*':
+                    # Wildcard rules always match
+                    filtered_rules.append(rule)
+                elif ',' in rule.symbol:
+                    # Check if our symbol is in the comma-separated list (case-insensitive)
+                    rule_symbols = [s.strip().upper() for s in rule.symbol.split(',')]
+                    if symbol.upper() in rule_symbols:
+                        filtered_rules.append(rule)
+                elif rule.symbol.upper() == symbol.upper():
+                    # Exact match for non-comma-separated symbols
+                    filtered_rules.append(rule)
+            rules = filtered_rules
+        
         logger.info(f"Found {len(rules)} rules in database")
         return rules
     
@@ -322,8 +407,6 @@ class CommissionCacheService:
             logger.info("Cache disabled, fetching from database")
             return cls._get_ib_hierarchy_from_db(customer_id)
             
-        from shared_models.ib_commission.models import IBHierarchy
-        
         cache_key = cls.HIERARCHY_CACHE_KEY.format(customer_id=customer_id)
         
         logger.info(f"Looking for cache key: {cache_key}")
@@ -498,70 +581,17 @@ class CommissionCacheService:
             return
             
         if agreement_id:
-            # Get all unique symbols and account types for this agreement from the database
-            from shared_models.ib_commission.models import IBCommissionRule
-            
-            # Get all rules for this agreement
-            rules = IBCommissionRule.objects.filter(
-                agreement_id=agreement_id
-            ).values('symbol', 'account_type_id').distinct()
-            
-            # Build list of unique symbol/account_type combinations
-            symbol_account_combos = []
-            unique_symbols = set()
-            
-            for rule in rules:
-                symbol = rule['symbol']
-                account_type_id = rule['account_type_id']
-                
-                # Handle comma-separated symbols
-                if symbol and ',' in symbol:
-                    # Split comma-separated symbols and add each individually
-                    for s in symbol.split(','):
-                        s = s.strip()
-                        if s:
-                            unique_symbols.add(s)
-                            symbol_account_combos.append((s, account_type_id))
-                else:
-                    unique_symbols.add(symbol)
-                    symbol_account_combos.append((symbol, account_type_id))
-            
-            # Also add None symbol if not present (for wildcard rules)
-            if None not in unique_symbols:
-                unique_symbols.add(None)
-                # Add combinations for None symbol with all account types
-                account_types = set(r['account_type_id'] for r in rules if r['account_type_id'])
-                for at_id in account_types:
-                    symbol_account_combos.append((None, at_id))
-                # Also add None/None combo
-                symbol_account_combos.append((None, None))
-            
-            # Invalidate all commission types, symbols, and account types for this agreement
+            # With the new caching strategy, we only need to invalidate 2 keys per agreement
+            # (one for COMMISSION and one for REBATE)
             invalidated_count = 0
             for commission_type in ['COMMISSION', 'REBATE']:
-                # First invalidate base keys (without account type)
-                for symbol in unique_symbols:
-                    cache_key = cls.RULE_CACHE_KEY.format(
-                        agreement_id=agreement_id,
-                        symbol=symbol if symbol is not None else "none",
-                        commission_type=commission_type
-                    )
-                    logger.debug(f"Invalidating cache key: {cache_key}")
-                    get_cache().delete(cache_key)
-                    invalidated_count += 1
-                
-                # Then invalidate keys with account types
-                for symbol, account_type_id in symbol_account_combos:
-                    cache_key = cls.RULE_CACHE_KEY.format(
-                        agreement_id=agreement_id,
-                        symbol=symbol if symbol is not None else "none",
-                        commission_type=commission_type
-                    )
-                    if account_type_id:
-                        cache_key += f":at{account_type_id}"
-                    logger.debug(f"Invalidating cache key: {cache_key}")
-                    get_cache().delete(cache_key)
-                    invalidated_count += 1
+                cache_key = cls.RULE_CACHE_KEY.format(
+                    agreement_id=agreement_id,
+                    commission_type=commission_type
+                )
+                logger.debug(f"Invalidating cache key: {cache_key}")
+                get_cache().delete(cache_key)
+                invalidated_count += 1
             
             logger.info(f"Invalidated {invalidated_count} cache keys for agreement {agreement_id}")
         else:

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

@@ -957,7 +957,7 @@ class CommissionCalculatorService:
                     if account_type_id:
                         exact_symbol_account_type_rules = [
                             rule for rule in all_rules 
-                            if rule.symbol and rule.symbol.lower() == symbol.lower() 
+                            if rule.symbol and cls._symbol_matches(rule.symbol, symbol)
                             and rule.account_type_id == account_type_id
                         ]
                         
@@ -1209,7 +1209,7 @@ class CommissionCalculatorService:
                 # 2. Exact symbol match (any account type)
                 exact_symbol_rules = [
                     rule for rule in all_rules 
-                    if rule.symbol and rule.symbol.lower() == symbol.lower() 
+                    if rule.symbol and cls._symbol_matches(rule.symbol, symbol)
                     and (rule.account_type_id is None)
                 ]
                 
@@ -1393,7 +1393,7 @@ class CommissionCalculatorService:
                 # 2. Exact symbol match (any account type)
                 exact_symbol_rules = [
                     rule for rule in all_rules 
-                    if rule.symbol and rule.symbol.lower() == symbol.lower() 
+                    if rule.symbol and cls._symbol_matches(rule.symbol, symbol)
                     and (rule.account_type_id is None)
                 ]
                 

fx_shared_models-0.2.80/shared_models/referrals/migrations/0003_referralsource_agreement_path_referralsource_ib_path.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.20 on 2025-08-14 12:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('referrals', '0002_alter_referralreward_payment_gateway_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='referralsource',
+            name='agreement_path',
+            field=models.TextField(blank=True, help_text='Agreement IDs for each IB level (dot-separated) at time of code generation', null=True),
+        ),
+        migrations.AddField(
+            model_name='referralsource',
+            name='ib_path',
+            field=models.TextField(blank=True, help_text='Full IB hierarchy path (dot-separated customer IDs) at time of code generation', null=True),
+        ),
+    ]