Updated models

Author: rachana-egov

packages/digit_forms_engine/lib/helper/visibility_manager.dart

@@ -32,11 +32,14 @@ class VisibilityManager {
       final key = entry.key;
       final schema = entry.value;
 
-      final expression =
-          schema.conditions?['visibilityCondition']?['expression'];
-      if (expression is! String) continue;
+      final visibilityCondition = schema.visibilityCondition;
+      if (visibilityCondition == null ||
+          visibilityCondition.expression.isEmpty) {
+        continue;
+      }
 
-      final isVisible = evaluateVisibilityExpression(expression, flatValues);
+      final isVisible = evaluateVisibilityExpression(
+          visibilityCondition.expression, flatValues);
 
       toggleControlVisibility(key, isVisible, schema);
     }

packages/digit_forms_engine/lib/models/property_schema/property_schema.dart

@@ -32,10 +32,12 @@ class PropertySchema with _$PropertySchema {
     PropertySchemaFormat? format,
     @JsonKey(fromJson: _stringOrNull) final String? startDate,
     @JsonKey(fromJson: _stringOrNull) final String? endDate,
-    int? minValue,
-    int? maxValue,
-    int? minLength,
-    int? maxLength,
+    @JsonKey(fromJson: _intOrNull) int? minValue,
+    @JsonKey(fromJson: _intOrNull) int? maxValue,
+    @JsonKey(fromJson: _intOrNull) int? minLength,
+    @JsonKey(fromJson: _intOrNull) int? maxLength,
+    @JsonKey(fromJson: _intOrNull) int? min,
+    @JsonKey(fromJson: _intOrNull) int? max,
     String? helpText,
     String? tooltip,
     String? prefixText,
@@ -118,13 +120,23 @@ class NavigateToConfig with _$NavigateToConfig {
 @freezed
 class VisibilityCondition with _$VisibilityCondition {
   const factory VisibilityCondition({
-    required String expression,
+    required List<VisibilityExpression> expression,
   }) = _VisibilityCondition;
 
   factory VisibilityCondition.fromJson(Map<String, dynamic> json) =>
       _$VisibilityConditionFromJson(json);
 }
 
+@freezed
+class VisibilityExpression with _$VisibilityExpression {
+  const factory VisibilityExpression({
+    required String condition,
+  }) = _VisibilityExpression;
+
+  factory VisibilityExpression.fromJson(Map<String, dynamic> json) =>
+      _$VisibilityExpressionFromJson(json);
+}
+
 @freezed
 class ConditionalNavigateTo with _$ConditionalNavigateTo {
   const factory ConditionalNavigateTo({
@@ -187,6 +199,14 @@ String? _stringOrNull(dynamic value) {
   return value is String ? value : null;
 }
 
+int? _intOrNull(dynamic value) {
+  if (value == null) return null;
+  if (value is int) return value;
+  if (value is num) return value.toInt();
+  if (value is String) return int.tryParse(value);
+  return null;
+}
+
 NavigateToConfig? _navigateToConfigOrNull(dynamic value) {
   if (value is Map && value.isEmpty) {
     return null; // Treat {} as null