Fixed import, added some missing fields parsing. Fixed available_geography for the Signal model.

Author: dmytrotsko

src/base/admin.py

@@ -6,6 +6,7 @@
     DescriptedFilter,
     DescriptedFilterField,
     Link,
+    License
 )
 
 
@@ -27,3 +28,12 @@ class LinkAdmin(admin.ModelAdmin):
     Admin interface for managing link objects.
     """
     list_display: tuple[Literal['url'], Literal['link_type']] = ('url', 'link_type')
+
+
+@admin.register(License)
+class GeographyAdmin(admin.ModelAdmin):
+    """
+    Admin interface for managing license objects.
+    """
+    list_display: tuple[Literal['name'], Literal['use_restrictions']] = ('name', 'use_restrictions')
+    search_fields: tuple[Literal['name']] = ('name',)

src/base/migrations/0004_license.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.10 on 2024-06-07 12:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0003_descriptedfilter_alter_link_link_type_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='License',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='License', max_length=256, unique=True)),
+                ('use_restrictions', models.TextField(blank=True, help_text='Use Restrictions', null=True)),
+            ],
+        ),
+    ]

src/base/models.py

@@ -123,3 +123,20 @@ def get_preview(self) -> LinkPreview:
             return {
                 'description': _('No description available'),
             }
+
+
+class License(models.Model):
+    """
+    A model representing a License.
+    """
+    name: models.CharField = models.CharField(help_text=_('License'), max_length=256, unique=True)
+    use_restrictions: models.TextField = models.TextField(help_text=_('Use Restrictions'), blank=True, null=True)
+
+    def __str__(self) -> str:
+        """
+        Returns the name of the license as a string.
+
+        :return: The name of the license as a string.
+        :rtype: str
+        """
+        return self.name

src/datasources/migrations/0006_alter_datasource_source_license.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.10 on 2024-06-07 12:15
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0004_license'),
+        ('datasources', '0005_sourcesubdivision_external_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='datasource',
+            name='source_license',
+            field=models.ForeignKey(help_text='License', on_delete=django.db.models.deletion.PROTECT, related_name='source_license', to='base.license'),
+        ),
+    ]

src/datasources/migrations/0007_alter_datasource_source_license.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.10 on 2024-06-07 12:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0004_license'),
+        ('datasources', '0006_alter_datasource_source_license'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='datasource',
+            name='source_license',
+            field=models.ForeignKey(help_text='License', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='data_sources', to='base.license'),
+        ),
+    ]

src/datasources/models.py

@@ -78,10 +78,15 @@ class DataSource(TimeStampedModel):
         null=True,
         blank=True
     )
-    source_license: models.CharField = models.CharField(
+
+    source_license: models.ForeignKey = models.ForeignKey(
+        'base.License',
+        related_name='data_sources',
         help_text=_('License'),
-        max_length=128
+        on_delete=models.PROTECT,
+        null=True
     )
+
     links: models.ManyToManyField = models.ManyToManyField(
         'base.Link',
         help_text=_('DataSource links'),

src/datasources/resources.py

@@ -5,7 +5,7 @@
 from import_export import resources
 from import_export.fields import Field, widgets
 
-from base.models import Link, LinkTypeChoices
+from base.models import Link, LinkTypeChoices, License
 from datasources.models import DataSource, SourceSubdivision
 
 
@@ -40,6 +40,7 @@ def before_import_row(self, row, **kwargs) -> None:
         any additional links specified in 'DUA' or 'Link' columns.
         """
         self.process_links(row)
+        self.process_licenses(row)
         self.process_datasource(row)
 
     def process_links(self, row) -> None:
@@ -58,6 +59,13 @@ def process_links(self, row) -> None:
             link, created = Link.objects.get_or_create(url=link_url, link_type=link_type)
             row['Links'] += row['Links'] + f'|{link.url}'
 
+    def process_licenses(self, row) -> None:
+        if row['License']:
+            license: License
+            created: bool
+            license, created = License.objects.get_or_create(name=row['License'])
+            row['License'] = license
+
     def process_datasource(self, row) -> None:
         if row['Name']:
             data_source: DataSource
@@ -71,4 +79,6 @@ def process_datasource(self, row) -> None:
                 }
             )
             links: QuerySet[Link] = Link.objects.filter(url__in=row['Links'].split('|')).values_list('id', flat=True)
+            license: License = License.objects.filter(name=row['License']).first()
             data_source.links.add(*links)
+            data_source.source_license = license

src/signals/admin.py

@@ -11,6 +11,7 @@
     Signal,
     SignalCategory,
     SignalType,
+    GeographySignal,
 )
 from signals.resources import SignalBaseResource, SignalResource
 
@@ -42,6 +43,15 @@ class GeographyAdmin(admin.ModelAdmin):
     search_fields: tuple[Literal['name']] = ('name',)
 
 
