Fix the endpoint to view project chats in order (#334)

* endpoint to view project chats in order * send username along with chats to admin * refactor * show username in chats list to admin
ohcnetwork · Oct 3, 2023 · 054e4dd · 054e4dd
1 parent 774e59c
commit 054e4dd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ayushma/serializers/chat.py b/ayushma/serializers/chat.py
@@ -7,6 +7,7 @@
 
 class ChatSerializer(serializers.ModelSerializer):
     project = ProjectSerializer(read_only=True)
+    username = serializers.CharField(source='user.username', read_only=True)
 
     class Meta:
         model = Chat
@@ -15,12 +16,14 @@ class Meta:
             "title",
             "created_at",
             "modified_at",
+            "username",
             "project",
         )
         read_only_fields = (
             "external_id",
             "created_at",
             "modified_at",
+            "username",
             "project",
         )
 
@@ -109,20 +112,22 @@ class ConverseSerializer(serializers.Serializer):
 class ChatDetailSerializer(serializers.ModelSerializer):
     chats = serializers.SerializerMethodField()
     message = ConverseSerializer(required=False)
+    username = serializers.CharField(source='user.username', read_only=True)
 
     class Meta:
         model = Chat
         fields = (
             "external_id",
             "title",
+            "username",
             "created_at",
             "modified_at",
             "chats",
             "prompt",
             "message",
             "model",
         )
-        read_only_fields = ("external_id", "created_at", "modified_at", "chats")
+        read_only_fields = ("external_id", "created_at", "modified_at", "chats", "username")
 
     def get_chats(self, obj):
         chatmessages = ChatMessage.objects.filter(chat=obj).order_by("created_at")

diff --git a/ayushma/views/chat.py b/ayushma/views/chat.py
@@ -58,7 +58,9 @@ def get_parsers(self):
     def get_queryset(self):
         user = self.request.user
         project_id = self.kwargs["project_external_id"]
-        queryset = self.queryset.filter(project__external_id=project_id)
+        queryset = self.queryset.filter(project__external_id=project_id).order_by(
+            "-created_at"
+        )
 
         if user.is_superuser and self.action == "list_all":
             return queryset