DATAAPI-46: skip queue flag evaluation

Author: jjannek

interceptors/DataApiInterceptors.cfc

@@ -118,7 +118,7 @@ component extends="coldbox.system.Interceptor" {
 	}
 
 	public void function preDeleteObjectData( event, interceptData ) {
-		if ( !_applicationLoaded ) return;
+		if ( _skipQueue( interceptData ) ) return;
 
 		if( isEmptyString( interceptData.id ?: "" ) ){
 			interceptData.deletedIds = dataApiQueueService.getDeletedRecordIds( argumentCollection = interceptData );
@@ -142,49 +142,41 @@ component extends="coldbox.system.Interceptor" {
 	}
 
 	public void function postDeleteObjectData( event, interceptData ) {
-		if ( !_applicationLoaded ) return;
-
-		var skipDataApiQueue = IsBoolean( interceptData.skipDataApiQueue ?: "" ) && interceptData.skipDataApiQueue;
-		var skipSyncQueue    = IsBoolean( interceptData.skipSyncQueue    ?: "" ) && interceptData.skipSyncQueue;
-
-		skipDataApiQueue = skipDataApiQueue || ( skipSyncQueue && dataApiConfigurationService.skipApiQueueWhenSkipSyncQueue( interceptData.objectName ) );
-
-		if( skipDataApiQueue ) return;
+		if ( _skipQueue( interceptData ) ) return;
 
 		dataApiQueueService.queueDelete( argumentCollection=interceptData );
 	}
 
 	public void function preUpdateObjectData( event, interceptData ) {
-		if ( !_applicationLoaded ) return;
+		if ( _skipQueue( interceptData ) ) return;
 
 		if ( dataApiQueueService.queueRequired( argumentCollection=interceptData ) ) {
 			interceptData.calculateChangedData = true;
 		}
 	}
 
 	public void function postUpdateObjectData( event, interceptData ) {
-		if ( !_applicationLoaded ) return;
-
-		var skipDataApiQueue = IsBoolean( interceptData.skipDataApiQueue ?: "" ) && interceptData.skipDataApiQueue;
-		var skipSyncQueue    = IsBoolean( interceptData.skipSyncQueue    ?: "" ) && interceptData.skipSyncQueue;
-
-		skipDataApiQueue = skipDataApiQueue || ( skipSyncQueue && dataApiConfigurationService.skipApiQueueWhenSkipSyncQueue( interceptData.objectName ) );
-
-		if( skipDataApiQueue ) return;
+		if ( _skipQueue( interceptData ) ) return;
 
 		dataApiQueueService.queueUpdate( argumentCollection=interceptData );
 	}
 
 	public void function postInsertObjectData( event, interceptData ) {
-		if ( !_applicationLoaded ) return;
+		if ( _skipQueue( interceptData ) ) return;
+
+		dataApiQueueService.queueInsert( argumentCollection=interceptData );
+	}
 
-		var skipDataApiQueue = IsBoolean( interceptData.skipDataApiQueue ?: "" ) && interceptData.skipDataApiQueue;
-		var skipSyncQueue    = IsBoolean( interceptData.skipSyncQueue    ?: "" ) && interceptData.skipSyncQueue;
+	private boolean function _skipQueue( interceptData ) {
 
-		skipDataApiQueue = skipDataApiQueue || ( skipSyncQueue && dataApiConfigurationService.skipApiQueueWhenSkipSyncQueue( interceptData.objectName ) );
+		if ( !_applicationLoaded ) {
+			return true;
+		}
 
-		if( skipDataApiQueue ) return;
+		if ( IsTrue( interceptData.skipDataApiQueue ?: "" ) ) {
+			return true;
+		}
 
-		dataApiQueueService.queueInsert( argumentCollection=interceptData );
+		return IsTrue( interceptData.skipSyncQueue ?: "" ) && dataApiConfigurationService.skipApiQueueWhenSkipSyncQueue( interceptData.objectName );
 	}
 }