fx-shared-models 0.2.0__tar.gz → 0.2.2__tar.gz

{fx_shared_models-0.2.0/fx_shared_models.egg-info → fx_shared_models-0.2.2}/PKG-INFO

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

{fx_shared_models-0.2.0 → fx_shared_models-0.2.2/fx_shared_models.egg-info}/PKG-INFO

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

{fx_shared_models-0.2.0 → fx_shared_models-0.2.2}/fx_shared_models.egg-info/SOURCES.txt

@@ -15,11 +15,19 @@ shared_models/accounts/models.py
 shared_models/accounts/migrations/0001_initial.py
 shared_models/accounts/migrations/0002_remove_account_group_type_account_has_bonus_and_more.py
 shared_models/accounts/migrations/0003_account_is_archived_account_is_trading_enabled.py
+shared_models/accounts/migrations/0004_alter_account_created_at_alter_account_created_by_and_more.py
+shared_models/accounts/migrations/0005_account_currency.py
+shared_models/accounts/migrations/0006_alter_account_options.py
 shared_models/accounts/migrations/__init__.py
 shared_models/common/base.py
 shared_models/common/utils.py
 shared_models/common/__pycache__/base.cpython-313.pyc
 shared_models/common/__pycache__/utils.cpython-313.pyc
+shared_models/company_ba/__init__.py
+shared_models/company_ba/apps.py
+shared_models/company_ba/models.py
+shared_models/company_ba/migrations/0001_initial.py
+shared_models/company_ba/migrations/__init__.py
 shared_models/customers/__init__.py
 shared_models/customers/apps.py
 shared_models/customers/models.py
@@ -27,9 +35,36 @@ shared_models/customers/__pycache__/__init__.cpython-313.pyc
 shared_models/customers/__pycache__/apps.cpython-313.pyc
 shared_models/customers/__pycache__/models.cpython-313.pyc
 shared_models/customers/migrations/0001_initial.py
+shared_models/customers/migrations/0002_alter_customer_email_alter_customer_first_name_and_more.py
+shared_models/customers/migrations/0004_customerauth_two_factor_backup_codes_and_more.py
+shared_models/customers/migrations/0005_customerauth_temp_webauthn_challenge.py
+shared_models/customers/migrations/0006_customerauth_webauthn_challenge.py
+shared_models/customers/migrations/0007_customerauth_blocked_customerauth_blocked_at_and_more.py
+shared_models/customers/migrations/0008_customer_email_hash.py
 shared_models/customers/migrations/__init__.py
 shared_models/customers/migrations/__pycache__/0001_initial.cpython-313.pyc
+shared_models/customers/migrations/__pycache__/0002_alter_customer_email_alter_customer_first_name_and_more.cpython-313.pyc
+shared_models/customers/migrations/__pycache__/0004_customerauth_two_factor_backup_codes_and_more.cpython-313.pyc
+shared_models/customers/migrations/__pycache__/0005_customerauth_temp_webauthn_challenge.cpython-313.pyc
+shared_models/customers/migrations/__pycache__/0006_customerauth_webauthn_challenge.cpython-313.pyc
+shared_models/customers/migrations/__pycache__/0007_customerauth_blocked_customerauth_blocked_at_and_more.cpython-313.pyc
+shared_models/customers/migrations/__pycache__/0008_customer_email_hash.cpython-313.pyc
 shared_models/customers/migrations/__pycache__/__init__.cpython-313.pyc
+shared_models/ib_commission/__init__.py
+shared_models/ib_commission/apps.py
+shared_models/ib_commission/models.py
+shared_models/ib_commission/migrations/0001_initial.py
+shared_models/ib_commission/migrations/0002_alter_clientibmapping_id_and_more.py
+shared_models/ib_commission/migrations/0003_commissiondistribution_is_pass_up_and_more.py
+shared_models/ib_commission/migrations/0004_rename_ib_commissi_account_76e731_idx_ib_commissi_account_10d556_idx_and_more.py
+shared_models/ib_commission/migrations/0005_alter_ibagreementmember_start_date.py
+shared_models/ib_commission/migrations/0006_clientibmapping_agreement_and_more.py
+shared_models/ib_commission/migrations/0007_alter_clientibmapping_mt5_login.py
+shared_models/ib_commission/migrations/0008_commissiondistribution_is_processed_and_more.py
+shared_models/ib_commission/migrations/0009_commissiondistribution_processing_notes_and_more.py
+shared_models/ib_commission/migrations/__init__.py
+shared_models/ib_commission/services/__init__.py
+shared_models/ib_commission/services/commission_calculator_service.py
 shared_models/services/group_resolver.py
 shared_models/system_settings/apps.py
 shared_models/system_settings/serializers.py
