Merge pull request #14 from RandomProgramm3r/develop

feat(business): Replace numeric ID with UUID for Company and Promo models.

Author: RandomProgramm3r

promo_code/business/migrations/0001_initial.py

@@ -1,5 +1,7 @@
-# Generated by Django 5.2b1 on 2025-03-25 14:18
+# Generated by Django 5.2b1 on 2025-03-30 18:24
 
+import django.db.models.deletion
+import uuid
 from django.db import migrations, models
 
 
@@ -13,15 +15,6 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Company',
             fields=[
-                (
-                    'id',
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name='ID',
-                    ),
-                ),
                 (
                     'password',
                     models.CharField(max_length=128, verbose_name='password'),
@@ -32,6 +25,16 @@ class Migration(migrations.Migration):
                         blank=True, null=True, verbose_name='last login'
                     ),
                 ),
+                (
+                    'id',
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='UUID',
+                    ),
+                ),
                 ('email', models.EmailField(max_length=120, unique=True)),
                 ('name', models.CharField(max_length=50)),
                 ('token_version', models.IntegerField(default=0)),
@@ -42,4 +45,78 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.CreateModel(
+            name='Promo',
+            fields=[
+                (
+                    'id',
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='UUID',
+                    ),
+                ),
+                ('description', models.CharField(max_length=300)),
+                (
+                    'image_url',
+                    models.URLField(blank=True, max_length=350, null=True),
+                ),
+                ('target', models.JSONField(default=dict)),
+                ('max_count', models.IntegerField()),
+                ('active_from', models.DateField(blank=True, null=True)),
+                ('active_until', models.DateField(blank=True, null=True)),
+                (
+                    'mode',
+                    models.CharField(
+                        choices=[('COMMON', 'Common'), ('UNIQUE', 'Unique')],
+                        max_length=10,
+                    ),
+                ),
+                (
+                    'promo_common',
+                    models.CharField(blank=True, max_length=30, null=True),
+                ),
+                ('active', models.BooleanField(default=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                (
+                    'company',
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to='business.company',
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name='PromoCode',
+            fields=[
+                (
+                    'id',
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='ID',
+                    ),
+                ),
+                ('code', models.CharField(max_length=30)),
+                ('is_used', models.BooleanField(default=False)),
+                ('used_at', models.DateTimeField(blank=True, null=True)),
+                (
+                    'promo',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name='unique_codes',
+                        to='business.promo',
+                    ),
+                ),
+            ],
+            options={
+                'unique_together': {('promo', 'code')},
+            },
+        ),
     ]

promo_code/business/migrations/0002_promo_promocode.py

@@ -1,3 +1,5 @@
+import uuid
+
 import django.contrib.auth.models
 import django.db.models
 
@@ -19,6 +21,12 @@ def create_company(self, email, name, password=None, **extra_fields):
 
 
 class Company(django.contrib.auth.models.AbstractBaseUser):
+    id = django.db.models.UUIDField(
+        'UUID',
+        primary_key=True,
+        default=uuid.uuid4,
+        editable=False,
+    )
     email = django.db.models.EmailField(
         unique=True,
         max_length=120,
@@ -46,6 +54,13 @@ class Promo(django.db.models.Model):
         (MODE_UNIQUE, 'Unique'),
     ]
 
+    id = django.db.models.UUIDField(
+        'UUID',
+        primary_key=True,
+        default=uuid.uuid4,
+        editable=False,
+    )
+
     company = django.db.models.ForeignKey(
         Company,
         on_delete=django.db.models.CASCADE,
@@ -81,6 +96,7 @@ class PromoCode(django.db.models.Model):
         Promo,
         on_delete=django.db.models.CASCADE,
         related_name='unique_codes',
+        to_field='id',
     )
     code = django.db.models.CharField(max_length=30)
     is_used = django.db.models.BooleanField(default=False)

promo_code/business/models.py

