Skip to content

Commit ce986af

Browse files
authored
Merge pull request #256 from Mosquito-Alert/refactor_tigapublic
Fix managed models
2 parents 5d59696 + f5ec1fa commit ce986af

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

tigapublic/migrations/0004_auto_20240315_1341.py

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
from django.db import migrations, models
44
import django.db.models.deletion
55

6+
def delete_useless_map_aux_reports(apps, schema_editor):
7+
MapAuxReports = apps.get_model("tigapublic", "MapAuxReports")
8+
Report = apps.get_model("tigaserver_app", "Report")
9+
10+
MapAuxReports.objects.annotate(
11+
report_exists=models.Exists(Report.objects.filter(pk=models.OuterRef('version_uuid')))
12+
).filter(report_exists=False).delete()
13+
614

715
class Migration(migrations.Migration):
816

@@ -21,8 +29,18 @@ class Migration(migrations.Migration):
2129
name='Userfixes',
2230
),
2331
migrations.AlterModelOptions(
24-
name='mapauxreports',
25-
options={'managed': False},
32+
name='stormdrain',
33+
options={'managed': True},
34+
),
35+
migrations.AlterModelOptions(
36+
name='stormdrainuserversions',
37+
options={'managed': True},
38+
),
39+
migrations.RunPython(delete_useless_map_aux_reports, migrations.RunPython.noop),
40+
migrations.AlterField(
41+
model_name='mapauxreports',
42+
name='version_uuid',
43+
field=models.OneToOneField(db_column='version_uuid', on_delete=django.db.models.deletion.CASCADE, related_name='map_aux_report', to='tigaserver_app.Report'),
2644
),
2745
migrations.AlterField(
2846
model_name='observationnotifications',

tigapublic/models.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class Meta:
111111
class MapAuxReports(models.Model):
112112
"""All mosquito observations."""
113113

114-
id = models.AutoField(primary_key=True)
114+
id = models.IntegerField(primary_key=True)
115115
version_uuid = models.OneToOneField(Report, db_column='version_uuid', related_name='map_aux_report',on_delete=models.CASCADE)
116116
user_id = models.CharField(max_length=36, blank=True)
117117
observation_date = models.DateTimeField(null=True, blank=True)
@@ -145,7 +145,7 @@ class MapAuxReports(models.Model):
145145
class Meta:
146146
"""Meta."""
147147

148-
managed = False
148+
managed = True
149149
db_table = 'map_aux_reports'
150150

151151

@@ -177,7 +177,7 @@ class Meta:
177177
"""Meta."""
178178

179179
db_table = 'storm_drain'
180-
managed = False
180+
managed = True
181181

182182

183183
class PredefinedNotificationManager(models.Manager):
@@ -267,7 +267,7 @@ class Meta:
267267
"""Meta."""
268268

269269
db_table = 'tigapublic_storm_drain_user_version'
270-
managed = False
270+
managed = True
271271

272272

273273
class Epidemiology(models.Model):

0 commit comments

Comments
 (0)