diff --git a/api/management/commands/ingest_gdacs.py b/api/management/commands/ingest_gdacs.py index 32af944d42..04ecf902eb 100644 --- a/api/management/commands/ingest_gdacs.py +++ b/api/management/commands/ingest_gdacs.py @@ -62,7 +62,7 @@ def handle(self, *args, **options): "event_type": alert[nspace + "eventtype"], "alert_level": levels[alert_level], "alert_score": alert_score, - "severity": alert[nspace + "severity"]["#text"], + "severity": alert[nspace + "severity"].get("#text"), "severity_unit": alert[nspace + "severity"]["@unit"], "severity_value": alert[nspace + "severity"]["@value"], "population_unit": alert[nspace + "population"]["@unit"], diff --git a/api/migrations/0196_alter_gdacsevent_severity.py b/api/migrations/0196_alter_gdacsevent_severity.py new file mode 100644 index 0000000000..8edb6c8378 --- /dev/null +++ b/api/migrations/0196_alter_gdacsevent_severity.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.23 on 2023-12-21 10:36 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0195_merge_20231219_0511'), + ] + + operations = [ + migrations.AlterField( + model_name='gdacsevent', + name='severity', + field=models.TextField(blank=True, null=True, verbose_name='severity'), + ), + ] diff --git a/api/models.py b/api/models.py index 569b74a2a2..bd61d799eb 100644 --- a/api/models.py +++ b/api/models.py @@ -1004,7 +1004,7 @@ class GDACSEvent(models.Model): disaster_type = models.ForeignKey(DisasterType, verbose_name=('disaster type'), on_delete=models.PROTECT, null=True) alert_level = models.IntegerField(choices=AlertLevel.choices, verbose_name=_('alert level'), default=0) alert_score = models.CharField(verbose_name=_('alert score'), max_length=16, null=True) - severity = models.TextField(verbose_name=_('severity')) + severity = models.TextField(verbose_name=_('severity'), null=True, blank=True) severity_unit = models.CharField(verbose_name=_('severity unit'), max_length=16) severity_value = models.CharField(verbose_name=_('severity value'), max_length=16) population_unit = models.CharField(verbose_name=_('population unit'), max_length=16) diff --git a/databank/management/commands/sources/FDRS.py b/databank/management/commands/sources/FDRS.py index 30ccac6d70..29121614fd 100644 --- a/databank/management/commands/sources/FDRS.py +++ b/databank/management/commands/sources/FDRS.py @@ -27,7 +27,10 @@ ('KPI_PeopleVol_Tot_age_6_12', CO.people_age_6_12), ('KPI_PeopleVol_Tot_age_13_17', CO.people_age_13_17), ('KPI_PeopleVol_Tot_age_18_29', CO.people_age_18_29), - # ('KPI_noLocalUnits', CO.branches), + ('KPI_noLocalUnits', CO.branches), + ('KPI_PeopleVol_Tot_age_60_69', CO.people_age_60_69), + ('KPI_PeopleVol_Tot_age_70_79', CO.people_age_70_79) + ('KPI_PeopleVol_Tot_age_80', CO.people_age_80), ) FDRS_INDICATORS = [indicator for indicator, _ in FDRS_INDICATORS_FIELD_MAP]