@@ -1,3 +1,5 @@
+import uuid
+
 import django.contrib.auth.password_validation
 import django.core.exceptions
 import django.core.validators
@@ -15,6 +17,7 @@
 
 
 class CompanySignUpSerializer(rest_framework.serializers.ModelSerializer):
+    id = rest_framework.serializers.UUIDField(read_only=True)
     password = rest_framework.serializers.CharField(
         write_only=True,
         required=True,
@@ -43,6 +46,7 @@ class CompanySignUpSerializer(rest_framework.serializers.ModelSerializer):
     class Meta:
         model = business_models.Company
         fields = (
+            'id',
             'name',
             'email',
             'password',
@@ -119,7 +123,9 @@ def validate(self, attrs):
             )
 
         try:
-            company = business_models.Company.objects.get(id=company_id)
+            company = business_models.Company.objects.get(
+                id=uuid.UUID(company_id),
+            )
         except business_models.Company.DoesNotExist:
             raise rest_framework_simplejwt.exceptions.InvalidToken(
                 'Company not found',
@@ -131,7 +137,15 @@ def validate(self, attrs):
                 'Token is blacklisted',
             )
 
-        return super().validate(attrs)
+        new_refresh = rest_framework_simplejwt.tokens.RefreshToken()
+        new_refresh['user_type'] = 'company'
+        new_refresh['company_id'] = str(company.id)
+        new_refresh['token_version'] = company.token_version
+
+        return {
+            'access': str(new_refresh.access_token),
+            'refresh': str(new_refresh),
+        }
 
 
 class TargetSerializer(rest_framework.serializers.Serializer):

promo_code/business/serializers.py

@@ -109,7 +109,7 @@ def setUp(self):
         self.company_refresh.payload.update(
             {
                 'user_type': 'company',
-                'company_id': self.company.id,
+                'company_id': str(self.company.id),
                 'token_version': self.company.token_version,
             },
         )
@@ -194,7 +194,11 @@ def test_missing_company_id(self):
     def test_company_not_found(self):
         invalid_refresh = rest_framework_simplejwt.tokens.RefreshToken()
         invalid_refresh.payload.update(
-            {'user_type': 'company', 'company_id': 999, 'token_version': 1},
+            {
+                'user_type': 'company',
+                'company_id': 'da3ad08d-9b86-41ff-ad70-a30a64d3d170',
+                'token_version': 1,
+            },
         )
 
         response = self.client.post(

promo_code/business/tests/auth/test_tokens.py

@@ -37,12 +37,12 @@ def post(self, request):
 
         refresh = rest_framework_simplejwt.tokens.RefreshToken()
         refresh['user_type'] = 'company'
-        refresh['company_id'] = company.id
+        refresh['company_id'] = str(company.id)
         refresh['token_version'] = company.token_version
 
         access_token = refresh.access_token
         access_token['user_type'] = 'company'
-        access_token['company_id'] = company.id
+        access_token['company_id'] = str(company.id)
         refresh['token_version'] = company.token_version
 
         response_data = {
@@ -83,12 +83,12 @@ def post(self, request):
 
         refresh = rest_framework_simplejwt.tokens.RefreshToken()
         refresh['user_type'] = 'company'
-        refresh['company_id'] = company.id
+        refresh['company_id'] = str(company.id)
         refresh['token_version'] = company.token_version
 
         access_token = refresh.access_token
         access_token['user_type'] = 'company'
-        access_token['company_id'] = company.id
+        access_token['company_id'] = str(company.id)
 
         response_data = {
             'access': str(access_token),
@@ -120,7 +120,7 @@ def post(self, request, *args, **kwargs):
         if serializer.is_valid():
             instance = serializer.save()
             return rest_framework.response.Response(
-                {'id': instance.id},
+                {'id': str(instance.id)},
                 status=rest_framework.status.HTTP_201_CREATED,
             )