@@ -43,6 +78,8 @@ shared_models/system_settings/migrations/0005_accountsequence_accounttype.py
 shared_models/system_settings/migrations/0006_alter_accounttype_sequence.py
 shared_models/system_settings/migrations/0007_remove_accounttype_default_group_type_and_more.py
 shared_models/system_settings/migrations/0008_paymentgatewayconfig_paymentmethodconfig_and_more.py
+shared_models/system_settings/migrations/0009_alter_accountsequence_created_at_and_more.py
+shared_models/system_settings/migrations/0010_alter_paymentgatewayconfig_gateway_and_more.py
 shared_models/system_settings/migrations/__init__.py
 shared_models/system_settings/migrations/__pycache__/0001_initial.cpython-313.pyc
 shared_models/system_settings/migrations/__pycache__/0002_rename_is_enabled_systemsetting_is_active.cpython-313.pyc
@@ -52,6 +89,8 @@ shared_models/system_settings/migrations/__pycache__/0005_accountsequence_accoun
 shared_models/system_settings/migrations/__pycache__/0006_alter_accounttype_sequence.cpython-313.pyc
 shared_models/system_settings/migrations/__pycache__/0007_remove_accounttype_default_group_type_and_more.cpython-313.pyc
 shared_models/system_settings/migrations/__pycache__/0008_paymentgatewayconfig_paymentmethodconfig_and_more.cpython-313.pyc
+shared_models/system_settings/migrations/__pycache__/0009_alter_accountsequence_created_at_and_more.cpython-313.pyc
+shared_models/system_settings/migrations/__pycache__/0010_alter_paymentgatewayconfig_gateway_and_more.cpython-313.pyc
 shared_models/system_settings/migrations/__pycache__/__init__.cpython-313.pyc
 shared_models/system_settings/models/__init__.py
 shared_models/system_settings/models/account_sequence.py
@@ -65,6 +104,7 @@ shared_models/system_settings/models/transaction_configs.py
 shared_models/system_settings/models/__pycache__/__init__.cpython-313.pyc
 shared_models/system_settings/models/__pycache__/account_sequence.cpython-313.pyc
 shared_models/system_settings/models/__pycache__/account_types.cpython-313.pyc
+shared_models/system_settings/models/__pycache__/accounts.cpython-313.pyc
 shared_models/system_settings/models/__pycache__/base.cpython-313.pyc
 shared_models/system_settings/models/__pycache__/email.cpython-313.pyc
 shared_models/system_settings/models/__pycache__/group_configurations.cpython-313.pyc
@@ -77,4 +117,6 @@ shared_models/transactions/constants.py
 shared_models/transactions/enums.py
 shared_models/transactions/models.py
 shared_models/transactions/migrations/0001_initial.py
+shared_models/transactions/migrations/0002_transaction_mt5_ticket.py
+shared_models/transactions/migrations/0003_alter_transaction_options.py
 shared_models/transactions/migrations/__init__.py

{fx_shared_models-0.2.0 → fx_shared_models-0.2.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='fx-shared-models',
-    version='0.2.0',
+    version='0.2.2',
     packages=find_namespace_packages(include=['shared_models*']),
     install_requires=[
         'Django>=3.0',
@@ -27,11 +27,13 @@ setup(
     package_data={
         'shared_models': [
             'accounts/*'
-            'transactions/*',
+            'common/*',
+            'company_ba/*'
             'customers/*',
+            'ib_commission/*',
+            'services/*',
             'system_settings/*',
-            'common/*',
-            'services/*'
+            'transactions/*',
         ],
     },
 ) 

fx_shared_models-0.2.2/shared_models/__init__.py

@@ -0,0 +1,6 @@
+"""
+Shared models package for FX Backend
+Contains Customer, System Settings, and IB Commission models
+"""
+
+__version__ = '0.2.2'  

fx_shared_models-0.2.2/shared_models/accounts/migrations/0004_alter_account_created_at_alter_account_created_by_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.19 on 2025-02-08 13:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0003_account_is_archived_account_is_trading_enabled'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='account',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name='account',
+            name='created_by',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='account',
+            name='updated_by',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]

fx_shared_models-0.2.2/shared_models/accounts/migrations/0005_account_currency.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.19 on 2025-02-09 17:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0004_alter_account_created_at_alter_account_created_by_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='account',
+            name='currency',
+            field=models.CharField(default='USD', max_length=3),
+        ),
+    ]

