fix(cohort): sort DMs within an RQS

aphp · Jan 21, 2025 · 381fc2f · 381fc2f
1 parent 35adb39
commit 381fc2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/admin_cohort/settings.py b/admin_cohort/settings.py
@@ -8,7 +8,7 @@
 from celery.schedules import crontab
 
 TITLE = "Portail/Cohort360 API"
-VERSION = "3.24.11"
+VERSION = "3.24.12"
 AUTHOR = "Assistance Publique - Hopitaux de Paris, Département I&D"
 DESCRIPTION_MD = f"""Supports the official **Cohort360** web app and **Portail**  
                      Built by **{AUTHOR}**

diff --git a/cohort/serializers.py b/cohort/serializers.py
@@ -184,7 +184,7 @@ class RQSSerializer(BaseSerializer):
     owner = UserPrimaryKeyRelatedField(queryset=User.objects.all(), required=False)
     request = PrimaryKeyRelatedFieldWithOwner(queryset=Request.objects.all(), required=False)
     previous_snapshot = PrimaryKeyRelatedFieldWithOwner(required=False, queryset=RequestQuerySnapshot.objects.all())
-    dated_measures = DatedMeasureSerializer(many=True, read_only=True)
+    dated_measures = serializers.SerializerMethodField()
     cohort_results = CohortResultSerializer(many=True, read_only=True)
     shared_by = UserSerializer(allow_null=True, read_only=True)
 
@@ -195,6 +195,10 @@ class Meta:
                             "cohort_results",
                             "shared_by"]
 
+    def get_dated_measures(self, obj):
+        dated_measures = obj.dated_measures.all().order_by('-modified_at')
+        return DatedMeasureSerializer(dated_measures, many=True).data
+
 
 class RQSCreateSerializer(serializers.ModelSerializer):
     class Meta: