Fixed up API

PostHog · Jan 2, 2024 · 11cf2a3 · 11cf2a3
1 parent 767561b
commit 11cf2a3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/frontend/src/scenes/comments/Comment.tsx b/frontend/src/scenes/comments/Comment.tsx
@@ -54,7 +54,7 @@ const Comment = ({ comment }: { comment: CommentType }): JSX.Element => {
                                 {
                                     icon: <IconShare />,
                                     label: 'Reply',
-                                    onClick: () => setReplyingComment(comment.source_comment_id ?? comment.id),
+                                    onClick: () => setReplyingComment(comment.source_comment ?? comment.id),
                                 },
                                 {
                                     icon: <IconPencil />,

diff --git a/frontend/src/scenes/comments/commentsLogic.ts b/frontend/src/scenes/comments/commentsLogic.ts
@@ -103,7 +103,7 @@ export const commentsLogic = kea<commentsLogicType>([
                         scope: props.scope,
                         item_id: props.item_id,
                         item_context: values.itemContext?.context,
-                        source_comment_id: values.replyingCommentId ?? undefined,
+                        source_comment: values.replyingCommentId ?? undefined,
                     })
 
                     values.itemContext?.callback?.({ sent: true })
@@ -180,11 +180,11 @@ export const commentsLogic = kea<commentsLogicType>([
                 const commentsById: Record<string, CommentWithRepliesType> = {}
 
                 for (const comment of sortedComments ?? []) {
-                    let commentsWithReplies = commentsById[comment.source_comment_id ?? comment.id]
+                    let commentsWithReplies = commentsById[comment.source_comment ?? comment.id]
 
                     if (!commentsWithReplies) {
-                        commentsById[comment.source_comment_id ?? comment.id] = commentsWithReplies = {
-                            id: comment.source_comment_id ?? comment.id,
+                        commentsById[comment.source_comment ?? comment.id] = commentsWithReplies = {
+                            id: comment.source_comment ?? comment.id,
                             comment: undefined,
                             replies: [],
                         }

diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -3263,7 +3263,7 @@ export type CommentType = {
     version: number
     created_at: string
     created_by: UserBasicType | null
-    source_comment_id?: string | null
+    source_comment?: string | null
     scope: ActivityScope
     item_id?: string
     item_context: Record<string, any> | null

diff --git a/posthog/api/comments.py b/posthog/api/comments.py
@@ -85,14 +85,14 @@ def get_queryset(self) -> QuerySet:
         if params.get("item_id"):
             queryset = queryset.filter(item_id=params.get("item_id"))
 
-        source_comment_id = params.get("source_comment_id")
+        source_comment = params.get("source_comment")
         if self.action == "thread":
-            # Filter based on the source_comment_id
-            source_comment_id = self.kwargs.get("pk")
+            # Filter based on the source_comment
+            source_comment = self.kwargs.get("pk")
 
-        if source_comment_id:
+        if source_comment:
             # NOTE: Should we also return the source_comment ?
-            queryset = queryset.filter(source_comment_id=source_comment_id)
+            queryset = queryset.filter(source_comment_id=source_comment)
 
         return queryset
 

diff --git a/posthog/api/test/test_comments.py b/posthog/api/test/test_comments.py
@@ -55,7 +55,7 @@ def test_creates_comment_successfully(self) -> None:
             "item_id": None,
             "item_context": None,
             "scope": "Notebook",
-            "source_comment_id": None,
+            "source_comment": None,
         }
 
     def test_updates_content_and_increments_version(self) -> None:
@@ -85,7 +85,7 @@ def test_updates_content_and_increments_version(self) -> None:
             "item_id": None,
             "item_context": None,
             "scope": "Notebook",
-            "source_comment_id": None,
+            "source_comment": None,
         }
 
     def test_empty_comments_list(self) -> None:
@@ -122,13 +122,13 @@ def test_lists_comments_filtering(self) -> None:
 
     def test_lists_comments_thread(self) -> None:
         initial_comment = self._create_comment({"content": "comment notebook-1", "scope": "Notebook", "item_id": "1"})
-        self._create_comment({"content": "comment reply", "source_comment_id": initial_comment["id"]})
-        self._create_comment({"content": "comment other reply", "source_comment_id": initial_comment["id"]})
+        self._create_comment({"content": "comment reply", "source_comment": initial_comment["id"]})
+        self._create_comment({"content": "comment other reply", "source_comment": initial_comment["id"]})
         self._create_comment({"content": "comment elsewhere"})
 
         for url in [
             f"/api/projects/{self.team.id}/comments/{initial_comment['id']}/thread",
-            f"/api/projects/{self.team.id}/comments/?source_comment_id={initial_comment['id']}",
+            f"/api/projects/{self.team.id}/comments/?source_comment={initial_comment['id']}",
         ]:
             response = self.client.get(url)
             assert len(response.json()["results"]) == 2