Merge pull request #218 from Mosquito-Alert/refactor_tigapublic

Refactor tigapublic

Author: epou

tigapublic/admin.py

@@ -2,32 +2,6 @@
 from django.contrib import admin
 
 # Register your models here.
-from .models import AuthUser, Municipalities, PredefinedNotification
+from .models import PredefinedNotification
 
-
-class AuthUserAdmin(admin.ModelAdmin):
-    """AuthUserAdmin."""
-
-    filter_horizontal = ('province', 'municipalities')
-
-    def formfield_for_manytomany(self, db_field, request, **kwargs):
-        """formfield_for_manytomany."""
-        if db_field.name == "municipalities":
-
-            editing_user_id = request.resolver_match.kwargs['object_id']
-
-            qs_p = AuthUser.objects.filter(
-                id__exact=editing_user_id
-            ).values('province__id')
-
-            kwargs["queryset"] = Municipalities.objects.filter(
-                codprov__in=qs_p
-            )
-
-        return super(AuthUserAdmin, self).formfield_for_manytomany(db_field,
-                                                                   request,
-                                                                   **kwargs)
-
-
-admin.site.register(AuthUser, AuthUserAdmin)
 admin.site.register(PredefinedNotification)

tigapublic/migrations/0001_initial.py

@@ -196,7 +196,7 @@ class Migration(migrations.Migration):
                 ('style_json', models.TextField()),
                 ('visible', models.BooleanField()),
                 ('title', models.CharField(blank=True, max_length=50)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tigapublic.AuthUser')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'db_table': 'tigapublic_storm_drain_user_version',
@@ -224,7 +224,7 @@ class Migration(migrations.Migration):
                 ('original_lat', models.FloatField(blank=True, null=True)),
                 ('size', models.CharField(blank=True, max_length=5, null=True)),
                 ('model', models.CharField(blank=True, max_length=5, null=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tigapublic.AuthUser')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'db_table': 'storm_drain',
@@ -240,7 +240,7 @@ class Migration(migrations.Migration):
                 ('title_es', models.TextField(help_text='Title of the comment, shown innon-detail view, in spanish')),
                 ('title_ca', models.TextField(blank=True, default=None, help_text='Title of the comment, shown innon-detail view, in catalan', null=True)),
                 ('title_en', models.TextField(blank=True, default=None, help_text='Title of the comment, shown innon-detail view, in english', null=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tigapublic.AuthUser')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'db_table': 'tigaserver_app_notificationpredefined',
@@ -255,7 +255,7 @@ class Migration(migrations.Migration):
                 ('expert_comment', models.TextField(help_text='Text message sent to user', verbose_name='Expert comment')),
                 ('expert_html', models.TextField(help_text='Expanded message informationgoes here. This field can contain HTML', verbose_name='Expert comment, expanded and allows html')),
                 ('public', models.BooleanField(default=False)),
-                ('expert', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tigapublic.AuthUser')),
+                ('expert', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
                 ('notification_content', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tigapublic.NotificationContent')),
                 ('preset_notification', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='tigapublic.PredefinedNotification')),
                 ('report', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tigapublic.MapAuxReports', to_field='version_uuid')),
@@ -301,7 +301,7 @@ class Migration(migrations.Migration):
                 ('date_notification', models.DateTimeField(blank=True, default=None, null=True)),
                 ('patient_state', models.CharField(blank=True, max_length=225, null=True)),
                 ('comments', models.TextField(blank=True, default=None, help_text='Extra comments for patients', null=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tigapublic.AuthUser')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'db_table': 'tigapublic_epidemiology',

tigapublic/migrations/0004_auto_20240315_1341.py

@@ -0,0 +1,35 @@
+# Generated by Django 2.2.7 on 2024-03-15 13:41
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tigapublic', '0003_irideon'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='AuthUser',
+        ),
+        migrations.DeleteModel(
+            name='Notification',
+        ),
+        migrations.DeleteModel(
+            name='Userfixes',
+        ),
+        migrations.AlterModelOptions(
+            name='mapauxreports',
+            options={'managed': False},
+        ),
+        migrations.AlterField(
+            model_name='observationnotifications',
+            name='notification_content',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tigaserver_app.NotificationContent'),
+        ),
+        migrations.DeleteModel(
+            name='NotificationContent',
+        ),
+    ]

tigapublic/models.py

@@ -2,36 +2,14 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from datetime import datetime
-
-from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.db import models
+from django.utils import timezone
 
+from tigaserver_app.models import Fix as TigaserverAppFix, Notification, NotificationContent, Report
 
-class UserfixesManager(models.Manager):
-    """a."""
-
-
-class Userfixes(models.Model):
-    """Userfixes model."""
-
-    id = models.IntegerField(primary_key=True)
-    fix_time = models.DateTimeField(blank=True, null=True)
-    masked_lon = models.FloatField(blank=True, null=True)
-    masked_lat = models.FloatField(blank=True, null=True)
-
-    def _get_the_type(self):
-        """a."""
-        return 'Feature'
-
-    thetype = property(_get_the_type)
-
-    class Meta:
-        """Meta information."""
-
-        db_table = 'tigaserver_app_fix'
-        managed = False
-
+AuthUser = User = get_user_model()
+Userfixes = TigaserverAppFix
 
 class NotificationImageFormModel(models.Model):
     """NotificationImageFormModel."""
@@ -107,46 +85,6 @@ class Meta:
         db_table = 'municipis_4326'
 
 
-class AuthUserManager(models.Manager):
-    """AuthUser manager. Ordering by username."""
-
-    def get_queryset(self):
-        """Just ordering province name."""
-        return super(AuthUserManager, self).get_queryset().order_by('username')
-
-
-class AuthUser(models.Model):
-    """Users who can get authenticated at the map."""
-
-    id = models.IntegerField(primary_key=True)
-    password = models.CharField(max_length=128)
-    last_login = models.DateTimeField()
-    is_superuser = models.BooleanField()
-    username = models.CharField(max_length=30)
-    first_name = models.CharField(max_length=30)
-    last_name = models.CharField(max_length=30)
-    email = models.CharField(max_length=75)
-    is_staff = models.BooleanField()
-    is_active = models.BooleanField()
-    date_joined = models.DateTimeField()
-    province = models.ManyToManyField(Province, blank=True)
-    municipalities = models.ManyToManyField(Municipalities, blank=True)
-
-    objects = AuthUserManager()
-
-    def __str__(self):
-        """Convert this object into a string."""
-        return self.username
-
-    class Meta:
-        """Meta."""
-
-        managed = False
-        db_table = 'auth_user'
-        verbose_name = 'User (municipalities)'
-        verbose_name_plural = 'User (provinces and municipalities)'
-
-
 class ReportsMapData(models.Model):
     """All mosquito observations."""
 
@@ -173,8 +111,8 @@ class Meta:
 class MapAuxReports(models.Model):
     """All mosquito observations."""
 
-    id = models.IntegerField(primary_key=True)
-    version_uuid = models.CharField(max_length=36, blank=True, unique=True)
+    id = models.AutoField(primary_key=True)
+    version_uuid = models.OneToOneField(Report, db_column='version_uuid', related_name='map_aux_report',on_delete=models.CASCADE)
     user_id = models.CharField(max_length=36, blank=True)
     observation_date = models.DateTimeField(null=True, blank=True)
     lon = models.FloatField(blank=True, null=True)
@@ -207,7 +145,7 @@ class MapAuxReports(models.Model):
     class Meta:
         """Meta."""
 
-        managed = True
+        managed = False
         db_table = 'map_aux_reports'
 
 
@@ -228,8 +166,8 @@ class StormDrain(models.Model):
     code = models.CharField(max_length=50, blank=True, null=True)
     lon = models.DecimalField(max_digits=9, decimal_places=6)
     lat = models.DecimalField(max_digits=9, decimal_places=6)
-    user = models.ForeignKey(AuthUser, on_delete=models.CASCADE)
-    date = models.DateTimeField(default=datetime.now, blank=True, null=True)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    date = models.DateTimeField(default=timezone.now, blank=True, null=True)
     original_lon = models.FloatField(blank=True, null=True)
     original_lat = models.FloatField(blank=True, null=True)
     size = models.CharField(max_length=5, blank=True, null=True)
@@ -242,36 +180,6 @@ class Meta:
         managed = False
 
 
-class NotificationContent(models.Model):
-    """Notification content."""
-
-    id = models.AutoField(help_text='Unique identifier of the notification.'
-                          'Automatically generated by server when notification'
-                          'created.', primary_key=True)
-    body_html_es = models.TextField(help_text='Expert comment, expanded and'
-                                    'allows html, in spanish')
-    body_html_ca = models.TextField(help_text='Expert comment, expanded and'
-                                    'allows html, in catalan', default=None,
-                                    blank=True, null=True)
-    body_html_en = models.TextField(help_text='Expert comment, expanded and'
-                                    'allows html, in english', default=None,
-                                    blank=True, null=True)
-    title_es = models.TextField(help_text='Title of the comment, shown in'
-                                'non-detail view, in spanish')
-    title_ca = models.TextField(help_text='Title of the comment, shown in'
-                                'non-detail view, in catalan', default=None,
-                                blank=True, null=True)
-    title_en = models.TextField(help_text='Title of the comment, shown in'
-                                'non-detail view, in english', default=None,
-                                blank=True, null=True)
-
-    class Meta:
-        """Meta."""
-
-        db_table = 'tigaserver_app_notificationcontent'
-        managed = False
-
-
 class PredefinedNotificationManager(models.Manager):
     """PredefinedNotification manager. Ordering."""
 
@@ -287,7 +195,7 @@ class PredefinedNotification(models.Model):
     id = models.AutoField(primary_key=True, help_text='Unique identifier of'
                           'the notification. Automatically generated by server'
                           'when notification created.')
-    user = models.ForeignKey(AuthUser, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
     body_html_es = models.TextField(help_text='Expert comment, expanded and'
                                     'allows html, in spanish')
     body_html_ca = models.TextField(help_text='Expert comment, expanded and'
@@ -318,44 +226,13 @@ class Meta:
         db_table = 'tigaserver_app_notificationpredefined'
 
 
-class Notification(models.Model):
-    """Notifications."""
-
-    report = models.ForeignKey(MapAuxReports, to_field='version_uuid',
-                               on_delete=models.CASCADE)
-    user_id = models.CharField(max_length=36, blank=False)
-    expert = models.ForeignKey(AuthUser, on_delete=models.CASCADE)
-    date_comment = models.DateTimeField(auto_now_add=True)
-    expert_comment = models.TextField('Expert comment',
-                                      help_text='Text message sent to user')
-    expert_html = models.TextField('Expert comment, expanded and allows html',
-                                   help_text='Expanded message information'
-                                   'goes here. This field can contain HTML')
-    photo_url = models.TextField('Url to picture that originated the comment',
-                                 help_text='Relative url to the public report'
-                                 'photo', null=True, blank=True)
-    acknowledged = models.BooleanField(help_text='This is set to True through'
-                                       'the public API, when the user signals'
-                                       'that the message has been received',
-                                       default=False)
-    public = models.BooleanField(default=False)
-    notification_content = models.ForeignKey(NotificationContent,
-                                             on_delete=models.CASCADE)
-
-    class Meta:
-        """Meta."""
-
-        db_table = 'tigaserver_app_notification'
-        managed = False
-
-
 class ObservationNotifications(models.Model):
     """Observation notifications."""
 
     report = models.ForeignKey(MapAuxReports, to_field='version_uuid',
                                on_delete=models.CASCADE)
     user_id = models.CharField(max_length=36, blank=False)
-    expert = models.ForeignKey(AuthUser, on_delete=models.CASCADE)
+    expert = models.ForeignKey(User, on_delete=models.CASCADE)
     date_comment = models.DateTimeField(auto_now_add=True)
     expert_comment = models.TextField('Expert comment',
                                       help_text='Text message sent to user')
@@ -379,9 +256,9 @@ class StormDrainUserVersions(models.Model):
     """Storm drain user versions."""
 
     id = models.AutoField(primary_key=True)
-    user = models.ForeignKey(AuthUser, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
     version = models.IntegerField()
-    published_date = models.DateTimeField(default=datetime.now)
+    published_date = models.DateTimeField(default=timezone.now)
     style_json = models.TextField()
     visible = models.BooleanField()
     title = models.CharField(max_length=50, blank=True)
@@ -427,7 +304,7 @@ class Epidemiology(models.Model):
                                 default=None,
                                 blank=True,
                                 null=True)
-    user = models.ForeignKey(AuthUser, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
 
     class Meta:
         """Meta."""