From 3b78ab04c7a68e39afa9936ac692169ed2c8fb74 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Mon, 22 May 2023 15:46:04 -0400
Subject: [PATCH 1/2] fix: #2662, draft=true querying by id

---
 src/versions/drafts/appendVersionToQueryKey.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/versions/drafts/appendVersionToQueryKey.ts b/src/versions/drafts/appendVersionToQueryKey.ts
index e5db030e5d..77084d21f0 100644
--- a/src/versions/drafts/appendVersionToQueryKey.ts
+++ b/src/versions/drafts/appendVersionToQueryKey.ts
@@ -16,6 +16,9 @@ export const appendVersionToQueryKey = (query: Where): Where => {
       };
     }
 
-    return res;
+    return {
+      ...res,
+      _id: val,
+    };
   }, {});
 };

From 314ddbd44cbea4a9fb204fb2af998b74e0c77706 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Mon, 22 May 2023 15:50:54 -0400
Subject: [PATCH 2/2] chore: tests

---
 test/versions/int.spec.ts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/test/versions/int.spec.ts b/test/versions/int.spec.ts
index 71590b9638..32de3b0470 100644
--- a/test/versions/int.spec.ts
+++ b/test/versions/int.spec.ts
@@ -510,6 +510,27 @@ describe('Versions', () => {
 
       expect(draftFindResults.docs).toHaveLength(0);
     });
+
+    it('should be able to query by id with draft=true', async () => {
+      const allDocs = await payload.find({
+        collection: 'draft-posts',
+        draft: true,
+      });
+
+      expect(allDocs.docs.length).toBeGreaterThan(1);
+
+      const byID = await payload.find({
+        collection: 'draft-posts',
+        draft: true,
+        where: {
+          id: {
+            equals: allDocs.docs[0].id,
+          },
+        },
+      });
+
+      expect(byID.docs).toHaveLength(1);
+    });
   });
 
   describe('Collections - GraphQL', () => {