fx-shared-models 0.2.63__tar.gz → 0.2.65__tar.gz

{fx_shared_models-0.2.63/fx_shared_models.egg-info → fx_shared_models-0.2.65}/PKG-INFO

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

{fx_shared_models-0.2.63 → fx_shared_models-0.2.65/fx_shared_models.egg-info}/PKG-INFO

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

{fx_shared_models-0.2.63 → fx_shared_models-0.2.65}/fx_shared_models.egg-info/SOURCES.txt

@@ -87,6 +87,7 @@ shared_models/ib_commission/migrations/0005_ibonboardingstatus_ib_journey_form_s
 shared_models/ib_commission/migrations/0006_ibonboardingstatus_creation_source.py
 shared_models/ib_commission/migrations/0007_ibquestionnaire.py
 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/__init__.py
 shared_models/ib_commission/model/ib_onboarding.py
 shared_models/ib_commission/model/ib_questionnaire.py
@@ -156,6 +157,7 @@ shared_models/transactions/migrations/0008_alter_transaction_payment_method.py
 shared_models/transactions/migrations/0009_alter_transaction_approved_by_and_more.py
 shared_models/transactions/migrations/0010_alter_transaction_payment_method.py
 shared_models/transactions/migrations/0011_alter_transaction_options.py
+shared_models/transactions/migrations/0012_transaction_transaction_custome_fb8ec8_idx.py
 shared_models/transactions/migrations/__init__.py
 shared_models/ui_elements/__init__.py
 shared_models/ui_elements/apps.py

{fx_shared_models-0.2.63 → fx_shared_models-0.2.65}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages # Import find_packages
 
 setup(
     name='fx-shared-models',
-    version='0.2.63', # Incremented version after adding shared_models/__init__.py
+    version='0.2.65', # 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.65/shared_models/ib_commission/migrations/0009_ibcommissionrule_min_volume.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.21 on 2025-07-18 11:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ib_commission', '0008_ibcommissionrule_lot_size'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ibcommissionrule',
+            name='min_volume',
+            field=models.DecimalField(decimal_places=2, default=0.0, help_text='Minimum volume (in lots) required to qualify for this rule', max_digits=10),
+        ),
+    ]

{fx_shared_models-0.2.63 → fx_shared_models-0.2.65}/shared_models/ib_commission/models.py

@@ -220,6 +220,8 @@ class IBCommissionRule(BaseModel):
                               help_text='Amount per lot/percentage/pip')
     lot_size = models.DecimalField(max_digits=10, decimal_places=2, default=1.00,
                                  help_text='Number of lots this value applies to (for LOT_BASED calculation)')
+    min_volume = models.DecimalField(max_digits=10, decimal_places=2, default=0.00,
+                                   help_text='Minimum volume (in lots) required to qualify for this rule')
     keep_percentage = models.DecimalField(max_digits=5, decimal_places=2, default=100.00,
                                       help_text='Percentage of commission to keep (0-100)')
     pass_up_percentage = models.DecimalField(max_digits=5, decimal_places=2, default=0.00,

{fx_shared_models-0.2.63 → fx_shared_models-0.2.65}/shared_models/ib_commission/services/commission_calculator_service.py

@@ -766,7 +766,13 @@ class CommissionCalculatorService:
         logger.info(f"  - Rule ID: {rule.id}, Type: {rule.calculation_type}, Value: {rule.value}")
         logger.info(f"  - Volume: {volume} (type: {type(volume)})")
         logger.info(f"  - Commission USD: {commission_usd}")
-        logger.info(f"  - Min Amount: {rule.min_amount}, Max Amount: {rule.max_amount}")
+        logger.info(f"  - Min Volume: {rule.min_volume}, Min Amount: {rule.min_amount}, Max Amount: {rule.max_amount}")
+        
+        # Check minimum volume requirement
+        min_volume = getattr(rule, 'min_volume', Decimal('0.00')) or Decimal('0.00')
+        if Decimal(str(volume)) < min_volume:
+            logger.info(f"  - Volume {volume} is below minimum required {min_volume}, returning 0")
+            return Decimal('0.0')
         
         if rule.calculation_type == 'LOT_BASED':
             # Get lot size, default to 1 if not specified

fx_shared_models-0.2.65/shared_models/transactions/migrations/0012_transaction_transaction_custome_fb8ec8_idx.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.21 on 2025-07-18 10:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0011_alter_transaction_options'),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name='transaction',
+            index=models.Index(fields=['customer', 'created_at'], name='transaction_custome_fb8ec8_idx'),
+        ),
+    ]

{fx_shared_models-0.2.63 → fx_shared_models-0.2.65}/shared_models/transactions/models.py

@@ -115,6 +115,7 @@ class Transaction(BaseModel):
         indexes = [
             models.Index(fields=['transaction_type', 'status']),
             models.Index(fields=['account', 'created_at']),
+            models.Index(fields=['customer', 'created_at']),
             models.Index(fields=['payment_method']),
             models.Index(fields=['payment_gateway']),
             models.Index(fields=['assigned_user']),