fixed list of recent runs in the detail session view

Author: Shahidul-Khan2004

Backend/apps/simulations/serializers.py

@@ -35,7 +35,7 @@ class Meta:
         ]
 
 class SimulationSessionsDetailSerializer(serializers.ModelSerializer):
-    runs = SimulationRunSerializer(many=True, read_only=True)
+    runs = serializers.SerializerMethodField()
 
     state_count = serializers.IntegerField(read_only=True)
     transition_count = serializers.IntegerField(read_only=True)
@@ -64,6 +64,10 @@ class Meta:
             'transition_count',
             'runs'
         ]
+
+    def get_runs(self, obj):
+        recent_runs = obj.runs.order_by('-created_at')[:5]
+        return SimulationRunSerializer(recent_runs, many=True).data
 
     def get_share_url(self, obj):
         """

Backend/apps/simulations/views.py

@@ -98,30 +98,25 @@ def get_queryset(self):
             ).select_related('user').prefetch_related(
                 Prefetch(
                     'runs',
-                    queryset=SimulationRun.objects.order_by('-created_at')[:5]
+                    queryset=SimulationRun.objects.order_by('-created_at')
                 )
             )
 
         # List view: Only user's own sessions
         queryset = SimulationSessions.objects.filter(
             user=self.request.user
         )
-        queryset = queryset.select_related('user')
-        queryset = queryset.prefetch_related(
-            Prefetch(
-                'runs',
-                queryset=SimulationRun.objects.order_by('-created_at')[:5]
-            )
-        )
-        queryset = queryset.annotate(
-            run_count=Count('runs')
-        )
-    
-        # Conditional filtering based on query params
+        
+        # Conditional filtering based on query params (must be before select_related)
         automata_type = self.request.query_params.get('type')
         if automata_type:
             queryset = queryset.filter(automata_type=automata_type.upper())
 
+        # Optimize queries
+        queryset = queryset.select_related('user')
+        queryset = queryset.annotate(run_count=Count('runs'))
+        queryset = queryset.prefetch_related('runs')
+        
         logger.debug(f"Queryset for user {self.request.user.email}: {queryset.query}")
 
         return queryset