@finos/legend-data-cube 0.0.41 → 0.0.42

package/src/stores/core/filter/DataCubeQueryFilterOperation__LessThanOrEqual.tsx

@@ -15,7 +15,7 @@
  */
 import {
   DataCubeQueryFilterOperation,
-  generateDefaultFilterConditionPrimitiveTypeValue,
+  _defaultPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
@@ -23,6 +23,7 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   DataCubeQueryFilterOperator,
+  isPrimitiveType,
   ofDataType,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
@@ -33,15 +34,8 @@ import {
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import {
-  V1_PrimitiveValueSpecification,
-  type V1_AppliedFunction,
-  type V1_AppliedProperty,
-} from '@finos/legend-graph';
-import {
-  _buildConditionSnapshotProperty,
-  _dataCubeOperationValue,
-} from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__LessThanOrEqual extends DataCubeQueryFilterOperation {
   override get label() {
@@ -70,12 +64,13 @@ export class DataCubeQueryFilterOperation__LessThanOrEqual extends DataCubeQuery
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
+      value.value !== undefined &&
+      isPrimitiveType(value.type) &&
       ofDataType(value.type, [
         DataCubeColumnDataType.NUMBER,
         DataCubeColumnDataType.DATE,
         DataCubeColumnDataType.TIME,
       ]) &&
-      value.value !== undefined &&
       !Array.isArray(value.value)
     );
   }
@@ -83,20 +78,21 @@ export class DataCubeQueryFilterOperation__LessThanOrEqual extends DataCubeQuery
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.LESS_THAN_OR_EQUAL,
+      ),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__LessThanOrEqualColumn.tsx

@@ -32,11 +32,8 @@ import {
   _var,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable, isString } from '@finos/legend-shared';
-import {
-  V1_AppliedProperty,
-  type V1_AppliedFunction,
-} from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__LessThanOrEqualColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -65,8 +62,8 @@ export class DataCubeQueryFilterOperation__LessThanOrEqualColumn extends DataCub
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       value.value !== undefined &&
+      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       isString(value.value)
     );
   }
@@ -78,20 +75,17 @@ export class DataCubeQueryFilterOperation__LessThanOrEqualColumn extends DataCub
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.LESS_THAN_OR_EQUAL,
+      ),
     );
