Merge pull request #165 from mapswipe/fix/error-logging-project

Author: tnagorra

apps/common/migrations/0001_initial.py

@@ -1,8 +1,11 @@
-# Generated by Django 5.2.5 on 2025-09-04 17:46
+# Generated by Django 5.2.5 on 2025-09-10 17:23
 
 import django.core.files.storage
+import django.db.models.manager
 import django_choices_field.fields
 import main.fields
+import ulid
+import utils.common
 from django.db import migrations, models
 
 
@@ -14,6 +17,29 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Announcement',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('client_id', models.CharField(max_length=26, unique=True, validators=[utils.common.validate_ulid])),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('modified_at', models.DateTimeField(auto_now=True)),
+                ('old_id', models.CharField(blank=True, db_index=True, max_length=30, null=True)),
+                ('firebase_id', models.CharField(default=ulid.ULID, max_length=30, unique=True)),
+                ('firebase_push_status', django_choices_field.fields.IntegerChoicesField(blank=True, choices=[(1, 'Pending'), (2, 'Processing'), (3, 'Success'), (4, 'Failed')], null=True)),
+                ('firebase_last_pushed', models.DateTimeField(blank=True, help_text='The latest time when resource was pushed to firebase', null=True)),
+                ('text', models.TextField()),
+                ('url', models.URLField(max_length=300)),
+                ('is_active', models.BooleanField(default=False)),
+            ],
+            options={
+                'ordering': ['-id'],
+                'abstract': False,
+            },
+            managers=[
+                ('cte_objects', django.db.models.manager.Manager()),
+            ],
+        ),
         migrations.CreateModel(
             name='GlobalExportAsset',
             fields=[

apps/common/migrations/0002_announcement.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.5 on 2025-09-10 17:23
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('common', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='announcement',
+            name='created_by',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='%(class)s_created', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='announcement',
+            name='modified_by',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='%(class)s_modified', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

apps/common/migrations/0002_initial.py

@@ -1,6 +1,5 @@
-# Generated by Django 5.1.6 on 2025-05-15 10:29
+# Generated by Django 5.2.5 on 2025-09-10 17:23
 
-import apps.community_dashboard.models
 import django.db.models.manager
 import django_choices_field.fields
 from django.db import migrations, models
@@ -18,7 +17,7 @@ class Migration(migrations.Migration):
             name='AggregatedTracking',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('type', django_choices_field.fields.IntegerChoicesField(choices=[(0, 'Contributor User Data Latest Date'), (1, 'Contributor UserGroup Stat Data Latest Date')], choices_enum=apps.community_dashboard.models.AggregatedTrackingTypeEnum, unique=True)),
+                ('type', django_choices_field.fields.IntegerChoicesField(choices=[(0, 'Contributor User Data Latest Date'), (1, 'Contributor UserGroup Stat Data Latest Date')], unique=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
                 ('value', models.CharField(help_text='Represents the date before which data is synced to aggregated tables.', max_length=225, null=True)),
             ],

apps/community_dashboard/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.6 on 2025-05-15 10:29
+# Generated by Django 5.2.5 on 2025-09-10 17:23
 
 import django.db.models.deletion
 from django.db import migrations, models

apps/community_dashboard/migrations/0002_initial.py

@@ -1,9 +1,10 @@
-# Generated by Django 5.1.6 on 2025-05-15 10:29
+# Generated by Django 5.2.5 on 2025-09-10 17:23
 
-import apps.common.models
-import apps.contributor.models
 import django.db.models.manager
 import django_choices_field.fields
+import ulid
+import utils.common
+import uuid
 from django.db import migrations, models
 
 
@@ -15,28 +16,64 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='ContributorTeam',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('client_id', models.CharField(max_length=26, unique=True, validators=[utils.common.validate_ulid])),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('modified_at', models.DateTimeField(auto_now=True)),
+                ('is_archived', models.BooleanField(default=False)),
+                ('archived_at', models.DateTimeField(blank=True, null=True)),
+                ('old_id', models.CharField(blank=True, db_index=True, max_length=30, null=True)),
+                ('firebase_id', models.CharField(default=ulid.ULID, max_length=30, unique=True)),
+                ('firebase_push_status', django_choices_field.fields.IntegerChoicesField(blank=True, choices=[(1, 'Pending'), (2, 'Processing'), (3, 'Success'), (4, 'Failed')], null=True)),
+                ('firebase_last_pushed', models.DateTimeField(blank=True, help_text='The latest time when resource was pushed to firebase', null=True)),
+                ('name', models.CharField(max_length=255)),
+                ('token', models.UUIDField(default=uuid.uuid4, unique=True)),
+            ],
+            options={
+                'ordering': ['-id'],
+                'abstract': False,
+            },
+            managers=[
+                ('cte_objects', django.db.models.manager.Manager()),
+            ],
+        ),
         migrations.CreateModel(
             name='ContributorUser',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('user_id', models.CharField(db_index=True, help_text='Firebase User ID', max_length=30, unique=True)),
+                ('old_id', models.CharField(blank=True, db_index=True, max_length=30, null=True)),
+                ('firebase_push_status', django_choices_field.fields.IntegerChoicesField(blank=True, choices=[(1, 'Pending'), (2, 'Processing'), (3, 'Success'), (4, 'Failed')], null=True)),
+                ('firebase_last_pushed', models.DateTimeField(blank=True, help_text='The latest time when resource was pushed to firebase', null=True)),
                 ('username', models.CharField(max_length=255)),
+                ('firebase_id', models.CharField(help_text='Firebase User ID (External)', max_length=30, unique=True)),
                 ('created_at', models.DateTimeField(null=True)),
                 ('modified_at', models.DateTimeField(null=True)),
             ],
+            options={
+                'abstract': False,
+            },
+            managers=[
+                ('cte_objects', django.db.models.manager.Manager()),
+            ],
         ),
         migrations.CreateModel(
             name='ContributorUserGroup',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('client_id', models.CharField(editable=False, max_length=26, unique=True, validators=[apps.common.models.validate_ulid])),
+                ('client_id', models.CharField(max_length=26, unique=True, validators=[utils.common.validate_ulid])),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('modified_at', models.DateTimeField(auto_now=True)),
-                ('old_id', models.CharField(db_index=True, max_length=30, null=True)),
-                ('name', models.CharField(max_length=255)),
-                ('description', models.TextField()),
                 ('is_archived', models.BooleanField(default=False)),
                 ('archived_at', models.DateTimeField(blank=True, null=True)),
+                ('old_id', models.CharField(blank=True, db_index=True, max_length=30, null=True)),
+                ('firebase_id', models.CharField(default=ulid.ULID, max_length=30, unique=True)),
+                ('firebase_push_status', django_choices_field.fields.IntegerChoicesField(blank=True, choices=[(1, 'Pending'), (2, 'Processing'), (3, 'Success'), (4, 'Failed')], null=True)),
+                ('firebase_last_pushed', models.DateTimeField(blank=True, help_text='The latest time when resource was pushed to firebase', null=True)),
+                ('name', models.CharField(max_length=255)),
+                ('description', models.TextField()),
             ],
             options={
                 'ordering': ['-id'],
@@ -57,8 +94,22 @@ class Migration(migrations.Migration):
             name='ContributorUserGroupMembershipLog',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('action', django_choices_field.fields.IntegerChoicesField(choices=[(1, 'Join'), (2, 'Leave')], choices_enum=apps.contributor.models.ContributorUserGroupMembershipLogActionEnum)),
+                ('action', django_choices_field.fields.IntegerChoicesField(choices=[(1, 'Join'), (2, 'Leave')])),
+                ('date', models.DateTimeField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ContributorUserGroupMembershipLogTemp',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('firebase_id', models.CharField(max_length=255)),
+                ('contributor_user_group_firebase_id', models.CharField(max_length=255)),
+                ('contributor_user_firebase_id', models.CharField(max_length=255)),
+                ('action', django_choices_field.fields.IntegerChoicesField(choices=[(1, 'Join'), (2, 'Leave')])),
                 ('date', models.DateTimeField()),
+                ('contributor_user_group_id', models.BigIntegerField(blank=True, null=True)),
+                ('contributor_user_id', models.BigIntegerField(blank=True, null=True)),
+                ('is_firebase_mapping_valid', models.BooleanField(blank=True, null=True)),
             ],
         ),
     ]

apps/contributor/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.6 on 2025-05-15 10:29
+# Generated by Django 5.2.5 on 2025-09-10 17:23
 
 import django.db.models.deletion
 from django.conf import settings
@@ -15,6 +15,26 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.AddField(
+            model_name='contributorteam',
+            name='archived_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='contributorteam',
+            name='created_by',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='%(class)s_created', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='contributorteam',
+            name='modified_by',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='%(class)s_modified', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='contributoruser',
+            name='team',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='user', to='contributor.contributorteam'),
+        ),
         migrations.AddField(
             model_name='contributorusergroup',
             name='archived_by',
@@ -45,4 +65,8 @@ class Migration(migrations.Migration):
             name='membership',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contributor.contributorusergroupmembership'),
         ),
+        migrations.AlterUniqueTogether(
+            name='contributorusergroupmembership',
+            unique_together={('user_group', 'user')},
+        ),
     ]