feat(scloud): cf751a8f30d1920646823e9e1583bbdf74e12d2d

Author: serverpod_cloud

serverpod_cloud_cli/lib/commands/me/me.dart

@@ -9,22 +9,43 @@ abstract class MeCommands {
   }) async {
     final user = await cloudApiClient.users.readUser();
 
-    String planDisplayName = 'No plan';
+    SubscriptionInfo? subscriptionInfo;
     try {
-      final subscriptionInfo = await cloudApiClient.plans.getSubscriptionInfo();
-      planDisplayName = subscriptionInfo.planDisplayName;
-    } on NoSubscriptionException {
-      planDisplayName = 'No plan';
+      subscriptionInfo = await cloudApiClient.plans.getSubscriptionInfo();
+    } on NoSubscriptionException catch (_) {
     } on Exception catch (e) {
       logger.debug('Failed to fetch subscription info: $e');
     }
 
+    final planDisplayName = subscriptionInfo?.planDisplayName ?? 'No plan';
+    final status = _determineStatus(subscriptionInfo) ?? '';
+
     final table = TablePrinter(
-      headers: ['Email', 'Plan'],
+      headers: ['Email', 'Plan', 'Status'],
       rows: [
-        [user.email, planDisplayName],
+        [user.email, planDisplayName, status],
       ],
     );
     table.writeLines(logger.line);
   }
+
+  static String? _determineStatus(final SubscriptionInfo? subscriptionInfo) {
+    if (subscriptionInfo == null) {
+      return null;
+    }
+
+    final now = DateTime.now();
+    final today = DateTime(now.year, now.month, now.day);
+
+    final endDate = subscriptionInfo.endDate;
+    final trialEndDate = subscriptionInfo.trialEndDate;
+
+    if (endDate != null && endDate.isBefore(today)) {
+      return 'Subscription ended ${endDate.toString().substring(0, 10)}';
+    } else if (trialEndDate != null && !trialEndDate.isBefore(today)) {
+      return 'Trial until ${trialEndDate.toString().substring(0, 10)}';
+    } else {
+      return 'Subscription active';
+    }
+  }
 }

serverpod_cloud_cli/test_integration/commands/me_command_test.dart

@@ -9,7 +9,6 @@ import 'package:serverpod_cloud_cli/command_runner/helpers/cloud_cli_service_pro
 import 'package:ground_control_client/ground_control_client.dart';
 import 'package:ground_control_client/ground_control_client_test_tools.dart';
 
-import '../../test_utils/command_logger_matchers.dart';
 import '../../test_utils/test_command_logger.dart';
 
 void main() {
@@ -60,11 +59,11 @@ void main() {
 
         expect(logger.lineCalls, isNotEmpty);
         expect(
-          logger.lineCalls,
+          logger.lineCalls.map((final l) => l.line),
           containsAllInOrder([
-            equalsLineCall(line: 'Email            | Plan        '),
-            equalsLineCall(line: '-----------------+-------------'),
-            equalsLineCall(line: 'test@example.com | Early Access'),
+            'Email            | Plan         | Status                ',
+            '-----------------+--------------+-----------------------',
+            contains('test@example.com | Early Access | Trial until 20'),
           ]),
         );
       });
@@ -93,11 +92,11 @@ void main() {
 
         expect(logger.lineCalls, isNotEmpty);
         expect(
-          logger.lineCalls,
+          logger.lineCalls.map((final l) => l.line),
           containsAllInOrder([
-            equalsLineCall(line: 'Email            | Plan   '),
-            equalsLineCall(line: '-----------------+--------'),
-            equalsLineCall(line: 'test@example.com | No plan'),
+            'Email            | Plan    | Status',
+            '-----------------+---------+-------',
+            'test@example.com | No plan |       ',
           ]),
         );
       });