-
-    if (value instanceof V1_AppliedProperty) {
-      filterConditionSnapshot.value = {
-        value: value.property,
-        type: DataCubeOperationAdvancedValueType.COLUMN,
-      } satisfies DataCubeOperationValue;
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotContain.tsx

@@ -15,7 +15,7 @@
  */
 import {
   DataCubeQueryFilterOperation,
-  generateDefaultFilterConditionPrimitiveTypeValue,
+  _defaultPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
@@ -23,6 +23,7 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   DataCubeQueryFilterOperator,
+  isPrimitiveType,
   ofDataType,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
@@ -33,15 +34,11 @@ import {
   _property,
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
+import { guaranteeNonNullable, returnUndefOnError } from '@finos/legend-shared';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
 import {
-  V1_PrimitiveValueSpecification,
-  type V1_AppliedFunction,
-  type V1_AppliedProperty,
-} from '@finos/legend-graph';
-import {
-  _buildConditionSnapshotProperty,
-  _dataCubeOperationValue,
+  _unwrapNotFilterCondition,
+  _baseFilterCondition,
 } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__NotContain extends DataCubeQueryFilterOperation {
@@ -67,8 +64,9 @@ export class DataCubeQueryFilterOperation__NotContain extends DataCubeQueryFilte
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       value.value !== undefined &&
+      isPrimitiveType(value.type) &&
+      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       !Array.isArray(value.value)
     );
   }
@@ -76,20 +74,23 @@ export class DataCubeQueryFilterOperation__NotContain extends DataCubeQueryFilte
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    const unwrapped = returnUndefOnError(() =>
+      _unwrapNotFilterCondition(expression),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
+    if (!unwrapped) {
+      return undefined;
     }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(unwrapped, columnGetter, DataCubeFunction.CONTAINS),
+    );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEndWith.tsx

@@ -15,7 +15,7 @@
  */
 import {
   DataCubeQueryFilterOperation,
-  generateDefaultFilterConditionPrimitiveTypeValue,
+  _defaultPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
@@ -23,6 +23,7 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   DataCubeQueryFilterOperator,
+  isPrimitiveType,
   ofDataType,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
@@ -33,15 +34,11 @@ import {
   _property,
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
+import { guaranteeNonNullable, returnUndefOnError } from '@finos/legend-shared';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
 import {
-  V1_PrimitiveValueSpecification,
-  type V1_AppliedFunction,
-  type V1_AppliedProperty,
-} from '@finos/legend-graph';
-import {
-  _buildConditionSnapshotProperty,
-  _dataCubeOperationValue,
+  _unwrapNotFilterCondition,
+  _baseFilterCondition,
 } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__NotEndWith extends DataCubeQueryFilterOperation {
@@ -67,8 +64,9 @@ export class DataCubeQueryFilterOperation__NotEndWith extends DataCubeQueryFilte
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       value.value !== undefined &&
+      isPrimitiveType(value.type) &&
+      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       !Array.isArray(value.value)
     );
   }
@@ -76,20 +74,23 @@ export class DataCubeQueryFilterOperation__NotEndWith extends DataCubeQueryFilte
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    const unwrapped = returnUndefOnError(() =>
+      _unwrapNotFilterCondition(expression),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
+    if (!unwrapped) {
+      return undefined;
     }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(unwrapped, columnGetter, DataCubeFunction.ENDS_WITH),
+    );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEqual.tsx

@@ -15,7 +15,7 @@
  */
 import {
   DataCubeQueryFilterOperation,
-  generateDefaultFilterConditionPrimitiveTypeValue,
+  _defaultPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
@@ -23,6 +23,7 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   DataCubeQueryFilterOperator,
+  isPrimitiveType,
   ofDataType,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
@@ -33,15 +34,11 @@ import {
   _property,
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
+import { guaranteeNonNullable, returnUndefOnError } from '@finos/legend-shared';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
 import {
-  V1_PrimitiveValueSpecification,
-  type V1_AppliedFunction,
-  type V1_AppliedProperty,
-} from '@finos/legend-graph';
-import {
-  _buildConditionSnapshotProperty,
-  _dataCubeOperationValue,
+  _unwrapNotFilterCondition,
+  _baseFilterCondition,
 } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__NotEqual extends DataCubeQueryFilterOperation {
@@ -72,13 +69,14 @@ export class DataCubeQueryFilterOperation__NotEqual extends DataCubeQueryFilterO
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
+      value.value !== undefined &&
+      isPrimitiveType(value.type) &&
       ofDataType(value.type, [
         DataCubeColumnDataType.TEXT,
         DataCubeColumnDataType.NUMBER,
         DataCubeColumnDataType.DATE,
         DataCubeColumnDataType.TIME,
       ]) &&
-      value.value !== undefined &&
       !Array.isArray(value.value)
     );
   }
@@ -86,20 +84,23 @@ export class DataCubeQueryFilterOperation__NotEqual extends DataCubeQueryFilterO
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    const unwrapped = returnUndefOnError(() =>
+      _unwrapNotFilterCondition(expression),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
+    if (!unwrapped) {
+      return undefined;
     }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(unwrapped, columnGetter, DataCubeFunction.EQUAL),
+    );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEqualCaseInsensitive.tsx

@@ -15,7 +15,7 @@
  */
 import {
   DataCubeQueryFilterOperation,
-  generateDefaultFilterConditionPrimitiveTypeValue,
+  _defaultPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
@@ -23,6 +23,7 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   DataCubeQueryFilterOperator,
+  isPrimitiveType,
   ofDataType,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
@@ -34,15 +35,11 @@ import {
   _value,
   _var,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
+import { guaranteeNonNullable, returnUndefOnError } from '@finos/legend-shared';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
 import {
-  V1_PrimitiveValueSpecification,
-  type V1_AppliedFunction,
-  type V1_AppliedProperty,
-} from '@finos/legend-graph';
-import {
-  _buildConditionSnapshotProperty,
-  _dataCubeOperationValue,
+  _caseSensitiveBaseFilterCondition,
+  _unwrapNotFilterCondition,
 } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__NotEqualCaseInsensitive extends DataCubeQueryFilterOperation {
@@ -68,8 +65,9 @@ export class DataCubeQueryFilterOperation__NotEqualCaseInsensitive extends DataC
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       value.value !== undefined &&
+      isPrimitiveType(value.type) &&
+      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       !Array.isArray(value.value)
     );
   }
@@ -77,20 +75,27 @@ export class DataCubeQueryFilterOperation__NotEqualCaseInsensitive extends DataC
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    const unwrapped = returnUndefOnError(() =>
+      _unwrapNotFilterCondition(expression),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
+    if (!unwrapped) {
+      return undefined;
     }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
+    return this._finalizeConditionSnapshot(
+      _caseSensitiveBaseFilterCondition(
+        unwrapped,
+        columnGetter,
+        DataCubeFunction.EQUAL,
+      ),
+    );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEqualCaseInsensitiveColumn.tsx

@@ -32,12 +32,16 @@ import {
   _value,
   _var,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable, isString } from '@finos/legend-shared';
 import {
-  V1_AppliedProperty,
-  type V1_AppliedFunction,
-} from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+  guaranteeNonNullable,
+  isString,
+  returnUndefOnError,
+} from '@finos/legend-shared';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import {
+  _caseSensitiveBaseFilterCondition,
+  _unwrapNotFilterCondition,
+} from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__NotEqualCaseInsensitiveColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -62,8 +66,8 @@ export class DataCubeQueryFilterOperation__NotEqualCaseInsensitiveColumn extends
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       value.value !== undefined &&
+      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       isString(value.value)
     );
   }
@@ -75,20 +79,23 @@ export class DataCubeQueryFilterOperation__NotEqualCaseInsensitiveColumn extends
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    const unwrapped = returnUndefOnError(() =>
+      _unwrapNotFilterCondition(expression),
     );
-
-    if (value instanceof V1_AppliedProperty) {
-      filterConditionSnapshot.value = {
-        value: value.property,
-        type: DataCubeOperationAdvancedValueType.COLUMN,
-      } satisfies DataCubeOperationValue;
+    if (!unwrapped) {
+      return undefined;
     }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
+    return this._finalizeConditionSnapshot(
+      _caseSensitiveBaseFilterCondition(
+        unwrapped,
+        columnGetter,
+        DataCubeFunction.EQUAL,
+      ),
+    );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEqualColumn.tsx

@@ -32,12 +32,16 @@ import {
   _value,
   _var,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable, isString } from '@finos/legend-shared';
 import {
-  V1_AppliedProperty,
-  type V1_AppliedFunction,
-} from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+  guaranteeNonNullable,
+  isString,
+  returnUndefOnError,
+} from '@finos/legend-shared';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import {
+  _baseFilterCondition,
+  _unwrapNotFilterCondition,
+} from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__NotEqualColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -67,8 +71,8 @@ export class DataCubeQueryFilterOperation__NotEqualColumn extends DataCubeQueryF
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       value.value !== undefined &&
+      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       isString(value.value)
     );
   }
@@ -80,20 +84,19 @@ export class DataCubeQueryFilterOperation__NotEqualColumn extends DataCubeQueryF
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    const unwrapped = returnUndefOnError(() =>
+      _unwrapNotFilterCondition(expression),
     );
-
-    if (value instanceof V1_AppliedProperty) {
-      filterConditionSnapshot.value = {
-        value: value.property,
-        type: DataCubeOperationAdvancedValueType.COLUMN,
-      } satisfies DataCubeOperationValue;
+    if (!unwrapped) {
+      return undefined;
     }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(unwrapped, columnGetter, DataCubeFunction.EQUAL),
+    );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {