add generated fields as part of the formula fields

pixl8 · Aug 10, 2023 · 5a13cdc · 5a13cdc
1 parent 19d62e3
commit 5a13cdc
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/services/DataApiConfigurationService.cfc b/services/DataApiConfigurationService.cfc
@@ -679,9 +679,15 @@ component {
 		var fields         = [];
 
 		for( var fieldName in props ) {
-			if ( ( len( trim( props[ fieldName ].formula ?: "" ) ) || len( trim( props[ fieldName ].default ?: "" ) ) ) &&
-				 ( !isBoolean( props[ fieldName ][ propEnabledKey ] ?: "" ) || !props[ fieldName ][ propEnabledKey ] )
-			) {
+			var isFormulaFields = Len( Trim( props[ fieldName ].formula  ?: "" ) ) ||
+			                      Len( Trim( props[ fieldName ].default  ?: "" ) ) ||
+			                      (
+			                           Len( Trim( props[ fieldName ].generate ?: "" ) ) &&
+			                           ArrayFindNoCase( [ "insert", "always" ], props[ fieldName ].generate ) &&
+			                           !ArrayFindNoCase( [ "UUID", "none" ], props[ fieldName ].generator ?: "" )
+			                      );
+
+			if ( isFormulaFields && ( !isBoolean( props[ fieldName ][ propEnabledKey ] ?: "" ) || !props[ fieldName ][ propEnabledKey ] ) ) {
 				arrayAppend( fields, fieldName );
 			}
 		}