Merge pull request #1638 from IFRCGo/develop

Hotfix for pagination

Author: szabozoltan69

CHANGELOG.md

@@ -6,11 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.467
+
+### Added
+ - Pagination fix (event, personnel)
+
 ## 1.1.466
 
 ### Added
  - DREF Final Report finalization + new features
- - LocalUnits – first steps
+ - LocalUnits
  - Event visibility fix
 
 ## 1.1.465
@@ -2133,7 +2138,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## 0.1.20
 
-[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.466...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.467...HEAD
+[1.1.467]: https://github.com/IFRCGo/go-api/compare/1.1.466...1.1.467
 [1.1.466]: https://github.com/IFRCGo/go-api/compare/1.1.465...1.1.466
 [1.1.465]: https://github.com/IFRCGo/go-api/compare/1.1.464...1.1.465
 [1.1.464]: https://github.com/IFRCGo/go-api/compare/1.1.463...1.1.464

api/migrations/0161_alter_event_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.16 on 2023-01-17 10:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0160_merge_0159_auto_20221022_1542_0159_auto_20221028_0940'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='event',
+            options={'ordering': ('-disaster_start_date', 'id'), 'verbose_name': 'emergency', 'verbose_name_plural': 'emergencies'},
+        ),
+    ]

api/models.py

@@ -605,7 +605,7 @@ class Event(models.Model):
     )
 
     class Meta:
-        ordering = ('-disaster_start_date',)
+        ordering = ('-disaster_start_date', 'id',)
         verbose_name = _('emergency')
         verbose_name_plural = _('emergencies')
 

deployments/migrations/0070_alter_personnel_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.16 on 2023-01-17 10:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deployments', '0069_auto_20221022_1542'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='personnel',
+            options={'ordering': ('deployment', 'country_to', 'country_from', 'molnix_id', 'deployedperson_ptr_id'), 'verbose_name': 'Personnel', 'verbose_name_plural': 'Personnels'},
+        ),
+    ]

deployments/models.py

@@ -210,6 +210,7 @@ def __str__(self):
         return '%s: %s - %s' % (self.type.upper(), self.name, self.role)
 
     class Meta:
+        ordering = ('deployment', 'country_to', 'country_from', 'molnix_id', 'deployedperson_ptr_id',)
         verbose_name = _('Personnel')
         verbose_name_plural = _('Personnels')
 

deployments/snapshots/snap_tests.py

@@ -416,7 +416,7 @@
             'target_total': 0
         },
         {
-            'budget_amount_total': 6730000,
+            'budget_amount_total': 7050000,
             'id': 31,
             'iso3': 'IBB',
             'name': 'country-TtOYzaCmFldtcpOlRYtastbgkeCJvBTOnPWtmzervxcfkMbqpf',
@@ -440,8 +440,8 @@
         {
             'budget_amount_total': 4260000,
             'id': 33,
-            'iso3': 'STh',
-            'name': 'country-GhslFoucligTrYZNfzfdSWfMLvoRjfavNEGPtQYlQIfZsPpOuh',
+            'iso3': 'PNP',
+            'name': 'country-TIuGhslFoucligTrYZNfzfdSWfMLvoRjfavNEGPtQYlQIfZsPp',
             'ongoing_projects': 1,
             'operation_types': [
                 1
@@ -456,7 +456,7 @@
                     'primary_sector_display': 'Health'
                 }
             ],
-            'society_name': 'society-name-NKDMYIfFApbQgMPVWggwrZnUhBSCdfQshatRJHibAqQwyjPObO',
+            'society_name': 'society-name-tSThNKDMYIfFApbQgMPVWggwrZnUhBSCdfQshatRJHibAqQwyj',
             'target_total': 0
         },
         {
@@ -485,16 +485,16 @@
 }
 
 snapshots['TestProjectAPI::test_personnel_csv_api 1'] = '''event_id,event_glide_id,event_name,event_ifrc_severity_level,event_disaster_type,event_country_name,event_country_iso3,event_country_nationalsociety,event_country_regionname,role,type,name,deployed_id,deployed_to_name,deployed_to_iso3,deployed_to_nationalsociety,deployed_to_regionname,deployed_from_name,deployed_from_iso3,deployed_from_nationalsociety,deployed_from_regionname,start_date,end_date,ongoing,is_active,molnix_id,molnix_sector,molnix_role_profile,molnix_language,molnix_region,molnix_scope,molnix_modality,molnix_operation\r
-,,,,,,,,,,,,10,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,9,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,8,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,7,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,6,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,5,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,4,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,3,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,2,,,,,,,,,,,True,True,,,,,,,,\r
 ,,,,,,,,,,,,1,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,2,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,3,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,4,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,5,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,6,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,7,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,8,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,9,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,10,,,,,,,,,,,True,True,,,,,,,,\r
 '''
 
 snapshots['TestProjectAPI::test_project_create 1'] = {

local_units/__init__.py

@@ -0,0 +1,6 @@
+from django.contrib.gis import admin
+
+from .models import LocalUnit, LocalUnitType
+
+admin.site.register(LocalUnit, admin.OSMGeoAdmin)
+admin.site.register(LocalUnitType, admin.ModelAdmin)

local_units/admin.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class LocalUnits(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'local_units'

local_units/apps.py

@@ -0,0 +1,49 @@
+from django.db import transaction
+import csv
+from django.core.management.base import BaseCommand, CommandError
+from django.contrib.gis.geos import Point
+
+from api.models import Country
+from ...models import LocalUnit, LocalUnitType
+
+
+class Command(BaseCommand):
+    help = "Import LocalUnits data from CSV"
+    missing_args_message = "Filename is missing. Filename / path to CSV file required. Required headers in CSV: distr_code, GOadm2code, ADM2"
+
+    def add_arguments(self, parser):
+        parser.add_argument('filename', nargs='+', type=str)
+
+    @transaction.atomic
+    def handle(self, *args, **options):
+        filename = options['filename'][0]
+        with open(filename) as csvfile:
+            reader = csv.DictReader(csvfile)
+            for row in reader:
+                unit = LocalUnit()
+                unit.country = Country.objects.get(iso3=row['ISO3'])
+                unit.type, created = LocalUnitType.objects.get_or_create(
+                    level=row['TYPECODE'],
+                    name=row['TYPENAME']
+                )
+                if created:
+                    print(f'New LocalUnitType created: {unit.type.name}')
+
+                unit.name_loc = row['NAME_LOC']
+                unit.name_en = row['NAME_EN']
+                unit.branch_level = int(row['TYPECODE'])
+                unit.postcode = int(row['POSTCODE']) if row['POSTCODE'] else None
+                unit.address_loc = row['ADDRESS_LOC']
+                unit.address_en = row['ADDRESS_EN']
+                unit.city_loc = row['CITY_LOC']
+                unit.city_en = row['CITY_EN']
+                unit.focal_person_loc = row['FOCAL_PERSON_LOC']
+                unit.focal_person_en = row['FOCAL_PERSON_EN']
+                unit.phone = row['TELEPHONE']
+                unit.email = row['EMAIL']
+                unit.link = row['WEBSITE']
+                unit.source_en = row['SOURCE_EN']
+                unit.source_loc = row['SOURCE_LOC']
+                unit.location = Point(float(row['LONGITUDE']), float(row['LATITUDE']))
+                unit.save()
+                print(f'{unit.name_en} saved')