Merge pull request #1637 from IFRCGo/1636-api-pagination-issue

API pagination issue

Author: szabozoltan69

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

@@ -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'] = {