+@admin.register(GeographySignal)
+class GeographySignalAdmin(admin.ModelAdmin):
+    """
+    Admin interface for managing signal geography objects.
+    """
+    list_display: tuple[Literal['geography']] = ('geography', 'signal', 'aggregated_by_delphi')
+    search_fields: tuple[Literal['geography']] = ('geography', 'signal', 'aggregated_by_delphi')
+
+
 @admin.register(Pathogen)
 class PathogenAdmin(admin.ModelAdmin):
     """

src/signals/migrations/0012_remove_signal_licence_signal_license_delete_licence.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.10 on 2024-06-07 12:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0004_license'),
+        ('signals', '0011_alter_geographysignal_geography_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='signal',
+            name='licence',
+        ),
+        migrations.AddField(
+            model_name='signal',
+            name='license',
+            field=models.ForeignKey(help_text='License', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='signals', to='base.license'),
+        ),
+        migrations.DeleteModel(
+            name='Licence',
+        ),
+    ]

src/signals/migrations/0013_remove_signal_signal_type_signal_signal_type.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.10 on 2024-06-07 14:14
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('signals', '0012_remove_signal_licence_signal_license_delete_licence'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='signal',
+            name='signal_type',
+        ),
+        migrations.AddField(
+            model_name='signal',
+            name='signal_type',
+            field=models.ForeignKey(help_text='Source Type', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='signals', to='signals.signaltype'),
+        ),
+    ]

src/signals/migrations/0014_remove_signal_from_date_remove_signal_to_date.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.10 on 2024-06-07 15:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('signals', '0013_remove_signal_signal_type_signal_signal_type'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='signal',
+            name='from_date',
+        ),
+        migrations.RemoveField(
+            model_name='signal',
+            name='to_date',
+        ),
+    ]

src/signals/migrations/0015_signal_from_date_signal_to_date_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.10 on 2024-06-07 15:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('signals', '0014_remove_signal_from_date_remove_signal_to_date'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='signal',
+            name='from_date',
+            field=models.DateField(blank=True, help_text='From Date', null=True),
+        ),
+        migrations.AddField(
+            model_name='signal',
+            name='to_date',
+            field=models.DateField(blank=True, help_text='To Date', null=True),
+        ),
+        migrations.AlterField(
+            model_name='signal',
+            name='temporal_scope_end',
+            field=models.CharField(blank=True, help_text='Temporal Scope End', max_length=128, null=True),
+        ),
+        migrations.AlterField(
+            model_name='signal',
+            name='temporal_scope_start',
+            field=models.CharField(blank=True, help_text='Temporal Scope Start', max_length=128, null=True),
+        ),
+    ]

src/signals/models.py

@@ -264,26 +264,6 @@ class Organisation(TimeStampedModel):
     )
 
 
-class Licence(TimeStampedModel):
-    """
-    A model representing a licence.
-    """
-    name: models.CharField = models.CharField(
-        help_text=_('Name'),
-        max_length=128,
-        unique=True
-    )
-
-    def __str__(self) -> str:
-        """
-        Returns the name of the licence as a string.
-
-        :return: The name of the licence as a string.
-        :rtype: str
-        """
-        return str(self.name)
-
-
 class Signal(TimeStampedModel):
     """
     A model representing a signal.
@@ -309,10 +289,12 @@ class Signal(TimeStampedModel):
         related_name='signals',
         help_text=_('Pathogen/Disease Area'),
     )
-    signal_type: models.ManyToManyField = models.ManyToManyField(
-        'signals.SignalType',
+    signal_type: models.ForeignKey = models.ForeignKey(
+        'signals.signalType',
         related_name='signals',
-        help_text=_('Signal Type')
+        help_text=_('Source Type'),
+        on_delete=models.PROTECT,
+        null=True
     )
     active: models.BooleanField = models.BooleanField(
         help_text=_('Active'),
@@ -482,10 +464,12 @@ class Signal(TimeStampedModel):
         related_name='shared_signals'
     )
 
-    licence: models.ManyToManyField = models.ManyToManyField(
-        'signals.Licence',
-        help_text=_('Licence'),
-        related_name='signals'
+    license: models.ForeignKey = models.ForeignKey(
+        'base.License',
+        related_name='signals',
+        help_text=_('License'),
+        on_delete=models.PROTECT,
+        null=True
     )
 
     restrictions: models.TextField = models.TextField(
@@ -510,6 +494,19 @@ class Signal(TimeStampedModel):
         blank=True
     )
 
+    temporal_scope_start: models.CharField = models.CharField(
+        help_text=_('Temporal Scope Start'),
+        null=True,
+        blank=True,
+        max_length=128
+    )
+    temporal_scope_end: models.CharField = models.CharField(
+        help_text=_('Temporal Scope End'),
+        null=True,
+        blank=True,
+        max_length=128
+    )
+
     @property
     def is_access_public(self) -> bool:
         """