Merge branch 'feature-DATAAPI-2_delete-by-filters-without-id' into re…

…lease-3.2.0
pixl8 · Jun 24, 2021 · c2c4780 · c2c4780
2 parents 97247eb + b12c0bd
commit c2c4780
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/interceptors/DataApiInterceptors.cfc b/interceptors/DataApiInterceptors.cfc
@@ -111,6 +111,14 @@ component extends="coldbox.system.Interceptor" {
 		}
 	}
 
+	public void function preDeleteObjectData( event, interceptData ) {
+		if ( !_applicationLoaded ) return;
+
+		if( isEmptyString( interceptData.id ?: "" ) ){
+			interceptData.deletedIds = dataApiQueueService.getDeletedRecordIds( argumentCollection = interceptData );
+		}
+	}
+
 	public void function postDeleteObjectData( event, interceptData ) {
 		if ( !_applicationLoaded ) return;
 

diff --git a/services/DataApiQueueService.cfc b/services/DataApiQueueService.cfc
@@ -235,7 +235,11 @@ component {
 		  string objectName = ""
 		, string id         = ""
 		, any    filter     = {}
+		, array  deletedIds = []
 	) {
+		if( $helpers.isEmptyString( filter.id ?: "" ) && arrayLen( deletedIds ) ) {
+			filter = { id = deletedIds };
+		}
 		if ( IsStruct( filter ) && filter.count() == 1 ) {
 			var value = filter.id ?: ( filter[ "#objectName#.id" ] ?: "" );
 			if ( !IsArray( value ) ) {
@@ -349,6 +353,28 @@ component {
 		return subscribers;
 	}
 
+	public array function getDeletedRecordIds (
+		  required string objectName
+		,          any    filter       = {}
+		,          struct filterParams = {}
+		,          array  extraFilters = []
+		,          array  savedFilters = []
+	){
+		var values = [];
+
+		arguments.selectFields = [ "id" ];
+
+		try{
+			var queuedObj = $getPresideObject( objectName ).selectData( argumentCollection=arguments );
+			if( queuedObj.recordcount ) {
+				values = valueArray( queuedObj, "id" );
+			}
+		} catch( any e ) {
+			values = [];
+		}
+
+		return values;
+	}
 
 // PRIVATE HELPERS
 	private struct function _getQueueFilter( required string queueName ) {