From ab59541a4d10670566ce8e5c206e24eac6d1f7f1 Mon Sep 17 00:00:00 2001
From: Dominic Watson <watson.dominic@gmail.com>
Date: Wed, 6 Sep 2023 15:19:07 +0100
Subject: [PATCH 1/4] [twgit] Init hotfix 'hotfix-3.5.7'.


From 7d8ea028f6c82f348e8a9967c7fa199e4f12e93b Mon Sep 17 00:00:00 2001
From: Dominic Watson <watson.dominic@gmail.com>
Date: Wed, 6 Sep 2023 15:20:46 +0100
Subject: [PATCH 2/4] changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6b9722..eb827db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.5.7
+
+* Always return id field in entity GETs
+* Stop silent try/catch that could lead to inconsistent return form of atomic data api queue items
+
 ## v3.5.6
 
 * Queue with atomic changes do not include default value or generated value fields for INSERT

From bfc0ff8f43ac45929e3bdca46f59e0de845dc030 Mon Sep 17 00:00:00 2001
From: Jasmin <jasmin0123@hotmail.com>
Date: Wed, 11 Oct 2023 18:39:42 +0800
Subject: [PATCH 3/4] DATAAPI-25 Updated to use the same validation data for
 updating record

So that the same validation data that potentially manipulated on interception point 'preValidateUpsertData' or 'postValidateUpsertData' will be passed through to the update record.
---
 handlers/rest-apis/data/v1/SingleRecord.cfc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/handlers/rest-apis/data/v1/SingleRecord.cfc b/handlers/rest-apis/data/v1/SingleRecord.cfc
index eb8edba..57a3c77 100644
--- a/handlers/rest-apis/data/v1/SingleRecord.cfc
+++ b/handlers/rest-apis/data/v1/SingleRecord.cfc
@@ -74,7 +74,7 @@ component {
 		var updated = dataApiService.updateSingleRecord(
 			  entity   = entity
 			, recordId = recordId
-			, data     = body
+			, data     = validationData
 		);
 
 		if ( updated ) {
@@ -96,4 +96,4 @@ component {
 
 		restResponse.setData( { deleted=deletedCount } );
 	}
-}
\ No newline at end of file
+}

From 114f8aaf0b72679ff4718c0b494e13484bf1edc2 Mon Sep 17 00:00:00 2001
From: Dominic Watson <watson.dominic@gmail.com>
Date: Fri, 13 Oct 2023 14:44:41 +0100
Subject: [PATCH 4/4] [twgit] Init feature
 'feature-DATAAPI-25_pass-validated-data-to-update-record'.