fx_shared_models-0.2.2/shared_models/accounts/migrations/0006_alter_account_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.19 on 2025-02-17 11:41
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0005_account_currency'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='account',
+            options={'permissions': [('view_own_account', 'Can view own customer accounts'), ('view_team_account', "Can view team's customer accounts"), ('view_all_account', 'Can view all customer accounts'), ('change_account_group', 'Can change account group')], 'verbose_name': 'Account', 'verbose_name_plural': 'Accounts'},
+        ),
+    ]

{fx_shared_models-0.2.0 → fx_shared_models-0.2.2}/shared_models/accounts/models.py

@@ -38,6 +38,10 @@ class Account(BaseModel):
         default=False,
         help_text="Whether this account has markup applied"
     )
+    currency = models.CharField(
+        max_length=3,
+        default='USD',
+    )
 
     class Meta:
         app_label = 'accounts'
@@ -51,7 +55,10 @@ class Account(BaseModel):
             models.Index(fields=['account_type']),
         ]
         permissions = [
-            ('change_account_group', 'Can change account group'),
+            ("view_own_account", "Can view own customer accounts"),
+            ("view_team_account", "Can view team's customer accounts"),
+            ("view_all_account", "Can view all customer accounts"),
+            ("change_account_group", "Can change account group"),
         ]
 
     def __str__(self):

fx_shared_models-0.2.2/shared_models/company_ba/apps.py

@@ -0,0 +1,9 @@
+from django.apps import AppConfig
+
+class CompanyBankAccounts(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'shared_models.company_ba'
+    verbose_name = 'Company Bank Accounts'
+
+    def ready(self):
+        pass

fx_shared_models-0.2.2/shared_models/company_ba/migrations/0001_initial.py

@@ -0,0 +1,39 @@
+# Generated by Django 4.2.19 on 2025-02-17 19:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CompanyBankAccount',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('created_by', models.CharField(blank=True, max_length=255, null=True)),
+                ('updated_by', models.CharField(blank=True, max_length=255, null=True)),
+                ('id', models.AutoField(editable=False, primary_key=True, serialize=False)),
+                ('bank_name', models.CharField(max_length=255)),
+                ('country', models.CharField(max_length=255)),
+                ('currency', models.CharField(max_length=255)),
+                ('account_number', models.CharField(max_length=255)),
+                ('iban', models.CharField(max_length=255)),
+                ('swift', models.CharField(max_length=255)),
+                ('ifsc', models.CharField(max_length=255)),
+            ],
+            options={
+                'verbose_name': 'Company Bank Account',
+                'verbose_name_plural': 'Company Bank Accounts',
+                'db_table': 'company_bank_accounts',
+                'ordering': ['-created_at'],
+                'permissions': [('view_company_bank_account', 'Can view company bank account'), ('delete_company_bank_account', 'Can delete company bank account'), ('change_company_bank_account', 'Can change company bank account'), ('add_company_bank_account', 'Can add company bank account')],
+                'indexes': [models.Index(fields=['bank_name', 'country'], name='company_ban_bank_na_b2e9d5_idx'), models.Index(fields=['account_number'], name='company_ban_account_13481d_idx')],
+            },
+        ),
+    ]

fx_shared_models-0.2.2/shared_models/company_ba/models.py

@@ -0,0 +1,32 @@
+from django.db import models
+from ..common.base import BaseModel
+
+class  CompanyBankAccount(BaseModel):
+    id = models.AutoField(primary_key=True, editable=False)
+    bank_name = models.CharField(max_length=255)
+    country = models.CharField(max_length=255)
+    currency = models.CharField(max_length=255)
+    account_number = models.CharField(max_length=255)
+    iban = models.CharField(max_length=255)
+    swift = models.CharField(max_length=255)
+    ifsc = models.CharField(max_length=255)
+
+    class Meta:
+        app_label = 'company_ba'
+        db_table = 'company_bank_accounts'
+        verbose_name = 'Company Bank Account'
+        verbose_name_plural = 'Company Bank Accounts'
+        ordering = ['-created_at']
+        indexes = [
+            models.Index(fields=['bank_name', 'country']),
+            models.Index(fields=['account_number']),
+        ]
+        permissions = [
+            ('view_company_bank_account', 'Can view company bank account'),
+            ('delete_company_bank_account', 'Can delete company bank account'),
+            ('change_company_bank_account', 'Can change company bank account'),
+            ('add_company_bank_account', 'Can add company bank account')
+        ]
+
+    def __str__(self):
+        return f"Bank Account {self.bank_name} ({self.account_number})"

