fix: select in findByID with draft: true may return a wrong version (#14742)

Fixes #14589
This was caused by the fact that our `replacwWithDraftIfAvailable`
function expects to have `createdAt` and `updatedAt` fields and when the
user doesn't select `createdAt` and `updatedAt` fields the logic breaks.
Now, specifically for this case we force to select those fields,
however, you still won't receive `createdAt` and `updatedAt` fields to
the final result if they weren't specified in `select`.

---------

Co-authored-by: Jarrod Flesch <[email protected]>

Author: r1tsuu

packages/payload/src/collections/operations/findByID.ts

@@ -24,6 +24,7 @@ import { afterRead, type AfterReadArgs } from '../../fields/hooks/afterRead/inde
 import { validateQueryPaths } from '../../index.js'
 import { lockedDocumentsCollectionSlug } from '../../locked-documents/config.js'
 import { appendNonTrashedFilter } from '../../utilities/appendNonTrashedFilter.js'
+import { getSelectMode } from '../../utilities/getSelectMode.js'
 import { hasDraftsEnabled } from '../../utilities/getVersionsConfig.js'
 import { killTransaction } from '../../utilities/killTransaction.js'
 import { sanitizeSelect } from '../../utilities/sanitizeSelect.js'
@@ -152,6 +153,17 @@ export const findByIDOperation = async <
     // Find by ID
     // /////////////////////////////////////
 
+    let dbSelect = select
+
+    if (
+      collectionConfig.versions?.drafts &&
+      replaceWithVersion &&
+      select &&
+      getSelectMode(select) === 'include'
+    ) {
+      dbSelect = { ...select, createdAt: true, updatedAt: true }
+    }
+
     const findOneArgs: FindOneArgs = {
       collection: collectionConfig.slug,
       draftsEnabled: replaceWithVersion,
@@ -160,7 +172,7 @@ export const findByIDOperation = async <
       req: {
         transactionID: req.transactionID,
       } as PayloadRequest,
-      select,
+      select: dbSelect,
       where: fullWhere,
     }
 

packages/payload/src/globals/operations/findOne.ts

@@ -101,11 +101,21 @@ export const findOneOperation = async <T extends Record<string, unknown>>(
     // Perform database operation
     // /////////////////////////////////////
 
+    let dbSelect = select
+
+    if (
+      globalConfig.versions?.drafts &&
+      replaceWithVersion &&
+      select &&
+      getSelectMode(select) === 'include'
+    ) {
+      dbSelect = { ...select, createdAt: true, updatedAt: true }
+    }
     const docFromDB = await req.payload.db.findGlobal({
       slug,
       locale: locale!,
       req,
-      select,
+      select: dbSelect,
       where: overrideAccess ? undefined : (accessResult as Where),
     })
 

test/select/int.spec.ts

@@ -1635,6 +1635,39 @@ describe('Select', () => {
       expect(doc.version.text).toBe(post.text)
     })
 
+    it('should return a latest version with findByID and draft: true', async () => {
+      const doc = await payload.create({
+        collection: 'versioned-posts',
+        data: { text: 'draft-post', _status: 'draft' },
+        draft: true,
+      })
+
+      const res = await payload.findByID({
+        collection: 'versioned-posts',
+        id: doc.id,
+        draft: true,
+        select: { text: true },
+      })
+      expect(res.text).toBe('draft-post')
+      await payload.update({
+        collection: 'versioned-posts',
+        id: doc.id,
+        data: { text: 'published', _status: 'published' },
+      })
+
+      const res_2 = await payload.findByID({
+        collection: 'versioned-posts',
+        id: doc.id,
+        draft: true,
+        select: { text: true },
+      })
+
+      expect(res_2).toStrictEqual({
+        text: 'published',
+        id: res_2.id,
+      })
+    })
+
     it('should create versions with complete data when updating with select', async () => {
       // First, update the post with select to only return the id field
       const updatedPost = await payload.update({

test/select/payload-types.ts

@@ -1059,6 +1059,7 @@ export interface GlobalPost {
   id: string;
   text?: string | null;
   number?: number | null;
+  _status?: ('draft' | 'published') | null;
   updatedAt?: string | null;
   createdAt?: string | null;
 }
@@ -1086,6 +1087,7 @@ export interface ForceSelectGlobal {
 export interface GlobalPostSelect<T extends boolean = true> {
   text?: T;
   number?: T;
+  _status?: T;
   updatedAt?: T;
   createdAt?: T;
   globalType?: T;