From 6946a68cd2a98aa311b533c60e0bd83de17879b1 Mon Sep 17 00:00:00 2001 From: Joel Falknau Date: Tue, 4 Mar 2025 11:40:52 +1000 Subject: [PATCH] Start squashing some smaller apps --- .../analytics/migrations/0011_v5squash.py | 56 +++++++++++++++++++ allianceauth/analytics/models.py | 1 + .../corputils/migrations/0006_v5squash.py | 52 +++++++++++++++++ ...ter_evecharacter_alliance_name_and_more.py | 33 +++++++++++ .../migrations/0008_v5squash.py | 49 ++++++++++++++++ .../notifications/migrations/0006_v5squash.py | 31 ++++++++++ .../optimer/migrations/0005_v5squash.py | 52 +++++++++++++++++ allianceauth/srp/migrations/0005_v5squash.py | 51 +++++++++++++++++ .../timerboard/migrations/0008_v5squash.py | 41 ++++++++++++++ 9 files changed, 366 insertions(+) create mode 100644 allianceauth/analytics/migrations/0011_v5squash.py create mode 100644 allianceauth/corputils/migrations/0006_v5squash.py create mode 100644 allianceauth/eveonline/migrations/0018_alter_evecharacter_alliance_name_and_more.py create mode 100644 allianceauth/fleetactivitytracking/migrations/0008_v5squash.py create mode 100644 allianceauth/notifications/migrations/0006_v5squash.py create mode 100644 allianceauth/optimer/migrations/0005_v5squash.py create mode 100644 allianceauth/srp/migrations/0005_v5squash.py create mode 100644 allianceauth/timerboard/migrations/0008_v5squash.py diff --git a/allianceauth/analytics/migrations/0011_v5squash.py b/allianceauth/analytics/migrations/0011_v5squash.py new file mode 100644 index 00000000..e8ac54b5 --- /dev/null +++ b/allianceauth/analytics/migrations/0011_v5squash.py @@ -0,0 +1,56 @@ +# Generated by Django 5.1.6 on 2025-03-04 01:03 + +# This was built by Deleting Every Migration, Creating one from scratch +# And porting in anything necessary + +import uuid + +from django.db import migrations, models + + +def add_aa_team_token(apps, schema_editor): + Tokens = apps.get_model('analytics', 'AnalyticsTokens') + token = Tokens() + + token.type = 'GA-V4' + token.token = 'G-6LYSMYK8DE' + token.secret = 'KLlpjLZ-SRGozS5f5wb_kw' + token.name = 'AA Team Public Google Analytics (V4)' + token.save() + + +class Migration(migrations.Migration): + + replaces = [('analytics', '0001_initial'), ('analytics', '0002_add_AA_Team_Token'), ('analytics', '0003_Generate_Identifier'), ('analytics', '0004_auto_20211015_0502'), ('analytics', '0005_alter_analyticspath_ignore_path'), ('analytics', '0006_more_ignore_paths'), ('analytics', '0007_analyticstokens_secret'), ('analytics', '0008_add_AA_GA-4_Team_Token '), ('analytics', '0009_remove_analyticstokens_ignore_paths_and_more'), ('analytics', '0010_alter_analyticsidentifier_options')] + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='AnalyticsIdentifier', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('identifier', models.UUIDField(default=uuid.uuid4, editable=False)), + ], + options={ + 'verbose_name': 'Analytics Identifier', + }, + ), + migrations.CreateModel( + name='AnalyticsTokens', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=254)), + ('type', models.CharField(choices=[('GA-U', 'Google Analytics Universal'), ('GA-V4', 'Google Analytics V4')], max_length=254)), + ('token', models.CharField(max_length=254)), + ('secret', models.CharField(blank=True, max_length=254)), + ('send_stats', models.BooleanField(default=False)), + ], + ), + migrations.RunPython( + add_aa_team_token + ), + ] diff --git a/allianceauth/analytics/models.py b/allianceauth/analytics/models.py index a1d1398b..64bbcc28 100644 --- a/allianceauth/analytics/models.py +++ b/allianceauth/analytics/models.py @@ -17,6 +17,7 @@ class AnalyticsIdentifier(SingletonModel): class Meta: verbose_name = "Analytics Identifier" + class AnalyticsTokens(models.Model): class Analytics_Type(models.TextChoices): diff --git a/allianceauth/corputils/migrations/0006_v5squash.py b/allianceauth/corputils/migrations/0006_v5squash.py new file mode 100644 index 00000000..d157e26e --- /dev/null +++ b/allianceauth/corputils/migrations/0006_v5squash.py @@ -0,0 +1,52 @@ +# Generated by Django 5.1.6 on 2025-03-04 01:29 + +# This was built by Deleting Every Migration, Creating one from scratch +# And porting in anything necessary +# Some functions were skipped as they only make sense _if you are migrating in place_ +# i.e. permissions migration + + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + replaces = [('corputils', '0001_initial'), ('corputils', '0002_migrate_permissions'), ('corputils', '0003_granular_permissions'), ('corputils', '0004_member_models'), ('corputils', '0005_cleanup_permissions')] + + initial = True + + dependencies = [ + ('esi', '0012_fix_token_type_choices'), + ('eveonline', '0018_alter_evecharacter_alliance_name_and_more'), + ] + + operations = [ + migrations.CreateModel( + name='CorpStats', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('last_update', models.DateTimeField(auto_now=True)), + ('corp', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='eveonline.evecorporationinfo')), + ('token', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='esi.token')), + ], + options={ + 'verbose_name': 'corp stats', + 'verbose_name_plural': 'corp stats', + 'permissions': (('view_corp_corpstats', 'Can view corp stats of their corporation.'), ('view_alliance_corpstats', 'Can view corp stats of members of their alliance.'), ('view_state_corpstats', 'Can view corp stats of members of their auth state.')), + }, + ), + migrations.CreateModel( + name='CorpMember', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('character_id', models.PositiveIntegerField()), + ('character_name', models.CharField(max_length=37)), + ('corpstats', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='members', to='corputils.corpstats')), + ], + options={ + 'ordering': ['character_name'], + 'unique_together': {('corpstats', 'character_id')}, + }, + ), + ] diff --git a/allianceauth/eveonline/migrations/0018_alter_evecharacter_alliance_name_and_more.py b/allianceauth/eveonline/migrations/0018_alter_evecharacter_alliance_name_and_more.py new file mode 100644 index 00000000..80acd139 --- /dev/null +++ b/allianceauth/eveonline/migrations/0018_alter_evecharacter_alliance_name_and_more.py @@ -0,0 +1,33 @@ +# Generated by Django 5.1.6 on 2025-03-04 01:29 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('eveonline', '0017_alliance_and_corp_names_are_not_unique'), + ] + + operations = [ + migrations.AlterField( + model_name='evecharacter', + name='alliance_name', + field=models.CharField(blank=True, default='', max_length=254), + ), + migrations.AlterField( + model_name='evecharacter', + name='alliance_ticker', + field=models.CharField(blank=True, default='', max_length=5), + ), + migrations.AlterField( + model_name='evecharacter', + name='faction_id', + field=models.PositiveIntegerField(blank=True, default=None), + ), + migrations.AlterField( + model_name='evecharacter', + name='faction_name', + field=models.CharField(blank=True, default='', max_length=254), + ), + ] diff --git a/allianceauth/fleetactivitytracking/migrations/0008_v5squash.py b/allianceauth/fleetactivitytracking/migrations/0008_v5squash.py new file mode 100644 index 00000000..dda10226 --- /dev/null +++ b/allianceauth/fleetactivitytracking/migrations/0008_v5squash.py @@ -0,0 +1,49 @@ +# Generated by Django 5.1.6 on 2025-03-04 01:20 + +import django.db.models.deletion +import django.utils.timezone +from django.conf import settings +from django.db import migrations, models + +import allianceauth.framework.api.user + + +class Migration(migrations.Migration): + + replaces = [('fleetactivitytracking', '0001_initial'), ('fleetactivitytracking', '0002_auto_20160905_2220'), ('fleetactivitytracking', '0003_auto_20160906_2354'), ('fleetactivitytracking', '0004_make_strings_more_stringy'), ('fleetactivitytracking', '0005_remove_fat_name'), ('fleetactivitytracking', '0006_auto_20180803_0430'), ('fleetactivitytracking', '0007_sentinel_user')] + + initial = True + + dependencies = [ + ('eveonline', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Fatlink', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('fatdatetime', models.DateTimeField(default=django.utils.timezone.now)), + ('duration', models.PositiveIntegerField()), + ('fleet', models.CharField(max_length=254)), + ('hash', models.CharField(max_length=254, unique=True)), + ('creator', models.ForeignKey(on_delete=models.SET(allianceauth.framework.api.user.get_sentinel_user), to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='Fat', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('system', models.CharField(max_length=30)), + ('shiptype', models.CharField(max_length=100)), + ('station', models.CharField(max_length=125)), + ('character', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eveonline.evecharacter')), + ('fatlink', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fleetactivitytracking.fatlink')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'unique_together': {('character', 'fatlink')}, + }, + ), + ] diff --git a/allianceauth/notifications/migrations/0006_v5squash.py b/allianceauth/notifications/migrations/0006_v5squash.py new file mode 100644 index 00000000..b3b7b8d3 --- /dev/null +++ b/allianceauth/notifications/migrations/0006_v5squash.py @@ -0,0 +1,31 @@ +# Generated by Django 5.1.6 on 2025-03-04 01:24 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + replaces = [('notifications', '0001_initial'), ('notifications', '0002_auto_20160910_1649'), ('notifications', '0003_make_strings_more_stringy'), ('notifications', '0004_performance_tuning'), ('notifications', '0005_fix_level_choices')] + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Notification', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('level', models.CharField(choices=[('danger', 'danger'), ('warning', 'warning'), ('info', 'info'), ('success', 'success')], default='info', max_length=10)), + ('title', models.CharField(max_length=254)), + ('message', models.TextField()), + ('timestamp', models.DateTimeField(auto_now_add=True, db_index=True)), + ('viewed', models.BooleanField(db_index=True, default=False)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/allianceauth/optimer/migrations/0005_v5squash.py b/allianceauth/optimer/migrations/0005_v5squash.py new file mode 100644 index 00000000..9ebb3ac9 --- /dev/null +++ b/allianceauth/optimer/migrations/0005_v5squash.py @@ -0,0 +1,52 @@ +# Generated by Django 5.1.6 on 2025-03-04 01:26 + +import datetime + +import django.db.models.deletion +import django.utils.timezone +from django.db import migrations, models + + +class Migration(migrations.Migration): + + replaces = [('optimer', '0001_initial'), ('optimer', '0002_auto_20170413_0442'), ('optimer', '0003_make_strings_more_stringy'), ('optimer', '0004_on_delete'), ('optimer', '0005_add_type_and_description')] + + initial = True + + dependencies = [ + ('eveonline', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='OpTimerType', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('type', models.CharField(default='', max_length=254)), + ], + options={ + 'ordering': ['type'], + 'default_permissions': (), + }, + ), + migrations.CreateModel( + name='optimer', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('doctrine', models.CharField(default='', max_length=254)), + ('system', models.CharField(default='', max_length=254)), + ('start', models.DateTimeField(default=datetime.datetime.now)), + ('duration', models.CharField(default='', max_length=25)), + ('operation_name', models.CharField(default='', max_length=254)), + ('fc', models.CharField(default='', max_length=254)), + ('post_time', models.DateTimeField(default=django.utils.timezone.now)), + ('eve_character', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.evecharacter')), + ('description', models.TextField(blank=True, default='')), + ('type', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='optimer.optimertype')), + ], + options={ + 'ordering': ['start'], + 'default_permissions': (), + }, + ), + ] diff --git a/allianceauth/srp/migrations/0005_v5squash.py b/allianceauth/srp/migrations/0005_v5squash.py new file mode 100644 index 00000000..651d0055 --- /dev/null +++ b/allianceauth/srp/migrations/0005_v5squash.py @@ -0,0 +1,51 @@ +# Generated by Django 5.1.6 on 2025-03-04 01:26 + +import django.db.models.deletion +import django.utils.timezone +from django.db import migrations, models + + +class Migration(migrations.Migration): + + replaces = [('srp', '0001_initial'), ('srp', '0002_srpuserrequest_srp_status_choices'), ('srp', '0003_make_strings_more_stringy'), ('srp', '0004_on_delete')] + + initial = True + + dependencies = [ + ('eveonline', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='SrpFleetMain', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('fleet_name', models.CharField(default='', max_length=254)), + ('fleet_doctrine', models.CharField(default='', max_length=254)), + ('fleet_time', models.DateTimeField()), + ('fleet_srp_code', models.CharField(default='', max_length=254)), + ('fleet_srp_status', models.CharField(default='', max_length=254)), + ('fleet_srp_aar_link', models.CharField(default='', max_length=254)), + ('fleet_commander', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.evecharacter')), + ], + options={ + 'permissions': (('access_srp', 'Can access SRP module'),), + }, + ), + migrations.CreateModel( + name='SrpUserRequest', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('killboard_link', models.CharField(default='', max_length=254)), + ('after_action_report_link', models.CharField(default='', max_length=254)), + ('additional_info', models.CharField(default='', max_length=254)), + ('srp_status', models.CharField(choices=[('Pending', 'Pending'), ('Approved', 'Approved'), ('Rejected', 'Rejected')], default='Pending', max_length=8)), + ('srp_total_amount', models.BigIntegerField(default=0)), + ('kb_total_loss', models.BigIntegerField(default=0)), + ('srp_ship_name', models.CharField(default='', max_length=254)), + ('post_time', models.DateTimeField(default=django.utils.timezone.now)), + ('character', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.evecharacter')), + ('srp_fleet_main', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='srp.srpfleetmain')), + ], + ), + ] diff --git a/allianceauth/timerboard/migrations/0008_v5squash.py b/allianceauth/timerboard/migrations/0008_v5squash.py new file mode 100644 index 00000000..fc77c5d6 --- /dev/null +++ b/allianceauth/timerboard/migrations/0008_v5squash.py @@ -0,0 +1,41 @@ +# Generated by Django 5.1.6 on 2025-03-04 01:27 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + replaces = [('timerboard', '0001_initial'), ('timerboard', '0002_make_strings_more_stringy'), ('timerboard', '0003_on_delete'), ('timerboard', '0004_timer_type'), ('timerboard', '0005_alter_timer_planet_moon'), ('timerboard', '0006_alter_timer_objective_alter_timer_structure_and_more'), ('timerboard', '0007_alter_timer_structure')] + + initial = True + + dependencies = [ + ('eveonline', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Timer', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('details', models.CharField(default='', max_length=254)), + ('system', models.CharField(default='', max_length=254)), + ('planet_moon', models.CharField(blank=True, default='', max_length=254)), + ('structure', models.CharField(choices=[('POCO', 'POCO'), ('Orbital Skyhook', 'Orbital Skyhook'), ('I-HUB', 'Sovereignty Hub'), ('TCU', 'TCU'), ('POS[S]', 'POS [S]'), ('POS[M]', 'POS [M]'), ('POS[L]', 'POS [L]'), ('Astrahus', 'Astrahus'), ('Fortizar', 'Fortizar'), ('Keepstar', 'Keepstar'), ('Raitaru', 'Raitaru'), ('Azbel', 'Azbel'), ('Sotiyo', 'Sotiyo'), ('Athanor', 'Athanor'), ('Tatara', 'Tatara'), ('Pharolux Cyno Beacon', 'Cyno Beacon'), ('Tenebrex Cyno Jammer', 'Cyno Jammer'), ('Ansiblex Jump Gate', 'Ansiblex Jump Gate'), ('Mercenary Den', 'Mercenary Den'), ('Moon Mining Cycle', 'Moon Mining Cycle'), ('Metenox Moon Drill', 'Metenox Moon Drill'), ('Other', 'Other')], default='Other', max_length=254)), + ('objective', models.CharField(choices=[('Friendly', 'Friendly'), ('Hostile', 'Hostile'), ('Neutral', 'Neutral')], default='Neutral', max_length=254)), + ('eve_time', models.DateTimeField()), + ('important', models.BooleanField(default=False)), + ('corp_timer', models.BooleanField(default=False)), + ('eve_character', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.evecharacter')), + ('eve_corp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eveonline.evecorporationinfo')), + ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)), + ('timer_type', models.CharField(choices=[('UNSPECIFIED', 'Not Specified'), ('SHIELD', 'Shield'), ('ARMOR', 'Armor'), ('HULL', 'Hull'), ('FINAL', 'Final'), ('ANCHORING', 'Anchoring'), ('UNANCHORING', 'Unanchoring'), ('ABANDONED', 'Abandoned')], default='UNSPECIFIED', max_length=254)), + ], + options={ + 'ordering': ['eve_time'], + }, + ), + ]