Merge branch 'hotfix-3.5.9' into stable

pixl8 · Mar 28, 2024 · 1e27868 · 1e27868
2 parents 543ad2d + 9cbf495
commit 1e27868
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.5.9
+
+* [DATAAPI-27](https://projects.pixl8.london/browse/DATAAPI-27) - Function count does not exist in the object
+* [DATAAPI-28](https://projects.pixl8.london/browse/DATAAPI-28) - Swagger docs expand api to invalid endpoint url
+
 ## v3.5.8
 
 * Validated data not passed through on update single record - PUT

diff --git a/services/DataApiQueueService.cfc b/services/DataApiQueueService.cfc
@@ -174,8 +174,9 @@ component {
 			var actualChanges = {};
 
 			for( var recordId in arguments.changedData ) {
-				if ( arguments.changedData[ recordId ].count() ) {
-					actualChanges[ recordId ] = arguments.changedData[ recordId ];
+				var recordChanges = arguments.changedData[ recordId ];
+				if ( isStruct( recordChanges ) && !structIsEmpty( recordChanges ) ) {
+					actualChanges[ recordId ] = recordChanges;
 				}
 			}
 

diff --git a/services/DataApiSpecService.cfc b/services/DataApiSpecService.cfc
@@ -72,7 +72,7 @@ component {
 			  , version     = _i18nNamespaced( uri="dataapi:api.version" )
 			  , "x-favicon" = _i18nNamespaced( uri="dataapi:api.favicon", defaultValue="" )
 		};
-		spec.servers    = [ { url="#protocol#://#domain#/api#route#" } ];
+		spec.servers    = [ { url="#protocol#://#domain#/api#ReReplace( route, "/docs$", "" )#" } ];
 		spec.components = {
 			  schemas         = {}
 			, headers         = {}