fix: cef3a0b6d4a332ec90f39841fbb6df83eeceb62d

Author: serverpod_cloud

ground_control_client/lib/src/protocol/client.dart

@@ -91,13 +91,6 @@ class EndpointAdminMigration extends _i1.EndpointRef {
         'migrateProcuredDatabaseProducts',
         {},
       );
-
-  _i2.Future<Map<String, dynamic>> backfillDatabaseResources() =>
-      caller.callServerEndpoint<Map<String, dynamic>>(
-        'adminMigration',
-        'backfillDatabaseResources',
-        {},
-      );
 }
 
 /// Endpoint for global administrator to handle procurement for users.

ground_control_client/lib/src/protocol/features/databases/models/database_info.dart

@@ -15,7 +15,7 @@ import 'package:serverpod_client/serverpod_client.dart' as _i1;
 abstract class DatabaseInfo implements _i1.SerializableModel {
   DatabaseInfo._({
     required this.cloudCapsuleId,
-    this.size,
+    required this.size,
     this.minCu,
     this.maxCu,
     required this.memoryMb,
@@ -25,7 +25,7 @@ abstract class DatabaseInfo implements _i1.SerializableModel {
 
   factory DatabaseInfo({
     required String cloudCapsuleId,
-    String? size,
+    required String size,
     double? minCu,
     double? maxCu,
     required int memoryMb,
@@ -36,7 +36,7 @@ abstract class DatabaseInfo implements _i1.SerializableModel {
   factory DatabaseInfo.fromJson(Map<String, dynamic> jsonSerialization) {
     return DatabaseInfo(
       cloudCapsuleId: jsonSerialization['cloudCapsuleId'] as String,
-      size: jsonSerialization['size'] as String?,
+      size: jsonSerialization['size'] as String,
       minCu: (jsonSerialization['minCu'] as num?)?.toDouble(),
       maxCu: (jsonSerialization['maxCu'] as num?)?.toDouble(),
       memoryMb: jsonSerialization['memoryMb'] as int,
@@ -48,22 +48,25 @@ abstract class DatabaseInfo implements _i1.SerializableModel {
   /// The cloud capsule ID.
   String cloudCapsuleId;
 
-  /// The size of the database, small, medium, large, large+.
-  String? size;
+  /// The size of the database: small, medium, large, largePlus, or unknown.
+  /// A value of unknown means the size could not be determined.
+  String size;
 
   /// The minimum number of CPUs that the database can be scaled to.
+  /// Null if the database size does not support scaling.
   double? minCu;
 
   /// The maximum number of CPUs that the database can be scaled to.
+  /// Null if the database size does not support scaling.
   double? maxCu;
 
   /// The memory of the database in MB.
   int memoryMb;
 
-  /// The storage limit of the database in GB.
+  /// The storage limit of the database in GB. Null means no limit.
   int? storageLimitGB;
 
-  /// The compute hours limit of the database in hours.
+  /// The compute hours limit of the database in hours. Null means no limit.
   int? computeHoursLimit;
 
   /// Returns a shallow copy of this [DatabaseInfo]
@@ -83,7 +86,7 @@ abstract class DatabaseInfo implements _i1.SerializableModel {
     return {
       '__className__': 'DatabaseInfo',
       'cloudCapsuleId': cloudCapsuleId,
-      if (size != null) 'size': size,
+      'size': size,
       if (minCu != null) 'minCu': minCu,
       if (maxCu != null) 'maxCu': maxCu,
       'memoryMb': memoryMb,
@@ -103,7 +106,7 @@ class _Undefined {}
 class _DatabaseInfoImpl extends DatabaseInfo {
   _DatabaseInfoImpl({
     required String cloudCapsuleId,
-    String? size,
+    required String size,
     double? minCu,
     double? maxCu,
     required int memoryMb,
@@ -125,7 +128,7 @@ class _DatabaseInfoImpl extends DatabaseInfo {
   @override
   DatabaseInfo copyWith({
     String? cloudCapsuleId,
-    Object? size = _Undefined,
+    String? size,
     Object? minCu = _Undefined,
     Object? maxCu = _Undefined,
     int? memoryMb,
@@ -134,7 +137,7 @@ class _DatabaseInfoImpl extends DatabaseInfo {
   }) {
     return DatabaseInfo(
       cloudCapsuleId: cloudCapsuleId ?? this.cloudCapsuleId,
-      size: size is String? ? size : this.size,
+      size: size ?? this.size,
       minCu: minCu is double? ? minCu : this.minCu,
       maxCu: maxCu is double? ? maxCu : this.maxCu,
       memoryMb: memoryMb ?? this.memoryMb,

ground_control_client/lib/src/protocol/features/databases/models/database_resource.dart

@@ -24,8 +24,8 @@ abstract class DatabaseResource implements _i1.SerializableModel {
     required this.providerId,
     required this.provider,
     required this.connection,
-    this.scaling,
-    this.quota,
+    required this.scaling,
+    required this.quota,
   });
 
   factory DatabaseResource({
@@ -34,8 +34,8 @@ abstract class DatabaseResource implements _i1.SerializableModel {
     required String providerId,
     required _i2.DatabaseProvider provider,
     required _i3.DatabaseConnection connection,
-    _i4.DatabaseScaling? scaling,
-    _i5.DatabaseQuota? quota,
+    required _i4.DatabaseScaling scaling,
+    required _i5.DatabaseQuota quota,
   }) = _DatabaseResourceImpl;
 
   factory DatabaseResource.fromJson(Map<String, dynamic> jsonSerialization) {
@@ -49,16 +49,12 @@ abstract class DatabaseResource implements _i1.SerializableModel {
       connection: _i6.Protocol().deserialize<_i3.DatabaseConnection>(
         jsonSerialization['connection'],
       ),
-      scaling: jsonSerialization['scaling'] == null
-          ? null
-          : _i6.Protocol().deserialize<_i4.DatabaseScaling>(
-              jsonSerialization['scaling'],
-            ),
-      quota: jsonSerialization['quota'] == null
-          ? null
-          : _i6.Protocol().deserialize<_i5.DatabaseQuota>(
-              jsonSerialization['quota'],
-            ),
+      scaling: _i6.Protocol().deserialize<_i4.DatabaseScaling>(
+        jsonSerialization['scaling'],
+      ),
+      quota: _i6.Protocol().deserialize<_i5.DatabaseQuota>(
+        jsonSerialization['quota'],
+      ),
     );
   }
 
@@ -75,9 +71,9 @@ abstract class DatabaseResource implements _i1.SerializableModel {
 
   _i3.DatabaseConnection connection;
 
-  _i4.DatabaseScaling? scaling;
+  _i4.DatabaseScaling scaling;
 
-  _i5.DatabaseQuota? quota;
+  _i5.DatabaseQuota quota;
 
   /// Returns a shallow copy of this [DatabaseResource]
   /// with some or all fields replaced by the given arguments.
@@ -100,8 +96,8 @@ abstract class DatabaseResource implements _i1.SerializableModel {
       'providerId': providerId,
       'provider': provider.toJson(),
       'connection': connection.toJson(),
-      if (scaling != null) 'scaling': scaling?.toJson(),
-      if (quota != null) 'quota': quota?.toJson(),
+      'scaling': scaling.toJson(),
+      'quota': quota.toJson(),
     };
   }
 
@@ -120,8 +116,8 @@ class _DatabaseResourceImpl extends DatabaseResource {
     required String providerId,
     required _i2.DatabaseProvider provider,
     required _i3.DatabaseConnection connection,
-    _i4.DatabaseScaling? scaling,
-    _i5.DatabaseQuota? quota,
+    required _i4.DatabaseScaling scaling,
+    required _i5.DatabaseQuota quota,
   }) : super._(
          id: id,
          cloudCapsuleId: cloudCapsuleId,
@@ -142,19 +138,17 @@ class _DatabaseResourceImpl extends DatabaseResource {
     String? providerId,
     _i2.DatabaseProvider? provider,
     _i3.DatabaseConnection? connection,
-    Object? scaling = _Undefined,
-    Object? quota = _Undefined,
+    _i4.DatabaseScaling? scaling,
+    _i5.DatabaseQuota? quota,
   }) {
     return DatabaseResource(
       id: id is int? ? id : this.id,
       cloudCapsuleId: cloudCapsuleId ?? this.cloudCapsuleId,
       providerId: providerId ?? this.providerId,
       provider: provider ?? this.provider,
       connection: connection ?? this.connection.copyWith(),
-      scaling: scaling is _i4.DatabaseScaling?
-          ? scaling
-          : this.scaling?.copyWith(),
-      quota: quota is _i5.DatabaseQuota? ? quota : this.quota?.copyWith(),
+      scaling: scaling ?? this.scaling.copyWith(),
+      quota: quota ?? this.quota.copyWith(),
     );
   }
 }

ground_control_client/lib/src/protocol/features/databases/models/database_scaling.dart

@@ -14,31 +14,33 @@ import 'package:serverpod_client/serverpod_client.dart' as _i1;
 import '../../../features/databases/models/database_size.dart' as _i2;
 
 abstract class DatabaseScaling implements _i1.SerializableModel {
-  DatabaseScaling._({required this.minCu, required this.maxCu, this.size});
+  DatabaseScaling._({
+    required this.minCu,
+    required this.maxCu,
+    required this.size,
+  });
 
   factory DatabaseScaling({
     required double minCu,
     required double maxCu,
-    _i2.DatabaseSizeOption? size,
+    required _i2.DatabaseSizeOption size,
   }) = _DatabaseScalingImpl;
 
   factory DatabaseScaling.fromJson(Map<String, dynamic> jsonSerialization) {
     return DatabaseScaling(
       minCu: (jsonSerialization['minCu'] as num).toDouble(),
       maxCu: (jsonSerialization['maxCu'] as num).toDouble(),
-      size: jsonSerialization['size'] == null
-          ? null
-          : _i2.DatabaseSizeOption.fromJson(
-              (jsonSerialization['size'] as String),
-            ),
+      size: _i2.DatabaseSizeOption.fromJson(
+        (jsonSerialization['size'] as String),
+      ),
     );
   }
 
   double minCu;
 
   double maxCu;
 
-  _i2.DatabaseSizeOption? size;
+  _i2.DatabaseSizeOption size;
 
   /// Returns a shallow copy of this [DatabaseScaling]
   /// with some or all fields replaced by the given arguments.
@@ -54,7 +56,7 @@ abstract class DatabaseScaling implements _i1.SerializableModel {
       '__className__': 'DatabaseScaling',
       'minCu': minCu,
       'maxCu': maxCu,
-      if (size != null) 'size': size?.toJson(),
+      'size': size.toJson(),
     };
   }
 
@@ -64,13 +66,11 @@ abstract class DatabaseScaling implements _i1.SerializableModel {
   }
 }
 
-class _Undefined {}
-
 class _DatabaseScalingImpl extends DatabaseScaling {
   _DatabaseScalingImpl({
     required double minCu,
     required double maxCu,
-    _i2.DatabaseSizeOption? size,
+    required _i2.DatabaseSizeOption size,
   }) : super._(minCu: minCu, maxCu: maxCu, size: size);
 
   /// Returns a shallow copy of this [DatabaseScaling]
@@ -80,12 +80,12 @@ class _DatabaseScalingImpl extends DatabaseScaling {
   DatabaseScaling copyWith({
     double? minCu,
     double? maxCu,
-    Object? size = _Undefined,
+    _i2.DatabaseSizeOption? size,
   }) {
     return DatabaseScaling(
       minCu: minCu ?? this.minCu,
       maxCu: maxCu ?? this.maxCu,
-      size: size is _i2.DatabaseSizeOption? ? size : this.size,
+      size: size ?? this.size,
     );
   }
 }