fx_shared_models-0.2.2/shared_models/customers/__init__.py

@@ -0,0 +1 @@
+

fx_shared_models-0.2.2/shared_models/customers/migrations/0002_alter_customer_email_alter_customer_first_name_and_more.py

@@ -0,0 +1,64 @@
+# Generated by Django 4.2.19 on 2025-02-19 07:43
+
+from django.db import migrations
+import encrypted_model_fields.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('customers', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='customer',
+            name='email',
+            field=encrypted_model_fields.fields.EncryptedEmailField(unique=True, verbose_name='email address'),
+        ),
+        migrations.AlterField(
+            model_name='customer',
+            name='first_name',
+            field=encrypted_model_fields.fields.EncryptedCharField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='customer',
+            name='last_name',
+            field=encrypted_model_fields.fields.EncryptedCharField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='customer',
+            name='mobile',
+            field=encrypted_model_fields.fields.EncryptedCharField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='customer',
+            name='phone',
+            field=encrypted_model_fields.fields.EncryptedCharField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='customerdetail',
+            name='address',
+            field=encrypted_model_fields.fields.EncryptedCharField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='customerdetail',
+            name='address2',
+            field=encrypted_model_fields.fields.EncryptedCharField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='customerdetail',
+            name='city',
+            field=encrypted_model_fields.fields.EncryptedCharField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='customerdetail',
+            name='title',
+            field=encrypted_model_fields.fields.EncryptedCharField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='customerdetail',
+            name='zip_code',
+            field=encrypted_model_fields.fields.EncryptedCharField(blank=True),
+        ),
+    ]

fx_shared_models-0.2.2/shared_models/customers/migrations/0004_customerauth_two_factor_backup_codes_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.19 on 2025-02-21 18:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('customers', '0002_alter_customer_email_alter_customer_first_name_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customerauth',
+            name='two_factor_backup_codes',
+            field=models.JSONField(default=list),
+        ),
+        migrations.AddField(
+            model_name='customerauth',
+            name='two_factor_enabled',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='customerauth',
+            name='two_factor_secret',
+            field=models.CharField(blank=True, max_length=32),
+        ),
+        migrations.AddField(
+            model_name='customerauth',
+            name='webauthn_credentials',
+            field=models.JSONField(default=list),
+        ),
+    ]

fx_shared_models-0.2.2/shared_models/customers/migrations/0005_customerauth_temp_webauthn_challenge.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.19 on 2025-02-25 14:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('customers', '0004_customerauth_two_factor_backup_codes_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customerauth',
+            name='temp_webauthn_challenge',
+            field=models.CharField(blank=True, max_length=512, null=True),
+        ),
+    ]

fx_shared_models-0.2.2/shared_models/customers/migrations/0006_customerauth_webauthn_challenge.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.19 on 2025-02-25 19:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('customers', '0005_customerauth_temp_webauthn_challenge'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customerauth',
+            name='webauthn_challenge',
+            field=models.CharField(blank=True, max_length=512, null=True),
+        ),
+    ]

fx_shared_models-0.2.2/shared_models/customers/migrations/0007_customerauth_blocked_customerauth_blocked_at_and_more.py

@@ -0,0 +1,46 @@
+# Generated by Django 4.2.19 on 2025-02-26 14:04
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('customers', '0006_customerauth_webauthn_challenge'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customerauth',
+            name='blocked',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='customerauth',
+            name='blocked_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='customerauth',
+            name='blocked_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='blocked_customers', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='customerauth',
+            name='blocked_reason',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='customerauth',
+            name='unblocked_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='customerauth',
+            name='unblocked_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='unblocked_customers', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

fx_shared_models-0.2.2/shared_models/customers/migrations/0008_customer_email_hash.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.19 on 2025-03-02 21:07
+
+import uuid
+from django.db import migrations, models
+
+def generate_unique_hashes(apps, schema_editor):
+    Customer = apps.get_model('customers', 'Customer')
+    for customer in Customer.objects.all():
+        customer.email_hash = uuid.uuid4().hex
+        customer.save(update_fields=['email_hash'])
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('customers', '0007_customerauth_blocked_customerauth_blocked_at_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customer',
+            name='email_hash',
+            field=models.CharField(db_index=True, max_length=64, unique=True, null=True),
+        ),
+        migrations.RunPython(generate_unique_hashes),
+        migrations.AlterField(
+            model_name='customer',
+            name='email_hash',
+            field=models.CharField(db_index=True, max_length=64, unique=True),
+        ),
+    ]